fix: fixed some issues with importing native modules on Windows operating system

Author: jacopodl

argon/vm/importer/dlwrap.cpp

@@ -22,10 +22,11 @@ using namespace argon::vm::datatype;
 using namespace argon::vm::importer;
 
 DLHandle argon::vm::importer::OpenLibrary(const char *path, Error **out_error) {
-#ifdef _ARGON_PLATFORM_WINDOWS
-    HMODULE handle;
+    *out_error = nullptr;
 
-    if ((handle = LoadLibraryA(path)) == nullptr) {
+#ifdef _ARGON_PLATFORM_WINDOWS
+    auto handle = LoadLibraryEx(path, nullptr,  LOAD_LIBRARY_SEARCH_DLL_LOAD_DIR|LOAD_LIBRARY_SEARCH_DEFAULT_DIRS);
+    if (handle == nullptr) {
         auto *winerr = ErrorGetMsgFromWinErr();
 
         *out_error = ErrorNewFormat(kModuleImportError[0],
@@ -62,6 +63,8 @@ DLHandle argon::vm::importer::LoadSymbol(DLHandle handle, const char *sym_name)
 }
 
 int argon::vm::importer::CloseLibrary(DLHandle handle, datatype::Error **out_error) {
+    *out_error = nullptr;
+
 #ifdef _ARGON_PLATFORM_WINDOWS
     if (FreeLibrary((HMODULE) handle) == 0) {
         auto *winerr = ErrorGetMsgFromWinErr();

argon/vm/importer/import.cpp

@@ -38,6 +38,8 @@ String *FindSourceInPaths(const Import *imp, String *mod_path, String *mod_name)
 
 String *GetModuleName(String *path, const String *sep);
 
+String *SanitizeModulePath(String *name, const String *path_sep);
+
 void DelModuleFromCache(Import *imp, String *name);
 
 // EOF
@@ -645,24 +647,33 @@ Module *argon::vm::importer::LoadModule(Import *imp, const char *name, ImportSpe
 Module *argon::vm::importer::LoadModule(Import *imp, String *name, ImportSpec *hint) {
     ImportModuleCacheEntry *entry;
 
+    if ((name = SanitizeModulePath(name, imp->path_sep)) == nullptr)
+        return nullptr;
+
     std::unique_lock lock(imp->lock);
 
     if ((entry = imp->module_cache.Lookup(name)) != nullptr) {
         if (!AR_TYPEOF(entry->value, type_module_)) {
             ErrorFormat(kModuleImportError[0], kModuleImportError[2], ARGON_RAW_STRING(name));
+
+            Release(name);
             return nullptr;
         }
 
+        Release(name);
         return (Module *) IncRef(entry->value);
     }
 
     auto *spec = Locate(imp, name, hint);
     if (spec == nullptr) {
         ErrorFormat(kModuleImportError[0], kModuleImportError[0], ARGON_RAW_STRING(name));
+
+        Release(name);
         return nullptr;
     }
 
     if (!AddModule2Cache(imp, name, nullptr)) {
+        Release(name);
         Release(spec);
         return nullptr;
     }
@@ -675,12 +686,15 @@ Module *argon::vm::importer::LoadModule(Import *imp, String *name, ImportSpec *h
 
     if (mod != nullptr) {
         if (!AddModule2Cache(imp, name, mod)) {
+            Release(name);
             Release(mod);
             return nullptr;
         }
     } else
         DelModuleFromCache(imp, name);
 
+    Release(name);
+
     return mod;
 }
 
@@ -819,6 +833,25 @@ String *GetModuleName(String *path, const String *sep) {
     return IncRef(path);
 }
 
+String *SanitizeModulePath(String *name, const String *path_sep) {
+    String *altsep;
+
+#ifdef _ARGON_PLATFORM_WINDOWS
+    altsep = StringIntern("/");
+#else
+    altsep = StringIntern("\\");
+#endif
+
+    if (altsep == nullptr)
+        return nullptr;
+
+    auto *res = StringReplace(name, altsep, path_sep, -1);
+
+    Release(altsep);
+
+    return res;
+}
+
 void DelModuleFromCache(Import *imp, String *name) {
     auto *entry = imp->module_cache.Remove(name);