Nuitka-winsvc 2.2.3__cp311-cp311-win_amd64.whl → 2.3.2__cp311-cp311-win_amd64.whl

nuitka/build/static_src/MainProgram.c

@@ -34,6 +34,7 @@
 #define SYSFLAG_UNBUFFERED 0
 #define NUITKA_MAIN_MODULE_NAME "__main__"
 #define NUITKA_MAIN_IS_PACKAGE_BOOL false
+#define _NUITKA_ATTACH_CONSOLE_WINDOW 1
 #endif
 
 // It doesn't work for MinGW64 to update the standard output handles early on,
@@ -48,6 +49,10 @@
 #define NUITKA_STANDARD_HANDLES_EARLY 0
 #endif
 
+#if defined(_WIN32) && defined(_NUITKA_ATTACH_CONSOLE_WINDOW)
+#include "HelpersConsole.c"
+#endif
+
 extern PyCodeObject *codeobj_main;
 
 /* For later use in "Py_GetArgcArgv" we expose the needed value  */
@@ -328,20 +333,23 @@ static PyObject *EXECUTE_MAIN_MODULE(PyThreadState *tstate, char const *module_n
     return IMPORT_EMBEDDED_MODULE(tstate, module_name);
 }
 
-#ifdef _NUITKA_PLUGIN_WINDOWS_SERVICE_ENABLED
+#if _NUITKA_PLUGIN_WINDOWS_SERVICE_ENABLED
 #include "nuitka_windows_service.h"
 
 // Callback from Windows Service logic.
