Sync to TFS

Author: ras0219-msft

Release/src/websockets/client/ws_winrt.cpp

@@ -25,6 +25,7 @@
 * =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
 ****/
 #include "stdafx.h"
+#include <concrt.h>
 
 #if WINAPI_FAMILY == WINAPI_FAMILY_APP
 
@@ -115,16 +116,30 @@ class winrt_client : public _websocket_client_impl
                 tce.set_exception(std::make_exception_ptr(websocket_exception(_XPLATSTR("Error occured during receive."))));
             }
         }, 
-        [=]()
+        [=]() // Close handler called upon receiving a close frame from the server.
         {
-            close_pending_tasks_with_error();           
+            close_pending_tasks_with_error();
             m_close_tce.set();
+            m_server_close_complete.set();
         }); 
     }
 
     ~winrt_client()
     {
-        close_pending_tasks_with_error();
+        // task_completion_event::set() returns false if it has already been set.
+        // In that case, wait on the m_server_close_complete event for the tce::set() to complete.
+        // The websocket client on close handler (upon receiving close frame from server) will 
+        // set this event.
+        // If we have not received a close frame from the server, this set will be a no-op as the 
+        // websocket_client is anyways destructing.
+        if (!m_close_tce.set())
+        {
+            m_server_close_complete.wait(); 
+        }
+        else
+        {
+            close_pending_tasks_with_error();
+        }
     }
 
     void close_pending_tasks_with_error()
@@ -298,6 +313,13 @@ class winrt_client : public _websocket_client_impl
     ReceiveContext ^ m_context;
 
     pplx::task_completion_event<void> m_close_tce;
+    // There is a bug in ppl task_completion_event. The task_completion_event::set() accesses some 
+    // internal data after signalling the event. The waiting thread might go ahead and start destroying the 
+    // websocket_client. Due to this race, set() can cause a crash.
+    // To workaround this bug, maintain another event: m_server_close_complete. We will signal this when the m_close_tce.set() has 
+    // completed. The websocket_client destructor can wait on this event before proceeding.
+    Concurrency::event m_server_close_complete;
+
     // m_client_closed maintains the state of the client. It is set to true when:
     // 1. the client has not connected 
     // 2. if it has received a close frame from the server.

Release/tests/Common/UnitTestpp/src/TestList.h

@@ -1,10 +1,10 @@
 /***
 * This file is based on or incorporates material from the UnitTest++ r30 open source project.
-* Microsoft is not the original author of this code but has modified it and is licensing the code under
-* the MIT License. Microsoft reserves all other rights not expressly granted under the MIT License,
-* whether by implication, estoppel or otherwise.
+* Microsoft is not the original author of this code but has modified it and is licensing the code under 
+* the MIT License. Microsoft reserves all other rights not expressly granted under the MIT License, 
+* whether by implication, estoppel or otherwise. 
 *
-* UnitTest++ r30
+* UnitTest++ r30 
 *
 * Copyright (c) 2006 Noel Llopis and Charles Nicholson
 * Portions Copyright (c) Microsoft Corporation
@@ -13,19 +13,19 @@
 *
 * MIT License
 *
-* 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,
+* 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
+* 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 THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
-* DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+* 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 THE AUTHORS OR COPYRIGHT HOLDERS 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.
 ***/
 
@@ -42,7 +42,6 @@ class TestList
 {
 public:
     UNITTEST_LINKAGE TestList();
-
     UNITTEST_LINKAGE void Add(Test* test);
 
     UNITTEST_LINKAGE Test* GetFirst() const;

Release/tests/Functional/http/listener/VS12/HttpListener120_test.vcxproj

@@ -76,7 +76,7 @@
     <PlatformToolset>v120</PlatformToolset>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <Import Project="..\..\..\..\..\..\..\Build\Release.Tests.Settings" />
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), build.root))\Build\Release.Tests.Settings" />
   <ImportGroup Label="ExtensionSettings">
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">