[ros-diffs] [hbelusca] 67582: [NTVDM]: Move the DosStartProcess dprint inside the function.

Author: hbelusca
Date: Wed May  6 22:07:16 2015
New Revision: 67582

URL: http://svn.reactos.org/svn/reactos?rev=67582&view=rev
Log:
[NTVDM]: Move the DosStartProcess dprint inside the function.

Modified:
    trunk/reactos/subsystems/mvdm/ntvdm/dos/dem.c
    trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/process.c

Modified: trunk/reactos/subsystems/mvdm/ntvdm/dos/dem.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/dos/…
==============================================================================
--- trunk/reactos/subsystems/mvdm/ntvdm/dos/dem.c	[iso-8859-1] (original)
+++ trunk/reactos/subsystems/mvdm/ntvdm/dos/dem.c	[iso-8859-1] Wed May  6 22:07:16 2015
@@ -257,11 +257,6 @@
         }
 
         /* Start the process from the command line */
-        DPRINT1("Starting '%s' ('%.*s')...\n",
-                AppName,
-                CommandInfo.CmdLen >= 2 ? CommandInfo.CmdLen - 2 /* Display the
command line without the terminating 0d 0a */
-                                        : CommandInfo.CmdLen,
-                CmdLine);
         Result = DosStartProcess(AppName, CmdLine, Env);
         if (Result != ERROR_SUCCESS)
         {
@@ -474,7 +469,6 @@
     }
 
     /* Start the process from the command line */
-    DPRINT1("Starting '%s' ('%s')...\n", ApplicationName,
CommandLine);
     Result = DosStartProcess(ApplicationName, CommandLine,
                              SEG_OFF_TO_PTR(SYSTEM_ENV_BLOCK, 0));
     if (Result != ERROR_SUCCESS)

Modified: trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/process.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/dos/…
==============================================================================
--- trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/process.c	[iso-8859-1] (original)
+++ trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/process.c	[iso-8859-1] Wed May  6
22:07:16 2015
@@ -621,6 +621,15 @@
 {
     DWORD Result;
     LPDWORD IntVecTable = (LPDWORD)((ULONG_PTR)BaseAddress);
+
+    SIZE_T CmdLen = strlen(CommandLine);
+    DPRINT1("Starting '%s' ('%.*s')...\n",
+            ExecutablePath,
+            /* Display the command line without the terminating 0d 0a (and skip the
terminating NULL) */
+            CmdLen >= 2 ? (CommandLine[CmdLen - 2] == '\r' ? CmdLen - 2
+                                                           : CmdLen)
+                        : CmdLen,
+            CommandLine);
 
     Result = DosLoadExecutable(DOS_LOAD_AND_EXECUTE,
                                ExecutablePath,