From: Johan Lorensson <lateralusx.github@gmail.com>
Date: Tue, 19 Sep 2017 06:40:04 +0000 (+0200)
Subject: Merge pull request #5573 from lateralusX/lateralusX/windows-invalid-socket-error
X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=commitdiff_plain;h=6e2db26f5ed7b992de75d07522bb215a43af124a;hp=7cec5b71231cfc136d6d70428370b3f7e0465051;p=mono.git

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 43df41bfdc7..bf789f1d00d 100644
--- 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 5d5aa4adc53..b03ac936738 100644
--- 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 554e61985bd..ce8d2a1b1b1 100644
--- a/msvc/libmonoruntime.vcxproj.filters
+++ b/msvc/libmonoruntime.vcxproj.filters
@@ -576,6 +576,9 @@
     <ClInclude Include="..\mono\metadata\cominterop-win32-internals.h">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="..\mono\metadata\appdomain-icalls.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <Filter Include="Header Files">
diff --git a/msvc/libmonoutils.vcxproj.filters b/msvc/libmonoutils.vcxproj.filters
index 30badee3648..a8b85cafce8 100644
--- a/msvc/libmonoutils.vcxproj.filters
+++ b/msvc/libmonoutils.vcxproj.filters
@@ -130,15 +130,9 @@
     <ClCompile Include="..\mono\utils\mono-threads-mach.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\mono\utils\mono-threads-mach-abort-syscall.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="..\mono\utils\mono-threads-posix.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\mono\utils\mono-threads-posix-abort-syscall.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="..\mono\utils\mono-threads-posix-signals.c">
       <Filter>Source Files</Filter>
     </ClCompile>
@@ -148,9 +142,6 @@
     <ClCompile Include="..\mono\utils\mono-threads-windows.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\mono\utils\mono-threads-windows-abort-syscall.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="..\mono\utils\mono-time.c">
       <Filter>Source Files</Filter>
     </ClCompile>
@@ -199,6 +190,9 @@
     <ClCompile Include="..\mono\utils\os-event-win32.c">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="..\mono\utils\mono-os-mutex.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\mono\utils\atomic.h">
@@ -384,9 +378,6 @@
     <ClInclude Include="..\mono\utils\mono-threads-coop.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\mono\utils\mono-threads-posix-signals.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="..\mono\utils\mono-time.h">
       <Filter>Header Files</Filter>
     </ClInclude>