-bool SvcStartPython(void) {
+void SvcStartPython(void) {
     PyThreadState *tstate = PyThreadState_GET();
 
     EXECUTE_MAIN_MODULE(tstate, NUITKA_MAIN_MODULE_NAME, NUITKA_MAIN_IS_PACKAGE_BOOL);
 
-    if (HAS_ERROR_OCCURRED(tstate)) {
-        return true;
-    } else {
-        return false;
-    }
+    NUITKA_PRINT_TIMING("SvcStartPython() Python exited.")
+
+    int exit_code = HANDLE_PROGRAM_EXIT(tstate);
+
+    // TODO: Log exception and call ReportSvcStatus
+
+    NUITKA_PRINT_TIMING("SvcStartPython(): Calling Py_Exit.");
+    Py_Exit(exit_code);
 }
 
 void SvcStopPython(void) { PyErr_SetInterrupt(); }
@@ -409,12 +417,12 @@ static void setCommandLineParameters(int argc, wchar_t **argv) {
         }
 
         if (i == 1) {
-#ifdef _NUITKA_PLUGIN_WINDOWS_SERVICE_ENABLED
+#if _NUITKA_PLUGIN_WINDOWS_SERVICE_ENABLED
             if (strcmpFilename(argv[i], FILENAME_EMPTY_STR "install") == 0) {
                 NUITKA_PRINT_TRACE("main(): Calling plugin SvcInstall().");
 
                 SvcInstall();
-                NUITKA_CANNOT_GET_HERE("SvcInstall must not return");
+                NUITKA_CANNOT_GET_HERE("main(): SvcInstall must not return");
             }
 #endif
         }
@@ -801,7 +809,7 @@ static void setInputOutputHandles(PyThreadState *tstate) {
 // reason.
 #if NUITKA_STANDARD_HANDLES_EARLY == 1 && PYTHON_VERSION >= 0x370
 #if defined(NUITKA_FORCED_STDOUT_PATH) || defined(NUITKA_FORCED_STDERR_PATH)
-    PyObject *args = MAKE_DICT_EMPTY();
+    PyObject *args = MAKE_DICT_EMPTY(tstate);
 
     DICT_SET_ITEM(args, const_str_plain_encoding, Nuitka_String_FromString("utf-8"));
     DICT_SET_ITEM(args, const_str_plain_line_buffering, Py_True);
@@ -837,7 +845,7 @@ static void setInputOutputHandles(PyThreadState *tstate) {
 #if NUITKA_STANDARD_HANDLES_EARLY == 0
 #if defined(NUITKA_FORCED_STDOUT_PATH)
     {
-#ifdef _WIN32
+#if defined(_WIN32)
         PyObject *filename = getExpandedTemplatePath(L"" NUITKA_FORCED_STDOUT_PATH);
 #else
         PyObject *filename = getExpandedTemplatePath(NUITKA_FORCED_STDOUT_PATH);
@@ -912,15 +920,23 @@ static void setInputOutputHandles(PyThreadState *tstate) {
 }
 
 static void Nuitka_Py_Initialize(void) {
+#if PYTHON_VERSION > 0x350 && !defined(_NUITKA_EXPERIMENTAL_DISABLE_ALLOCATORS)
+    initNuitkaAllocators();
+#endif
+
 #if PYTHON_VERSION < 0x380 || defined(_NUITKA_EXPERIMENTAL_OLD_PY_INITIALIZE)
     Py_Initialize();
 #else
+#if PYTHON_VERSION < 0x3d0
     PyStatus status = _PyRuntime_Initialize();
     if (unlikely(status._type != 0)) {
         Py_ExitStatusException(status);
     }
     NUITKA_MAY_BE_UNUSED _PyRuntimeState *runtime = &_PyRuntime;
     assert(!runtime->initialized);
+#else
+    PyStatus status;
+#endif
 
     PyConfig config;
     _PyConfig_InitCompatConfig(&config);
@@ -998,23 +1014,13 @@ static void Nuitka_Py_Initialize(void) {
 static void changeStandardHandleTarget(int std_handle_id, FILE *std_handle, filename_char_t const *template_path) {
     filename_char_t filename_buffer[1024];
 
-    // TODO: We should only have one that works with filename_char_t rather than having
-    // to make a difference here.
-#ifdef _WIN32
-    bool res = expandTemplatePathW(filename_buffer, template_path, sizeof(filename_buffer) / sizeof(filename_char_t));
-
-    if (res == false) {
-        wprintf(L"Error, couldn't expand pattern '%lS'\n", template_path);
-        abort();
-    }
-#else
-    bool res = expandTemplatePath(filename_buffer, template_path, sizeof(filename_buffer) / sizeof(filename_char_t));
+    bool res =
+        expandTemplatePathFilename(filename_buffer, template_path, sizeof(filename_buffer) / sizeof(filename_char_t));
 
     if (res == false) {
-        printf("Error, couldn't expand pattern: '%s'\n", template_path);
+        printf("Error, couldn't expand pattern '" FILENAME_FORMAT_STR "'\n", template_path);
         abort();
     }
-#endif
 
     if (GetStdHandle(std_handle_id) == 0) {
         FILE *file_handle;
@@ -1129,7 +1135,13 @@ int main(int argc, char **argv) {
     atexit(Nuitka_at_exit);
 #endif
 
-    // First things, set up stdout/stderr according to user specification.
+    // Attach to the parent console respecting redirection only, otherwise we
+    // cannot even output traces.
+#if defined(_WIN32) && defined(_NUITKA_ATTACH_CONSOLE_WINDOW)
+    inheritAttachedConsole();
+#endif
+
+    // Set up stdout/stderr according to user specification.
 #if NUITKA_STANDARD_HANDLES_EARLY == 1
 #if defined(NUITKA_FORCED_STDOUT_PATH)
 #ifdef _WIN32
@@ -1416,6 +1428,57 @@ orig_argv = argv;
     }
 #endif
 
+#if defined(_WIN32) && defined(_NUITKA_ATTACH_CONSOLE_WINDOW)
+    if (needs_stdout_attaching) {
+        PyObject *filename = Nuitka_String_FromString("CONOUT$");
+        // This defaults to "utf-8" internally. We may add an argument of use
+        // platform ones in the future.
+        PyObject *encoding = NULL;
+
+        PyObject *stdout_file = BUILTIN_OPEN_SIMPLE(tstate, filename, "w", SYSFLAG_UNBUFFERED != 1, encoding);
+        if (unlikely(stdout_file == NULL)) {
+            PyErr_PrintEx(1);
+            Py_Exit(1);
+        }
+
+        Py_DECREF(filename);
+
+        Nuitka_SysSetObject("stdout", stdout_file);
+    }
+
+    if (needs_stderr_attaching) {
+        PyObject *filename = Nuitka_String_FromString("CONOUT$");
+        // This defaults to "utf-8" internally. We may add an argument of use
+        // platform ones in the future.
+        PyObject *encoding = NULL;
+
+        PyObject *stderr_file = BUILTIN_OPEN_SIMPLE(tstate, filename, "w", SYSFLAG_UNBUFFERED != 1, encoding);
+        if (unlikely(stderr_file == NULL)) {
+            PyErr_PrintEx(1);
+            Py_Exit(1);
+        }
+
+        Py_DECREF(filename);
+
+        Nuitka_SysSetObject("stderr", stderr_file);
+    }
+
+    if (needs_stdin_attaching) {
+        PyObject *filename = Nuitka_String_FromString("CONIN$");
+        // This defaults to "utf-8" internally. We may add an argument of use
+        // platform ones in the future.
+        PyObject *encoding = NULL;
+
+        // CPython core requires stdin to be buffered due to methods usage, and it won't matter
+        // here much.
+        PyObject *stdin_file = BUILTIN_OPEN_SIMPLE(tstate, filename, "r", true, encoding);
+
+        Py_DECREF(filename);
+
+        Nuitka_SysSetObject("stdin", stdin_file);
+    }
+#endif
+
     NUITKA_PRINT_TRACE("main(): Setting Python input/output handles.");
     setInputOutputHandles(tstate);
 
@@ -1444,8 +1507,10 @@ orig_argv = argv;
     /* Enable meta path based loader. */
     setupMetaPathBasedLoader(tstate);
 
+#if PYTHON_VERSION < 0x3d0
     /* Initialize warnings module. */
     _PyWarnings_Init();
+#endif
 
 #if NO_PYTHON_WARNINGS && PYTHON_VERSION >= 0x342 && PYTHON_VERSION < 0x3a0 && defined(_NUITKA_FULL_COMPAT)
     // For full compatibility bump the warnings registry version,

nuitka/build/static_src/MetaPathBasedLoader.c

@@ -22,6 +22,9 @@
 #ifdef _WIN32
 #undef SEP
 #define SEP '\\'
+#define SEP_L L'\\'
+#else
+#define SEP_L SEP
 #endif
 
 #ifdef _WIN32
@@ -66,6 +69,7 @@ static char *appendModuleNameAsPath(char *buffer, char const *module_name, size_
     // Skip to the end
     while (*buffer != 0) {
         buffer++;
+        buffer_size -= 1;
     }
 
     while (*module_name) {
@@ -90,20 +94,17 @@ static char *appendModuleNameAsPath(char *buffer, char const *module_name, size_
 
 #if defined(_WIN32) && defined(_NUITKA_STANDALONE)
 
-static void appendModuleNameAsPathW(wchar_t *buffer, char const *module_name, size_t buffer_size) {
-    // Skip to the end
-    while (*buffer != 0) {
-        buffer++;
-    }
+static void appendModuleNameAsPathW(wchar_t *buffer, PyObject *module_name, size_t buffer_size) {
+    wchar_t const *module_name_wstr = PyUnicode_AsWideCharString(module_name, NULL);
 
-    while (*module_name) {
-        char c = *module_name++;
+    while (*module_name_wstr != 0) {
+        wchar_t c = *module_name_wstr++;
 
-        if (c == '.') {
-            c = SEP;
+        if (c == L'.') {
+            c = SEP_L;
         }
 
-        appendCharSafeW(buffer, c, buffer_size);
+        appendWCharSafeW(buffer, c, buffer_size);
     }
 }
 #endif
@@ -199,7 +200,9 @@ static PyObject *loadModuleFromCodeObject(PyObject *module, PyCodeObject *code_o
 
     if (is_package) {
         /* Set __path__ properly, unlike frozen module importer does. */
-        PyObject *path_list = MAKE_LIST_EMPTY(1);
+        NUITKA_MAY_BE_UNUSED PyThreadState *tstate = PyThreadState_GET();
+
+        PyObject *path_list = MAKE_LIST_EMPTY(tstate, 1);
         if (unlikely(path_list == NULL)) {
             return NULL;
         }
@@ -313,7 +316,7 @@ static PyObject *_getImportingSuffixesByPriority(PyThreadState *tstate, int kind
     static PyObject *result = NULL;
 
     if (result == NULL) {
-        result = MAKE_LIST_EMPTY(0);
+        result = MAKE_LIST_EMPTY(tstate, 0);
 
         PyObject *imp_module = PyImport_ImportModule("imp");
         PyObject *get_suffixes_func = PyObject_GetAttrString(imp_module, "get_suffixes");
@@ -371,7 +374,7 @@ static bool scanModuleInPackagePath(PyThreadState *tstate, PyObject *module_name
         return false;
     }
 
-    PyObject *candidates = MAKE_LIST_EMPTY(0);
+    PyObject *candidates = MAKE_LIST_EMPTY(tstate, 0);
 
     // Search only relative to the parent name of course.
     char const *module_relative_name_str = Nuitka_String_AsString(module_name) + strlen(parent_module_name) + 1;
@@ -434,7 +437,7 @@ static bool scanModuleInPackagePath(PyThreadState *tstate, PyObject *module_name
                 PyObject *fullpath = JOIN_PATH2(directory, candidate);
 
                 if (installed_extension_modules == NULL) {
-                    installed_extension_modules = MAKE_DICT_EMPTY();
+                    installed_extension_modules = MAKE_DICT_EMPTY(tstate);
                 }
 
 // Force path to unicode, to have easier consumption, as we need a wchar_t or char *
@@ -458,11 +461,7 @@ static bool scanModuleInPackagePath(PyThreadState *tstate, PyObject *module_name
     return result;
 }
 
-#ifdef _WIN32
-static PyObject *callIntoExtensionModule(PyThreadState *tstate, char const *full_name, const wchar_t *filename);
-#else
-static PyObject *callIntoExtensionModule(PyThreadState *tstate, char const *full_name, const char *filename);
-#endif
+static PyObject *callIntoExtensionModule(PyThreadState *tstate, char const *full_name, const filename_char_t *filename);
 
 static PyObject *callIntoInstalledExtensionModule(PyThreadState *tstate, PyObject *module_name,
                                                   PyObject *extension_module_filename) {
@@ -561,7 +560,7 @@ static PyObject *_nuitka_loader_find_module(PyObject *self, PyObject *args, PyOb
         PySys_WriteStderr("import %s # denied responsibility\n", name);
     }
 
-    Py_INCREF(Py_None);
+    Py_INCREF_IMMORTAL(Py_None);
     return Py_None;
 }
 
@@ -638,11 +637,46 @@ typedef PyObject *(*entrypoint_t)(void);
 static PyObject *createModuleSpec(PyThreadState *tstate, PyObject *module_name, PyObject *origin, bool is_package);
 #endif
 
-#ifdef _WIN32
-static PyObject *callIntoExtensionModule(PyThreadState *tstate, char const *full_name, const wchar_t *filename) {
+static void _fillExtensionModuleDllEntryFunctionName(PyThreadState *tstate, char *buffer, size_t buffer_size,
+                                                     char const *name) {
+
+#if PYTHON_VERSION >= 0x350
+    PyObject *name_bytes_obj = PyBytes_FromString(name);
+    PyObject *name_obj = BYTES_DECODE2(tstate, name_bytes_obj, Nuitka_String_FromString("utf8"));
+    Py_DECREF(name_bytes_obj);
+
+    PyObject *name_ascii = UNICODE_ENCODE2(tstate, name_obj, const_str_plain_ascii);
+
+    if (name_ascii == NULL) {
+        DROP_ERROR_OCCURRED(tstate);
+
+        PyObject *name_punycode = UNICODE_ENCODE2(tstate, name_obj, const_str_plain_punycode);
+
+        CHECK_OBJECT(name_punycode);
+
+        snprintf(buffer, buffer_size, "PyInitU_%s", PyBytes_AsString(name_punycode));
+
+        Py_DECREF(name_punycode);
+    } else {
+        Py_DECREF(name_ascii);
+
+        snprintf(buffer, buffer_size, "PyInit_%s", name);
+    }
+    Py_DECREF(name_obj);
+#else
+
+    snprintf(buffer, buffer_size,
+#if PYTHON_VERSION < 0x300
+             "init%s",
 #else
-static PyObject *callIntoExtensionModule(PyThreadState *tstate, char const *full_name, const char *filename) {
+             "PyInit_%s",
+#endif
+             name);
 #endif
+}
+
+static PyObject *callIntoExtensionModule(PyThreadState *tstate, char const *full_name,
+                                         const filename_char_t *filename) {
     // Determine the package name and basename of the module to load.
     char const *dot = strrchr(full_name, '.');
     char const *name;
@@ -658,13 +692,7 @@ static PyObject *callIntoExtensionModule(PyThreadState *tstate, char const *full
     }
 
     char entry_function_name[1024];
-    snprintf(entry_function_name, sizeof(entry_function_name),
-#if PYTHON_VERSION < 0x300
-             "init%s",
-#else
-             "PyInit_%s",
-#endif
-             name);
+    _fillExtensionModuleDllEntryFunctionName(tstate, entry_function_name, sizeof(entry_function_name), name);
 
 #ifdef _WIN32
     if (isVerbose()) {
@@ -701,15 +729,18 @@ static PyObject *callIntoExtensionModule(PyThreadState *tstate, char const *full
 
         // Report either way even if failed to get error message.
         if (size == 0) {
-            PyOS_snprintf(buffer, sizeof(buffer), "LoadLibraryExW '%S' failed with error code %d", filename,
-                          error_code);
+            int ret = PyOS_snprintf(buffer, sizeof(buffer), "LoadLibraryExW '%S' failed with error code %d", filename,
+                                    error_code);
+
+            assert(ret >= 0);
         } else {
             // Strip trailing newline.
             if (size >= 2 && error_message[size - 2] == '\r' && error_message[size - 1] == '\n') {
                 size -= 2;
                 error_message[size] = '\0';
             }
-            PyOS_snprintf(buffer, sizeof(buffer), "LoadLibraryExW '%S' failed: %s", filename, error_message);
+            int ret = PyOS_snprintf(buffer, sizeof(buffer), "LoadLibraryExW '%S' failed: %s", filename, error_message);
+            assert(ret >= 0);
         }
 
         SET_CURRENT_EXCEPTION_TYPE0_STR(tstate, PyExc_ImportError, buffer);
@@ -911,20 +942,23 @@ static PyObject *callIntoExtensionModule(PyThreadState *tstate, char const *full
 #endif
     CHECK_OBJECT(filename_obj);
 
+#if PYTHON_VERSION < 0x3d0
     int res = _PyImport_FixupExtensionObject(module, full_name_obj, filename_obj
 #if PYTHON_VERSION >= 0x370
                                              ,
                                              Nuitka_GetSysModules()
 #endif
-
     );
+#endif
 
     Py_DECREF(full_name_obj);
     Py_DECREF(filename_obj);
 
+#if PYTHON_VERSION < 0x3d0
     if (unlikely(res == -1)) {
         return NULL;
     }
+#endif
 #endif
 
     return module;
@@ -984,7 +1018,7 @@ static PyObject *loadModule(PyThreadState *tstate, PyObject *module, PyObject *m
 
         appendWStringSafeW(filename, getBinaryDirectoryWideChars(true), sizeof(filename) / sizeof(wchar_t));
         appendCharSafeW(filename, SEP, sizeof(filename) / sizeof(wchar_t));
-        appendModuleNameAsPathW(filename, entry->name, sizeof(filename) / sizeof(wchar_t));
+        appendModuleNameAsPathW(filename, module_name, sizeof(filename) / sizeof(wchar_t));
         appendStringSafeW(filename, ".pyd", sizeof(filename) / sizeof(wchar_t));
 #else
         char filename[MAXPATHLEN + 1] = {0};
@@ -1114,7 +1148,7 @@ static PyObject *_EXECUTE_EMBEDDED_MODULE(PyThreadState *tstate, PyObject *modul
         return result;
     }
 
-    Py_INCREF(Py_None);
+    Py_INCREF_IMMORTAL(Py_None);
     return Py_None;
 }
 
@@ -1222,7 +1256,7 @@ static PyObject *_nuitka_loader_is_package(PyObject *self, PyObject *args, PyObj
         result = Py_None;
     }
 
-    Py_INCREF(result);
+    Py_INCREF_IMMORTAL(result);
     return result;
 }
 
@@ -1237,7 +1271,9 @@ static PyObject *_nuitka_loader_iter_modules(struct Nuitka_LoaderObject *self, P
         return NULL;
     }
 
-    PyObject *result = MAKE_LIST_EMPTY(0);
+    NUITKA_MAY_BE_UNUSED PyThreadState *tstate = PyThreadState_GET();
+
+    PyObject *result = MAKE_LIST_EMPTY(tstate, 0);
 
     struct Nuitka_MetaPathBasedLoaderEntry *current = loader_entries;
     assert(current);
@@ -1293,9 +1329,9 @@ static PyObject *_nuitka_loader_iter_modules(struct Nuitka_LoaderObject *self, P
             Py_DECREF(old);
         }
 
-        PyObject *r = MAKE_TUPLE_EMPTY(2);
+        PyObject *r = MAKE_TUPLE_EMPTY(tstate, 2);
         PyTuple_SET_ITEM(r, 0, name);
-        PyTuple_SET_ITEM0(r, 1, BOOL_FROM((current->flags & NUITKA_PACKAGE_FLAG) != 0));
+        PyTuple_SET_ITEM_IMMORTAL(r, 1, BOOL_FROM((current->flags & NUITKA_PACKAGE_FLAG) != 0));
 
         LIST_APPEND1(result, r);
 
@@ -1448,7 +1484,7 @@ static PyObject *createModuleSpec(PyThreadState *tstate, PyObject *module_name,
         return NULL;
     }
 
-    PyObject *args = MAKE_TUPLE2(module_name, (PyObject *)&Nuitka_Loader_Type);
+    PyObject *args = MAKE_TUPLE2(tstate, module_name, (PyObject *)&Nuitka_Loader_Type);
 
     PyObject *kw_values[] = {is_package ? Py_True : Py_False, origin};
 
@@ -1534,7 +1570,7 @@ static PyObject *_nuitka_loader_find_spec(PyObject *self, PyObject *args, PyObje
             PySys_WriteStderr("import %s # denied responsibility\n", full_name);
         }
 
-        Py_INCREF(Py_None);
+        Py_INCREF_IMMORTAL(Py_None);
         return Py_None;
     }
 
@@ -1674,13 +1710,13 @@ static PyObject *_nuitka_loader_find_distributions(PyObject *self, PyObject *arg
         return NULL;
     }
 
-    PyObject *temp = MAKE_LIST_EMPTY(0);
+    PyThreadState *tstate = PyThreadState_GET();
+
+    PyObject *temp = MAKE_LIST_EMPTY(tstate, 0);
 
     Py_ssize_t pos = 0;
     PyObject *distribution_name;
 
-    PyThreadState *tstate = PyThreadState_GET();
-
     while (Nuitka_DistributionNext(&pos, &distribution_name)) {
         bool include = false;
         if (name == Py_None) {

nuitka/build/static_src/MetaPathBasedLoaderResourceReaderFiles.c

@@ -111,7 +111,7 @@ static PyObject *Nuitka_ResourceReaderFiles_iterdir(struct Nuitka_ResourceReader
         return NULL;
     }
 
-    PyObject *files_objects = MAKE_LIST_EMPTY(0);
+    PyObject *files_objects = MAKE_LIST_EMPTY(tstate, 0);
 
     Py_ssize_t n = PyList_GET_SIZE(file_names);
     for (Py_ssize_t i = 0; i < n; i++) {
@@ -418,7 +418,7 @@ static PyObject *Nuitka_ResourceReaderFiles_enter(struct Nuitka_ResourceReaderFi
 static PyObject *Nuitka_ResourceReaderFiles_exit(struct Nuitka_ResourceReaderFilesObject *files) {
     CHECK_OBJECT(files);
 
-    Py_INCREF(Py_None);
+    Py_INCREF_IMMORTAL(Py_None);
     return Py_None;
 }
 

nuitka/build/static_src/OnefileBootstrap.c

@@ -67,6 +67,7 @@
 #define _NUITKA_AUTO_UPDATE_DEBUG_BOOL 1
 #define _NUITKA_AUTO_UPDATE_URL_SPEC "https://..."
 
+#define _NUITKA_ATTACH_CONSOLE_WINDOW 1
 #endif
 
 #if _NUITKA_ONEFILE_COMPRESSION_BOOL == 1
@@ -105,6 +106,10 @@
 #include "HelpersFilesystemPaths.c"
 #include "HelpersSafeStrings.c"
 
+#if defined(_WIN32) && defined(_NUITKA_ATTACH_CONSOLE_WINDOW)
+#include "HelpersConsole.c"
+#endif
+
 // For tracing outputs if enabled at compile time.
 #include "nuitka/tracing.h"
 
@@ -137,22 +142,6 @@ static void fatalErrorMemory(void) { fatalError("Error, couldn't allocate memory
 // Could not launch child process.
 static void fatalErrorChild(char const *message, error_code_t error_code) { fatalIOError(message, error_code); }
 
-#if defined(_WIN32)
-static void appendWCharSafeW(wchar_t *target, wchar_t c, size_t buffer_size) {
-    while (*target != 0) {
-        target++;
-        buffer_size -= 1;
-    }
-
-    if (buffer_size < 1) {
-        abort();
-    }
-
-    *target++ = c;
-    *target = 0;
-}
-#endif
-
 static void fatalErrorTempFileCreate(filename_char_t const *filename) {
     fprintf(stderr, "Error, failed to open '" FILENAME_FORMAT_STR "' for writing.\n", filename);
     exit(2);
@@ -993,6 +982,12 @@ int wmain(int argc, wchar_t **argv) {
 int main(int argc, char **argv) {
 #endif
 #endif
+    // Attach to the parent console respecting redirection only, otherwise we cannot
+    // even output traces.
+#if defined(_WIN32) && defined(_NUITKA_ATTACH_CONSOLE_WINDOW)
+    inheritAttachedConsole();
+#endif
+
     NUITKA_PRINT_TIMING("ONEFILE: Entered main().");
 
     filename_char_t const *pattern = FILENAME_EMPTY_STR _NUITKA_ONEFILE_TEMP_SPEC;
@@ -1240,6 +1235,10 @@ int main(int argc, char **argv) {
 
     STARTUPINFOW si;
     memset(&si, 0, sizeof(si));
+    si.dwFlags = STARTF_USESTDHANDLES;
+    si.hStdInput = GetStdHandle(STD_INPUT_HANDLE);
+    si.hStdOutput = GetStdHandle(STD_OUTPUT_HANDLE);
+    si.hStdError = GetStdHandle(STD_ERROR_HANDLE);
     si.cb = sizeof(si);
 
     PROCESS_INFORMATION pi;
@@ -1248,7 +1247,7 @@ int main(int argc, char **argv) {
                               GetCommandLineW(),     // command line
                               NULL,                  // process attributes
                               NULL,                  // thread attributes
-                              FALSE,                 // inherit handles
+                              TRUE,                  // inherit handles
                               NORMAL_PRIORITY_CLASS, // creation flags
                               NULL, NULL, &si, &pi);
 

nuitka/code_generation/CodeGeneration.py

@@ -283,6 +283,7 @@ from .PackageResourceCodes import (
     generateOsPathIsabsCallCode,
     generateOsPathIsdirCallCode,
     generateOsPathIsfileCallCode,
+    generateOsPathNormpathCallCode,
     generateOsUnameCallCode,
     generatePkglibGetDataCallCode,
     generatePkgResourcesDistributionValueCode,
@@ -339,7 +340,7 @@ from .StringCodes import (
 from .SubscriptCodes import (
     generateAssignmentSubscriptCode,
     generateDelSubscriptCode,
-    generateSubscriptCheckCode,
+    generateMatchSubscriptCheckCode,
     generateSubscriptLookupCode,
 )
 from .TensorflowCodes import generateTensorflowFunctionCallCode
@@ -847,7 +848,7 @@ addExpressionDispatchDict(
         "EXPRESSION_CLASS_BODY_P3": generateFunctionOutlineCode,
         "EXPRESSION_SUBSCRIPT_LOOKUP": generateSubscriptLookupCode,
         "EXPRESSION_SUBSCRIPT_LOOKUP_FOR_UNPACK": generateSubscriptLookupCode,
-        "EXPRESSION_SUBSCRIPT_CHECK": generateSubscriptCheckCode,
+        "EXPRESSION_MATCH_SUBSCRIPT_CHECK": generateMatchSubscriptCheckCode,
         "EXPRESSION_SLICE_LOOKUP": generateSliceLookupCode,
         "EXPRESSION_SET_OPERATION_UPDATE": generateSetOperationUpdateCode,
         "EXPRESSION_SIDE_EFFECTS": generateSideEffectsCode,
@@ -911,6 +912,7 @@ addExpressionDispatchDict(
         "EXPRESSION_OS_PATH_DIRNAME_REF": generateImportModuleNameHardCode,
         "EXPRESSION_OS_PATH_BASENAME_REF": generateImportModuleNameHardCode,
         "EXPRESSION_OS_PATH_ABSPATH_REF": generateImportModuleNameHardCode,
+        "EXPRESSION_OS_PATH_NORMPATH_REF": generateImportModuleNameHardCode,
         "EXPRESSION_BUILTINS_OPEN_REF": generateImportModuleNameHardCode,
         "EXPRESSION_CTYPES_CDLL_REF": generateImportModuleNameHardCode,
         "EXPRESSION_CTYPES_CDLL_SINCE38_CALL": generateCtypesCdllCallCode,
@@ -940,6 +942,7 @@ addExpressionDispatchDict(
         "EXPRESSION_OS_PATH_BASENAME_CALL": generateOsPathBasenameCallCode,
         "EXPRESSION_OS_PATH_DIRNAME_CALL": generateOsPathDirnameCallCode,
         "EXPRESSION_OS_PATH_ABSPATH_CALL": generateOsPathAbspathCallCode,
+        "EXPRESSION_OS_PATH_NORMPATH_CALL": generateOsPathNormpathCallCode,
         "EXPRESSION_OS_PATH_ISABS_CALL": generateOsPathIsabsCallCode,
         "EXPRESSION_OS_LISTDIR_CALL": generateOsListdirCallCode,
         "EXPRESSION_MATCH_ARGS": generateMatchArgsCode,

nuitka/code_generation/ConstantCodes.py

@@ -19,7 +19,7 @@ import sys
 from nuitka import Options
 from nuitka.ModuleRegistry import getRootTopModule
 from nuitka.PythonVersions import python_version
-from nuitka.Serialization import ConstantAccessor
+from nuitka.Serialization import GlobalConstantAccessor
 from nuitka.utils.CStrings import encodePythonStringToC
 from nuitka.utils.Distributions import getDistributionTopLevelPackageNames
 from nuitka.Version import getNuitkaVersionTuple
@@ -86,7 +86,7 @@ def getConstantsDefinitionCode():
     """
     # Somewhat detail rich, pylint: disable=too-many-locals
 
-    constant_accessor = ConstantAccessor(
+    constant_accessor = GlobalConstantAccessor(
         data_filename="__constants.const", top_level_name="global_constants"
     )
 

nuitka/code_generation/DictCodes.py

@@ -272,7 +272,7 @@ if (%(value_name)s == NULL) {
 if (%(value_name)s == NULL && !HAS_ERROR_OCCURRED(tstate)) {
 {% endif %}
     %(value_name)s = Py_None;
-    Py_INCREF(%(value_name)s);
+    Py_INCREF_IMMORTAL(%(value_name)s);
 }
 """,
                 expression=expression,
@@ -541,7 +541,7 @@ def generateDictOperationCopyCode(to_name, expression, emit, context):
     generateCAPIObjectCode(
         to_name=to_name,
         capi="DICT_COPY",
-        tstate=False,
+        tstate=True,
         arg_desc=(("dict_arg", expression.subnode_dict_arg),),
         may_raise=False,
         conversion_check=decideConversionCheckNeeded(to_name, expression),