Changeset 3645 in kBuild for trunk

Timestamp:

Nov 3, 2024 2:32:49 AM (4 weeks ago)

Author:

bird

Message:

lib/startuphacks-win.c: UCRT adjustments.

File:

• trunk/src/lib/startuphacks-win.c (modified) (7 diffs)

trunk/src/lib/startuphacks-win.c

@@ -2 +2 @@
 /** @file
  * kBuild - Alternative argument parser for the windows startup code.
- *
- * @todo Update license when SED is updated.
  */
 
 /*
- * Copyright (c) 2006-2010 knut st. osmundsen <[email protected]>
+ * Copyright (c) 2006-2024 knut st. osmundsen <[email protected]>
  *
  * parse_args(): Copyright (c) 1992-1998 by Eberhard Mattes
@@ -36 +34 @@
 #include <malloc.h>
 #include <Windows.h>
+#if _MSC_VER >= 1400
+# include <vcruntime_startup.h>
+#endif
 
 
@@ -53 +54 @@
 
 
-
+#if _MSC_VER >= 1400
+int __cdecl _configure_narrow_argv(_crt_argv_mode const mode)
+#else
 int __cdecl _setargv(void)
+#endif
 {
     static char s_szProgramName[MAX_PATH + 1];
@@ -66 +70 @@
     GetModuleFileName(NULL, s_szProgramName, MAX_PATH);
     s_szProgramName[MAX_PATH] = '\0';
-#if _MSC_VER >= 1400 && !defined(CRTDLL) && !defined(_DLL)
-    _set_pgmptr(s_szProgramName);
+#if _MSC_VER >= 1400
+    _pgmptr = s_szProgramName;
+    (void)mode;
 #endif
 
@@ -83 +88 @@
     g_papszArgs = malloc(sizeof(*g_papszArgs) * (g_cArgs + 2));
     if (!g_papszArgs)
-        return -1;
+        return _MSC_VER >= 1400 ? ENOMEM : -1;
     pszCmdLineBuf = malloc(cb);
     if (!pszCmdLineBuf)
-        return -1;
+        return _MSC_VER >= 1400 ? ENOMEM : -1;
     parse_args(pszCmdLine, g_papszArgs, pszCmdLineBuf);
     g_papszArgs[g_cArgs] = g_papszArgs[g_cArgs + 1] = NULL;
@@ -95 +100 @@
     return 0;
 }
-
-
+#if _MSC_VER >= 1400
+int (__cdecl * __imp__configure_narrow_argv)(_crt_argv_mode) = _configure_narrow_argv;
+#endif
+
+
+#if _MSC_VER < 1400
 /* when linking with the crtexe.c, the __getmainargs() call will redo the _setargv job inside the msvc*.dll. */
 int __cdecl __getmainargs(int *pargc, char ***pargv, char ***penvp, int dowildcard, /*_startupinfo*/ void *startinfo)
@@ -106 +115 @@
 }
 
-#if defined(_M_IX86)
+# if defined(_M_IX86)
 int (__cdecl * _imp____getmainargs)(int *, char ***, char ***, int, /*_startupinfo*/ void *) = __getmainargs;
-#else
+# else
 int (__cdecl * __imp___getmainargs)(int *, char ***, char ***, int, /*_startupinfo*/ void *) = __getmainargs;
-#endif
-
+# endif
+#endif