Merge pull request #5573 from lateralusX/lateralusX/windows-invalid-socket-error

Fix sporadic failures in MonoTests.System.Net.HttpRequestStreamTest on x64 Windows.

diff --git a/mono/metadata/w32socket.c b/mono/metadata/w32socket.c
index 43df41bfdc717181022977d5bbc39853e43bdb87..bf789f1d00da93972c6b897f42d51c2f75a73071 100644 (file)
--- a/mono/metadata/w32socket.c
+++ b/mono/metadata/w32socket.c
@@ -208,7 +208,7 @@ mono_w32socket_close (SOCKET sock)
 {
        gboolean ret;
        MONO_ENTER_GC_SAFE;
-       ret = CloseHandle (sock);
+       ret = closesocket (sock);
        MONO_EXIT_GC_SAFE;
        return ret;
 }

diff --git a/mono/metadata/w32socket.h b/mono/metadata/w32socket.h
index 5d5aa4adc53b472f35e448cf21e01bacc80e1829..b03ac936738b3a38ed3d8a0d430e1c160baa1ffd 100644 (file)
--- a/mono/metadata/w32socket.h
+++ b/mono/metadata/w32socket.h
@@ -16,10 +16,10 @@
 
 #include <mono/metadata/object-internals.h>
 
+#ifndef HOST_WIN32
 #define INVALID_SOCKET ((SOCKET)(guint32)(~0))
 #define SOCKET_ERROR (-1)
 
-#ifndef HOST_WIN32
 typedef gint SOCKET;
 
 typedef struct {

diff --git a/msvc/libmonoruntime.vcxproj.filters b/msvc/libmonoruntime.vcxproj.filters
index 554e61985bdb1745ac9df6d44d0c7d1423bdd6f3..ce8d2a1b1b14988b46efe31fc602ae100a5828fa 100644 (file)
--- a/msvc/libmonoruntime.vcxproj.filters
+++ b/msvc/libmonoruntime.vcxproj.filters
@@ -576,6 +576,9 @@
     <ClInclude Include="..\mono\metadata\cominterop-win32-internals.h">\r
       <Filter>Header Files</Filter>\r
     </ClInclude>\r
+    <ClInclude Include="..\mono\metadata\appdomain-icalls.h">\r
+      <Filter>Header Files</Filter>\r
+    </ClInclude>\r
   </ItemGroup>\r
   <ItemGroup>\r
     <Filter Include="Header Files">\r

diff --git a/msvc/libmonoutils.vcxproj.filters b/msvc/libmonoutils.vcxproj.filters
index 30badee3648d03e88c2a0eec33f164a87902f672..a8b85cafce86e1c03fcf45ec014d136d12f7a423 100644 (file)
--- a/msvc/libmonoutils.vcxproj.filters
+++ b/msvc/libmonoutils.vcxproj.filters
@@ -130,15 +130,9 @@
     <ClCompile Include="..\mono\utils\mono-threads-mach.c">\r
       <Filter>Source Files</Filter>\r
     </ClCompile>\r
-    <ClCompile Include="..\mono\utils\mono-threads-mach-abort-syscall.c">\r
-      <Filter>Source Files</Filter>\r
-    </ClCompile>\r
     <ClCompile Include="..\mono\utils\mono-threads-posix.c">\r
       <Filter>Source Files</Filter>\r
     </ClCompile>\r
-    <ClCompile Include="..\mono\utils\mono-threads-posix-abort-syscall.c">\r
-      <Filter>Source Files</Filter>\r
-    </ClCompile>\r
     <ClCompile Include="..\mono\utils\mono-threads-posix-signals.c">\r
       <Filter>Source Files</Filter>\r
     </ClCompile>\r
@@ -148,9 +142,6 @@
     <ClCompile Include="..\mono\utils\mono-threads-windows.c">\r
       <Filter>Source Files</Filter>\r
     </ClCompile>\r
-    <ClCompile Include="..\mono\utils\mono-threads-windows-abort-syscall.c">\r
-      <Filter>Source Files</Filter>\r
-    </ClCompile>\r
     <ClCompile Include="..\mono\utils\mono-time.c">\r
       <Filter>Source Files</Filter>\r
     </ClCompile>\r
@@ -199,6 +190,9 @@
     <ClCompile Include="..\mono\utils\os-event-win32.c">\r
       <Filter>Source Files</Filter>\r
     </ClCompile>\r
+    <ClCompile Include="..\mono\utils\mono-os-mutex.c">\r
+      <Filter>Source Files</Filter>\r
+    </ClCompile>\r
   </ItemGroup>\r
   <ItemGroup>\r
     <ClInclude Include="..\mono\utils\atomic.h">\r
@@ -384,9 +378,6 @@
     <ClInclude Include="..\mono\utils\mono-threads-coop.h">\r
       <Filter>Header Files</Filter>\r
     </ClInclude>\r
-    <ClInclude Include="..\mono\utils\mono-threads-posix-signals.h">\r
-      <Filter>Header Files</Filter>\r
-    </ClInclude>\r
     <ClInclude Include="..\mono\utils\mono-time.h">\r
       <Filter>Header Files</Filter>\r
     </ClInclude>\r