Changeset 1106

Timestamp:

Sep 23, 2007, 6:20:22 AM (18 years ago)

Author:

bird

Message:

fixed sed bustage after converting to msvc*.dll.

File:

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

trunk/src/lib/startuphacks-win.c

@@ -46 +46 @@
 *******************************************************************************/
 /** argument count found by parse_args(). */
-static int g_cArgs;
+static int  g_cArgs = 0;
+/** the argument vector, for __getmainargs(). */
+static char **g_papszArgs = NULL;
 
 
@@ -55 +57 @@
     const char *pszCmdLine;
     char       *pszCmdLineBuf;
-    char      **papszArgs = NULL;
     int         cb;
 
@@ -63 +64 @@
     GetModuleFileName(NULL, s_szProgramName, MAX_PATH);
     s_szProgramName[MAX_PATH] = '\0';
-#if _MSC_VER >= 1400
+#if _MSC_VER >= 1400 && !defined(CRTDLL) && !defined(_DLL)
     _set_pgmptr(s_szProgramName);
 #endif
@@ -78 +79 @@
      */
     cb = parse_args(pszCmdLine, NULL, NULL);
-    papszArgs = malloc(sizeof(*papszArgs) * (g_cArgs + 2));
-    if (!papszArgs)
+    g_papszArgs = malloc(sizeof(*g_papszArgs) * (g_cArgs + 2));
+    if (!g_papszArgs)
         return -1;
     pszCmdLineBuf = malloc(cb);
     if (!pszCmdLineBuf)
         return -1;
-    parse_args(pszCmdLine, papszArgs, pszCmdLineBuf);
-    papszArgs[g_cArgs] = papszArgs[g_cArgs + 1] = NULL;
+    parse_args(pszCmdLine, g_papszArgs, pszCmdLineBuf);
+    g_papszArgs[g_cArgs] = g_papszArgs[g_cArgs + 1] = NULL;
 
     /* set return variables */
     __argc = g_cArgs;
-    __argv = papszArgs;
+    __argv = g_papszArgs;
     return 0;
 }
+
+
+/* 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)
+{
+    __argc = *pargc = g_cArgs;
+    __argv = *pargv = g_papszArgs;
+    *penvp = _environ;
+    return 0;
+}
+
+#if defined(_M_IX86)
+int (__cdecl * _imp____getmainargs)(int *, char ***, char ***, int, /*_startupinfo*/ void *) = __getmainargs;
+#else
+int (__cdecl * __imp___getmainargs)(int *, char ***, char ***, int, /*_startupinfo*/ void *) = __getmainargs;
+#endif
+