Extend use of w32subset API partitioning to cover more Win32 functions. (#20453)

* Extend w32subset API usage.

* Fix C++ build error.

* Remove HAVE_SYSTEM from w32subset.h.

* Use relative path for w32subset.h in eglib.

* Move w32subset.h into utils.

8 files changed, 8 insertions, 35 deletions

diff --git a/msvc/eglib-win32.targets b/msvc/eglib-win32.targets
index fbe78bc87f5..49d5a7df1b1 100644
--- a/msvc/eglib-win32.targets
+++ b/msvc/eglib-win32.targets
@@ -6,7 +6,6 @@
     <ClCompile Include="$(MonoSourceLocation)\mono\eglib\gfile-win32.c" />
     <ClCompile Include="$(MonoSourceLocation)\mono\eglib\gmisc-win32.c" />
     <ClCompile Include="$(MonoSourceLocation)\mono\eglib\gmodule-win32.c" />
-    <ClInclude Include="$(MonoSourceLocation)\mono\eglib\gmodule-win32-internals.h" />
     <ClCompile Include="$(MonoSourceLocation)\mono\eglib\gtimer-win32.c" />
     <ClCompile Include="$(MonoSourceLocation)\mono\eglib\gunicode-win32.c" />
   </ItemGroup>
diff --git a/msvc/eglib-win32.targets.filters b/msvc/eglib-win32.targets.filters
index c8483310937..b677ba809a3 100644
--- a/msvc/eglib-win32.targets.filters
+++ b/msvc/eglib-win32.targets.filters
@@ -16,9 +16,6 @@
     <ClCompile Include="$(MonoSourceLocation)\mono\eglib\gmodule-win32.c">
       <Filter>Source Files$(EGLibFilterSubFolder)\win32</Filter>
     </ClCompile>
-    <ClInclude Include="$(MonoSourceLocation)\mono\eglib\gmodule-win32-internals.h">
-      <Filter>Header Files$(EGLibFilterSubFolder)\win32</Filter>
-    </ClInclude>
     <ClCompile Include="$(MonoSourceLocation)\mono\eglib\gtimer-win32.c">
       <Filter>Source Files$(EGLibFilterSubFolder)\win32</Filter>
     </ClCompile>
diff --git a/msvc/libmonoruntime-win32.targets b/msvc/libmonoruntime-win32.targets
index bf15d05d246..316f22cabb7 100644
--- a/msvc/libmonoruntime-win32.targets
+++ b/msvc/libmonoruntime-win32.targets
@@ -2,16 +2,10 @@
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="win32_sources">
     <ClCompile Include="$(MonoSourceLocation)\mono\metadata\console-win32.c" />
-    <ClInclude Include="$(MonoSourceLocation)\mono\metadata\console-win32-internals.h" />
-    <ClInclude Include="$(MonoSourceLocation)\mono\metadata\cominterop-win32-internals.h" />
     <ClCompile Include="$(MonoSourceLocation)\mono\metadata\w32file-win32.c" />
-    <ClInclude Include="$(MonoSourceLocation)\mono\metadata\w32file-win32-internals.h" />
     <ClCompile Include="$(MonoSourceLocation)\mono\metadata\icall-windows.c" />
-    <ClInclude Include="$(MonoSourceLocation)\mono\metadata\icall-windows-internals.h" />
     <ClCompile Include="$(MonoSourceLocation)\mono\metadata\marshal-windows.c" />
-    <ClInclude Include="$(MonoSourceLocation)\mono\metadata\marshal-windows-internals.h" />
     <ClCompile Include="$(MonoSourceLocation)\mono\metadata\mono-security-windows.c" />
-    <ClInclude Include="$(MonoSourceLocation)\mono\metadata\mono-security-windows-internals.h" />
     <ClCompile Include="$(MonoSourceLocation)\mono\metadata\w32mutex-win32.c" />
     <ClCompile Include="$(MonoSourceLocation)\mono\metadata\w32semaphore-win32.c" />
     <ClCompile Include="$(MonoSourceLocation)\mono\metadata\w32event-win32.c" />
diff --git a/msvc/libmonoruntime-win32.targets.filters b/msvc/libmonoruntime-win32.targets.filters
index d120579b22d..52d34a687f4 100644
--- a/msvc/libmonoruntime-win32.targets.filters
+++ b/msvc/libmonoruntime-win32.targets.filters
@@ -4,36 +4,18 @@
     <ClCompile Include="$(MonoSourceLocation)\mono\metadata\console-win32.c">
       <Filter>Source Files$(MonoRuntimeFilterSubFolder)\win32</Filter>
     </ClCompile>
-    <ClInclude Include="$(MonoSourceLocation)\mono\metadata\console-win32-internals.h">
-      <Filter>Header Files$(MonoRuntimeFilterSubFolder)\win32</Filter>
-    </ClInclude>
-    <ClInclude Include="$(MonoSourceLocation)\mono\metadata\cominterop-win32-internals.h">
-      <Filter>Header Files$(MonoRuntimeFilterSubFolder)\win32</Filter>
-    </ClInclude>
     <ClCompile Include="$(MonoSourceLocation)\mono\metadata\w32file-win32.c">
       <Filter>Source Files$(MonoRuntimeFilterSubFolder)\win32</Filter>
     </ClCompile>
-    <ClInclude Include="$(MonoSourceLocation)\mono\metadata\w32file-win32-internals.h">
-      <Filter>Header Files$(MonoRuntimeFilterSubFolder)\win32</Filter>
-    </ClInclude>
     <ClCompile Include="$(MonoSourceLocation)\mono\metadata\icall-windows.c">
       <Filter>Source Files$(MonoRuntimeFilterSubFolder)\win32</Filter>
     </ClCompile>
-    <ClInclude Include="$(MonoSourceLocation)\mono\metadata\icall-windows-internals.h">
-      <Filter>Header Files$(MonoRuntimeFilterSubFolder)\win32</Filter>
-    </ClInclude>
     <ClCompile Include="$(MonoSourceLocation)\mono\metadata\marshal-windows.c">
       <Filter>Source Files$(MonoRuntimeFilterSubFolder)\win32</Filter>
     </ClCompile>
-    <ClInclude Include="$(MonoSourceLocation)\mono\metadata\marshal-windows-internals.h">
-      <Filter>Header Files$(MonoRuntimeFilterSubFolder)\win32</Filter>
-    </ClInclude>
     <ClCompile Include="$(MonoSourceLocation)\mono\metadata\mono-security-windows.c">
       <Filter>Source Files$(MonoRuntimeFilterSubFolder)\win32</Filter>
     </ClCompile>
-    <ClInclude Include="$(MonoSourceLocation)\mono\metadata\mono-security-windows-internals.h">
-      <Filter>Header Files$(MonoRuntimeFilterSubFolder)\win32</Filter>
-    </ClInclude>
     <ClCompile Include="$(MonoSourceLocation)\mono\metadata\w32mutex-win32.c">
       <Filter>Source Files$(MonoRuntimeFilterSubFolder)\win32</Filter>
     </ClCompile>
diff --git a/msvc/libmonoutils-common.targets b/msvc/libmonoutils-common.targets
index 88cc2c34979..28e3d1cf754 100644
--- a/msvc/libmonoutils-common.targets
+++ b/msvc/libmonoutils-common.targets
@@ -47,7 +47,6 @@
     <ClCompile Include="$(MonoSourceLocation)\mono\utils\mono-mmap-windows.c" />
     <ClInclude Include="$(MonoSourceLocation)\mono\utils\mono-mmap.h" />
     <ClInclude Include="$(MonoSourceLocation)\mono\utils\mono-mmap-internals.h" />
-    <ClInclude Include="$(MonoSourceLocation)\mono\utils\mono-mmap-windows-internals.h" />
     <ClInclude Include="$(MonoSourceLocation)\mono\utils\mono-os-mutex.h" />
     <ClCompile Include="$(MonoSourceLocation)\mono\utils\mono-os-mutex.c">
       <ExcludedFromBuild>$(ExcludeFromWindowsBuild)</ExcludedFromBuild>
diff --git a/msvc/libmonoutils-common.targets.filters b/msvc/libmonoutils-common.targets.filters
index 88f842fa5ce..c60ab5144f5 100644
--- a/msvc/libmonoutils-common.targets.filters
+++ b/msvc/libmonoutils-common.targets.filters
@@ -94,9 +94,6 @@
     <ClInclude Include="$(MonoSourceLocation)\mono\utils\mono-mmap-internals.h">
       <Filter>Header Files$(MonoUtilsFilterSubFolder)\common</Filter>
     </ClInclude>
-    <ClInclude Include="$(MonoSourceLocation)\mono\utils\mono-mmap-windows-internals.h">
-      <Filter>Header Files$(MonoUtilsFilterSubFolder)\common</Filter>
-    </ClInclude>
     <ClInclude Include="$(MonoSourceLocation)\mono\utils\mono-os-mutex.h">
       <Filter>Header Files$(MonoUtilsFilterSubFolder)\common</Filter>
     </ClInclude>
diff --git a/msvc/monozlib.targets b/msvc/monozlib.targets
index 6d62dd45ff5..b30e5b46212 100644
--- a/msvc/monozlib.targets
+++ b/msvc/monozlib.targets
@@ -3,27 +3,35 @@
   <ItemGroup Label="monozlib">
     <ClCompile Include="$(MonoSourceLocation)\mono\zlib\adler32.c">
       <CompileAs>CompileAsC</CompileAs>
+      <DisableSpecificWarnings>4005;4131</DisableSpecificWarnings>
     </ClCompile>
     <ClCompile Include="$(MonoSourceLocation)\mono\zlib\crc32.c">
       <CompileAs>CompileAsC</CompileAs>
+      <DisableSpecificWarnings>4005;4131</DisableSpecificWarnings>
     </ClCompile>
     <ClCompile Include="$(MonoSourceLocation)\mono\zlib\deflate.c">
       <CompileAs>CompileAsC</CompileAs>
+      <DisableSpecificWarnings>4005;4131</DisableSpecificWarnings>
     </ClCompile>
     <ClCompile Include="$(MonoSourceLocation)\mono\zlib\inffast.c">
       <CompileAs>CompileAsC</CompileAs>
+      <DisableSpecificWarnings>4005;4131</DisableSpecificWarnings>
     </ClCompile>
     <ClCompile Include="$(MonoSourceLocation)\mono\zlib\inflate.c">
       <CompileAs>CompileAsC</CompileAs>
+      <DisableSpecificWarnings>4005;4131</DisableSpecificWarnings>
     </ClCompile>
     <ClCompile Include="$(MonoSourceLocation)\mono\zlib\inftrees.c">
       <CompileAs>CompileAsC</CompileAs>
+      <DisableSpecificWarnings>4005;4131</DisableSpecificWarnings>
     </ClCompile>
     <ClCompile Include="$(MonoSourceLocation)\mono\zlib\trees.c">
       <CompileAs>CompileAsC</CompileAs>
+      <DisableSpecificWarnings>4005;4131</DisableSpecificWarnings>
     </ClCompile>
     <ClCompile Include="$(MonoSourceLocation)\mono\zlib\zutil.c">
       <CompileAs>CompileAsC</CompileAs>
+      <DisableSpecificWarnings>4005;4131</DisableSpecificWarnings>
     </ClCompile>
     <ClInclude Include="$(MonoSourceLocation)\mono\zlib\crc32.h"/>
     <ClInclude Include="$(MonoSourceLocation)\mono\zlib\deflate.h"/>
diff --git a/msvc/msvc-win32-support.h b/msvc/msvc-win32-support.h
index 926de0c17d0..763933c277c 100644
--- a/msvc/msvc-win32-support.h
+++ b/msvc/msvc-win32-support.h
@@ -25,9 +25,6 @@
 #elif WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_APP)
 	#define HAVE_CLASSIC_WINAPI_SUPPORT 0
 	#define HAVE_UWP_WINAPI_SUPPORT 1
-#ifndef HAVE_EXTERN_DEFINED_WINAPI_SUPPORT
-	#error Unsupported WINAPI family
-#endif
 #else
 	#define HAVE_CLASSIC_WINAPI_SUPPORT 0
 	#define HAVE_UWP_WINAPI_SUPPORT 0