From 8b1cac7f9b09d65caff25336666056ed2fbcfd7d Mon Sep 17 00:00:00 2001
From: casey langen <casey.langen@gmail.com>
Date: Thu, 9 Mar 2017 08:38:03 -0800
Subject: [PATCH] - Updated project build settings to all favor fast code,
 instead of small   code. Also ensure all projects are compiled against the
 unicode charset. - Updated CHANGELOG and bumped versions.

---
 CHANGELOG.txt                                 |  15 +
 CMakeLists.txt                                |   2 +-
 src/3rdparty/3rdparty.vcxproj                 |   2 +-
 src/contrib/cddadecoder/CddaDataStream.cpp    |   4 +-
 .../cddadecoder/CddaDataStreamFactory.cpp     |   2 +-
 src/contrib/cddadecoder/cddadecoder.vcxproj   |   6 +-
 .../directsoundout/directsoundout.vcxproj     |   7 +-
 .../directsoundout/directsoundout_plugin.cpp  |   2 +-
 src/contrib/flacdecoder/flacdecoder.vcxproj   |   2 +
 src/contrib/m4adecoder/m4adecoder.vcxproj     |   2 +
 src/contrib/nomaddecoder/nomaddecoder.vcxproj |   3 +-
 src/contrib/nullout/nullout.vcxproj           |   3 +-
 src/contrib/oggdecoder/oggdecoder.vcxproj     |   3 +-
 .../taglib_plugin/taglib_plugin.vcxproj       |   7 +-
 src/contrib/wasapiout/wasapiout.vcxproj       |   3 +-
 src/contrib/wasapiout/wasapiout_plugin.cpp    |   2 +-
 src/contrib/waveout/waveout.vcxproj           |   3 +-
 .../websocket_remote/websocket_remote.vcxproj |  99 +++++-
 .../websocket_remote.vcxproj.filters          | 284 ++++++++++++++++++
 .../win32gdivis/GdiVis-musikcube.vcxproj      |   3 +-
 .../win32globalhotkeys.vcxproj                |   3 +-
 src/core/core.vcxproj                         |   2 +-
 src/glue/glue.vcxproj                         |   2 +-
 src/musikbox/app/util/Version.h               |   2 +-
 src/musikbox/cursespp/Win32Util.cpp           |   4 +-
 src/musikbox/musikbox.vcxproj                 |   6 +-
 src/musikwin/musikwin.vcxproj                 |   3 +-
 27 files changed, 444 insertions(+), 32 deletions(-)

diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index 13949fb43..5507ccce7 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -1,3 +1,18 @@
+0.9.3
+
+win32 only release:
+
+* updated `WASAPI` output plugin to disable endpoint routing by default. it
+  causes a crash in some rare cases that i don't seem to be able to work
+  around. i see similar crashes in firefox and some other apps that use this
+  feature.
+* updated `DirectSound` output volume adjustment to be as close to the `WASAPI`
+  `WaveOut` plugins as possible
+* changed compiler optimizations to favor fast code, instead of small code,
+  plus a few other small tweaks to (hopefully) improve performance.
+
+--------------------------------------------------------------------------------
+
 0.9.2
 
 * added an icon to the windows and android builds (not great, but better than
diff --git a/CMakeLists.txt b/CMakeLists.txt
index bf36ec76b..4ca81ae8f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -8,7 +8,7 @@ cmake_minimum_required(VERSION 3.0)
 project(musikbox)
 set (musikbox_VERSION_MAJOR 0)
 set (musikbox_VERSION_MINOR 9)
-set (musikbox_VERSION_PATCH 2)
+set (musikbox_VERSION_PATCH 3)
 set (musikbox_VERSION "${musikbox_VERSION_MAJOR}.${musikbox_VERSION_MINOR}.${musikbox_VERSION_PATCH}")
 
 include(ExternalProject)
diff --git a/src/3rdparty/3rdparty.vcxproj b/src/3rdparty/3rdparty.vcxproj
index e7fd02d90..3a6c0f835 100755
--- a/src/3rdparty/3rdparty.vcxproj
+++ b/src/3rdparty/3rdparty.vcxproj
@@ -70,7 +70,7 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
+      <Optimization>Full</Optimization>
       <InlineFunctionExpansion>Default</InlineFunctionExpansion>
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
diff --git a/src/contrib/cddadecoder/CddaDataStream.cpp b/src/contrib/cddadecoder/CddaDataStream.cpp
index 8ced0b8b9..73968c390 100755
--- a/src/contrib/cddadecoder/CddaDataStream.cpp
+++ b/src/contrib/cddadecoder/CddaDataStream.cpp
@@ -100,10 +100,10 @@ static int getTrackNumber(const char* uri) {
 bool CddaDataStream::Open(const char *uri, unsigned int options) {
     int trackIndex;
 
-    char driveLetter = 'A' + PathGetDriveNumber(uri);
+    char driveLetter = 'A' + PathGetDriveNumberA(uri);
     std::string drivePath = "\\\\.\\" + std::string(1, driveLetter) + ":";
 
-    this->drive = CreateFile(
+    this->drive = CreateFileA(
         drivePath.c_str(),
         GENERIC_READ,
         FILE_SHARE_READ,
diff --git a/src/contrib/cddadecoder/CddaDataStreamFactory.cpp b/src/contrib/cddadecoder/CddaDataStreamFactory.cpp
index b53296a7a..bba383f07 100755
--- a/src/contrib/cddadecoder/CddaDataStreamFactory.cpp
+++ b/src/contrib/cddadecoder/CddaDataStreamFactory.cpp
@@ -46,7 +46,7 @@ CddaDataStreamFactory::~CddaDataStreamFactory() {
 }
 
 bool CddaDataStreamFactory::CanRead(const char *uri) {
-    std::string extension = PathFindExtension(uri);
+    std::string extension = PathFindExtensionA(uri);
     return (extension == ".cda");
 }
 
diff --git a/src/contrib/cddadecoder/cddadecoder.vcxproj b/src/contrib/cddadecoder/cddadecoder.vcxproj
index e966db66d..0140a17de 100755
--- a/src/contrib/cddadecoder/cddadecoder.vcxproj
+++ b/src/contrib/cddadecoder/cddadecoder.vcxproj
@@ -19,13 +19,13 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
+    <CharacterSet>Unicode</CharacterSet>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <PlatformToolset>v140</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
+    <CharacterSet>Unicode</CharacterSet>
     <PlatformToolset>v140</PlatformToolset>
     <WholeProgramOptimization>false</WholeProgramOptimization>
   </PropertyGroup>
@@ -89,6 +89,8 @@
       <ObjectFileName>$(IntDir)</ObjectFileName>
       <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
       <FunctionLevelLinking>true</FunctionLevelLinking>
+      <Optimization>Full</Optimization>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
     </ClCompile>
     <Link>
       <AdditionalDependencies>shlwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
diff --git a/src/contrib/directsoundout/directsoundout.vcxproj b/src/contrib/directsoundout/directsoundout.vcxproj
index 126037a0d..18cca7d6e 100644
--- a/src/contrib/directsoundout/directsoundout.vcxproj
+++ b/src/contrib/directsoundout/directsoundout.vcxproj
@@ -19,13 +19,13 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <PlatformToolset>v140</PlatformToolset>
-    <CharacterSet>MultiByte</CharacterSet>
+    <CharacterSet>Unicode</CharacterSet>
     <WholeProgramOptimization>true</WholeProgramOptimization>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <PlatformToolset>v140</PlatformToolset>
-    <CharacterSet>MultiByte</CharacterSet>
+    <CharacterSet>Unicode</CharacterSet>
     <WholeProgramOptimization>false</WholeProgramOptimization>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
@@ -81,7 +81,7 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
-      <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
+      <InlineFunctionExpansion>Default</InlineFunctionExpansion>
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <AdditionalIncludeDirectories>../..;../../3rdparty/include;../../../../boost_1_60_0;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -94,6 +94,7 @@
       <WholeProgramOptimization>true</WholeProgramOptimization>
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <Optimization>Full</Optimization>
     </ClCompile>
     <Link>
       <AdditionalDependencies>dsound.lib;dxguid.lib;%(AdditionalDependencies)</AdditionalDependencies>
diff --git a/src/contrib/directsoundout/directsoundout_plugin.cpp b/src/contrib/directsoundout/directsoundout_plugin.cpp
index 9dbc68e43..f159414fa 100644
--- a/src/contrib/directsoundout/directsoundout_plugin.cpp
+++ b/src/contrib/directsoundout/directsoundout_plugin.cpp
@@ -43,7 +43,7 @@ class DirectSoundPlugin : public musik::core::sdk::IPlugin {
     public:
         virtual void Destroy() { delete this; }
         virtual const char* Name() { return "DirectSound IOutput"; };
-        virtual const char* Version() { return "0.3.0"; };
+        virtual const char* Version() { return "0.4.0"; };
         virtual const char* Author() { return "clangen"; };
         virtual int SdkVersion() { return musik::core::sdk::SdkVersion; }
 };
diff --git a/src/contrib/flacdecoder/flacdecoder.vcxproj b/src/contrib/flacdecoder/flacdecoder.vcxproj
index 65980b501..a44caebf4 100755
--- a/src/contrib/flacdecoder/flacdecoder.vcxproj
+++ b/src/contrib/flacdecoder/flacdecoder.vcxproj
@@ -87,6 +87,8 @@
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
       <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
       <FunctionLevelLinking>true</FunctionLevelLinking>
+      <Optimization>Full</Optimization>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
     </ClCompile>
     <Link>
       <AdditionalLibraryDirectories>./lib;../../3rdparty/lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
diff --git a/src/contrib/m4adecoder/m4adecoder.vcxproj b/src/contrib/m4adecoder/m4adecoder.vcxproj
index d5955b578..0ed125e7f 100755
--- a/src/contrib/m4adecoder/m4adecoder.vcxproj
+++ b/src/contrib/m4adecoder/m4adecoder.vcxproj
@@ -84,6 +84,8 @@
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
       <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
       <FunctionLevelLinking>true</FunctionLevelLinking>
+      <Optimization>Full</Optimization>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
     </ClCompile>
     <Link>
       <AdditionalLibraryDirectories>../../3rdparty/lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
diff --git a/src/contrib/nomaddecoder/nomaddecoder.vcxproj b/src/contrib/nomaddecoder/nomaddecoder.vcxproj
index 53bb04a57..5121bc9d5 100644
--- a/src/contrib/nomaddecoder/nomaddecoder.vcxproj
+++ b/src/contrib/nomaddecoder/nomaddecoder.vcxproj
@@ -80,7 +80,7 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
-      <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
+      <InlineFunctionExpansion>Default</InlineFunctionExpansion>
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <AdditionalIncludeDirectories>.;./mad;./nomad;../..;../../3rdparty/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>FPM_DEFAULT;_LIB;HAVE_CONFIG_H;ASO_ZEROCHECK;WIN32;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -90,6 +90,7 @@
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
       <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
       <FunctionLevelLinking>true</FunctionLevelLinking>
+      <Optimization>Full</Optimization>
     </ClCompile>
     <Link>
       <AdditionalDependencies>shlwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
diff --git a/src/contrib/nullout/nullout.vcxproj b/src/contrib/nullout/nullout.vcxproj
index d64946884..faf241ebe 100644
--- a/src/contrib/nullout/nullout.vcxproj
+++ b/src/contrib/nullout/nullout.vcxproj
@@ -81,7 +81,7 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
-      <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
+      <InlineFunctionExpansion>Default</InlineFunctionExpansion>
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <AdditionalIncludeDirectories>../..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -94,6 +94,7 @@
       <WholeProgramOptimization>true</WholeProgramOptimization>
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <Optimization>Full</Optimization>
     </ClCompile>
     <Link>
       <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
diff --git a/src/contrib/oggdecoder/oggdecoder.vcxproj b/src/contrib/oggdecoder/oggdecoder.vcxproj
index 22b6f9565..72f20000b 100755
--- a/src/contrib/oggdecoder/oggdecoder.vcxproj
+++ b/src/contrib/oggdecoder/oggdecoder.vcxproj
@@ -80,7 +80,7 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
-      <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
+      <InlineFunctionExpansion>Default</InlineFunctionExpansion>
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <AdditionalIncludeDirectories>.;../..;../../3rdparty/include;../../../../boost_1_60_0;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;OGGDECODER_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -94,6 +94,7 @@
       <ProgramDataBaseFileName>$(IntDir)vc$(PlatformToolsetVersion).pdb</ProgramDataBaseFileName>
       <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
       <FunctionLevelLinking>true</FunctionLevelLinking>
+      <Optimization>Full</Optimization>
     </ClCompile>
     <Link>
       <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
diff --git a/src/contrib/taglib_plugin/taglib_plugin.vcxproj b/src/contrib/taglib_plugin/taglib_plugin.vcxproj
index d30011264..878cc0987 100755
--- a/src/contrib/taglib_plugin/taglib_plugin.vcxproj
+++ b/src/contrib/taglib_plugin/taglib_plugin.vcxproj
@@ -19,13 +19,13 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
+    <CharacterSet>Unicode</CharacterSet>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <PlatformToolset>v140</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
+    <CharacterSet>Unicode</CharacterSet>
     <PlatformToolset>v140</PlatformToolset>
     <WholeProgramOptimization>false</WholeProgramOptimization>
   </PropertyGroup>
@@ -85,7 +85,7 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
-      <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
+      <InlineFunctionExpansion>Default</InlineFunctionExpansion>
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
       <AdditionalIncludeDirectories>../../;../../3rdparty/include/;../../../../boost_1_60_0/;taglib-1.11;taglib-1.11/taglib;taglib-1.11/taglib/ape;taglib-1.11/taglib/asf;taglib-1.11/taglib/flac;taglib-1.11/taglib/mpc;taglib-1.11/taglib/mpeg;taglib-1.11/taglib/mpeg/id3v1;taglib-1.11/taglib/mpeg/id3v2;taglib-1.11/taglib/mpeg/id3v2/frames;taglib-1.11/taglib/ogg;taglib-1.11/taglib/ogg/flac;taglib-1.11/taglib/ogg/opus;taglib-1.11/taglib/ogg/speex;taglib-1.11/taglib/ogg/vorbis;taglib-1.11/taglib/toolkit;taglib-1.11/taglib/trueaudio;taglib-1.11/taglib/wavpack;taglib-1.11/taglib/xm;taglib-1.11/taglib/riff;taglib-1.11/taglib/riff/aiff;taglib-1.11/taglib/riff/wav;taglib-1.11/taglib/mod;taglib-1.11/taglib/s3m;taglib-1.11/taglib/mp4;taglib-1.11/taglib/it;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
@@ -100,6 +100,7 @@
       <ObjectFileName>$(IntDir)</ObjectFileName>
       <ProgramDataBaseFileName>$(IntDir)vc$(PlatformToolsetVersion).pdb</ProgramDataBaseFileName>
       <FunctionLevelLinking>true</FunctionLevelLinking>
+      <Optimization>Full</Optimization>
     </ClCompile>
     <Link>
       <OutputFile>$(OutDir)$(ProjectName).dll</OutputFile>
diff --git a/src/contrib/wasapiout/wasapiout.vcxproj b/src/contrib/wasapiout/wasapiout.vcxproj
index f7b9e05e3..2255bdbe9 100644
--- a/src/contrib/wasapiout/wasapiout.vcxproj
+++ b/src/contrib/wasapiout/wasapiout.vcxproj
@@ -81,7 +81,7 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
-      <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
+      <InlineFunctionExpansion>Default</InlineFunctionExpansion>
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <AdditionalIncludeDirectories>../..;../../3rdparty/include;../../../../boost_1_60_0;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -94,6 +94,7 @@
       <WholeProgramOptimization>true</WholeProgramOptimization>
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <Optimization>Full</Optimization>
     </ClCompile>
     <Link>
       <AdditionalDependencies>winmm.lib;%(AdditionalDependencies)</AdditionalDependencies>
diff --git a/src/contrib/wasapiout/wasapiout_plugin.cpp b/src/contrib/wasapiout/wasapiout_plugin.cpp
index bcb4f7b72..342f389c2 100644
--- a/src/contrib/wasapiout/wasapiout_plugin.cpp
+++ b/src/contrib/wasapiout/wasapiout_plugin.cpp
@@ -43,7 +43,7 @@ class WasapiPlugin : public musik::core::sdk::IPlugin {
     public:
         virtual void Destroy() { delete this; }
         virtual const char* Name() { return "Wasapi IOutput"; };
-        virtual const char* Version() { return "0.3.0"; };
+        virtual const char* Version() { return "0.4.0"; };
         virtual const char* Author() { return "clangen"; };
         virtual int SdkVersion() { return musik::core::sdk::SdkVersion; }
 };
diff --git a/src/contrib/waveout/waveout.vcxproj b/src/contrib/waveout/waveout.vcxproj
index 4b3ce740a..bfea57069 100755
--- a/src/contrib/waveout/waveout.vcxproj
+++ b/src/contrib/waveout/waveout.vcxproj
@@ -81,7 +81,7 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
-      <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
+      <InlineFunctionExpansion>Default</InlineFunctionExpansion>
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <AdditionalIncludeDirectories>../..;../../3rdparty/include;../../../../boost_1_60_0;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -94,6 +94,7 @@
       <WholeProgramOptimization>true</WholeProgramOptimization>
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <Optimization>Full</Optimization>
     </ClCompile>
     <Link>
       <AdditionalDependencies>winmm.lib;%(AdditionalDependencies)</AdditionalDependencies>
diff --git a/src/contrib/websocket_remote/websocket_remote.vcxproj b/src/contrib/websocket_remote/websocket_remote.vcxproj
index 69976c27a..72d52b692 100644
--- a/src/contrib/websocket_remote/websocket_remote.vcxproj
+++ b/src/contrib/websocket_remote/websocket_remote.vcxproj
@@ -106,7 +106,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
       <WarningLevel>Level3</WarningLevel>
-      <Optimization>MaxSpeed</Optimization>
+      <Optimization>Full</Optimization>
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <SDLCheck>true</SDLCheck>
@@ -114,7 +114,7 @@
       <PreprocessorDefinitions>WIN32;ZLIB_WINAPI;_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
       <DebugInformationFormat>None</DebugInformationFormat>
-      <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
+      <InlineFunctionExpansion>Default</InlineFunctionExpansion>
       <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
     </ClCompile>
     <Link>
@@ -146,6 +146,101 @@
   <ItemGroup>
     <ClCompile Include="main.cpp" />
   </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="3rdparty\include\websocketpp\base64\base64.hpp" />
+    <ClInclude Include="3rdparty\include\websocketpp\client.hpp" />
+    <ClInclude Include="3rdparty\include\websocketpp\close.hpp" />
+    <ClInclude Include="3rdparty\include\websocketpp\common\asio.hpp" />
+    <ClInclude Include="3rdparty\include\websocketpp\common\asio_ssl.hpp" />
+    <ClInclude Include="3rdparty\include\websocketpp\common\chrono.hpp" />
+    <ClInclude Include="3rdparty\include\websocketpp\common\connection_hdl.hpp" />
+    <ClInclude Include="3rdparty\include\websocketpp\common\cpp11.hpp" />
+    <ClInclude Include="3rdparty\include\websocketpp\common\functional.hpp" />
+    <ClInclude Include="3rdparty\include\websocketpp\common\md5.hpp" />
+    <ClInclude Include="3rdparty\include\websocketpp\common\memory.hpp" />
+    <ClInclude Include="3rdparty\include\websocketpp\common\network.hpp" />
+    <ClInclude Include="3rdparty\include\websocketpp\common\platforms.hpp" />
+    <ClInclude Include="3rdparty\include\websocketpp\common\random.hpp" />
+    <ClInclude Include="3rdparty\include\websocketpp\common\regex.hpp" />
+    <ClInclude Include="3rdparty\include\websocketpp\common\stdint.hpp" />
+    <ClInclude Include="3rdparty\include\websocketpp\common\system_error.hpp" />
+    <ClInclude Include="3rdparty\include\websocketpp\common\thread.hpp" />
+    <ClInclude Include="3rdparty\include\websocketpp\common\time.hpp" />
+    <ClInclude Include="3rdparty\include\websocketpp\common\type_traits.hpp" />
+    <ClInclude Include="3rdparty\include\websocketpp\concurrency\basic.hpp" />
+    <ClInclude Include="3rdparty\include\websocketpp\concurrency\none.hpp" />
+    <ClInclude Include="3rdparty\include\websocketpp\config\asio.hpp" />
+    <ClInclude Include="3rdparty\include\websocketpp\config\asio_client.hpp" />
+    <ClInclude Include="3rdparty\include\websocketpp\config\asio_no_tls.hpp" />
+    <ClInclude Include="3rdparty\include\websocketpp\config\asio_no_tls_client.hpp" />
+    <ClInclude Include="3rdparty\include\websocketpp\config\boost_config.hpp" />
+    <ClInclude Include="3rdparty\include\websocketpp\config\core.hpp" />
+    <ClInclude Include="3rdparty\include\websocketpp\config\core_client.hpp" />
+    <ClInclude Include="3rdparty\include\websocketpp\config\debug.hpp" />
+    <ClInclude Include="3rdparty\include\websocketpp\config\debug_asio.hpp" />
+    <ClInclude Include="3rdparty\include\websocketpp\config\debug_asio_no_tls.hpp" />
+    <ClInclude Include="3rdparty\include\websocketpp\config\minimal_client.hpp" />
+    <ClInclude Include="3rdparty\include\websocketpp\config\minimal_server.hpp" />
+    <ClInclude Include="3rdparty\include\websocketpp\connection.hpp" />
+    <ClInclude Include="3rdparty\include\websocketpp\connection_base.hpp" />
+    <ClInclude Include="3rdparty\include\websocketpp\endpoint.hpp" />
+    <ClInclude Include="3rdparty\include\websocketpp\endpoint_base.hpp" />
+    <ClInclude Include="3rdparty\include\websocketpp\error.hpp" />
+    <ClInclude Include="3rdparty\include\websocketpp\extensions\extension.hpp" />
+    <ClInclude Include="3rdparty\include\websocketpp\extensions\permessage_deflate\disabled.hpp" />
+    <ClInclude Include="3rdparty\include\websocketpp\extensions\permessage_deflate\enabled.hpp" />
+    <ClInclude Include="3rdparty\include\websocketpp\frame.hpp" />
+    <ClInclude Include="3rdparty\include\websocketpp\http\constants.hpp" />
+    <ClInclude Include="3rdparty\include\websocketpp\http\impl\parser.hpp" />
+    <ClInclude Include="3rdparty\include\websocketpp\http\impl\request.hpp" />
+    <ClInclude Include="3rdparty\include\websocketpp\http\impl\response.hpp" />
+    <ClInclude Include="3rdparty\include\websocketpp\http\parser.hpp" />
+    <ClInclude Include="3rdparty\include\websocketpp\http\request.hpp" />
+    <ClInclude Include="3rdparty\include\websocketpp\http\response.hpp" />
+    <ClInclude Include="3rdparty\include\websocketpp\impl\connection_impl.hpp" />
+    <ClInclude Include="3rdparty\include\websocketpp\impl\endpoint_impl.hpp" />
+    <ClInclude Include="3rdparty\include\websocketpp\impl\utilities_impl.hpp" />
+    <ClInclude Include="3rdparty\include\websocketpp\logger\basic.hpp" />
+    <ClInclude Include="3rdparty\include\websocketpp\logger\levels.hpp" />
+    <ClInclude Include="3rdparty\include\websocketpp\logger\stub.hpp" />
+    <ClInclude Include="3rdparty\include\websocketpp\logger\syslog.hpp" />
+    <ClInclude Include="3rdparty\include\websocketpp\message_buffer\alloc.hpp" />
+    <ClInclude Include="3rdparty\include\websocketpp\message_buffer\message.hpp" />
+    <ClInclude Include="3rdparty\include\websocketpp\message_buffer\pool.hpp" />
+    <ClInclude Include="3rdparty\include\websocketpp\processors\base.hpp" />
+    <ClInclude Include="3rdparty\include\websocketpp\processors\hybi00.hpp" />
+    <ClInclude Include="3rdparty\include\websocketpp\processors\hybi07.hpp" />
+    <ClInclude Include="3rdparty\include\websocketpp\processors\hybi08.hpp" />
+    <ClInclude Include="3rdparty\include\websocketpp\processors\hybi13.hpp" />
+    <ClInclude Include="3rdparty\include\websocketpp\processors\processor.hpp" />
+    <ClInclude Include="3rdparty\include\websocketpp\random\none.hpp" />
+    <ClInclude Include="3rdparty\include\websocketpp\random\random_device.hpp" />
+    <ClInclude Include="3rdparty\include\websocketpp\roles\client_endpoint.hpp" />
+    <ClInclude Include="3rdparty\include\websocketpp\roles\server_endpoint.hpp" />
+    <ClInclude Include="3rdparty\include\websocketpp\server.hpp" />
+    <ClInclude Include="3rdparty\include\websocketpp\sha1\sha1.hpp" />
+    <ClInclude Include="3rdparty\include\websocketpp\transport\asio\base.hpp" />
+    <ClInclude Include="3rdparty\include\websocketpp\transport\asio\connection.hpp" />
+    <ClInclude Include="3rdparty\include\websocketpp\transport\asio\endpoint.hpp" />
+    <ClInclude Include="3rdparty\include\websocketpp\transport\asio\security\base.hpp" />
+    <ClInclude Include="3rdparty\include\websocketpp\transport\asio\security\none.hpp" />
+    <ClInclude Include="3rdparty\include\websocketpp\transport\asio\security\tls.hpp" />
+    <ClInclude Include="3rdparty\include\websocketpp\transport\base\connection.hpp" />
+    <ClInclude Include="3rdparty\include\websocketpp\transport\base\endpoint.hpp" />
+    <ClInclude Include="3rdparty\include\websocketpp\transport\debug\base.hpp" />
+    <ClInclude Include="3rdparty\include\websocketpp\transport\debug\connection.hpp" />
+    <ClInclude Include="3rdparty\include\websocketpp\transport\debug\endpoint.hpp" />
+    <ClInclude Include="3rdparty\include\websocketpp\transport\iostream\base.hpp" />
+    <ClInclude Include="3rdparty\include\websocketpp\transport\iostream\connection.hpp" />
+    <ClInclude Include="3rdparty\include\websocketpp\transport\iostream\endpoint.hpp" />
+    <ClInclude Include="3rdparty\include\websocketpp\transport\stub\base.hpp" />
+    <ClInclude Include="3rdparty\include\websocketpp\transport\stub\connection.hpp" />
+    <ClInclude Include="3rdparty\include\websocketpp\transport\stub\endpoint.hpp" />
+    <ClInclude Include="3rdparty\include\websocketpp\uri.hpp" />
+    <ClInclude Include="3rdparty\include\websocketpp\utf8_validator.hpp" />
+    <ClInclude Include="3rdparty\include\websocketpp\utilities.hpp" />
+    <ClInclude Include="3rdparty\include\websocketpp\version.hpp" />
+  </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
diff --git a/src/contrib/websocket_remote/websocket_remote.vcxproj.filters b/src/contrib/websocket_remote/websocket_remote.vcxproj.filters
index 08d7eb301..7bd8223b7 100644
--- a/src/contrib/websocket_remote/websocket_remote.vcxproj.filters
+++ b/src/contrib/websocket_remote/websocket_remote.vcxproj.filters
@@ -5,10 +5,294 @@
       <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
       <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
     </Filter>
+    <Filter Include="websocketpp">
+      <UniqueIdentifier>{bb67dd4b-bdf7-4821-a714-c1606bd1a1a6}</UniqueIdentifier>
+    </Filter>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="main.cpp">
       <Filter>src</Filter>
     </ClCompile>
   </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="3rdparty\include\websocketpp\random\none.hpp">
+      <Filter>websocketpp</Filter>
+    </ClInclude>
+    <ClInclude Include="3rdparty\include\websocketpp\random\random_device.hpp">
+      <Filter>websocketpp</Filter>
+    </ClInclude>
+    <ClInclude Include="3rdparty\include\websocketpp\roles\client_endpoint.hpp">
+      <Filter>websocketpp</Filter>
+    </ClInclude>
+    <ClInclude Include="3rdparty\include\websocketpp\roles\server_endpoint.hpp">
+      <Filter>websocketpp</Filter>
+    </ClInclude>
+    <ClInclude Include="3rdparty\include\websocketpp\sha1\sha1.hpp">
+      <Filter>websocketpp</Filter>
+    </ClInclude>
+    <ClInclude Include="3rdparty\include\websocketpp\transport\asio\base.hpp">
+      <Filter>websocketpp</Filter>
+    </ClInclude>
+    <ClInclude Include="3rdparty\include\websocketpp\transport\asio\connection.hpp">
+      <Filter>websocketpp</Filter>
+    </ClInclude>
+    <ClInclude Include="3rdparty\include\websocketpp\transport\asio\endpoint.hpp">
+      <Filter>websocketpp</Filter>
+    </ClInclude>
+    <ClInclude Include="3rdparty\include\websocketpp\transport\asio\security\base.hpp">
+      <Filter>websocketpp</Filter>
+    </ClInclude>
+    <ClInclude Include="3rdparty\include\websocketpp\transport\asio\security\none.hpp">
+      <Filter>websocketpp</Filter>
+    </ClInclude>
+    <ClInclude Include="3rdparty\include\websocketpp\transport\asio\security\tls.hpp">
+      <Filter>websocketpp</Filter>
+    </ClInclude>
+    <ClInclude Include="3rdparty\include\websocketpp\transport\base\connection.hpp">
+      <Filter>websocketpp</Filter>
+    </ClInclude>
+    <ClInclude Include="3rdparty\include\websocketpp\transport\base\endpoint.hpp">
+      <Filter>websocketpp</Filter>
+    </ClInclude>
+    <ClInclude Include="3rdparty\include\websocketpp\transport\debug\base.hpp">
+      <Filter>websocketpp</Filter>
+    </ClInclude>
+    <ClInclude Include="3rdparty\include\websocketpp\transport\debug\connection.hpp">
+      <Filter>websocketpp</Filter>
+    </ClInclude>
+    <ClInclude Include="3rdparty\include\websocketpp\transport\debug\endpoint.hpp">
+      <Filter>websocketpp</Filter>
+    </ClInclude>
+    <ClInclude Include="3rdparty\include\websocketpp\transport\iostream\base.hpp">
+      <Filter>websocketpp</Filter>
+    </ClInclude>
+    <ClInclude Include="3rdparty\include\websocketpp\transport\iostream\connection.hpp">
+      <Filter>websocketpp</Filter>
+    </ClInclude>
+    <ClInclude Include="3rdparty\include\websocketpp\transport\iostream\endpoint.hpp">
+      <Filter>websocketpp</Filter>
+    </ClInclude>
+    <ClInclude Include="3rdparty\include\websocketpp\transport\stub\base.hpp">
+      <Filter>websocketpp</Filter>
+    </ClInclude>
+    <ClInclude Include="3rdparty\include\websocketpp\transport\stub\connection.hpp">
+      <Filter>websocketpp</Filter>
+    </ClInclude>
+    <ClInclude Include="3rdparty\include\websocketpp\transport\stub\endpoint.hpp">
+      <Filter>websocketpp</Filter>
+    </ClInclude>
+    <ClInclude Include="3rdparty\include\websocketpp\client.hpp">
+      <Filter>websocketpp</Filter>
+    </ClInclude>
+    <ClInclude Include="3rdparty\include\websocketpp\close.hpp">
+      <Filter>websocketpp</Filter>
+    </ClInclude>
+    <ClInclude Include="3rdparty\include\websocketpp\connection.hpp">
+      <Filter>websocketpp</Filter>
+    </ClInclude>
+    <ClInclude Include="3rdparty\include\websocketpp\connection_base.hpp">
+      <Filter>websocketpp</Filter>
+    </ClInclude>
+    <ClInclude Include="3rdparty\include\websocketpp\endpoint.hpp">
+      <Filter>websocketpp</Filter>
+    </ClInclude>
+    <ClInclude Include="3rdparty\include\websocketpp\endpoint_base.hpp">
+      <Filter>websocketpp</Filter>
+    </ClInclude>
+    <ClInclude Include="3rdparty\include\websocketpp\error.hpp">
+      <Filter>websocketpp</Filter>
+    </ClInclude>
+    <ClInclude Include="3rdparty\include\websocketpp\frame.hpp">
+      <Filter>websocketpp</Filter>
+    </ClInclude>
+    <ClInclude Include="3rdparty\include\websocketpp\server.hpp">
+      <Filter>websocketpp</Filter>
+    </ClInclude>
+    <ClInclude Include="3rdparty\include\websocketpp\uri.hpp">
+      <Filter>websocketpp</Filter>
+    </ClInclude>
+    <ClInclude Include="3rdparty\include\websocketpp\utf8_validator.hpp">
+      <Filter>websocketpp</Filter>
+    </ClInclude>
+    <ClInclude Include="3rdparty\include\websocketpp\utilities.hpp">
+      <Filter>websocketpp</Filter>
+    </ClInclude>
+    <ClInclude Include="3rdparty\include\websocketpp\version.hpp">
+      <Filter>websocketpp</Filter>
+    </ClInclude>
+    <ClInclude Include="3rdparty\include\websocketpp\base64\base64.hpp">
+      <Filter>websocketpp</Filter>
+    </ClInclude>
+    <ClInclude Include="3rdparty\include\websocketpp\common\asio.hpp">
+      <Filter>websocketpp</Filter>
+    </ClInclude>
+    <ClInclude Include="3rdparty\include\websocketpp\common\asio_ssl.hpp">
+      <Filter>websocketpp</Filter>
+    </ClInclude>
+    <ClInclude Include="3rdparty\include\websocketpp\common\chrono.hpp">
+      <Filter>websocketpp</Filter>
+    </ClInclude>
+    <ClInclude Include="3rdparty\include\websocketpp\common\connection_hdl.hpp">
+      <Filter>websocketpp</Filter>
+    </ClInclude>
+    <ClInclude Include="3rdparty\include\websocketpp\common\cpp11.hpp">
+      <Filter>websocketpp</Filter>
+    </ClInclude>
+    <ClInclude Include="3rdparty\include\websocketpp\common\functional.hpp">
+      <Filter>websocketpp</Filter>
+    </ClInclude>
+    <ClInclude Include="3rdparty\include\websocketpp\common\md5.hpp">
+      <Filter>websocketpp</Filter>
+    </ClInclude>
+    <ClInclude Include="3rdparty\include\websocketpp\common\memory.hpp">
+      <Filter>websocketpp</Filter>
+    </ClInclude>
+    <ClInclude Include="3rdparty\include\websocketpp\common\network.hpp">
+      <Filter>websocketpp</Filter>
+    </ClInclude>
+    <ClInclude Include="3rdparty\include\websocketpp\common\platforms.hpp">
+      <Filter>websocketpp</Filter>
+    </ClInclude>
+    <ClInclude Include="3rdparty\include\websocketpp\common\random.hpp">
+      <Filter>websocketpp</Filter>
+    </ClInclude>
+    <ClInclude Include="3rdparty\include\websocketpp\common\regex.hpp">
+      <Filter>websocketpp</Filter>
+    </ClInclude>
+    <ClInclude Include="3rdparty\include\websocketpp\common\stdint.hpp">
+      <Filter>websocketpp</Filter>
+    </ClInclude>
+    <ClInclude Include="3rdparty\include\websocketpp\common\system_error.hpp">
+      <Filter>websocketpp</Filter>
+    </ClInclude>
+    <ClInclude Include="3rdparty\include\websocketpp\common\thread.hpp">
+      <Filter>websocketpp</Filter>
+    </ClInclude>
+    <ClInclude Include="3rdparty\include\websocketpp\common\time.hpp">
+      <Filter>websocketpp</Filter>
+    </ClInclude>
+    <ClInclude Include="3rdparty\include\websocketpp\common\type_traits.hpp">
+      <Filter>websocketpp</Filter>
+    </ClInclude>
+    <ClInclude Include="3rdparty\include\websocketpp\concurrency\basic.hpp">
+      <Filter>websocketpp</Filter>
+    </ClInclude>
+    <ClInclude Include="3rdparty\include\websocketpp\concurrency\none.hpp">
+      <Filter>websocketpp</Filter>
+    </ClInclude>
+    <ClInclude Include="3rdparty\include\websocketpp\config\asio.hpp">
+      <Filter>websocketpp</Filter>
+    </ClInclude>
+    <ClInclude Include="3rdparty\include\websocketpp\config\asio_client.hpp">
+      <Filter>websocketpp</Filter>
+    </ClInclude>
+    <ClInclude Include="3rdparty\include\websocketpp\config\asio_no_tls.hpp">
+      <Filter>websocketpp</Filter>
+    </ClInclude>
+    <ClInclude Include="3rdparty\include\websocketpp\config\asio_no_tls_client.hpp">
+      <Filter>websocketpp</Filter>
+    </ClInclude>
+    <ClInclude Include="3rdparty\include\websocketpp\config\boost_config.hpp">
+      <Filter>websocketpp</Filter>
+    </ClInclude>
+    <ClInclude Include="3rdparty\include\websocketpp\config\core.hpp">
+      <Filter>websocketpp</Filter>
+    </ClInclude>
+    <ClInclude Include="3rdparty\include\websocketpp\config\core_client.hpp">
+      <Filter>websocketpp</Filter>
+    </ClInclude>
+    <ClInclude Include="3rdparty\include\websocketpp\config\debug.hpp">
+      <Filter>websocketpp</Filter>
+    </ClInclude>
+    <ClInclude Include="3rdparty\include\websocketpp\config\debug_asio.hpp">
+      <Filter>websocketpp</Filter>
+    </ClInclude>
+    <ClInclude Include="3rdparty\include\websocketpp\config\debug_asio_no_tls.hpp">
+      <Filter>websocketpp</Filter>
+    </ClInclude>
+    <ClInclude Include="3rdparty\include\websocketpp\config\minimal_client.hpp">
+      <Filter>websocketpp</Filter>
+    </ClInclude>
+    <ClInclude Include="3rdparty\include\websocketpp\config\minimal_server.hpp">
+      <Filter>websocketpp</Filter>
+    </ClInclude>
+    <ClInclude Include="3rdparty\include\websocketpp\extensions\extension.hpp">
+      <Filter>websocketpp</Filter>
+    </ClInclude>
+    <ClInclude Include="3rdparty\include\websocketpp\extensions\permessage_deflate\disabled.hpp">
+      <Filter>websocketpp</Filter>
+    </ClInclude>
+    <ClInclude Include="3rdparty\include\websocketpp\extensions\permessage_deflate\enabled.hpp">
+      <Filter>websocketpp</Filter>
+    </ClInclude>
+    <ClInclude Include="3rdparty\include\websocketpp\http\constants.hpp">
+      <Filter>websocketpp</Filter>
+    </ClInclude>
+    <ClInclude Include="3rdparty\include\websocketpp\http\impl\parser.hpp">
+      <Filter>websocketpp</Filter>
+    </ClInclude>
+    <ClInclude Include="3rdparty\include\websocketpp\http\impl\request.hpp">
+      <Filter>websocketpp</Filter>
+    </ClInclude>
+    <ClInclude Include="3rdparty\include\websocketpp\http\impl\response.hpp">
+      <Filter>websocketpp</Filter>
+    </ClInclude>
+    <ClInclude Include="3rdparty\include\websocketpp\http\parser.hpp">
+      <Filter>websocketpp</Filter>
+    </ClInclude>
+    <ClInclude Include="3rdparty\include\websocketpp\http\request.hpp">
+      <Filter>websocketpp</Filter>
+    </ClInclude>
+    <ClInclude Include="3rdparty\include\websocketpp\http\response.hpp">
+      <Filter>websocketpp</Filter>
+    </ClInclude>
+    <ClInclude Include="3rdparty\include\websocketpp\impl\connection_impl.hpp">
+      <Filter>websocketpp</Filter>
+    </ClInclude>
+    <ClInclude Include="3rdparty\include\websocketpp\impl\endpoint_impl.hpp">
+      <Filter>websocketpp</Filter>
+    </ClInclude>
+    <ClInclude Include="3rdparty\include\websocketpp\impl\utilities_impl.hpp">
+      <Filter>websocketpp</Filter>
+    </ClInclude>
+    <ClInclude Include="3rdparty\include\websocketpp\logger\basic.hpp">
+      <Filter>websocketpp</Filter>
+    </ClInclude>
+    <ClInclude Include="3rdparty\include\websocketpp\logger\levels.hpp">
+      <Filter>websocketpp</Filter>
+    </ClInclude>
+    <ClInclude Include="3rdparty\include\websocketpp\logger\stub.hpp">
+      <Filter>websocketpp</Filter>
+    </ClInclude>
+    <ClInclude Include="3rdparty\include\websocketpp\logger\syslog.hpp">
+      <Filter>websocketpp</Filter>
+    </ClInclude>
+    <ClInclude Include="3rdparty\include\websocketpp\message_buffer\alloc.hpp">
+      <Filter>websocketpp</Filter>
+    </ClInclude>
+    <ClInclude Include="3rdparty\include\websocketpp\message_buffer\message.hpp">
+      <Filter>websocketpp</Filter>
+    </ClInclude>
+    <ClInclude Include="3rdparty\include\websocketpp\message_buffer\pool.hpp">
+      <Filter>websocketpp</Filter>
+    </ClInclude>
+    <ClInclude Include="3rdparty\include\websocketpp\processors\base.hpp">
+      <Filter>websocketpp</Filter>
+    </ClInclude>
+    <ClInclude Include="3rdparty\include\websocketpp\processors\hybi00.hpp">
+      <Filter>websocketpp</Filter>
+    </ClInclude>
+    <ClInclude Include="3rdparty\include\websocketpp\processors\hybi07.hpp">
+      <Filter>websocketpp</Filter>
+    </ClInclude>
+    <ClInclude Include="3rdparty\include\websocketpp\processors\hybi08.hpp">
+      <Filter>websocketpp</Filter>
+    </ClInclude>
+    <ClInclude Include="3rdparty\include\websocketpp\processors\hybi13.hpp">
+      <Filter>websocketpp</Filter>
+    </ClInclude>
+    <ClInclude Include="3rdparty\include\websocketpp\processors\processor.hpp">
+      <Filter>websocketpp</Filter>
+    </ClInclude>
+  </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/src/contrib/win32gdivis/GdiVis-musikcube.vcxproj b/src/contrib/win32gdivis/GdiVis-musikcube.vcxproj
index 8551286dc..33ec09d18 100644
--- a/src/contrib/win32gdivis/GdiVis-musikcube.vcxproj
+++ b/src/contrib/win32gdivis/GdiVis-musikcube.vcxproj
@@ -67,7 +67,7 @@
       <InlineFunctionExpansion>Default</InlineFunctionExpansion>
       <StringPooling>true</StringPooling>
       <FunctionLevelLinking>true</FunctionLevelLinking>
-      <Optimization>MaxSpeed</Optimization>
+      <Optimization>Full</Optimization>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <WarningLevel>Level3</WarningLevel>
       <AdditionalIncludeDirectories>.\;..\..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
@@ -78,6 +78,7 @@
       <ProgramDataBaseFileName>.\Release\</ProgramDataBaseFileName>
       <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
       <WholeProgramOptimization>true</WholeProgramOptimization>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
     </ClCompile>
     <Midl>
       <SuppressStartupBanner>true</SuppressStartupBanner>
diff --git a/src/contrib/win32globalhotkeys/win32globalhotkeys.vcxproj b/src/contrib/win32globalhotkeys/win32globalhotkeys.vcxproj
index 68950996b..919f61cbc 100644
--- a/src/contrib/win32globalhotkeys/win32globalhotkeys.vcxproj
+++ b/src/contrib/win32globalhotkeys/win32globalhotkeys.vcxproj
@@ -81,7 +81,7 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
-      <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
+      <InlineFunctionExpansion>Default</InlineFunctionExpansion>
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <AdditionalIncludeDirectories>../..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -94,6 +94,7 @@
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
       <WholeProgramOptimization>true</WholeProgramOptimization>
+      <Optimization>Full</Optimization>
     </ClCompile>
     <Link>
       <AdditionalDependencies>winmm.lib;%(AdditionalDependencies)</AdditionalDependencies>
diff --git a/src/core/core.vcxproj b/src/core/core.vcxproj
index 2d0b0e8db..d0c68693d 100755
--- a/src/core/core.vcxproj
+++ b/src/core/core.vcxproj
@@ -70,7 +70,7 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
+      <Optimization>Full</Optimization>
       <InlineFunctionExpansion>Default</InlineFunctionExpansion>
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
diff --git a/src/glue/glue.vcxproj b/src/glue/glue.vcxproj
index fa46e7ad9..685ece8e0 100644
--- a/src/glue/glue.vcxproj
+++ b/src/glue/glue.vcxproj
@@ -70,7 +70,7 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
+      <Optimization>Full</Optimization>
       <InlineFunctionExpansion>Default</InlineFunctionExpansion>
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
diff --git a/src/musikbox/app/util/Version.h b/src/musikbox/app/util/Version.h
index 46425a115..615bd7841 100644
--- a/src/musikbox/app/util/Version.h
+++ b/src/musikbox/app/util/Version.h
@@ -1,3 +1,3 @@
 #pragma once
 
-#define VERSION "0.9.2"
+#define VERSION "0.9.3"
diff --git a/src/musikbox/cursespp/Win32Util.cpp b/src/musikbox/cursespp/Win32Util.cpp
index 1317072bd..f367f7f48 100644
--- a/src/musikbox/cursespp/Win32Util.cpp
+++ b/src/musikbox/cursespp/Win32Util.cpp
@@ -39,7 +39,7 @@
 
 #ifdef WIN32
 
-static std::basic_string<TCHAR> className = "Curses_App";
+static std::basic_string<TCHAR> className = L"Curses_App";
 static HWND mainWindow = nullptr;
 
 static void findMainWindow() {
@@ -53,7 +53,7 @@ static void findMainWindow() {
             GetWindowThreadProcessId(hWnd, &dwWndProcID);
             if (dwWndProcID == dwProcID) {
                 GetClassName(hWnd, buffer, sizeof(buffer));
-                if (className == std::string(buffer)) {
+                if (className == std::basic_string<TCHAR>(buffer)) {
                     mainWindow = hWnd;
                     return;
                 }
diff --git a/src/musikbox/musikbox.vcxproj b/src/musikbox/musikbox.vcxproj
index f8c113cf4..42be56155 100755
--- a/src/musikbox/musikbox.vcxproj
+++ b/src/musikbox/musikbox.vcxproj
@@ -20,7 +20,7 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
+    <CharacterSet>Unicode</CharacterSet>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <PlatformToolset>v140</PlatformToolset>
   </PropertyGroup>
@@ -28,7 +28,7 @@
     <ConfigurationType>Application</ConfigurationType>
     <UseOfMfc>false</UseOfMfc>
     <UseOfAtl>false</UseOfAtl>
-    <CharacterSet>MultiByte</CharacterSet>
+    <CharacterSet>Unicode</CharacterSet>
     <PlatformToolset>v140</PlatformToolset>
     <WholeProgramOptimization>false</WholeProgramOptimization>
   </PropertyGroup>
@@ -101,6 +101,8 @@
       <ProgramDataBaseFileName>$(IntDir)vc$(PlatformToolsetVersion).pdb</ProgramDataBaseFileName>
       <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
       <FunctionLevelLinking>true</FunctionLevelLinking>
+      <Optimization>Full</Optimization>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
     </ClCompile>
     <Link>
       <AdditionalLibraryDirectories>../3rdparty/win32_lib;../../../boost_1_60_0/lib32-msvc-14.0;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
diff --git a/src/musikwin/musikwin.vcxproj b/src/musikwin/musikwin.vcxproj
index cde329158..17db51c95 100644
--- a/src/musikwin/musikwin.vcxproj
+++ b/src/musikwin/musikwin.vcxproj
@@ -125,7 +125,7 @@
       <WarningLevel>Level3</WarningLevel>
       <PrecompiledHeader>
       </PrecompiledHeader>
-      <Optimization>MaxSpeed</Optimization>
+      <Optimization>Full</Optimization>
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -133,6 +133,7 @@
       <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
       <AdditionalIncludeDirectories>./;../;../3rdparty/include;../3rdparty/win32_include;../../../boost_1_60_0;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>