Cleanup DLL exports (dotnet/coreclr#22500)

jkotas · web-flow · commit 7190d67492bc · 2019-02-10T13:57:11.000-08:00
Commit migrated from dotnet/coreclr@70cf6d4
diff --git a/src/coreclr/src/debug/daccess/daccess.cpp b/src/coreclr/src/debug/daccess/daccess.cpp
@@ -40,9 +40,10 @@ HINSTANCE g_thisModule;
 
 extern VOID STDMETHODCALLTYPE TLS_FreeMasterSlotIndex();
 
-DLLEXPORT
-EXTERN_C BOOL WINAPI
-DllMain(HANDLE instance, DWORD reason, LPVOID reserved)
+#if FEATURE_PAL
+DLLEXPORT // For Win32 PAL LoadLibrary emulation
+#endif
+EXTERN_C BOOL WINAPI DllMain(HANDLE instance, DWORD reason, LPVOID reserved)
 {
     static bool g_procInitialized = false;
 
diff --git a/src/coreclr/src/dlls/mscordbi/mscordbi.cpp b/src/coreclr/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/coreclr/src/dlls/mscoree/mscoree.cpp b/src/coreclr/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/coreclr/src/dlls/mscoree/mscorwks_unixexports.src b/src/coreclr/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
diff --git a/src/coreclr/src/inc/cortpoolhdr.h b/src/coreclr/src/inc/cortpoolhdr.h
diff --git a/src/coreclr/src/inc/crtwrap.h b/src/coreclr/src/inc/crtwrap.h
@@ -21,9 +21,10 @@
 #include <wchar.h>
 #include <stdio.h>
 
-#ifndef DLLEXPORT
-// DLLEXPORT is defined to influence method visibility for some compilers.
+#ifndef FEATURE_PAL
+// CoreCLR.dll uses linker .def files to control the exported symbols.
+// Define DLLEXPORT macro as empty on Windows.
 #define DLLEXPORT
-#endif // !DLLEXPORT
+#endif
 
 #endif // __CrtWrap_h__
diff --git a/src/coreclr/src/jit/ee_il_dll.cpp b/src/coreclr/src/jit/ee_il_dll.cpp
@@ -159,7 +159,11 @@ void jitShutdown(bool processIsTerminating)
 
 #ifndef FEATURE_MERGE_JIT_AND_ENGINE
 
-extern "C" DLLEXPORT BOOL WINAPI DllMain(HANDLE hInstance, DWORD dwReason, LPVOID pvReserved)
+#ifdef FEATURE_PAL
+DLLEXPORT // For Win32 PAL LoadLibrary emulation
+#endif
+    extern "C" BOOL WINAPI
+    DllMain(HANDLE hInstance, DWORD dwReason, LPVOID pvReserved)
 {
     if (dwReason == DLL_PROCESS_ATTACH)
     {
diff --git a/src/coreclr/src/pal/inc/pal.h b/src/coreclr/src/pal/inc/pal.h
@@ -4314,6 +4314,7 @@ See MSDN doc for memcpy
 --*/
 EXTERN_C
 PALIMPORT
+DLLEXPORT
 void *PAL_memcpy (void *dest, const void *src, size_t count);
 
 PALIMPORT void * __cdecl memcpy(void *, const void *, size_t) THROW_DECL;
@@ -4600,13 +4601,14 @@ PALIMPORT char * __cdecl _strdup(const char *);
 PALIMPORT PAL_NORETURN void __cdecl exit(int);
 int __cdecl atexit(void (__cdecl *function)(void));
 
-PALIMPORT DLLEXPORT void __cdecl qsort(void *, size_t, size_t, int (__cdecl *)(const void *, const void *));
-PALIMPORT void * __cdecl bsearch(const void *, const void *, size_t, size_t,
-int (__cdecl *)(const void *, const void *));
-
 PALIMPORT char * __cdecl _fullpath(char *, const char *, size_t);
 
 #ifndef PAL_STDCPP_COMPAT
+
+PALIMPORT DLLEXPORT void __cdecl qsort(void *, size_t, size_t, int(__cdecl *)(const void *, const void *));
+PALIMPORT DLLEXPORT void * __cdecl bsearch(const void *, const void *, size_t, size_t,
+    int(__cdecl *)(const void *, const void *));
+
 PALIMPORT time_t __cdecl time(time_t *);
 
 struct tm {
@@ -4725,8 +4727,8 @@ PALIMPORT DLLEXPORT int * __cdecl PAL_errno(int caller);
 #define errno  (*PAL_errno(PAL_get_caller))
 #endif // PAL_STDCPP_COMPAT
 
-PALIMPORT char * __cdecl getenv(const char *);
-PALIMPORT int __cdecl _putenv(const char *);
+PALIMPORT DLLEXPORT char * __cdecl getenv(const char *);
+PALIMPORT DLLEXPORT int __cdecl _putenv(const char *);
 
 #define ERANGE          34
 
diff --git a/src/coreclr/src/pal/inc/rt/palrt.h b/src/coreclr/src/pal/inc/rt/palrt.h
@@ -372,9 +372,9 @@ typedef union _ULARGE_INTEGER {
 
 /******************* OLE, BSTR, VARIANT *************************/
 
-STDAPI_(LPVOID) CoTaskMemAlloc(SIZE_T cb);
-STDAPI_(LPVOID) CoTaskMemRealloc(LPVOID pv, SIZE_T cb);
-STDAPI_(void) CoTaskMemFree(LPVOID pv);
+DLLEXPORT STDAPI_(LPVOID) CoTaskMemAlloc(SIZE_T cb);
+DLLEXPORT STDAPI_(LPVOID) CoTaskMemRealloc(LPVOID pv, SIZE_T cb);
+DLLEXPORT STDAPI_(void) CoTaskMemFree(LPVOID pv);
 
 typedef SHORT VARIANT_BOOL;
 #define VARIANT_TRUE ((VARIANT_BOOL)-1)
@@ -386,11 +386,11 @@ typedef const OLECHAR* LPCOLESTR;
 
 typedef WCHAR *BSTR;
 
-STDAPI_(BSTR) SysAllocString(const OLECHAR*);
-STDAPI_(BSTR) SysAllocStringLen(const OLECHAR*, UINT);
+DLLEXPORT STDAPI_(BSTR) SysAllocString(const OLECHAR*);
+DLLEXPORT STDAPI_(BSTR) SysAllocStringLen(const OLECHAR*, UINT);
 DLLEXPORT STDAPI_(BSTR) SysAllocStringByteLen(const char *, UINT);
-STDAPI_(void) SysFreeString(BSTR);
-STDAPI_(UINT) SysStringLen(BSTR);
+DLLEXPORT STDAPI_(void) SysFreeString(BSTR);
+DLLEXPORT STDAPI_(UINT) SysStringLen(BSTR);
 DLLEXPORT STDAPI_(UINT) SysStringByteLen(BSTR);
 
 typedef double DATE;
diff --git a/src/coreclr/src/pal/src/cruntime/misc.cpp b/src/coreclr/src/pal/src/cruntime/misc.cpp
@@ -243,7 +243,6 @@ PAL_qsort(void *base, size_t nmemb, size_t size,
     PERF_EXIT(qsort);
 }
 
-DLLEXPORT
 PALIMPORT 
 void * __cdecl 
 PAL_bsearch(const void *key, const void *base, size_t nmemb, size_t size,
@@ -299,7 +298,6 @@ PAL_memcpy
 Overlapping buffer-safe version of memcpy.
 See MSDN doc for memcpy
 --*/
-DLLEXPORT
 EXTERN_C
 PALIMPORT
 void *PAL_memcpy (void *dest, const void *src, size_t count)
diff --git a/src/coreclr/src/pal/src/misc/environ.cpp b/src/coreclr/src/pal/src/misc/environ.cpp
@@ -1050,7 +1050,6 @@ See MSDN for more details.
 Note:   The BSD implementation can cause
         memory leaks. See man pages for more details.
 --*/
-DLLEXPORT
 int
 __cdecl 
 _putenv( const char * envstring )
@@ -1080,7 +1079,7 @@ Function : PAL_getenv
     
 See MSDN for more details.
 --*/
-DLLEXPORT char * __cdecl PAL_getenv(const char *varname)
+char * __cdecl PAL_getenv(const char *varname)
 {
     char *retval;
 
diff --git a/src/coreclr/src/palrt/bstr.cpp b/src/coreclr/src/palrt/bstr.cpp
@@ -71,7 +71,7 @@ inline HRESULT CbSysStringSize(ULONG cchSize, BOOL isByteLen, ULONG *result)
 *  return value = BSTR, NULL if the allocation failed.
 *
 ***********************************************************************/
-DLLEXPORT STDAPI_(BSTR) SysAllocStringLen(const OLECHAR *psz, UINT len)
+STDAPI_(BSTR) SysAllocStringLen(const OLECHAR *psz, UINT len)
 {
     
     BSTR bstr;
@@ -168,7 +168,7 @@ SysAllocStringByteLen(const char FAR* psz, unsigned int len)
 *  None
 *
 ***********************************************************************/
-DLLEXPORT STDAPI_(void) SysFreeString(BSTR bstr)
+STDAPI_(void) SysFreeString(BSTR bstr)
 {
     if(bstr == NULL)
       return;
@@ -187,7 +187,7 @@ DLLEXPORT STDAPI_(void) SysFreeString(BSTR bstr)
 *  return value = unsigned int, length in characters.
 *
 ***********************************************************************/
-DLLEXPORT STDAPI_(unsigned int)
+STDAPI_(unsigned int)
 SysStringLen(BSTR bstr)
 {
     if(bstr == NULL)
diff --git a/src/coreclr/src/palrt/comem.cpp b/src/coreclr/src/palrt/comem.cpp
@@ -11,17 +11,17 @@
 
 #include "common.h" 
 
-DLLEXPORT STDAPI_(LPVOID) CoTaskMemAlloc(SIZE_T cb)
+STDAPI_(LPVOID) CoTaskMemAlloc(SIZE_T cb)
 {
     return LocalAlloc(LMEM_FIXED, cb);
 }
 
-DLLEXPORT STDAPI_(LPVOID) CoTaskMemRealloc(LPVOID pv, SIZE_T cb)
+STDAPI_(LPVOID) CoTaskMemRealloc(LPVOID pv, SIZE_T cb)
 {
     return LocalReAlloc(pv, cb, LMEM_MOVEABLE);
 }
 
-DLLEXPORT STDAPI_(void) CoTaskMemFree(LPVOID pv)
+STDAPI_(void) CoTaskMemFree(LPVOID pv)
 {
     LocalFree(pv);
 }
diff --git a/src/coreclr/src/vm/appdomain.hpp b/src/coreclr/src/vm/appdomain.hpp
@@ -846,7 +846,7 @@ class PEFileListLock : public ListLock
         pThis->Enter();
     }
 
-    DLLEXPORT DEBUG_NOINLINE static void HolderLeave(PEFileListLock *pThis)
+    DEBUG_NOINLINE static void HolderLeave(PEFileListLock *pThis)
     {
         WRAPPER_NO_CONTRACT;
         ANNOTATION_SPECIAL_HOLDER_CALLER_NEEDS_DYNAMIC_CONTRACT;
diff --git a/src/coreclr/src/vm/crst.h b/src/coreclr/src/vm/crst.h
@@ -189,7 +189,7 @@ friend class Crst;
         c->Enter(); 
     }
 
-    DLLEXPORT DEBUG_NOINLINE static void ReleaseLock(CrstBase *c) {
+    DEBUG_NOINLINE static void ReleaseLock(CrstBase *c) {
         WRAPPER_NO_CONTRACT;
         ANNOTATION_SPECIAL_HOLDER_CALLER_NEEDS_DYNAMIC_CONTRACT;
         c->Leave(); 
@@ -202,7 +202,7 @@ friend class Crst;
     // Argument: 
     //     input: c - the lock to be checked. 
     // Note: Throws
-    DLLEXPORT static void AcquireLock(CrstBase * c)
+    static void AcquireLock(CrstBase * c)
     {
         SUPPORTS_DAC;
         if (c->GetEnterCount() != 0) 
@@ -211,7 +211,7 @@ friend class Crst;
         }
     };
 
-    DLLEXPORT static void ReleaseLock(CrstBase *c)
+    static void ReleaseLock(CrstBase *c)
     {
         SUPPORTS_DAC;
     };
diff --git a/src/coreclr/src/vm/listlock.h b/src/coreclr/src/vm/listlock.h
@@ -196,14 +196,14 @@ class ListLockEntryBase
 
     // LockHolder holds the lock of the element, not the element itself
 
-    DLLEXPORT DEBUG_NOINLINE static void LockHolderEnter(Entry_t *pThis)
+    DEBUG_NOINLINE static void LockHolderEnter(Entry_t *pThis)
     {
         WRAPPER_NO_CONTRACT;
         ANNOTATION_SPECIAL_HOLDER_CALLER_NEEDS_DYNAMIC_CONTRACT;
         pThis->Enter();
     }
 
-    DLLEXPORT DEBUG_NOINLINE static void LockHolderLeave(Entry_t *pThis)
+    DEBUG_NOINLINE static void LockHolderLeave(Entry_t *pThis)
     {
         WRAPPER_NO_CONTRACT;
         ANNOTATION_SPECIAL_HOLDER_CALLER_NEEDS_DYNAMIC_CONTRACT;

Original file line number	Diff line number	Diff line change
`@@ -159,7 +159,11 @@ void jitShutdown(bool processIsTerminating)`
`159`	`159`
`160`	`160`	`#ifndef FEATURE_MERGE_JIT_AND_ENGINE`
`161`	`161`
`162`		`-extern "C" DLLEXPORT BOOL WINAPI DllMain(HANDLE hInstance, DWORD dwReason, LPVOID pvReserved)`
	`162`	`+#ifdef FEATURE_PAL`
	`163`	`+DLLEXPORT // For Win32 PAL LoadLibrary emulation`
	`164`	`+#endif`
	`165`	`+ extern "C" BOOL WINAPI`
	`166`	`+ DllMain(HANDLE hInstance, DWORD dwReason, LPVOID pvReserved)`
`163`	`167`	`{`
`164`	`168`	`if (dwReason == DLL_PROCESS_ATTACH)`
`165`	`169`	`{`