Set correct DLL flags in ctypes

Author: msimacek

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/NtModuleBuiltins.java

@@ -79,6 +79,10 @@
 
 @CoreFunctions(defineModule = "nt", isEager = true)
 public final class NtModuleBuiltins extends PythonBuiltins {
+
+    public static final int LOAD_LIBRARY_SEARCH_DLL_LOAD_DIR = 0x100;
+    public static final int LOAD_LIBRARY_SEARCH_DEFAULT_DIRS = 0x1000;
+
     @Override
     protected List<? extends NodeFactory<? extends PythonBuiltinBaseNode>> getNodeFactories() {
         return NtModuleBuiltinsFactory.getFactories();
@@ -88,8 +92,8 @@ protected List<? extends NodeFactory<? extends PythonBuiltinBaseNode>> getNodeFa
     public void initialize(Python3Core core) {
         super.initialize(core);
         if (PythonLanguage.getPythonOS() == PythonOS.PLATFORM_WIN32) {
-            addBuiltinConstant("_LOAD_LIBRARY_SEARCH_DLL_LOAD_DIR", 0x100);
-            addBuiltinConstant("_LOAD_LIBRARY_SEARCH_DEFAULT_DIRS", 0x1000);
+            addBuiltinConstant("_LOAD_LIBRARY_SEARCH_DLL_LOAD_DIR", LOAD_LIBRARY_SEARCH_DLL_LOAD_DIR);
+            addBuiltinConstant("_LOAD_LIBRARY_SEARCH_DEFAULT_DIRS", LOAD_LIBRARY_SEARCH_DEFAULT_DIRS);
             core.removeBuiltinModule(T_POSIX);
         } else {
             core.removeBuiltinModule(T_NT);

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/ctypes/CtypesModuleBuiltins.java

@@ -98,6 +98,7 @@
 import com.oracle.graal.python.builtins.PythonBuiltinClassType;
 import com.oracle.graal.python.builtins.PythonBuiltins;
 import com.oracle.graal.python.annotations.PythonOS;
+import com.oracle.graal.python.builtins.modules.NtModuleBuiltins;
 import com.oracle.graal.python.builtins.modules.PosixModuleBuiltins.FsConverterNode;
 import com.oracle.graal.python.builtins.modules.SysModuleBuiltins.AuditNode;
 import com.oracle.graal.python.builtins.modules.ctypes.CFieldBuiltins.GetFuncNode;
@@ -623,13 +624,22 @@ protected abstract static class DlOpenNode extends PythonTernaryClinicBuiltinNod
         private static final TruffleString MACOS_Security_LIB = tsLiteral("/System/Library/Frameworks/Security.framework/Security");
         private static final TruffleString MACOS_CoreFoundation_LIB = tsLiteral("/System/Library/Frameworks/CoreFoundation.framework/CoreFoundation");
 
-        private static final String T_RTLD_LOCAL = "RTLD_LOCAL|RTLD_NOW";
-        private static final String T_RTLD_GLOBAL = "RTLD_GLOBAL|RTLD_NOW";
-
         private static final TruffleLogger LOGGER = PythonLanguage.getLogger(DlOpenNode.class);
 
         protected static String flagsToString(int flag) {
-            return (flag & RTLD_LOCAL.getValueIfDefined()) != 0 ? T_RTLD_LOCAL : T_RTLD_GLOBAL;
+            StringBuilder sb = new StringBuilder("RTLD_NOW");
+            if ((flag & RTLD_LOCAL.getValueIfDefined()) != 0) {
+                sb.append("| RTLD_LOCAL");
+            } else {
+                sb.append("| RTLD_GLOBAL");
+            }
+            if ((flag & NtModuleBuiltins.LOAD_LIBRARY_SEARCH_DEFAULT_DIRS) != 0) {
+                sb.append("| LOAD_LIBRARY_SEARCH_DEFAULT_DIRS");
+            }
+            if ((flag & NtModuleBuiltins.LOAD_LIBRARY_SEARCH_DLL_LOAD_DIR) != 0) {
+                sb.append("| LOAD_LIBRARY_SEARCH_DLL_LOAD_DIR");
+            }
+            return sb.toString();
         }
 
         @Override

graalpython/lib-graalpython/_nt.py

@@ -41,21 +41,24 @@
 
 
 def _add_dll_directory(path):
-    # TODO error handling
-    import ctypes
+    import ctypes, os
     AddDllDirectory = ctypes.windll.kernel32['AddDllDirectory']
     AddDllDirectory.argtypes = [ctypes.c_wchar_p]
     AddDllDirectory.restype = ctypes.c_void_p
-    return AddDllDirectory(path)
+    result = AddDllDirectory(os.fspath(path))
+    if result == 0:
+        raise OSError(f"add_dll_directory: {ctypes.windll.kernel32.GetLastError()}")
+    return result
 
 
 def _remove_dll_directory(cookie):
-    # TODO error handling
     import ctypes
     RemoveDllDirectory = ctypes.windll.kernel32['RemoveDllDirectory']
     RemoveDllDirectory.argtypes = [ctypes.c_void_p]
     RemoveDllDirectory.restype = ctypes.c_int
-    RemoveDllDirectory(cookie)
+    result = RemoveDllDirectory(cookie)
+    if result == 0:
+        raise OSError(f"remove_dll_directory: {ctypes.windll.kernel32.GetLastError()}")
 
 
 nt._add_dll_directory = _add_dll_directory