mirrors/dotnet-installer
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Merge pull request #2144 from schellap/dll-load

Browse source 
Expand LoadLibrary search paths
This commit is contained in:
Senthil 2016-03-30 14:28:29 -07:00
commit c617ee1d80
1 changed files with 4 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/corehost/common/pal.windows.cpp
View file

@ -85,7 +85,10 @@ bool pal::getcwd(pal::string_t* recv)
bool pal::load_library(const char_t* path, dll_t* dll)
{
*dll = ::LoadLibraryW(path);
// LOAD_LIBRARY_SEARCH_DLL_LOAD_DIR:
// In portable apps, coreclr would come from another directory than the host,
// so make sure coreclr dependencies can be resolved from coreclr.dll load dir.
*dll = ::LoadLibraryExW(path, NULL, LOAD_LIBRARY_SEARCH_DLL_LOAD_DIR | LOAD_LIBRARY_SEARCH_DEFAULT_DIRS);
if (*dll == nullptr)
{
trace::error(_X("Failed to load the dll from %s, HRESULT: 0x%X"), path, HRESULT_FROM_WIN32(GetLastError()));