Cleanup DLL exports (#22500)

3 files changed, 14 insertions, 19 deletions

diff --git a/src/dlls/mscordbi/mscordbi.cpp b/src/dlls/mscordbi/mscordbi.cpp
index cb50b9c67c..7173e7343f 100644
--- a/src/dlls/mscordbi/mscordbi.cpp
+++ b/src/dlls/mscordbi/mscordbi.cpp
@@ -18,8 +18,10 @@ extern BOOL WINAPI DbgDllMain(HINSTANCE hInstance, DWORD dwReason,
 // The main dll entry point for this module.  This routine is called by the
 // OS when the dll gets loaded.  Control is simply deferred to the main code.
 //*****************************************************************************
-DLLEXPORT extern "C"
-BOOL WINAPI DllMain(HINSTANCE hInstance, DWORD dwReason, LPVOID lpReserved)
+#ifdef FEATURE_PAL
+DLLEXPORT // For Win32 PAL LoadLibrary emulation
+#endif
+extern "C" BOOL WINAPI DllMain(HINSTANCE hInstance, DWORD dwReason, LPVOID lpReserved)
 {
 	// Defer to the main debugging code.
     return DbgDllMain(hInstance, dwReason, lpReserved);
diff --git a/src/dlls/mscoree/mscoree.cpp b/src/dlls/mscoree/mscoree.cpp
index 7701035fb4..45298c5294 100644
--- a/src/dlls/mscoree/mscoree.cpp
+++ b/src/dlls/mscoree/mscoree.cpp
@@ -56,13 +56,16 @@ extern "C" IExecutionEngine* IEE();
 extern "C" BOOL WINAPI _CRT_INIT(HANDLE hInstance, DWORD dwReason, LPVOID lpReserved);
 #endif
 
-extern "C" DLLEXPORT BOOL WINAPI DllMain(HANDLE hInstance, DWORD dwReason, LPVOID lpReserved);
+extern "C" BOOL WINAPI DllMain(HANDLE hInstance, DWORD dwReason, LPVOID lpReserved);
 
 // For the CoreClr, this is the real DLL entrypoint. We make ourselves the first entrypoint as
 // we need to capture coreclr's hInstance before the C runtime initializes. This function
 // will capture hInstance, let the C runtime initialize and then invoke the "classic"
 // DllMain that initializes everything else.
-extern "C" DLLEXPORT BOOL WINAPI CoreDllMain(HANDLE hInstance, DWORD dwReason, LPVOID lpReserved)
+#ifdef FEATURE_PAL
+DLLEXPORT // For Win32 PAL LoadLibrary emulation
+#endif
+extern "C" BOOL WINAPI CoreDllMain(HANDLE hInstance, DWORD dwReason, LPVOID lpReserved)
 {
     STATIC_CONTRACT_NOTHROW;
 
@@ -115,8 +118,10 @@ extern "C" DLLEXPORT BOOL WINAPI CoreDllMain(HANDLE hInstance, DWORD dwReason, L
     return result;
 }
 
-extern "C"
-DLLEXPORT BOOL WINAPI DllMain(HANDLE hInstance, DWORD dwReason, LPVOID lpReserved)
+#ifdef FEATURE_PAL
+DLLEXPORT // For Win32 PAL LoadLibrary emulation
+#endif
+extern "C" BOOL WINAPI DllMain(HANDLE hInstance, DWORD dwReason, LPVOID lpReserved)
 {
     STATIC_CONTRACT_NOTHROW;
 
diff --git a/src/dlls/mscoree/mscorwks_unixexports.src b/src/dlls/mscoree/mscorwks_unixexports.src
index eaee90e77b..6ba08c9af8 100644
--- a/src/dlls/mscoree/mscorwks_unixexports.src
+++ b/src/dlls/mscoree/mscorwks_unixexports.src
@@ -20,7 +20,7 @@ CoreDllMain
 DllMain
 GetCLRRuntimeHost
 
-; Win32 API and other PAL functions used by the mscorlib
+; Win32 API and other PAL functions used by the System.Private.CoreLib
 CloseHandle
 CoTaskMemAlloc
 CoTaskMemRealloc
@@ -31,29 +31,23 @@ CreateMutexW
 CreateMutexExW
 CreateSemaphoreW
 CreateSemaphoreExW
-DuplicateHandle
 FormatMessageW
 FreeEnvironmentStringsW
-GetACP
 GetCurrentProcessId
 GetCurrentThreadId
 GetEnvironmentStringsW
 GetEnvironmentVariableW
-GetProcAddress
 GetStdHandle
 GetSystemInfo
 LocalAlloc
 LocalReAlloc
 LocalFree
-MetaDataGetDispenser
-MultiByteToWideChar
 OpenEventW
 OpenMutexW
 OpenSemaphoreW
 OutputDebugStringW
 QueryPerformanceCounter  
 QueryPerformanceFrequency
-RaiseException
 ReleaseMutex
 ReleaseSemaphore
 ResetEvent
@@ -62,11 +56,5 @@ SetEvent
 SysAllocStringByteLen
 SysAllocStringLen
 SysFreeString
-SysStringByteLen
 SysStringLen
-VirtualAlloc
-VirtualFree
-GlobalMemoryStatusEx
-VirtualQuery
-WideCharToMultiByte
 WriteFile