[CMD]: Addendum to r76000, with ConSetTitle.

svn path=/trunk/; revision=76001

[CMD]: Addendum to r76000, with ConSetTitle.
svn path=/trunk/; revision=76001
92541572 · Hermès Bélusca-Maïto · c1596e7b · 92541572 · 92541572 · 92541572
--- a/reactos/base/shell/cmd/cmd.c
+++ b/reactos/base/shell/cmd/cmd.c
@@ -378,7 +378,7 @@ Execute(LPTSTR Full, LPTSTR First, LPTSTR Rest, PARSED_COMMAND *Cmd)
    GetConsoleTitle(szWindowTitle, ARRAYSIZE(szWindowTitle));
    bTitleSet = FALSE;
    _stprintf(szNewTitle, _T("%s - %s%s"), szWindowTitle, First, Rest);
-    SetConsoleTitle(szNewTitle);
+    ConSetTitle(szNewTitle);

    /* check if this is a .BAT or .CMD file */
    dot = _tcsrchr (szFullName, _T('.'));
@@ -479,7 +479,7 @@ Execute(LPTSTR Full, LPTSTR First, LPTSTR Rest, PARSED_COMMAND *Cmd)

    /* Restore the original console title */
    if (!bTitleSet)
-        SetConsoleTitle(szWindowTitle);
+        ConSetTitle(szWindowTitle);

    return dwExitCode;
 }

--- a/reactos/base/shell/cmd/cmd.h
+++ b/reactos/base/shell/cmd/cmd.h
@@ -178,6 +178,9 @@ VOID ConOutResPrintf (UINT resID, ...);
 VOID ConErrResPrintf (UINT resID, ...);
 VOID ConOutResPaging(BOOL NewPage, UINT resID);

+
+BOOL ConSetTitle(IN LPCTSTR lpConsoleTitle);
+
 #ifdef INCLUDE_CMD_BEEP
 VOID ConRingBell(HANDLE hOutput);
 #endif

--- a/reactos/base/shell/cmd/console.c
+++ b/reactos/base/shell/cmd/console.c
@@ -568,6 +568,12 @@ VOID GetScreenSize(PSHORT maxx, PSHORT maxy)



+BOOL ConSetTitle(IN LPCTSTR lpConsoleTitle)
+{
+    /* Now really set the console title */
+    return SetConsoleTitle(lpConsoleTitle);
+}
+
 #ifdef INCLUDE_CMD_BEEP
 VOID ConRingBell(HANDLE hOutput)
 {

--- a/reactos/base/shell/cmd/title.c
+++ b/reactos/base/shell/cmd/title.c
@@ -15,7 +15,7 @@

 extern BOOL bTitleSet;

-INT cmd_title (LPTSTR param)
+INT cmd_title(LPTSTR param)
 {
    /* Do nothing if no args */
    if (*param == _T('\0'))
@@ -24,14 +24,14 @@ INT cmd_title (LPTSTR param)
    /* Asking help? */
    if (!_tcsncmp(param, _T("/?"), 2))
    {
-        ConOutResPaging(TRUE,STRING_TITLE_HELP);
+        ConOutResPaging(TRUE, STRING_TITLE_HELP);
        return 0;
    }

    bTitleSet = TRUE;
-    return SetConsoleTitle (param);
+    return ConSetTitle(param);
 }

-#endif /* def INCLUDE_CMD_TITLE */
+#endif /* INCLUDE_CMD_TITLE */

 /* EOF */