Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-09-28 05:26:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

[CMD]: Addendum to r76000, with ConSetTitle.

Browse source 
svn path=/trunk/; revision=76001
This commit is contained in:
Hermès Bélusca-Maïto 2017-09-30 14:26:34 +00:00
parent c1596e7b3a
commit 9254157290
4 changed files with 15 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
reactos/base/shell/cmd/cmd.c
View file

@ -378,7 +378,7 @@ Execute(LPTSTR Full, LPTSTR First, LPTSTR Rest, PARSED_COMMAND *Cmd)
GetConsoleTitle(szWindowTitle, ARRAYSIZE(szWindowTitle)); GetConsoleTitle(szWindowTitle, ARRAYSIZE(szWindowTitle));
bTitleSet = FALSE; bTitleSet = FALSE;
_stprintf(szNewTitle, _T("%s - %s%s"), szWindowTitle, First, Rest); _stprintf(szNewTitle, _T("%s - %s%s"), szWindowTitle, First, Rest);
SetConsoleTitle(szNewTitle); ConSetTitle(szNewTitle);
/* check if this is a .BAT or .CMD file */ /* check if this is a .BAT or .CMD file */
dot = _tcsrchr (szFullName, _T('.')); dot = _tcsrchr (szFullName, _T('.'));
@ -479,7 +479,7 @@ Execute(LPTSTR Full, LPTSTR First, LPTSTR Rest, PARSED_COMMAND *Cmd)
/* Restore the original console title */ /* Restore the original console title */
if (!bTitleSet) if (!bTitleSet)
SetConsoleTitle(szWindowTitle); ConSetTitle(szWindowTitle);
return dwExitCode; return dwExitCode;
} }

3
reactos/base/shell/cmd/cmd.h
View file

@ -178,6 +178,9 @@ VOID ConOutResPrintf (UINT resID, ...);
VOID ConErrResPrintf (UINT resID, ...); VOID ConErrResPrintf (UINT resID, ...);
VOID ConOutResPaging(BOOL NewPage, UINT resID); VOID ConOutResPaging(BOOL NewPage, UINT resID);
BOOL ConSetTitle(IN LPCTSTR lpConsoleTitle);
#ifdef INCLUDE_CMD_BEEP #ifdef INCLUDE_CMD_BEEP
VOID ConRingBell(HANDLE hOutput); VOID ConRingBell(HANDLE hOutput);
#endif #endif

6
reactos/base/shell/cmd/console.c
View file

@ -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 #ifdef INCLUDE_CMD_BEEP
VOID ConRingBell(HANDLE hOutput) VOID ConRingBell(HANDLE hOutput)
{ {

8
reactos/base/shell/cmd/title.c
View file

@ -15,7 +15,7 @@
extern BOOL bTitleSet; extern BOOL bTitleSet;
INT cmd_title (LPTSTR param) INT cmd_title(LPTSTR param)
{ {
/* Do nothing if no args */ /* Do nothing if no args */
if (*param == _T('\0')) if (*param == _T('\0'))
@ -24,14 +24,14 @@ INT cmd_title (LPTSTR param)
/* Asking help? */ /* Asking help? */
if (!_tcsncmp(param, _T("/?"), 2)) if (!_tcsncmp(param, _T("/?"), 2))
{ {
ConOutResPaging(TRUE,STRING_TITLE_HELP); ConOutResPaging(TRUE, STRING_TITLE_HELP);
return 0; return 0;
} }
bTitleSet = TRUE; bTitleSet = TRUE;
return SetConsoleTitle (param); return ConSetTitle(param);
} }
#endif /* def INCLUDE_CMD_TITLE */ #endif /* INCLUDE_CMD_TITLE */
/* EOF */ /* EOF */