Improve Dynamic Library for Windows

peterjc123 · peterjc123 · commit da24813c7f2d · 2020-06-22T23:26:22.000+08:00
diff --git a/aten/src/ATen/DynamicLibrary.cpp b/aten/src/ATen/DynamicLibrary.cpp
@@ -46,11 +46,24 @@ DynamicLibrary::~DynamicLibrary() {
 
 DynamicLibrary::DynamicLibrary(const char* name) {
   // NOLINTNEXTLINE(hicpp-signed-bitwise)
-  HMODULE theModule = LoadLibraryA(name);
+  HMODULE theModule;
+  if (GetProcAddress(GetModuleHandle("KERNEL32.DLL"), "AddDllDirectory") != NULL) {
+    theModule = LoadLibraryExA(
+        name,
+        NULL,
+        LOAD_LIBRARY_SEARCH_DEFAULT_DIRS | LOAD_LIBRARY_SEARCH_DLL_LOAD_DIR);
+  } else {
+    theModule = LoadLibraryA(name);
+  }
   if (theModule) {
     handle = theModule;
   } else {
-    AT_ERROR("error in LoadLibraryA");
+    char buf[256];
+    DWORD dw = GetLastError();
+    FormatMessageA(FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_IGNORE_INSERTS,
+                  NULL, dw, MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), 
+                  buf, (sizeof(buf) / sizeof(char)), NULL);
+    AT_ERROR("error in LoadLibrary for ", name, ". WinError ", dw, ": ", buf);
   }
 }
 
