Remove all uses of non Ex version of LoadLibrary API from PAL

src/coreclr/debug/di/process.cpp

@@ -181,9 +181,9 @@ STDAPI DLLEXPORT OpenVirtualProcessImpl2(
     CLR_DEBUGGING_PROCESS_FLAGS* pFlagsOut)
 {
 #ifdef TARGET_WINDOWS
-    HMODULE hDac = LoadLibraryExW(pDacModulePath, NULL, LOAD_WITH_ALTERED_SEARCH_PATH);
+    HMODULE hDac = WszLoadLibrary(pDacModulePath, NULL, LOAD_WITH_ALTERED_SEARCH_PATH);
 #else
-    HMODULE hDac = LoadLibraryW(pDacModulePath);
+    HMODULE hDac = WszLoadLibrary(pDacModulePath);
 #endif // !TARGET_WINDOWS
     if (hDac == NULL)
     {

src/coreclr/debug/di/shimprocess.cpp

@@ -1609,11 +1609,7 @@ HMODULE ShimProcess::GetDacModule(PathString& dacModulePath)
             ThrowLastError();
         }
 
-        // Dac Dll is named:
-        //   mscordaccore.dll  <-- coreclr
-        //   mscordacwks.dll   <-- desktop
         PCWSTR eeFlavor = MAKEDLLNAME_W(W("mscordaccore"));
-
         wszAccessDllPath.Append(eeFlavor);
     }
     hDacDll = WszLoadLibrary(wszAccessDllPath);

src/coreclr/dlls/mscordac/mscordac_unixexports.src

@@ -128,8 +128,7 @@ nativeStringResourceTable_mscorrc
 #GetTempPathW
 #InitializeCriticalSection
 #LeaveCriticalSection
-#LoadLibraryA
-#LoadLibraryW
+#LoadLibraryExA
 #LoadLibraryExW
 #MapViewOfFile
 #MapViewOfFileEx

src/coreclr/inc/winwrap.h

@@ -71,8 +71,6 @@
 #undef OpenSemaphore
 #undef CreateWaitableTimer
 #undef CreateFileMapping
-#undef LoadLibrary
-#undef LoadLibraryEx
 #undef GetModuleFileName
 #undef GetModuleHandle
 #undef GetModuleHandleEx
@@ -191,12 +189,10 @@
 //Note only the functions which are currently used are defined
 #ifdef HOST_WINDOWS
 #define WszLoadLibrary         LoadLibraryExWrapper
-#define WszLoadLibraryEx       LoadLibraryExWrapper
 #define WszCreateFile          CreateFileWrapper
 #define WszGetFileAttributesEx GetFileAttributesExWrapper
 #else // HOST_WINDOWS
-#define WszLoadLibrary         LoadLibraryW
-#define WszLoadLibraryEx       LoadLibraryExW
+#define WszLoadLibrary         LoadLibraryExW
 #define WszCreateFile          CreateFileW
 #define WszGetFileAttributesEx GetFileAttributesExW
 #endif // HOST_WINDOWS

src/coreclr/md/enc/stgio.cpp

