Use posix constants for winapi load flags

Author: msimacek

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

@@ -51,10 +51,10 @@
 import com.oracle.graal.python.annotations.ArgumentClinic;
 import com.oracle.graal.python.annotations.ArgumentClinic.ClinicConversion;
 import com.oracle.graal.python.annotations.Builtin;
+import com.oracle.graal.python.annotations.PythonOS;
 import com.oracle.graal.python.builtins.CoreFunctions;
 import com.oracle.graal.python.builtins.Python3Core;
 import com.oracle.graal.python.builtins.PythonBuiltins;
-import com.oracle.graal.python.annotations.PythonOS;
 import com.oracle.graal.python.builtins.modules.PosixModuleBuiltins.PathConversionNode;
 import com.oracle.graal.python.builtins.modules.PosixModuleBuiltins.PosixPath;
 import com.oracle.graal.python.builtins.objects.PNone;
@@ -80,9 +80,6 @@
 @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();
@@ -92,8 +89,6 @@ 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", 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/PosixModuleBuiltins.java

@@ -212,6 +212,11 @@ public PosixModuleBuiltins() {
         addConstants(PosixConstants.accessMode);
         addConstants(PosixConstants.exitStatus);
         addConstants(PosixConstants.rtld);
+        for (IntConstant c : PosixConstants.winapiLoadLibraryFlags) {
+            if (c.defined) {
+                addBuiltinConstant('_' + c.name, c.getValueIfDefined());
+            }
+        }
 
         addConstant(PosixConstants.SEEK_DATA);
         addConstant(PosixConstants.SEEK_HOLE);

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

@@ -98,7 +98,6 @@
 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;
@@ -161,6 +160,7 @@
 import com.oracle.graal.python.nodes.object.GetClassNode;
 import com.oracle.graal.python.nodes.util.CastToJavaStringNode;
 import com.oracle.graal.python.nodes.util.CastToTruffleStringNode;
+import com.oracle.graal.python.runtime.PosixConstants;
 import com.oracle.graal.python.runtime.PythonContext;
 import com.oracle.graal.python.runtime.exception.PException;
 import com.oracle.graal.python.runtime.object.PFactory;
@@ -629,15 +629,15 @@ protected abstract static class DlOpenNode extends PythonTernaryClinicBuiltinNod
         protected static String flagsToString(int flag) {
             StringBuilder sb = new StringBuilder("RTLD_NOW");
             if ((flag & RTLD_LOCAL.getValueIfDefined()) != 0) {
-                sb.append("| RTLD_LOCAL");
+                sb.append("|RTLD_LOCAL");
             } else {
-                sb.append("| RTLD_GLOBAL");
+                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");
+            for (PosixConstants.IntConstant constant : PosixConstants.winapiLoadLibraryFlags) {
+                if (constant.defined && (flag & constant.getValueIfDefined()) != 0) {
+                    sb.append('|');
+                    sb.append(constant.name);
+                }
             }
             return sb.toString();
         }