[ros-diffs] [mjansen] 73478: [CMD] Show the executed command in the title, do not restore the old title when it is modified. CORE-12586

Author: mjansen
Date: Thu Dec 22 21:25:37 2016
New Revision: 73478

URL: http://svn.reactos.org/svn/reactos?rev=73478&view=rev
Log:
[CMD] Show the executed command in the title, do not restore the old title when it is
modified. CORE-12586

Modified:
    trunk/reactos/base/shell/cmd/cmd.c
    trunk/reactos/base/shell/cmd/title.c

Modified: trunk/reactos/base/shell/cmd/cmd.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/cmd.c?rev=7…
==============================================================================
--- trunk/reactos/base/shell/cmd/cmd.c	[iso-8859-1] (original)
+++ trunk/reactos/base/shell/cmd/cmd.c	[iso-8859-1] Thu Dec 22 21:25:37 2016
@@ -163,6 +163,7 @@
 BOOL bUnicodeOutput = FALSE;
 BOOL bDisableBatchEcho = FALSE;
 BOOL bDelayedExpansion = FALSE;
+BOOL bTitleSet = FALSE;
 DWORD dwChildProcessId = 0;
 HANDLE hIn;
 HANDLE hOut;
@@ -314,7 +315,7 @@
 {
     TCHAR szFullName[MAX_PATH];
     TCHAR *first, *rest, *dot;
-    TCHAR szWindowTitle[MAX_PATH];
+    TCHAR szWindowTitle[MAX_PATH], szNewTitle[MAX_PATH*2];
     DWORD dwExitCode = 0;
     TCHAR *FirstEnd;
     TCHAR szFullCmdLine [CMDLINE_LENGTH];
@@ -377,7 +378,10 @@
         return 1;
     }
 
-    GetConsoleTitle (szWindowTitle, MAX_PATH);
+    GetConsoleTitle(szWindowTitle, ARRAYSIZE(szWindowTitle));
+    bTitleSet = FALSE;
+    _stprintf(szNewTitle, _T("%s - %s%s"), szWindowTitle, First, Rest);
+    SetConsoleTitle(szNewTitle);
 
     /* check if this is a .BAT or .CMD file */
     dot = _tcsrchr (szFullName, _T('.'));
@@ -475,7 +479,8 @@
     /* Get code page if it has been changed */
     InputCodePage= GetConsoleCP();
     OutputCodePage = GetConsoleOutputCP();
-    SetConsoleTitle(szWindowTitle);
+    if (!bTitleSet)
+        SetConsoleTitle(szWindowTitle);
 
     return dwExitCode;
 }

Modified: trunk/reactos/base/shell/cmd/title.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/title.c?rev…
==============================================================================
--- trunk/reactos/base/shell/cmd/title.c	[iso-8859-1] (original)
+++ trunk/reactos/base/shell/cmd/title.c	[iso-8859-1] Thu Dec 22 21:25:37 2016
@@ -13,6 +13,7 @@
 
 #ifdef INCLUDE_CMD_TITLE
 
+extern BOOL bTitleSet;
 
 INT cmd_title (LPTSTR param)
 {
@@ -27,6 +28,7 @@
         return 0;
     }
 
+    bTitleSet = TRUE;
     return SetConsoleTitle (param);
 }