@@ -232,7 +232,7 @@ HRESULT StgIO::Open(                    // Return code.
             // most of the security risk anyway).
             if ((fFlags & DBPROP_TMODEF_TRYLOADLIBRARY) != 0)
             {
-                m_hModule = WszLoadLibraryEx(szName, NULL, LOAD_LIBRARY_AS_IMAGE_RESOURCE);
+                m_hModule = WszLoadLibrary(szName, NULL, LOAD_LIBRARY_AS_IMAGE_RESOURCE);
                 if (m_hModule != NULL)
                 {
                     m_iType = STGIO_HMODULE;

src/coreclr/pal/inc/pal.h

@@ -2826,20 +2826,13 @@ PALAPI
 UnmapViewOfFile(
         IN LPCVOID lpBaseAddress);
 
-
-PALIMPORT
-HMODULE
-PALAPI
-LoadLibraryW(
-        IN LPCWSTR lpLibFileName);
-
 PALIMPORT
 HMODULE
 PALAPI
 LoadLibraryExW(
         IN LPCWSTR lpLibFileName,
-        IN /*Reserved*/ HANDLE hFile,
-        IN DWORD dwFlags);
+        IN /*Reserved*/ HANDLE hFile = NULL,
+        IN DWORD dwFlags = 0);
 
 PALIMPORT
 NATIVE_LIBRARY_HANDLE
@@ -2919,14 +2912,6 @@ BOOL
 PALAPI
 PAL_LOADMarkSectionAsNotNeeded(void * ptr);
 
-#ifdef UNICODE
-#define LoadLibrary LoadLibraryW
-#define LoadLibraryEx LoadLibraryExW
-#else
-#define LoadLibrary LoadLibraryA
-#define LoadLibraryEx LoadLibraryExA
-#endif
-
 PALIMPORT
 FARPROC
 PALAPI

src/coreclr/pal/inc/palprivate.h

@@ -128,12 +128,6 @@ OpenMutexA(
        IN BOOL bInheritHandle,
        IN LPCSTR lpName);
 
-PALIMPORT
-HMODULE
-PALAPI
-LoadLibraryA(
-        IN LPCSTR lpLibFileName);
-
 PALIMPORT
 HMODULE
 PALAPI

src/coreclr/pal/src/loader/module.cpp

@@ -104,34 +104,6 @@ static BOOL LOADCallDllMainSafe(MODSTRUCT *module, DWORD dwReason, LPVOID lpRese
 
 /* API function definitions ***************************************************/
 
-/*++
-Function:
-  LoadLibraryA
-
-See MSDN doc.
---*/
-HMODULE
-PALAPI
-LoadLibraryA(
-    IN LPCSTR lpLibFileName)
-{
-    return LoadLibraryExA(lpLibFileName, nullptr, 0);
-}
-
-/*++
-Function:
-  LoadLibraryW
-
-See MSDN doc.
---*/
-HMODULE
-PALAPI
-LoadLibraryW(
-    IN LPCWSTR lpLibFileName)
-{
-    return LoadLibraryExW(lpLibFileName, nullptr, 0);
-}
-
 /*++
 Function:
 LoadLibraryExA
@@ -154,7 +126,7 @@ LoadLibraryExA(
 
     HMODULE hModule = nullptr;
 
-    PERF_ENTRY(LoadLibraryA);
+    PERF_ENTRY(LoadLibraryExA);
     ENTRY("LoadLibraryExA (lpLibFileName=%p (%s)) \n",
           (lpLibFileName) ? lpLibFileName : "NULL",
           (lpLibFileName) ? lpLibFileName : "NULL");

src/coreclr/pal/tests/palsuite/filemapping_memmgt/FreeLibrary/test1/FreeLibrary.cpp

@@ -34,14 +34,14 @@ PALTEST(filemapping_memmgt_FreeLibrary_test1_paltest_freelibrary_test1, "filemap
     {
         return (FAIL);
     }
-    
+
     /*Load library (DLL). */
-    hLib = LoadLibrary(LibraryName);
+    hLib = LoadLibraryExA(LibraryName, NULL, 0);
 
     if(hLib == NULL)
     {
-        Fail("ERROR:%u:Unable to load library %s\n", 
-             GetLastError(), 
+        Fail("ERROR:%u:Unable to load library %s\n",
+             GetLastError(),
              LibraryName);
     }
 
@@ -54,10 +54,10 @@ PALTEST(filemapping_memmgt_FreeLibrary_test1_paltest_freelibrary_test1, "filemap
         Fail("");
     }
 
-    /* Call the FreeLibrary API. */ 
+    /* Call the FreeLibrary API. */
     if (!FreeLibrary(hLib))
     {
-        Fail("ERROR:%u: Unable to free library \"%s\"\n", 
+        Fail("ERROR:%u: Unable to free library \"%s\"\n",
              GetLastError(),
              LibraryName);
     }
@@ -83,7 +83,7 @@ BOOL PALAPI TestDll(HMODULE hLib, int testResult)
 #else
     char    FunctName[] = "DllTest";
 #endif
-    FARPROC DllAddr;    
+    FARPROC DllAddr;
 
     /* Attempt to grab the proc address of the dll function.
      * This one should succeed.*/
@@ -92,12 +92,12 @@ BOOL PALAPI TestDll(HMODULE hLib, int testResult)
         DllAddr = GetProcAddress(hLib, FunctName);
         if(DllAddr == NULL)
         {
-            Trace("ERROR: Unable to load function \"%s\" library \"%s\"\n", 
+            Trace("ERROR: Unable to load function \"%s\" library \"%s\"\n",
                     FunctName,
                     LibraryName);
             return (FALSE);
         }
-        /* Run the function in the DLL, 
+        /* Run the function in the DLL,
          * to ensure that the DLL was loaded properly.*/
         RetVal = DllAddr();
         if (RetVal != 1)
@@ -117,8 +117,8 @@ BOOL PALAPI TestDll(HMODULE hLib, int testResult)
         if(DllAddr != NULL)
         {
             Trace("ERROR: Able to load function \"%s\" from free'd"
-                " library \"%s\"\n", 
-                FunctName, 
+                " library \"%s\"\n",
+                FunctName,
                 LibraryName);
             return (FALSE);
         }

src/coreclr/pal/tests/palsuite/filemapping_memmgt/GetModuleFileNameA/test1/GetModuleFileNameA.cpp

@@ -44,7 +44,7 @@ PALTEST(filemapping_memmgt_GetModuleFileNameA_test1_paltest_getmodulefilenamea_t
 
 
     //load a module
-    ModuleHandle = LoadLibrary(ModuleName);
+    ModuleHandle = LoadLibraryExA(ModuleName, NULL, 0);
     if(!ModuleHandle)
     {
         Fail("Failed to call LoadLibrary API!\n");

src/coreclr/pal/tests/palsuite/filemapping_memmgt/GetModuleFileNameW/test1/GetModuleFileNameW.cpp

@@ -50,7 +50,7 @@ PALTEST(filemapping_memmgt_GetModuleFileNameW_test1_paltest_getmodulefilenamew_t
     lpModuleName = convert(ModuleName);
 
     //load a module
-        ModuleHandle = LoadLibrary(lpModuleName);
+        ModuleHandle = LoadLibraryExW(lpModuleName, NULL, 0);
 
     //free the memory
     free(lpModuleName);

src/coreclr/pal/tests/palsuite/filemapping_memmgt/GetProcAddress/test1/test1.cpp

@@ -6,9 +6,9 @@
 ** Source: test1.c (filemapping_memmgt\getprocaddress\test1)
 **
 ** Purpose: Positive test the GetProcAddress API.
-**          The first test calls GetProcAddress to retrieve the 
-**          address of SimpleFunction inside testlib by its name, 
-**          then calls the function and checks that it worked. 
+**          The first test calls GetProcAddress to retrieve the
+**          address of SimpleFunction inside testlib by its name,
+**          then calls the function and checks that it worked.
 **
 **
 **===========================================================================*/
@@ -43,7 +43,7 @@ PALTEST(filemapping_memmgt_GetProcAddress_test1_paltest_getprocaddress_test1, "f
 
 
     /* load a module */
-    hModule = LoadLibrary(lpModuleName);
+    hModule = LoadLibraryExA(lpModuleName, NULL, 0);
     if(!hModule)
     {
         Fail("Unexpected error: "
@@ -54,7 +54,7 @@ PALTEST(filemapping_memmgt_GetProcAddress_test1_paltest_getprocaddress_test1, "f
     /*
      * Test 1
      *
-     * Get the address of a function 
+     * Get the address of a function
      */
     procAddressByName = (SIMPLEFUNCTION) GetProcAddress(hModule,FunctionName);
     if(!procAddressByName)
@@ -67,7 +67,7 @@ PALTEST(filemapping_memmgt_GetProcAddress_test1_paltest_getprocaddress_test1, "f
         err = FreeLibrary(hModule);
         if(0 == err)
 	    {
-            Fail("Unexpected error: Failed to FreeLibrary %s\n", 
+            Fail("Unexpected error: Failed to FreeLibrary %s\n",
                  lpModuleName);
 	    }
         Fail("");
@@ -76,14 +76,14 @@ PALTEST(filemapping_memmgt_GetProcAddress_test1_paltest_getprocaddress_test1, "f
     /* Call the function to see that it really worked */
     /* Simple function adds 1 to the argument passed */
     if( 2 != ((procAddressByName)(1)))
-    { 
+    {
         Trace("ERROR: Problem calling the function by its address.\n");
-         
+
         /* Cleanup */
         err = FreeLibrary(hModule);
         if(0 == err)
 	    {
-            Fail("Unexpected error: Failed to FreeLibrary %s\n", 
+            Fail("Unexpected error: Failed to FreeLibrary %s\n",
                  lpModuleName);
 	    }
         Fail("");
@@ -93,7 +93,7 @@ PALTEST(filemapping_memmgt_GetProcAddress_test1_paltest_getprocaddress_test1, "f
     err = FreeLibrary(hModule);
     if(0 == err)
 	{
-        Fail("Unexpected error: Failed to FreeLibrary %s\n", 
+        Fail("Unexpected error: Failed to FreeLibrary %s\n",
              lpModuleName);
 	}
 

src/coreclr/pal/tests/palsuite/filemapping_memmgt/GetProcAddress/test2/test2.cpp

@@ -6,8 +6,8 @@
 ** Source: test2.c (filemapping_memmgt\getprocaddress\test2)
 **
 ** Purpose: This test tries to call GetProcAddress with
-**          a NULL handle, with a NULL function name, with an empty 
-**          function name, with an invalid name and with an 
+**          a NULL handle, with a NULL function name, with an empty
+**          function name, with an invalid name and with an
 **          invalid ordinal value.
 **
 **
@@ -39,7 +39,7 @@ PALTEST(filemapping_memmgt_GetProcAddress_test2_paltest_getprocaddress_test2, "f
     }
 
     /* load a module */
-    hModule = LoadLibrary(lpModuleName);
+    hModule = LoadLibraryExA(lpModuleName, NULL, 0);
     if(!hModule)
     {
         Fail("Unexpected error: "
@@ -63,7 +63,7 @@ PALTEST(filemapping_memmgt_GetProcAddress_test2_paltest_getprocaddress_test2, "f
         err = FreeLibrary(hModule);
         if(0 == err)
 	    {
-            Fail("Unexpected error: Failed to FreeLibrary %s\n", 
+            Fail("Unexpected error: Failed to FreeLibrary %s\n",
                  lpModuleName);
 	    }
         Fail("");
@@ -86,7 +86,7 @@ PALTEST(filemapping_memmgt_GetProcAddress_test2_paltest_getprocaddress_test2, "f
         err = FreeLibrary(hModule);
         if(0 == err)
 	    {
-            Fail("Unexpected error: Failed to FreeLibrary %s\n", 
+            Fail("Unexpected error: Failed to FreeLibrary %s\n",
                  lpModuleName);
 	    }
         Fail("");
@@ -109,7 +109,7 @@ PALTEST(filemapping_memmgt_GetProcAddress_test2_paltest_getprocaddress_test2, "f
         err = FreeLibrary(hModule);
         if(0 == err)
 	    {
-            Fail("Unexpected error: Failed to FreeLibrary %s\n", 
+            Fail("Unexpected error: Failed to FreeLibrary %s\n",
                  lpModuleName);
 	    }
         Fail("");
@@ -132,7 +132,7 @@ PALTEST(filemapping_memmgt_GetProcAddress_test2_paltest_getprocaddress_test2, "f
         err = FreeLibrary(hModule);
         if(0 == err)
 	    {
-            Fail("Unexpected error: Failed to FreeLibrary %s\n", 
+            Fail("Unexpected error: Failed to FreeLibrary %s\n",
                  lpModuleName);
 	    }
         Fail("");
@@ -142,7 +142,7 @@ PALTEST(filemapping_memmgt_GetProcAddress_test2_paltest_getprocaddress_test2, "f
     err = FreeLibrary(hModule);
     if(0 == err)
 	{
-        Fail("Unexpected error: Failed to FreeLibrary %s\n", 
+        Fail("Unexpected error: Failed to FreeLibrary %s\n",
               lpModuleName);
 	}
 

src/coreclr/pal/tests/palsuite/loader/LoadLibraryA/test1/LoadLibraryA.cpp

@@ -6,7 +6,7 @@
 ** Source:  loadlibrarya.c
 **
 ** Purpose: Positive test the LoadLibrary API.
-**          Call LoadLibrary to map a module into the calling 
+**          Call LoadLibrary to map a module into the calling
 **          process address space(DLL file)
 **
 **
@@ -34,7 +34,7 @@ PALTEST(loader_LoadLibraryA_test1_paltest_loadlibrarya_test1, "loader/LoadLibrar
     }
 
     /* load a module */
-    ModuleHandle = LoadLibrary(ModuleName);
+    ModuleHandle = LoadLibraryExA(ModuleName, NULL, 0);
     if(!ModuleHandle)
     {
         Fail("Failed to call LoadLibrary API!\n");