Add websocket phone8.1 support.

Author: zhelu2

Release/include/cpprest/ws_client.h

@@ -37,6 +37,7 @@
 
 #include "cpprest/xxpublic.h"
 
+#if _NOT_PHONE8_
 #if defined(_MSC_VER) && (_MSC_VER >= 1800)
 #include <ppltasks.h>
 namespace pplx = Concurrency;
@@ -397,5 +398,6 @@ class websocket_client
 
 }}}}
 
+#endif  // _NOT_PHONE8_
 #endif
 #endif  /* _CASA_WS_CLIENT_H */

Release/include/cpprest/ws_msg.h

@@ -35,6 +35,7 @@
 #include "cpprest/xxpublic.h"
 #include "cpprest/containerstream.h"
 
+#if _NOT_PHONE8_
 #if defined(_MSC_VER) && (_MSC_VER >= 1800)
 #include <ppltasks.h>
 namespace pplx = Concurrency;
@@ -239,6 +240,6 @@ class websocket_incoming_message
 
 }}}}
 
+#endif  // _NOT_PHONE8_
 #endif
-
 #endif  /* _CASA_WS_MSG_H */

Release/include/cpprest/xxpublic.h

@@ -68,3 +68,6 @@
 #ifdef __clang__
 #include <cstdio>
 #endif
+
+// Define the _NOT_PHONE8_ as non-windows or windows desktop without arm configuration or windows store app or windows phone8.1
+#define _NOT_PHONE8_ !defined(WINAPI_FAMILY) || (WINAPI_FAMILY == WINAPI_FAMILY_DESKTOP_APP && !defined(_M_ARM)) || WINAPI_FAMILY == WINAPI_FAMILY_APP || (WINAPI_FAMILY == WINAPI_FAMILY_PHONE_APP && _WIN32_WINNT == _WIN32_WINNT_WINBLUE)

Release/src/build/casablanca110.wp8.vcxproj

@@ -34,7 +34,7 @@
 
   <ItemDefinitionGroup>
     <ClCompile>
-      <PreprocessorDefinitions>_ASYNCRT_EXPORT;_PPLX_EXPORT;_PHONE8_;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WINAPI_FAMILY=WINAPI_FAMILY_PHONE_APP;_ASYNCRT_EXPORT;_PPLX_EXPORT;_PHONE8_;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <AdditionalUsingDirectories>$(WindowsSDK_MetadataPath);$(AdditionalUsingDirectories)</AdditionalUsingDirectories>
       <CompileAsWinRT>true</CompileAsWinRT>
       <AdditionalIncludeDirectories>$(CasablancaIncludeDir);$(CasablancaSrcDir)\pch;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

Release/src/build/casablanca120.wp81.vcxproj

@@ -37,7 +37,7 @@
   </PropertyGroup>
   <ItemDefinitionGroup>
     <ClCompile>
-      <PreprocessorDefinitions>WINAPI_FAMILY=WINAPI_PARTITION_PHONE_APP;_ASYNCRT_EXPORT;_PPLX_EXPORT;_PHONE81_;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WINAPI_FAMILY=WINAPI_FAMILY_PHONE_APP;_ASYNCRT_EXPORT;_PPLX_EXPORT;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <AdditionalUsingDirectories>$(WindowsSdkDir)\References\CommonConfiguration\Neutral;$(VSInstallDir)\vc\vcpackages;$(AdditionalUsingDirectories)</AdditionalUsingDirectories>
       <CompileAsWinRT>true</CompileAsWinRT>
       <AdditionalIncludeDirectories>$(CasablancaIncludeDir);$(CasablancaSrcDir)\pch;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

Release/src/websockets/client/ws_msg.cpp

@@ -32,14 +32,7 @@
 #include "cpprest/ws_client.h"
 
 #if !defined(_M_ARM) || defined(__cplusplus_winrt)
-#if defined(WINAPI_FAMILY_APP) && WINAPI_FAMILY == WINAPI_FAMILY_APP
-
-using namespace ::Windows::Foundation;
-using namespace ::Windows::Storage;
-using namespace ::Windows::Storage::Streams;
-using namespace ::Windows::Networking;
-using namespace ::Windows::Networking::Sockets;
-#endif /* WINAPI_FAMILY == WINAPI_FAMILY_APP */
+#if _NOT_PHONE8_
 
 using namespace concurrency;
 using namespace concurrency::streams::details;
@@ -94,4 +87,5 @@ pplx::task<std::string> websocket_incoming_message::extract_string() const
 }
 
 }}}}
+#endif  //  _NOT_PHONE8_
 #endif

Release/src/websockets/client/ws_winrt.cpp

@@ -27,7 +27,8 @@
 #include "stdafx.h"
 #include <concrt.h>
 
-#if WINAPI_FAMILY == WINAPI_FAMILY_APP
+// ws_winrt only available for windows storea app or window phone8.1
+#if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_PC_APP) || (WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_PHONE_APP) && _WIN32_WINNT == _WIN32_WINNT_WINBLUE)
 
 using namespace ::Windows::Foundation;
 using namespace ::Windows::Storage;