Changeset 2056 for trunk/src

Timestamp:

Dec 11, 1999, 2:35:52 PM (26 years ago)

Author:

sandervl

Message:

JW's GetMainArgs fix

Location:

trunk/src

Files:

• crtdll/crtdll.cpp (modified) (3 diffs)
• msvcrt/msvcrt.cpp (modified) (4 diffs)

trunk/src/crtdll/crtdll.cpp

@@ -1 @@
-/* $Id: crtdll.cpp,v 1.14 1999-11-30 20:42:10 sandervl Exp $ */
+/* $Id: crtdll.cpp,v 1.15 1999-12-11 13:33:30 sandervl Exp $ */
 
 /*
@@ -308 +308 @@
 
         i=0;xargv=NULL;xargc=0;afterlastspace=0;
+/*
         while (cmdline[i]) {
                 if (cmdline[i]==' ') {
@@ -331 +332 @@
         xargv[xargc-1] = HEAP_strdupA( GetProcessHeap(), 0,
                                        cmdline+afterlastspace);
+*/
         CRTDLL_argc_dll = xargc;
         *argc           = xargc;

trunk/src/msvcrt/msvcrt.cpp

@@ -1 @@
-/* $Id: msvcrt.cpp,v 1.8 1999-11-30 19:44:04 sandervl Exp $ */
+/* $Id: msvcrt.cpp,v 1.9 1999-12-11 13:35:52 sandervl Exp $ */
 
 /*
@@ -13 +13 @@
 #include <odinwrap.h>
 #include <wchar.h>
-#include <except.h>
 #include <heapstring.h>
 #include <crtdll.h>
@@ -674 +673 @@
 
         i=0;xargv=NULL;xargc=0;afterlastspace=0;
+/*
         while (cmdline[i]) {
                 if (cmdline[i]==' ') {
@@ -697 +697 @@
         xargv[xargc-1] = HEAP_strdupA( GetProcessHeap(), 0,
                                        cmdline+afterlastspace);
+*/
         MSVCRT___argc   = xargc;
         *argc           = xargc;
         MSVCRT___argv   = xargv;
         *argv           = xargv;
+        MSVCRT__environ = *environ = GetEnvironmentStringsA();
         dprintf(("MSVCRT: GetMainArgs end\n"));
-        MSVCRT__environ = *environ = GetEnvironmentStringsA();
         return 0;
 }