Ros-diffs September 2017

ros-diffs@reactos.org

17 participants
284 discussions

[hbelusca] 76010: [CMD]: Improve ExecuteAutoRunFile() with validity checks.

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Sat Sep 30 22:12:21 2017 New Revision: 76010 URL: http://svn.reactos.org/svn/reactos?rev=76010&view=rev Log: [CMD]: Improve ExecuteAutoRunFile() with validity checks. Modified: trunk/reactos/base/shell/cmd/cmd.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] Sat Sep 30 22:12:21 2017 @@ -1538,12 +1538,12 @@ { LONG lRet; HKEY hKey; + DWORD dwType, len; /* * Buffer big enough to hold the string L"4294967295", * corresponding to the literal 0xFFFFFFFF (MAX_ULONG) in decimal. */ DWORD Buffer[6]; - DWORD dwType, len; lRet = RegOpenKeyEx(hKeyRoot, _T("Software\\Microsoft\\Command Processor"), @@ -1685,28 +1685,33 @@ static VOID ExecuteAutoRunFile(HKEY hKeyRoot) { - TCHAR autorun[2048]; - DWORD len = sizeof autorun; - HKEY hkey; - - if (RegOpenKeyEx(hKeyRoot, - _T("SOFTWARE\\Microsoft\\Command Processor"), - 0, - KEY_READ, - &hkey) == ERROR_SUCCESS) - { - if (RegQueryValueEx(hkey, + LONG lRet; + HKEY hKey; + DWORD dwType, len; + TCHAR AutoRun[2048]; + + lRet = RegOpenKeyEx(hKeyRoot, + _T("Software\\Microsoft\\Command Processor"), + 0, + KEY_QUERY_VALUE, + &hKey); + if (lRet != ERROR_SUCCESS) + return; + + len = sizeof(AutoRun); + lRet = RegQueryValueEx(hKey, _T("AutoRun"), - 0, - 0, - (LPBYTE)autorun, - &len) == ERROR_SUCCESS) - { - if (*autorun) - ParseCommandLine(autorun); - } - RegCloseKey(hkey); - } + NULL, + &dwType, + (LPBYTE)&AutoRun, + &len); + if ((lRet == ERROR_SUCCESS) && (dwType == REG_EXPAND_SZ || dwType == REG_SZ)) + { + if (*AutoRun) + ParseCommandLine(AutoRun); + } + + RegCloseKey(hKey); } /* Get the command that comes after a /C or /K switch */

6 years, 11 months

[hbelusca] 76009: [CMD]: Small refactoring: - Moving ConGetDefaultAttributes() in console.h; - Moving some SDK inclusions into precomp.h; - Removing extern HANDLE hIn; and localize the SHORT maxx/y...

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Sat Sep 30 21:37:34 2017 New Revision: 76009 URL: http://svn.reactos.org/svn/reactos?rev=76009&view=rev Log: [CMD]: Small refactoring: - Moving ConGetDefaultAttributes() in console.h; - Moving some SDK inclusions into precomp.h; - Removing extern HANDLE hIn; and localize the SHORT maxx/y variables; - Comment fix; - Whitespace fixes for screen.c. Modified: trunk/reactos/base/shell/cmd/cmd.c trunk/reactos/base/shell/cmd/cmd.h trunk/reactos/base/shell/cmd/console.c trunk/reactos/base/shell/cmd/console.h trunk/reactos/base/shell/cmd/dir.c trunk/reactos/base/shell/cmd/precomp.h trunk/reactos/base/shell/cmd/screen.c trunk/reactos/base/shell/cmd/start.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] Sat Sep 30 21:37:34 2017 @@ -311,10 +311,11 @@ { TCHAR szFullName[MAX_PATH]; TCHAR *first, *rest, *dot; - TCHAR szWindowTitle[MAX_PATH], szNewTitle[MAX_PATH*2]; + TCHAR szWindowTitle[MAX_PATH]; + TCHAR szNewTitle[MAX_PATH*2]; DWORD dwExitCode = 0; TCHAR *FirstEnd; - TCHAR szFullCmdLine [CMDLINE_LENGTH]; + TCHAR szFullCmdLine[CMDLINE_LENGTH]; TRACE ("Execute: \'%s\' \'%s\'\n", debugstr_aw(First), debugstr_aw(Rest)); @@ -1762,33 +1763,6 @@ } -#ifdef INCLUDE_CMD_COLOR - -BOOL ConGetDefaultAttributes(PWORD pwDefAttr) -{ - BOOL Success; - HANDLE hConsole; - CONSOLE_SCREEN_BUFFER_INFO csbi; - - /* Do not modify *pwDefAttr if we fail, in which case use default attributes */ - - hConsole = CreateFile(_T("CONOUT$"), GENERIC_READ|GENERIC_WRITE, - FILE_SHARE_READ|FILE_SHARE_WRITE, NULL, - OPEN_EXISTING, 0, NULL); - if (hConsole == INVALID_HANDLE_VALUE) - return FALSE; // No default console - - Success = GetConsoleScreenBufferInfo(hConsole, &csbi); - if (Success) - *pwDefAttr = csbi.wAttributes; - - CloseHandle(hConsole); - return Success; -} - -#endif - - /* * Set up global initializations and process parameters */ @@ -1997,7 +1971,6 @@ if (IsExistingFile(_T("cmdexit.bat"))) { ConErrResPuts(STRING_CMD_ERROR5); - ParseCommandLine(_T("cmdexit.bat")); } else if (IsExistingFile(_T("\\cmdexit.bat"))) Modified: trunk/reactos/base/shell/cmd/cmd.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/cmd.h?rev=7… ============================================================================== --- trunk/reactos/base/shell/cmd/cmd.h [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/cmd.h [iso-8859-1] Sat Sep 30 21:37:34 2017 @@ -25,12 +25,6 @@ #include <config.h> -#include <winnls.h> -#include <winreg.h> -#include <winuser.h> -#include <wincon.h> -#include <tchar.h> - #include "cmdver.h" #include "cmddbg.h" @@ -43,7 +37,6 @@ #define D_ON _T("on") #define D_OFF _T("off") - /* command line buffer length */ #define CMDLINE_LENGTH 8192 @@ -51,7 +44,6 @@ #define BUFF_SIZE 16384 /* Global variables */ -extern HANDLE hIn; extern LPTSTR lpOriginalEnvironment; extern WORD wColor; extern WORD wDefColor; @@ -62,8 +54,6 @@ extern BOOL bEnableExtensions; extern BOOL bDelayedExpansion; extern INT nErrorLevel; -extern SHORT maxx; -extern SHORT maxy; extern BOOL bUnicodeOutput; Modified: trunk/reactos/base/shell/cmd/console.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/console.c?r… ============================================================================== --- trunk/reactos/base/shell/cmd/console.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/console.c [iso-8859-1] Sat Sep 30 21:37:34 2017 @@ -507,6 +507,33 @@ +#ifdef INCLUDE_CMD_COLOR + +BOOL ConGetDefaultAttributes(PWORD pwDefAttr) +{ + BOOL Success; + HANDLE hConsole; + CONSOLE_SCREEN_BUFFER_INFO csbi; + + /* Do not modify *pwDefAttr if we fail, in which case use default attributes */ + + hConsole = CreateFile(_T("CONOUT$"), GENERIC_READ|GENERIC_WRITE, + FILE_SHARE_READ|FILE_SHARE_WRITE, NULL, + OPEN_EXISTING, 0, NULL); + if (hConsole == INVALID_HANDLE_VALUE) + return FALSE; // No default console + + Success = GetConsoleScreenBufferInfo(hConsole, &csbi); + if (Success) + *pwDefAttr = csbi.wAttributes; + + CloseHandle(hConsole); + return Success; +} + +#endif + + BOOL ConSetTitle(IN LPCTSTR lpConsoleTitle) { /* Now really set the console title */ Modified: trunk/reactos/base/shell/cmd/console.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/console.h?r… ============================================================================== --- trunk/reactos/base/shell/cmd/console.h [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/console.h [iso-8859-1] Sat Sep 30 21:37:34 2017 @@ -72,6 +72,11 @@ VOID SetCursorType (BOOL, BOOL); +#ifdef INCLUDE_CMD_COLOR +BOOL ConGetDefaultAttributes(PWORD pwDefAttr); +#endif + + BOOL ConSetTitle(IN LPCTSTR lpConsoleTitle); #ifdef INCLUDE_CMD_BEEP Modified: trunk/reactos/base/shell/cmd/dir.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/dir.c?rev=7… ============================================================================== --- trunk/reactos/base/shell/cmd/dir.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/dir.c [iso-8859-1] Sat Sep 30 21:37:34 2017 @@ -1052,7 +1052,7 @@ /* Calculate size */ if (ptrFiles[i]->stFindInfo.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) { - /* Directory, no size it's a directory*/ + /* Directory, no size it's a directory */ iSizeFormat = -17; _tcscpy(szSize, _T("<DIR>")); } Modified: trunk/reactos/base/shell/cmd/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/precomp.h?r… ============================================================================== --- trunk/reactos/base/shell/cmd/precomp.h [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/precomp.h [iso-8859-1] Sat Sep 30 21:37:34 2017 @@ -7,15 +7,20 @@ #define _CRT_SECURE_NO_DEPRECATE #endif /*_MSC_VER */ +#include <stdio.h> +#include <stdarg.h> #include <stdlib.h> #include <malloc.h> +#include <tchar.h> #define WIN32_NO_STATUS -#include <stdarg.h> #include <windef.h> #include <winbase.h> +#include <winnls.h> +#include <winreg.h> +#include <winuser.h> +#include <wincon.h> #include <shellapi.h> -#include <stdio.h> #define NTOS_MODE_USER #include <ndk/rtlfuncs.h> Modified: trunk/reactos/base/shell/cmd/screen.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/screen.c?re… ============================================================================== --- trunk/reactos/base/shell/cmd/screen.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/screen.c [iso-8859-1] Sat Sep 30 21:37:34 2017 @@ -15,13 +15,13 @@ #ifdef INCLUDE_CMD_SCREEN - -INT CommandScreen (LPTSTR param) +INT CommandScreen(LPTSTR param) { - SHORT x,y; + SHORT x, y; + SHORT maxx, maxy; BOOL bSkipText = FALSE; - if (_tcsncmp (param, _T("/?"), 2) == 0) + if (_tcsncmp(param, _T("/?"), 2) == 0) { ConOutResPaging(TRUE,STRING_SCREEN_HELP); return 0; @@ -29,72 +29,71 @@ nErrorLevel = 0; - //get row - while(_istspace(*param)) + /* Retrieve the screen dimensions */ + GetScreenSize(&maxx, &maxy); + + /* Get row */ + while (_istspace(*param)) param++; - if (!(*param)) + if (!*param) { - error_req_param_missing (); + error_req_param_missing(); return 1; } y = _ttoi(param); - if (y<0 || y>(maxy-1)) + if (y < 0 || y > (maxy-1)) { ConOutResPuts(STRING_SCREEN_ROW); - return 1; } - //get col - if (!(param = _tcschr(param,_T(' ')))) + /* Get column */ + if (!(param = _tcschr(param, _T(' ')))) { - error_req_param_missing (); + error_req_param_missing(); return 1; } - while(_istspace(*param)) + while (_istspace(*param)) param++; - if (!(*param)) + if (!*param) { - error_req_param_missing (); + error_req_param_missing(); return 1; } x = _ttoi(param); - if (x<0 || x>(maxx-1)) + if (x < 0 || x > (maxx-1)) { ConErrResPuts(STRING_SCREEN_COL); return 1; } - //get text - if (!(param = _tcschr(param,_T(' ')))) + /* Get text */ + if (!(param = _tcschr(param, _T(' ')))) { bSkipText = TRUE; } else { - while(_istspace(*param)) + while (_istspace(*param)) param++; - if (!(*param)) - { + if (!*param) bSkipText = TRUE; - } } bIgnoreEcho = TRUE; if (bSkipText) - x=0; + x = 0; + SetCursorXY(x, y); - SetCursorXY(x,y); - - if (!(bSkipText)) + if (!bSkipText) ConOutPuts(param); return 0; Modified: trunk/reactos/base/shell/cmd/start.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/start.c?rev… ============================================================================== --- trunk/reactos/base/shell/cmd/start.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/start.c [iso-8859-1] Sat Sep 30 21:37:34 2017 @@ -45,7 +45,7 @@ BOOL bWait = FALSE; BOOL bBat = FALSE; BOOL bCreate = FALSE; - TCHAR szFullCmdLine [CMDLINE_LENGTH]; + TCHAR szFullCmdLine[CMDLINE_LENGTH]; PROCESS_INFORMATION prci; STARTUPINFO stui; #ifdef UNICODE @@ -303,6 +303,7 @@ nErrorLevel = (INT)dwExitCode; } CloseHandle (prci.hProcess); + /* Get New code page if it has change */ InputCodePage= GetConsoleCP(); OutputCodePage = GetConsoleOutputCP();

6 years, 11 months

[hbelusca] 76008: [CMD]: Continue refactoring to lay out the way to using the CONUTILS library in CMD. Part 3/x

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Sat Sep 30 21:05:49 2017 New Revision: 76008 URL: http://svn.reactos.org/svn/reactos?rev=76008&view=rev Log: [CMD]: Continue refactoring to lay out the way to using the CONUTILS library in CMD. Part 3/x Modified: trunk/reactos/base/shell/cmd/cmd.c trunk/reactos/base/shell/cmd/color.c trunk/reactos/base/shell/cmd/console.c trunk/reactos/base/shell/cmd/console.h trunk/reactos/base/shell/cmd/dir.c trunk/reactos/base/shell/cmd/type.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] Sat Sep 30 21:05:49 2017 @@ -1956,7 +1956,7 @@ } if (wDefColor != 0) - ConSetScreenColor(wDefColor, TRUE); + ConSetScreenColor(GetStdHandle(STD_OUTPUT_HANDLE), wDefColor, TRUE); #endif if (!*ptr) Modified: trunk/reactos/base/shell/cmd/color.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/color.c?rev… ============================================================================== --- trunk/reactos/base/shell/cmd/color.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/color.c [iso-8859-1] Sat Sep 30 21:05:49 2017 @@ -46,7 +46,7 @@ /* No parameter: Set the default colors */ if (rest[0] == _T('\0')) { - ConSetScreenColor(wDefColor, TRUE); + ConSetScreenColor(GetStdHandle(STD_OUTPUT_HANDLE), wDefColor, TRUE); return 0; } @@ -87,7 +87,8 @@ * Set the chosen color. Use also the following advanced flag: * /-F to avoid changing already buffered foreground/background. */ - if (ConSetScreenColor(wColor, !_tcsstr(rest, _T("/-F")) && !_tcsstr(rest, _T("/-f"))) == FALSE) + if (ConSetScreenColor(GetStdHandle(STD_OUTPUT_HANDLE), wColor, + !_tcsstr(rest, _T("/-F")) && !_tcsstr(rest, _T("/-f"))) == FALSE) { /* Failed because foreground and background colors were the same */ ConErrResPuts(STRING_COLOR_ERROR1); Modified: trunk/reactos/base/shell/cmd/console.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/console.c?r… ============================================================================== --- trunk/reactos/base/shell/cmd/console.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/console.c [iso-8859-1] Sat Sep 30 21:05:49 2017 @@ -21,7 +21,7 @@ #define OUTPUT_BUFFER_SIZE 4096 - +/* Cache codepage for text streams */ UINT InputCodePage; UINT OutputCodePage; @@ -342,7 +342,7 @@ /************************** Console PAGER functions ***************************/ -INT ConPrintfVPaging(DWORD nStdHandle, BOOL NewPage, LPTSTR szFormat, va_list arg_ptr) +BOOL ConPrintfVPaging(DWORD nStdHandle, BOOL NewPage, LPTSTR szFormat, va_list arg_ptr) { INT len; CONSOLE_SCREEN_BUFFER_INFO csbi; @@ -366,14 +366,14 @@ /* Reset LineCount and return if no string has been given */ if (szFormat == NULL) - return 0; + return TRUE; /* Get the size of the visual screen that can be printed to */ if (!IsConsoleHandle(hOutput) || !GetConsoleScreenBufferInfo(hOutput, &csbi)) { /* We assume it's a file handle */ ConPrintfV(nStdHandle, szFormat, arg_ptr); - return 0; + return TRUE; } /* @@ -387,7 +387,7 @@ if (ScreenLines < 4) { ConPrintfV(nStdHandle, szFormat, arg_ptr); - return 0; + return TRUE; } len = _vstprintf(szOut, szFormat, arg_ptr); @@ -408,9 +408,7 @@ /* Prompt the user */ if (PagePrompt() != PROMPT_YES) - { - return 1; - } + return FALSE; // TODO: Recalculate 'ScreenLines' in case the user redimensions // the window during the prompt. @@ -422,18 +420,18 @@ WriteConsole(hOutput, &szOut[from], i-from, &dwWritten, NULL); - return 0; -} - -INT ConOutPrintfPaging(BOOL NewPage, LPTSTR szFormat, ...) -{ - INT iReturn; + return TRUE; +} + +BOOL ConOutPrintfPaging(BOOL NewPage, LPTSTR szFormat, ...) +{ + BOOL bRet; va_list arg_ptr; va_start(arg_ptr, szFormat); - iReturn = ConPrintfVPaging(STD_OUTPUT_HANDLE, NewPage, szFormat, arg_ptr); + bRet = ConPrintfVPaging(STD_OUTPUT_HANDLE, NewPage, szFormat, arg_ptr); va_end(arg_ptr); - return iReturn; + return bRet; } VOID ConOutResPaging(BOOL NewPage, UINT resID) @@ -557,9 +555,8 @@ #endif #ifdef INCLUDE_CMD_COLOR -BOOL ConSetScreenColor(WORD wColor, BOOL bFill) -{ - HANDLE hConsole = GetStdHandle(STD_OUTPUT_HANDLE); +BOOL ConSetScreenColor(HANDLE hOutput, WORD wColor, BOOL bFill) +{ DWORD dwWritten; CONSOLE_SCREEN_BUFFER_INFO csbi; COORD coPos; @@ -571,11 +568,11 @@ /* Fill the whole background if needed */ if (bFill) { - GetConsoleScreenBufferInfo(hConsole, &csbi); + GetConsoleScreenBufferInfo(hOutput, &csbi); coPos.X = 0; coPos.Y = 0; - FillConsoleOutputAttribute(hConsole, + FillConsoleOutputAttribute(hOutput, wColor & 0x00FF, csbi.dwSize.X * csbi.dwSize.Y, coPos, @@ -583,7 +580,7 @@ } /* Set the text attribute */ - SetConsoleTextAttribute(hConsole, wColor & 0x00FF); + SetConsoleTextAttribute(hOutput, wColor & 0x00FF); return TRUE; } #endif Modified: trunk/reactos/base/shell/cmd/console.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/console.h?r… ============================================================================== --- trunk/reactos/base/shell/cmd/console.h [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/console.h [iso-8859-1] Sat Sep 30 21:05:49 2017 @@ -59,8 +59,8 @@ ConFormatMessage(STD_ERROR_HANDLE, (MessageId), ##__VA_ARGS__) -INT ConPrintfVPaging(DWORD nStdHandle, BOOL, LPTSTR, va_list); -INT ConOutPrintfPaging (BOOL NewPage, LPTSTR, ...); +BOOL ConPrintfVPaging(DWORD nStdHandle, BOOL, LPTSTR, va_list); +BOOL ConOutPrintfPaging (BOOL NewPage, LPTSTR, ...); VOID ConOutResPaging(BOOL NewPage, UINT resID); SHORT GetCursorX (VOID); @@ -83,7 +83,7 @@ #endif #ifdef INCLUDE_CMD_COLOR -BOOL ConSetScreenColor(WORD wColor, BOOL bFill); +BOOL ConSetScreenColor(HANDLE hOutput, WORD wColor, BOOL bFill); #endif // TCHAR cgetchar (VOID); Modified: trunk/reactos/base/shell/cmd/dir.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/dir.c?rev=7… ============================================================================== --- trunk/reactos/base/shell/cmd/dir.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/dir.c [iso-8859-1] Sat Sep 30 21:05:49 2017 @@ -550,18 +550,18 @@ } /* Print either with or without paging, depending on /P switch */ -static INT +static BOOL DirPrintf(LPDIRSWITCHFLAGS lpFlags, LPTSTR szFormat, ...) { - INT iReturn = 0; + BOOL Done = TRUE; va_list arg_ptr; va_start(arg_ptr, szFormat); if (lpFlags->bPause) - iReturn = ConPrintfVPaging(STD_OUTPUT_HANDLE, FALSE, szFormat, arg_ptr); + Done = ConPrintfVPaging(STD_OUTPUT_HANDLE, FALSE, szFormat, arg_ptr); else ConPrintfV(STD_OUTPUT_HANDLE, szFormat, arg_ptr); va_end(arg_ptr); - return iReturn; + return Done; } @@ -1139,7 +1139,7 @@ if (!lpFlags->bBareFormat && !(lpFlags->bRecursive && (dwCount <= 0))) { LoadString(CMD_ModuleHandle, STRING_DIR_HELP7, szMsg, ARRAYSIZE(szMsg)); - if (DirPrintf(lpFlags, szMsg, szTemp)) + if (!DirPrintf(lpFlags, szMsg, szTemp)) return; } Modified: trunk/reactos/base/shell/cmd/type.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/type.c?rev=… ============================================================================== --- trunk/reactos/base/shell/cmd/type.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/type.c [iso-8859-1] Sat Sep 30 21:05:49 2017 @@ -107,7 +107,7 @@ { while (FileGetString(hFile, buff, ARRAYSIZE(buff))) { - if (ConOutPrintfPaging(bFirstTime, _T("%s"), buff) == 1) + if (!ConOutPrintfPaging(bFirstTime, _T("%s"), buff)) { bCtrlBreak = FALSE; CloseHandle(hFile);

6 years, 11 months

[hbelusca] 76007: [CMD]: Continue refactoring to lay out the way to using the CONUTILS library in CMD. Part 2/x

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Sat Sep 30 19:52:30 2017 New Revision: 76007 URL: http://svn.reactos.org/svn/reactos?rev=76007&view=rev Log: [CMD]: Continue refactoring to lay out the way to using the CONUTILS library in CMD. Part 2/x Modified: trunk/reactos/base/shell/cmd/console.c trunk/reactos/base/shell/cmd/console.h trunk/reactos/base/shell/cmd/error.c Modified: trunk/reactos/base/shell/cmd/console.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/console.c?r… ============================================================================== --- trunk/reactos/base/shell/cmd/console.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/console.c [iso-8859-1] Sat Sep 30 19:52:30 2017 @@ -139,7 +139,7 @@ /******************** Console STREAM OUT utility functions ********************/ -static VOID ConWrite(TCHAR *str, DWORD len, DWORD nStdHandle) +static VOID ConWrite(DWORD nStdHandle, TCHAR *str, DWORD len) { DWORD dwNumBytes = 0; HANDLE hOutput = GetStdHandle(nStdHandle); @@ -260,26 +260,26 @@ } } -VOID ConOutChar(TCHAR c) -{ - ConWrite(&c, 1, STD_OUTPUT_HANDLE); -} - -VOID ConPuts(LPTSTR szText, DWORD nStdHandle) -{ - ConWrite(szText, (DWORD)_tcslen(szText), nStdHandle); -} - -VOID ConOutResPuts(UINT resID) +VOID ConPuts(DWORD nStdHandle, LPTSTR szText) +{ + ConWrite(nStdHandle, szText, (DWORD)_tcslen(szText)); +} + +VOID ConResPuts(DWORD nStdHandle, UINT resID) { TCHAR szMsg[RC_STRING_MAX_SIZE]; LoadString(CMD_ModuleHandle, resID, szMsg, ARRAYSIZE(szMsg)); - ConPuts(szMsg, STD_OUTPUT_HANDLE); -} - -VOID ConOutPuts(LPTSTR szText) -{ - ConPuts(szText, STD_OUTPUT_HANDLE); + ConPuts(nStdHandle, szMsg); +} + +VOID ConOutChar(TCHAR c) +{ + ConWrite(STD_OUTPUT_HANDLE, &c, 1); +} + +VOID ConErrChar(TCHAR c) +{ + ConWrite(STD_ERROR_HANDLE, &c, 1); } VOID ConPrintfV(DWORD nStdHandle, LPTSTR szFormat, va_list arg_ptr) @@ -288,12 +288,31 @@ DWORD len; len = (DWORD)_vstprintf(szOut, szFormat, arg_ptr); - ConWrite(szOut, len, nStdHandle); -} - -VOID ConErrFormatMessage(DWORD MessageId, ...) + ConWrite(nStdHandle, szOut, len); +} + +VOID ConPrintf(DWORD nStdHandle, LPTSTR szFormat, ...) +{ + va_list arg_ptr; + + va_start(arg_ptr, szFormat); + ConPrintfV(nStdHandle, szFormat, arg_ptr); + va_end(arg_ptr); +} + +VOID ConResPrintf(DWORD nStdHandle, UINT resID, ...) { TCHAR szMsg[RC_STRING_MAX_SIZE]; + va_list arg_ptr; + + va_start(arg_ptr, resID); + LoadString(CMD_ModuleHandle, resID, szMsg, ARRAYSIZE(szMsg)); + ConPrintfV(nStdHandle, szMsg, arg_ptr); + va_end(arg_ptr); +} + +VOID ConFormatMessage(DWORD nStdHandle, DWORD MessageId, ...) +{ DWORD ret; LPTSTR text; va_list arg_ptr; @@ -303,107 +322,20 @@ NULL, MessageId, MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), - (LPTSTR) &text, + (LPTSTR)&text, 0, &arg_ptr); - va_end(arg_ptr); + if (ret > 0) { - ConErrPuts(text); + ConPuts(nStdHandle, text); LocalFree(text); } else { - LoadString(CMD_ModuleHandle, STRING_CONSOLE_ERROR, szMsg, ARRAYSIZE(szMsg)); - ConErrPrintf(szMsg); - } -} - -VOID ConOutFormatMessage(DWORD MessageId, ...) -{ - TCHAR szMsg[RC_STRING_MAX_SIZE]; - DWORD ret; - LPTSTR text; - va_list arg_ptr; - - va_start(arg_ptr, MessageId); - ret = FormatMessage(FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_SYSTEM, - NULL, - MessageId, - MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), - (LPTSTR) &text, - 0, - &arg_ptr); - - va_end(arg_ptr); - if (ret > 0) - { - ConErrPuts(text); - LocalFree(text); - } - else - { - LoadString(CMD_ModuleHandle, STRING_CONSOLE_ERROR, szMsg, ARRAYSIZE(szMsg)); - ConErrPrintf(szMsg); - } -} - -VOID ConOutResPrintf(UINT resID, ...) -{ - TCHAR szMsg[RC_STRING_MAX_SIZE]; - va_list arg_ptr; - - va_start(arg_ptr, resID); - LoadString(CMD_ModuleHandle, resID, szMsg, ARRAYSIZE(szMsg)); - ConPrintfV(STD_OUTPUT_HANDLE, szMsg, arg_ptr); - va_end(arg_ptr); -} - -VOID ConOutPrintf(LPTSTR szFormat, ...) -{ - va_list arg_ptr; - - va_start(arg_ptr, szFormat); - ConPrintfV(STD_OUTPUT_HANDLE, szFormat, arg_ptr); - va_end(arg_ptr); -} - -VOID ConErrChar(TCHAR c) -{ - ConWrite(&c, 1, STD_ERROR_HANDLE); -} - -VOID ConErrResPuts(UINT resID) -{ - TCHAR szMsg[RC_STRING_MAX_SIZE]; - LoadString(CMD_ModuleHandle, resID, szMsg, ARRAYSIZE(szMsg)); - ConPuts(szMsg, STD_ERROR_HANDLE); -} - -VOID ConErrPuts(LPTSTR szText) -{ - ConPuts(szText, STD_ERROR_HANDLE); -} - -VOID ConErrResPrintf(UINT resID, ...) -{ - TCHAR szMsg[RC_STRING_MAX_SIZE]; - va_list arg_ptr; - - va_start(arg_ptr, resID); - LoadString(CMD_ModuleHandle, resID, szMsg, ARRAYSIZE(szMsg)); - ConPrintfV(STD_ERROR_HANDLE, szMsg, arg_ptr); - va_end(arg_ptr); -} - -VOID ConErrPrintf(LPTSTR szFormat, ...) -{ - va_list arg_ptr; - - va_start(arg_ptr, szFormat); - ConPrintfV(STD_ERROR_HANDLE, szFormat, arg_ptr); - va_end(arg_ptr); + ConResPrintf(nStdHandle, STRING_CONSOLE_ERROR, MessageId); + } } Modified: trunk/reactos/base/shell/cmd/console.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/console.h?r… ============================================================================== --- trunk/reactos/base/shell/cmd/console.h [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/console.h [iso-8859-1] Sat Sep 30 19:52:30 2017 @@ -17,17 +17,51 @@ VOID ConInKey (PINPUT_RECORD); VOID ConInString (LPTSTR, DWORD); + VOID ConOutChar (TCHAR); -VOID ConOutPuts (LPTSTR); +VOID ConErrChar (TCHAR); VOID ConPrintfV(DWORD, LPTSTR, va_list); + +VOID ConPuts(DWORD nStdHandle, LPTSTR szText); +VOID ConPrintf(DWORD nStdHandle, LPTSTR szFormat, ...); +VOID ConResPuts(DWORD nStdHandle, UINT resID); +VOID ConResPrintf(DWORD nStdHandle, UINT resID, ...); +VOID ConFormatMessage(DWORD nStdHandle, DWORD MessageId, ...); + +#define ConOutPuts(szStr) \ + ConPuts(STD_OUTPUT_HANDLE, (szStr)) + +#define ConErrPuts(szStr) \ + ConPuts(STD_ERROR_HANDLE, (szStr)) + +#define ConOutResPuts(uID) \ + ConResPuts(STD_OUTPUT_HANDLE, (uID)) + +#define ConErrResPuts(uID) \ + ConResPuts(STD_ERROR_HANDLE, (uID)) + +#define ConOutPrintf(szStr, ...) \ + ConPrintf(STD_OUTPUT_HANDLE, (szStr), ##__VA_ARGS__) + +#define ConErrPrintf(szStr, ...) \ + ConPrintf(STD_ERROR_HANDLE, (szStr), ##__VA_ARGS__) + +#define ConOutResPrintf(uID, ...) \ + ConResPrintf(STD_OUTPUT_HANDLE, (uID), ##__VA_ARGS__) + +#define ConErrResPrintf(uID, ...) \ + ConResPrintf(STD_ERROR_HANDLE, (uID), ##__VA_ARGS__) + +#define ConOutFormatMessage(MessageId, ...) \ + ConFormatMessage(STD_OUTPUT_HANDLE, (MessageId), ##__VA_ARGS__) + +#define ConErrFormatMessage(MessageId, ...) \ + ConFormatMessage(STD_ERROR_HANDLE, (MessageId), ##__VA_ARGS__) + + INT ConPrintfVPaging(DWORD nStdHandle, BOOL, LPTSTR, va_list); -VOID ConOutPrintf (LPTSTR, ...); INT ConOutPrintfPaging (BOOL NewPage, LPTSTR, ...); -VOID ConErrChar (TCHAR); -VOID ConErrPuts (LPTSTR); -VOID ConErrPrintf (LPTSTR, ...); -VOID ConOutFormatMessage (DWORD MessageId, ...); -VOID ConErrFormatMessage (DWORD MessageId, ...); +VOID ConOutResPaging(BOOL NewPage, UINT resID); SHORT GetCursorX (VOID); SHORT GetCursorY (VOID); @@ -36,12 +70,6 @@ VOID GetScreenSize (PSHORT, PSHORT); VOID SetCursorType (BOOL, BOOL); - -VOID ConOutResPuts (UINT resID); -VOID ConErrResPuts (UINT resID); -VOID ConOutResPrintf (UINT resID, ...); -VOID ConErrResPrintf (UINT resID, ...); -VOID ConOutResPaging(BOOL NewPage, UINT resID); BOOL ConSetTitle(IN LPCTSTR lpConsoleTitle); Modified: trunk/reactos/base/shell/cmd/error.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/error.c?rev… ============================================================================== --- trunk/reactos/base/shell/cmd/error.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/error.c [iso-8859-1] Sat Sep 30 19:52:30 2017 @@ -53,6 +53,7 @@ } /* Fall back just in case the error is not defined */ + LoadString(CMD_ModuleHandle, STRING_CONSOLE_ERROR, szMsg, ARRAYSIZE(szMsg)); if (szFormat) ConErrPrintf(_T("%s -- %s\n"), szMsg, szMessage); else

6 years, 11 months

[dquintana] 76006: [FATTEN] Fix copypasta.

by dquintana＠svn.reactos.org

Author: dquintana Date: Sat Sep 30 19:19:30 2017 New Revision: 76006 URL: http://svn.reactos.org/svn/reactos?rev=76006&view=rev Log: [FATTEN] Fix copypasta. Modified: trunk/reactos/sdk/tools/fatten/fatten.c Modified: trunk/reactos/sdk/tools/fatten/fatten.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/tools/fatten/fatten.c?… ============================================================================== --- trunk/reactos/sdk/tools/fatten/fatten.c [iso-8859-1] (original) +++ trunk/reactos/sdk/tools/fatten/fatten.c [iso-8859-1] Sat Sep 30 19:19:30 2017 @@ -138,7 +138,7 @@ // first parameter must be the image file. if (argc == 0) { - fprintf(stderr, "Error: First parameter must be a filename.\n", argv[0]); + fprintf(stderr, "Error: First parameter must be a filename.\n"); PRINT_HELP_AND_QUIT(); }

6 years, 11 months

[dquintana] 76005: [FATTEN] Improve the error checking and error messages a bit.

by dquintana＠svn.reactos.org

Author: dquintana Date: Sat Sep 30 19:11:22 2017 New Revision: 76005 URL: http://svn.reactos.org/svn/reactos?rev=76005&view=rev Log: [FATTEN] Improve the error checking and error messages a bit. Modified: trunk/reactos/sdk/tools/fatten/fatten.c Modified: trunk/reactos/sdk/tools/fatten/fatten.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/tools/fatten/fatten.c?… ============================================================================== --- trunk/reactos/sdk/tools/fatten/fatten.c [iso-8859-1] (original) +++ trunk/reactos/sdk/tools/fatten/fatten.c [iso-8859-1] Sat Sep 30 19:11:22 2017 @@ -103,8 +103,8 @@ #define NEED_PARAMS(_min_, _max_) \ do {\ - if (nargs < _min_) { printf("Too few args for command %s.\n" , argv[-1]); PRINT_HELP_AND_QUIT(); } \ - if (nargs > _max_) { printf("Too many args for command %s.\n", argv[-1]); PRINT_HELP_AND_QUIT(); } \ + if (nargs < _min_) { fprintf(stderr, "Error: Too few args for command %s.\n" , argv[-1]); PRINT_HELP_AND_QUIT(); } \ + if (nargs > _max_) { fprintf(stderr, "Error: Too many args for command %s.\n", argv[-1]); PRINT_HELP_AND_QUIT(); } \ } while(0) int need_mount(void) @@ -125,7 +125,7 @@ #define NEED_MOUNT() \ do { ret = need_mount(); if(ret) \ {\ - printf("Error: could not mount disk (%d).\n", ret); \ + fprintf(stderr, "Error: Could not mount disk (%d).\n", ret); \ goto exit; \ } } while(0) @@ -138,18 +138,19 @@ // first parameter must be the image file. if (argc == 0) { + fprintf(stderr, "Error: First parameter must be a filename.\n", argv[0]); PRINT_HELP_AND_QUIT(); } if (is_command(argv[0])) { - printf("Error: first parameter must be a filename, found '%s' instead.\n", argv[0]); + fprintf(stderr, "Error: First parameter must be a filename, found '%s' instead.\n", argv[0]); PRINT_HELP_AND_QUIT(); } if (disk_openimage(0, argv[0])) { - printf("Error: could not open image file '%s'.\n", argv[0]); + fprintf(stderr, "Error: Could not open image file '%s'.\n", argv[0]); ret = 1; goto exit; } @@ -165,7 +166,7 @@ if (!is_command(parg)) { - printf("Error: Expected a command, found '%s' instead.\n", parg); + fprintf(stderr, "Error: Expected a command, found '%s' instead.\n", parg); PRINT_HELP_AND_QUIT(); } @@ -189,19 +190,24 @@ if (sectors <= 0) { - printf("Error: Sectors must be > 0\n"); - ret = 1; - goto exit; - } - - disk_ioctl(0, SET_SECTOR_COUNT, &sectors); + fprintf(stderr, "Error: Sectors must be > 0\n"); + ret = 1; + goto exit; + } + + if (disk_ioctl(0, SET_SECTOR_COUNT, &sectors)) + { + fprintf(stderr, "Error: Failed to set sector count to %d.\n", sectors); + ret = 1; + goto exit; + } NEED_MOUNT(); ret = f_mkfs("0:", 1, sectors < 4096 ? 1 : 8); if (ret) { - printf("ERROR: Formatting drive: %d.\n", ret); + fprintf(stderr, "Error: Formatting drive: %d.\n", ret); goto exit; } @@ -248,14 +254,14 @@ if (invalid) { - printf("Error: header label is limited to 11 printable uppercase ASCII symbols."); + fprintf(stderr, "Error: Header label is limited to 11 printable uppercase ASCII symbols."); ret = 1; goto exit; } if (disk_read(0, buff, 0, 1)) { - printf("Error: unable to read existing boot sector from image."); + fprintf(stderr, "Error: Unable to read existing boot sector from image."); ret = 1; goto exit; } @@ -271,7 +277,7 @@ if (disk_write(0, buff, 0, 1)) { - printf("Error: unable to write new boot sector to image."); + fprintf(stderr, "Error: Unable to write new boot sector to image."); ret = 1; goto exit; } @@ -279,7 +285,12 @@ // Set also the directory volume label memcpy(vol_label, "0:", 2); vol_label[2 + FAT_VOL_LABEL_LEN] = '\0'; - f_setlabel(vol_label); + if (f_setlabel(vol_label)) + { + fprintf(stderr, "Error: Unable to set the volume label."); + ret = 1; + goto exit; + } } } else if (strcmp(parg, "boot") == 0) @@ -294,14 +305,14 @@ fe = fopen(argv[0], "rb"); if (!fe) { - printf("Error: unable to open external file '%s' for reading.", argv[0]); + fprintf(stderr, "Error: Unable to open external file '%s' for reading.", argv[0]); ret = 1; goto exit; } if (!fread(buff, 512, 1, fe)) { - printf("Error: unable to read boot sector from file '%s'.", argv[0]); + fprintf(stderr, "Error: Unable to read boot sector from file '%s'.", argv[0]); fclose(fe); ret = 1; goto exit; @@ -313,14 +324,14 @@ if (disk_read(0, temp, 0, 1)) { - printf("Error: unable to read existing boot sector from image."); + fprintf(stderr, "Error: Unable to read existing boot sector from image."); ret = 1; goto exit; } if (g_Filesystem.fs_type == FS_FAT32) { - printf("TODO: writing boot sectors for FAT32 images not yet supported."); + printf("TODO: Writing boot sectors for FAT32 images not yet supported."); ret = 1; goto exit; } @@ -334,7 +345,7 @@ if (disk_write(0, buff, 0, 1)) { - printf("Error: unable to write new boot sector to image."); + fprintf(stderr, "Error: Unable to write new boot sector to image."); ret = 1; goto exit; } @@ -356,14 +367,14 @@ fe = fopen(argv[0], "rb"); if (!fe) { - printf("Error: unable to open external file '%s' for reading.", argv[0]); + fprintf(stderr, "Error: Unable to open external file '%s' for reading.", argv[0]); ret = 1; goto exit; } if (f_open(&fv, argv[1], FA_WRITE | FA_CREATE_ALWAYS)) { - printf("Error: unable to open file '%s' for writing.", argv[1]); + fprintf(stderr, "Error: Unable to open file '%s' for writing.", argv[1]); fclose(fe); ret = 1; goto exit; @@ -371,7 +382,12 @@ while ((rdlen = fread(buff, 1, sizeof(buff), fe)) > 0) { - f_write(&fv, buff, rdlen, &wrlen); + if (f_write(&fv, buff, rdlen, &wrlen) || wrlen < rdlen) + { + fprintf(stderr, "Error: Unable to write '%d' bytes to disk.", wrlen); + ret = 1; + goto exit; + } } fclose(fe); @@ -393,7 +409,7 @@ if (f_open(&fe, argv[0], FA_READ)) { - printf("Error: unable to open file '%s' for reading.", argv[0]); + fprintf(stderr, "Error: Unable to open file '%s' for reading.", argv[0]); ret = 1; goto exit; } @@ -401,7 +417,7 @@ fv = fopen(argv[1], "wb"); if (!fv) { - printf("Error: unable to open external file '%s' for writing.", argv[1]); + fprintf(stderr, "Error: Unable to open external file '%s' for writing.", argv[1]); f_close(&fe); ret = 1; goto exit; @@ -409,7 +425,12 @@ while ((f_read(&fe, buff, sizeof(buff), &rdlen) == 0) && (rdlen > 0)) { - fwrite(buff, 1, rdlen, fv); + if (fwrite(buff, 1, rdlen, fv) < rdlen) + { + fprintf(stderr, "Error: Unable to write '%d' bytes to file.", rdlen); + ret = 1; + goto exit; + } } f_close(&fe); @@ -424,7 +445,11 @@ // Arg 2: new path & filename if (f_rename(argv[0], argv[1])) - printf("Error moving/renaming '%s' to '%s'", argv[0], argv[1]); + { + fprintf(stderr, "Error: Unable to move/rename '%s' to '%s'", argv[0], argv[1]); + ret = 1; + goto exit; + } } else if (strcmp(parg, "copy") == 0) { @@ -441,13 +466,13 @@ if (f_open(&fe, argv[0], FA_READ)) { - printf("Error: unable to open file '%s' for reading.", argv[0]); + fprintf(stderr, "Error: Unable to open file '%s' for reading.", argv[0]); ret = 1; goto exit; } if (f_open(&fv, argv[1], FA_WRITE | FA_CREATE_ALWAYS)) { - printf("Error: unable to open file '%s' for writing.", argv[1]); + fprintf(stderr, "Error: Unable to open file '%s' for writing.", argv[1]); f_close(&fe); ret = 1; goto exit; @@ -455,7 +480,12 @@ while ((f_read(&fe, buff, sizeof(buff), &rdlen) == 0) && (rdlen > 0)) { - f_write(&fv, buff, rdlen, &wrlen); + if (f_write(&fv, buff, rdlen, &wrlen) || wrlen < rdlen) + { + fprintf(stderr, "Error: Unable to write '%d' bytes to disk.", wrlen); + ret = 1; + goto exit; + } } f_close(&fe); @@ -468,7 +498,12 @@ NEED_MOUNT(); // Arg 1: folder path - f_mkdir(argv[0]); + if (f_mkdir(argv[0])) + { + fprintf(stderr, "Error: Unable to create directory."); + ret = 1; + goto exit; + } } else if (strcmp(parg, "delete") == 0) { @@ -477,7 +512,12 @@ NEED_MOUNT(); // Arg 1: file/folder path (cannot delete non-empty folders) - f_unlink(argv[0]); + if (f_unlink(argv[0])) + { + fprintf(stderr, "Error: Unable to delete file or directory."); + ret = 1; + goto exit; + } } else if (strcmp(parg, "list") == 0) { @@ -497,7 +537,7 @@ if (f_opendir(&dir, root)) { - printf("Error opening directory '%s'.\n", root); + fprintf(stderr, "Error: Unable to opening directory '%s' for listing.\n", root); ret = 1; goto exit; } @@ -516,7 +556,7 @@ } else { - printf("Error: Unknown or invalid command: %s\n", argv[-1]); + fprintf(stderr, "Error: Unknown or invalid command: %s\n", argv[-1]); PRINT_HELP_AND_QUIT(); } argv += nargs;

6 years, 11 months

[hbelusca] 76004: [TIMEOUT]: Italian translation by Carlo Bramini. CORE-13856 #resolve #comment Committed in r76004, thanks!

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Sat Sep 30 17:34:05 2017 New Revision: 76004 URL: http://svn.reactos.org/svn/reactos?rev=76004&view=rev Log: [TIMEOUT]: Italian translation by Carlo Bramini. CORE-13856 #resolve #comment Committed in r76004, thanks! Added: trunk/reactos/base/applications/cmdutils/timeout/lang/it-IT.rc (with props) Modified: trunk/reactos/base/applications/cmdutils/timeout/timeout.rc Added: trunk/reactos/base/applications/cmdutils/timeout/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/timeout/lang/it-IT.rc (added) +++ trunk/reactos/base/applications/cmdutils/timeout/lang/it-IT.rc [iso-8859-1] Sat Sep 30 17:34:05 2017 @@ -0,0 +1,34 @@ +LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL + +STRINGTABLE +BEGIN + IDS_USAGE "ReactOS Timeout Utility\n\ +\n\ +TIMEOUT [/?] [/T] tempo [/NOBREAK]\n\ +\n\ +Descrizione :\n\ + Questa utilitÃ permette di attendere finchÃ¨ un tempo fissato (in secondi)\n\ + non Ã¨ trascorso, oppure fino a quando non viene premuto un tasto. Accetta\n\ + un parametro per ignorare la pressione dei tasti.\n\ +\n\ +Parametri:\n\ + /? Visualizza questo messaggio di aiuto.\n\ +\n\ + /T tempo Indica il numero di secondi di attesa (da -1 a 99999).\n\ + Il valore -1 significa che il programma attenderÃ infinitamente\n\ + fino alla pressione di un tasto.\n\ + Notare che il parametro ""/T"" Ã¨ opzionale, Ã¨ possibile\n\ + specificare il valore del ritardo senza di esso.\n\ +\n\ + /NOBREAK Ignora la pressione di qualsiasi tasto, eccetto il Ctrl+C.\n\ +" + IDS_ERROR_OUT_OF_RANGE "ERRORE: il tempo di attesa deve essere compreso tra i limiti (-1 e 99999).\n" + IDS_ERROR_INVALID_HANDLE_VALUE "ERRORE: Impossibile ottenere l'handle per accedere alla console (errore %lu).\n" + IDS_ERROR_READ_INPUT "ERRORE: Impossibile leggere dalla console (errore %lu).\n" + IDS_ERROR_NO_TIMER_VALUE "ERRORE: il tempo di attesa non Ã¨ stato specificato (tra -1 e 99999).\n" + IDS_ERROR_ONE_TIME "ERRORE: Deve essere indicato un solo valore temporale.\n" + IDS_NOBREAK_INPUT "Premere Ctrl+C per interrompere..." + IDS_USER_INPUT "Premere un tasto per continuare..." + IDS_NOBREAK_INPUT_COUNT "Attendere %d secondi, premere Ctrl+C per interrompere..." + IDS_USER_INPUT_COUNT "Attendere %d secondi, premere un tasto per continuare..." +END Propchange: trunk/reactos/base/applications/cmdutils/timeout/lang/it-IT.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/base/applications/cmdutils/timeout/timeout.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/timeout/timeout.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/timeout/timeout.rc [iso-8859-1] Sat Sep 30 17:34:05 2017 @@ -19,3 +19,6 @@ #ifdef LANGUAGE_FR_FR #include "lang/fr-FR.rc" #endif +#ifdef LANGUAGE_IT_IT + #include "lang/it-IT.rc" +#endif

6 years, 11 months

[hbelusca] 76003: [CMD]: Continue refactoring to lay out the way to using the CONUTILS library in CMD.

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Sat Sep 30 15:28:06 2017 New Revision: 76003 URL: http://svn.reactos.org/svn/reactos?rev=76003&view=rev Log: [CMD]: Continue refactoring to lay out the way to using the CONUTILS library in CMD. Modified: trunk/reactos/base/shell/cmd/console.c trunk/reactos/base/shell/cmd/console.h trunk/reactos/base/shell/cmd/dir.c Modified: trunk/reactos/base/shell/cmd/console.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/console.c?r… ============================================================================== --- trunk/reactos/base/shell/cmd/console.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/console.c [iso-8859-1] Sat Sep 30 15:28:06 2017 @@ -50,6 +50,10 @@ return GetConsoleMode(hHandle, &dwMode); } + + +/********************* Console STREAM IN utility functions ********************/ + VOID ConInDisable(VOID) { HANDLE hInput = GetStdHandle(STD_INPUT_HANDLE); @@ -60,7 +64,6 @@ SetConsoleMode(hInput, dwMode); } - VOID ConInEnable(VOID) { HANDLE hInput = GetStdHandle(STD_INPUT_HANDLE); @@ -71,12 +74,10 @@ SetConsoleMode(hInput, dwMode); } - -VOID ConInFlush (VOID) +VOID ConInFlush(VOID) { FlushConsoleInputBuffer(GetStdHandle(STD_INPUT_HANDLE)); } - VOID ConInKey(PINPUT_RECORD lpBuffer) { @@ -95,7 +96,6 @@ } while (TRUE); } - VOID ConInString(LPTSTR lpInput, DWORD dwLength) { @@ -134,6 +134,10 @@ SetConsoleMode(hFile, dwOldMode); } + + + +/******************** Console STREAM OUT utility functions ********************/ static VOID ConWrite(TCHAR *str, DWORD len, DWORD nStdHandle) { @@ -266,13 +270,6 @@ ConWrite(szText, (DWORD)_tcslen(szText), nStdHandle); } -VOID ConOutResPaging(BOOL NewPage, UINT resID) -{ - TCHAR szMsg[RC_STRING_MAX_SIZE]; - LoadString(CMD_ModuleHandle, resID, szMsg, ARRAYSIZE(szMsg)); - ConOutPrintfPaging(NewPage, szMsg); -} - VOID ConOutResPuts(UINT resID) { TCHAR szMsg[RC_STRING_MAX_SIZE]; @@ -285,97 +282,13 @@ ConPuts(szText, STD_OUTPUT_HANDLE); } - -VOID ConPrintf(LPTSTR szFormat, va_list arg_ptr, DWORD nStdHandle) +VOID ConPrintfV(DWORD nStdHandle, LPTSTR szFormat, va_list arg_ptr) { TCHAR szOut[OUTPUT_BUFFER_SIZE]; DWORD len; len = (DWORD)_vstprintf(szOut, szFormat, arg_ptr); ConWrite(szOut, len, nStdHandle); -} - -INT ConPrintfPaging(BOOL NewPage, LPTSTR szFormat, va_list arg_ptr, DWORD nStdHandle) -{ - INT len; - CONSOLE_SCREEN_BUFFER_INFO csbi; - TCHAR szOut[OUTPUT_BUFFER_SIZE]; - DWORD dwWritten; - HANDLE hOutput = GetStdHandle(nStdHandle); - - /* Used to count number of lines since last pause */ - static int LineCount = 0; - - /* Used to see how big the screen is */ - int ScreenLines = 0; - - /* Chars since start of line */ - int CharSL; - - int from = 0, i = 0; - - if (NewPage == TRUE) - LineCount = 0; - - /* Reset LineCount and return if no string has been given */ - if (szFormat == NULL) - return 0; - - /* Get the size of the visual screen that can be printed to */ - if (!IsConsoleHandle(hOutput) || !GetConsoleScreenBufferInfo(hOutput, &csbi)) - { - /* We assume it's a file handle */ - ConPrintf(szFormat, arg_ptr, nStdHandle); - return 0; - } - - /* - * Get the number of lines currently displayed on screen, minus 1 - * to account for the "press any key..." prompt from PagePrompt(). - */ - ScreenLines = (csbi.srWindow.Bottom - csbi.srWindow.Top); - CharSL = csbi.dwCursorPosition.X; - - /* Make sure the user doesn't have the screen too small */ - if (ScreenLines < 4) - { - ConPrintf(szFormat, arg_ptr, nStdHandle); - return 0; - } - - len = _vstprintf(szOut, szFormat, arg_ptr); - - while (i < len) - { - /* Search until the end of a line is reached */ - if (szOut[i++] != _T('\n') && ++CharSL < csbi.dwSize.X) - continue; - - LineCount++; - CharSL=0; - - if (LineCount >= ScreenLines) - { - WriteConsole(hOutput, &szOut[from], i-from, &dwWritten, NULL); - from = i; - - /* Prompt the user */ - if (PagePrompt() != PROMPT_YES) - { - return 1; - } - - // TODO: Recalculate 'ScreenLines' in case the user redimensions - // the window during the prompt. - - /* Reset the number of lines being printed */ - LineCount = 0; - } - } - - WriteConsole(hOutput, &szOut[from], i-from, &dwWritten, NULL); - - return 0; } VOID ConErrFormatMessage(DWORD MessageId, ...) @@ -443,7 +356,7 @@ va_start(arg_ptr, resID); LoadString(CMD_ModuleHandle, resID, szMsg, ARRAYSIZE(szMsg)); - ConPrintf(szMsg, arg_ptr, STD_OUTPUT_HANDLE); + ConPrintfV(STD_OUTPUT_HANDLE, szMsg, arg_ptr); va_end(arg_ptr); } @@ -452,26 +365,14 @@ va_list arg_ptr; va_start(arg_ptr, szFormat); - ConPrintf(szFormat, arg_ptr, STD_OUTPUT_HANDLE); + ConPrintfV(STD_OUTPUT_HANDLE, szFormat, arg_ptr); va_end(arg_ptr); } -INT ConOutPrintfPaging(BOOL NewPage, LPTSTR szFormat, ...) -{ - INT iReturn; - va_list arg_ptr; - - va_start(arg_ptr, szFormat); - iReturn = ConPrintfPaging(NewPage, szFormat, arg_ptr, STD_OUTPUT_HANDLE); - va_end(arg_ptr); - return iReturn; -} - VOID ConErrChar(TCHAR c) { ConWrite(&c, 1, STD_ERROR_HANDLE); } - VOID ConErrResPuts(UINT resID) { @@ -485,7 +386,6 @@ ConPuts(szText, STD_ERROR_HANDLE); } - VOID ConErrResPrintf(UINT resID, ...) { TCHAR szMsg[RC_STRING_MAX_SIZE]; @@ -493,7 +393,7 @@ va_start(arg_ptr, resID); LoadString(CMD_ModuleHandle, resID, szMsg, ARRAYSIZE(szMsg)); - ConPrintf(szMsg, arg_ptr, STD_ERROR_HANDLE); + ConPrintfV(STD_ERROR_HANDLE, szMsg, arg_ptr); va_end(arg_ptr); } @@ -502,10 +402,118 @@ va_list arg_ptr; va_start(arg_ptr, szFormat); - ConPrintf(szFormat, arg_ptr, STD_ERROR_HANDLE); + ConPrintfV(STD_ERROR_HANDLE, szFormat, arg_ptr); va_end(arg_ptr); } + + +/************************** Console PAGER functions ***************************/ + +INT ConPrintfVPaging(DWORD nStdHandle, BOOL NewPage, LPTSTR szFormat, va_list arg_ptr) +{ + INT len; + CONSOLE_SCREEN_BUFFER_INFO csbi; + TCHAR szOut[OUTPUT_BUFFER_SIZE]; + DWORD dwWritten; + HANDLE hOutput = GetStdHandle(nStdHandle); + + /* Used to count number of lines since last pause */ + static int LineCount = 0; + + /* Used to see how big the screen is */ + int ScreenLines = 0; + + /* Chars since start of line */ + int CharSL; + + int from = 0, i = 0; + + if (NewPage == TRUE) + LineCount = 0; + + /* Reset LineCount and return if no string has been given */ + if (szFormat == NULL) + return 0; + + /* Get the size of the visual screen that can be printed to */ + if (!IsConsoleHandle(hOutput) || !GetConsoleScreenBufferInfo(hOutput, &csbi)) + { + /* We assume it's a file handle */ + ConPrintfV(nStdHandle, szFormat, arg_ptr); + return 0; + } + + /* + * Get the number of lines currently displayed on screen, minus 1 + * to account for the "press any key..." prompt from PagePrompt(). + */ + ScreenLines = (csbi.srWindow.Bottom - csbi.srWindow.Top); + CharSL = csbi.dwCursorPosition.X; + + /* Make sure the user doesn't have the screen too small */ + if (ScreenLines < 4) + { + ConPrintfV(nStdHandle, szFormat, arg_ptr); + return 0; + } + + len = _vstprintf(szOut, szFormat, arg_ptr); + + while (i < len) + { + /* Search until the end of a line is reached */ + if (szOut[i++] != _T('\n') && ++CharSL < csbi.dwSize.X) + continue; + + LineCount++; + CharSL=0; + + if (LineCount >= ScreenLines) + { + WriteConsole(hOutput, &szOut[from], i-from, &dwWritten, NULL); + from = i; + + /* Prompt the user */ + if (PagePrompt() != PROMPT_YES) + { + return 1; + } + + // TODO: Recalculate 'ScreenLines' in case the user redimensions + // the window during the prompt. + + /* Reset the number of lines being printed */ + LineCount = 0; + } + } + + WriteConsole(hOutput, &szOut[from], i-from, &dwWritten, NULL); + + return 0; +} + +INT ConOutPrintfPaging(BOOL NewPage, LPTSTR szFormat, ...) +{ + INT iReturn; + va_list arg_ptr; + + va_start(arg_ptr, szFormat); + iReturn = ConPrintfVPaging(STD_OUTPUT_HANDLE, NewPage, szFormat, arg_ptr); + va_end(arg_ptr); + return iReturn; +} + +VOID ConOutResPaging(BOOL NewPage, UINT resID) +{ + TCHAR szMsg[RC_STRING_MAX_SIZE]; + LoadString(CMD_ModuleHandle, resID, szMsg, ARRAYSIZE(szMsg)); + ConOutPrintfPaging(NewPage, szMsg); +} + + + +/************************** Console SCREEN functions **************************/ VOID SetCursorXY(SHORT x, SHORT y) { @@ -565,6 +573,7 @@ if (maxx) *maxx = csbi.dwSize.X; if (maxy) *maxy = csbi.dwSize.Y; } + Modified: trunk/reactos/base/shell/cmd/console.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/console.h?r… ============================================================================== --- trunk/reactos/base/shell/cmd/console.h [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/console.h [iso-8859-1] Sat Sep 30 15:28:06 2017 @@ -19,8 +19,8 @@ VOID ConOutChar (TCHAR); VOID ConOutPuts (LPTSTR); -VOID ConPrintf(LPTSTR, va_list, DWORD); -INT ConPrintfPaging(BOOL NewPage, LPTSTR, va_list, DWORD); +VOID ConPrintfV(DWORD, LPTSTR, va_list); +INT ConPrintfVPaging(DWORD nStdHandle, BOOL, LPTSTR, va_list); VOID ConOutPrintf (LPTSTR, ...); INT ConOutPrintfPaging (BOOL NewPage, LPTSTR, ...); VOID ConErrChar (TCHAR); Modified: trunk/reactos/base/shell/cmd/dir.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/dir.c?rev=7… ============================================================================== --- trunk/reactos/base/shell/cmd/dir.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/dir.c [iso-8859-1] Sat Sep 30 15:28:06 2017 @@ -557,9 +557,9 @@ va_list arg_ptr; va_start(arg_ptr, szFormat); if (lpFlags->bPause) - iReturn = ConPrintfPaging(FALSE, szFormat, arg_ptr, STD_OUTPUT_HANDLE); + iReturn = ConPrintfVPaging(STD_OUTPUT_HANDLE, FALSE, szFormat, arg_ptr); else - ConPrintf(szFormat, arg_ptr, STD_OUTPUT_HANDLE); + ConPrintfV(STD_OUTPUT_HANDLE, szFormat, arg_ptr); va_end(arg_ptr); return iReturn; }

6 years, 11 months

[hbelusca] 76002: [CMD]: Move console management prototypes to their own header.

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Sat Sep 30 15:09:38 2017 New Revision: 76002 URL: http://svn.reactos.org/svn/reactos?rev=76002&view=rev Log: [CMD]: Move console management prototypes to their own header. Added: trunk/reactos/base/shell/cmd/console.h (with props) Modified: trunk/reactos/base/shell/cmd/cmd.h Modified: trunk/reactos/base/shell/cmd/cmd.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/cmd.h?rev=7… ============================================================================== --- trunk/reactos/base/shell/cmd/cmd.h [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/cmd.h [iso-8859-1] Sat Sep 30 15:09:38 2017 @@ -40,7 +40,6 @@ #define BREAK_IGNORE 4 /* define some error messages */ - #define D_ON _T("on") #define D_OFF _T("off") @@ -78,11 +77,9 @@ /* Prototypes for ATTRIB.C */ INT CommandAttrib (LPTSTR); - /* Prototypes for BEEP.C */ INT cmd_beep (LPTSTR); - /* Prototypes for CALL.C */ INT cmd_call (LPTSTR); @@ -90,10 +87,8 @@ /* Prototypes for CHOICE.C */ INT CommandChoice (LPTSTR); - /* Prototypes for CLS.C */ INT cmd_cls (LPTSTR); - /* Prototypes for CMD.C */ INT ConvertULargeInteger(ULONGLONG num, LPTSTR des, UINT len, BOOL bPutSeparator); @@ -145,76 +140,25 @@ /* Prototypes for COLOR.C */ INT CommandColor(LPTSTR); -VOID ConInDummy (VOID); -VOID ConInDisable (VOID); -VOID ConInEnable (VOID); -VOID ConInFlush (VOID); -VOID ConInKey (PINPUT_RECORD); -VOID ConInString (LPTSTR, DWORD); - -VOID ConOutChar (TCHAR); -VOID ConOutPuts (LPTSTR); -VOID ConPrintf(LPTSTR, va_list, DWORD); -INT ConPrintfPaging(BOOL NewPage, LPTSTR, va_list, DWORD); -VOID ConOutPrintf (LPTSTR, ...); -INT ConOutPrintfPaging (BOOL NewPage, LPTSTR, ...); -VOID ConErrChar (TCHAR); -VOID ConErrPuts (LPTSTR); -VOID ConErrPrintf (LPTSTR, ...); -VOID ConOutFormatMessage (DWORD MessageId, ...); -VOID ConErrFormatMessage (DWORD MessageId, ...); - -SHORT GetCursorX (VOID); -SHORT GetCursorY (VOID); -VOID GetCursorXY (PSHORT, PSHORT); -VOID SetCursorXY (SHORT, SHORT); - -VOID GetScreenSize (PSHORT, PSHORT); -VOID SetCursorType (BOOL, BOOL); - -VOID ConOutResPuts (UINT resID); -VOID ConErrResPuts (UINT resID); -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 - -#ifdef INCLUDE_CMD_CLS -VOID ConClearScreen(HANDLE hOutput); -#endif - -#ifdef INCLUDE_CMD_COLOR -BOOL ConSetScreenColor(WORD wColor, BOOL bFill); -#endif - +/* Prototypes for CONSOLE.C */ +#include "console.h" /* Prototypes for COPY.C */ INT cmd_copy (LPTSTR); - /* Prototypes for DATE.C */ INT cmd_date (LPTSTR); - /* Prototypes for DEL.C */ INT CommandDelete (LPTSTR); - /* Prototypes for DELAY.C */ INT CommandDelay (LPTSTR); - /* Prototypes for DIR.C */ INT FormatDate (TCHAR *, LPSYSTEMTIME, BOOL); INT FormatTime (TCHAR *, LPSYSTEMTIME); INT CommandDir (LPTSTR); - /* Prototypes for DIRSTACK.C */ VOID InitDirectoryStack (VOID); @@ -224,14 +168,12 @@ INT CommandPopd (LPTSTR); INT CommandDirs (LPTSTR); - /* Prototypes for ECHO.C */ BOOL OnOffCommand(LPTSTR param, LPBOOL flag, INT message); INT CommandEcho (LPTSTR); INT CommandEchos (LPTSTR); INT CommandEchoerr (LPTSTR); INT CommandEchoserr (LPTSTR); - /* Prototypes for ERROR.C */ VOID ErrorMessage (DWORD, LPTSTR, ...); @@ -252,7 +194,6 @@ VOID msg_pause (VOID); - /* Prototypes for FILECOMP.C */ #ifdef FEATURE_UNIX_FILENAME_COMPLETION VOID CompleteFilename (LPTSTR, UINT); @@ -275,10 +216,8 @@ /* Prototypes for FREE.C */ INT CommandFree (LPTSTR); - /* Prototypes for GOTO.C */ INT cmd_goto (LPTSTR); - /* Prototypes for HISTORY.C */ #ifdef FEATURE_HISTORY @@ -291,7 +230,6 @@ INT CommandHistory (LPTSTR param); #endif - /* Prototypes for IF.C */ #define IFFLAG_NEGATE 1 /* NOT */ #define IFFLAG_IGNORECASE 2 /* /I */ @@ -299,7 +237,6 @@ IF_STRINGEQ, /* == */ IF_EQU, IF_GTR, IF_GEQ, IF_LSS, IF_LEQ, IF_NEQ }; INT ExecuteIf(struct _PARSED_COMMAND *Cmd); - /* Prototypes for INTERNAL.C */ VOID InitLastPath (VOID); @@ -314,7 +251,6 @@ /* Prototypes for LABEL.C */ INT cmd_label (LPTSTR); - /* Prototypes for LOCALE.C */ extern TCHAR cDateSeparator; extern INT nDateFormat; @@ -324,22 +260,15 @@ extern TCHAR cDecimalSeparator; extern INT nNumberGroups; - VOID InitLocale (VOID); LPTSTR GetDateString (VOID); LPTSTR GetTimeString (VOID); -/* cache codepage */ -extern UINT InputCodePage; -extern UINT OutputCodePage; - /* Prototypes for MEMORY.C */ INT CommandMemory (LPTSTR); - /* Prototypes for MKLINK.C */ INT cmd_mklink(LPTSTR); - /* Prototypes for MISC.C */ INT GetRootPath(TCHAR *InPath,TCHAR *OutPath,INT size); @@ -367,14 +296,11 @@ INT FilePromptYN (UINT); INT FilePromptYNA (UINT); - /* Prototypes for MOVE.C */ INT cmd_move (LPTSTR); - /* Prototypes for MSGBOX.C */ INT CommandMsgbox (LPTSTR); - /* Prototypes from PARSER.C */ enum { C_COMMAND, C_QUIET, C_BLOCK, C_MULTI, C_IFFAILURE, C_IFSUCCESS, C_PIPE, C_IF, C_FOR }; @@ -413,16 +339,13 @@ TCHAR *Unparse(PARSED_COMMAND *Cmd, TCHAR *Out, TCHAR *OutEnd); VOID FreeCommand(PARSED_COMMAND *Cmd); - /* Prototypes from PATH.C */ INT cmd_path (LPTSTR); - /* Prototypes from PROMPT.C */ VOID InitPrompt (VOID); VOID PrintPrompt (VOID); INT cmd_prompt (LPTSTR); - /* Prototypes for REDIR.C */ typedef enum _REDIR_MODE @@ -444,7 +367,6 @@ INT GetRedirection(LPTSTR, REDIRECTION **); VOID FreeRedirection(REDIRECTION *); - /* Prototypes for REN.C */ INT cmd_rename (LPTSTR); @@ -453,7 +375,6 @@ /* Prototypes for SCREEN.C */ INT CommandScreen (LPTSTR); - /* Prototypes for SET.C */ INT cmd_set (LPTSTR); @@ -466,40 +387,31 @@ /* Prototypes for START.C */ INT cmd_start (LPTSTR); - /* Prototypes for STRTOCLR.C */ BOOL StringToColor (LPWORD, LPTSTR *); - /* Prototypes for TIME.C */ INT cmd_time (LPTSTR); - /* Prototypes for TIMER.C */ INT CommandTimer (LPTSTR param); - /* Prototypes for TITLE.C */ INT cmd_title (LPTSTR); - /* Prototypes for TYPE.C */ INT cmd_type (LPTSTR); - /* Prototypes for VER.C */ VOID InitOSVersion(VOID); VOID PrintOSVersion(VOID); INT cmd_ver (LPTSTR); - /* Prototypes for VERIFY.C */ INT cmd_verify (LPTSTR); - /* Prototypes for VOL.C */ INT cmd_vol (LPTSTR); - /* Prototypes for WHERE.C */ BOOL SearchForExecutable (LPCTSTR, LPTSTR); @@ -507,7 +419,6 @@ /* Prototypes for WINDOW.C */ INT CommandActivate (LPTSTR); INT CommandWindow (LPTSTR); - /* The MSDOS Batch Commands [MS-DOS 5.0 User's Guide and Reference p359] */ int cmd_if(TCHAR *); Added: trunk/reactos/base/shell/cmd/console.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/console.h?r… ============================================================================== --- trunk/reactos/base/shell/cmd/console.h (added) +++ trunk/reactos/base/shell/cmd/console.h [iso-8859-1] Sat Sep 30 15:09:38 2017 @@ -0,0 +1,71 @@ + +#pragma once + +/* Cache codepage */ +extern UINT InputCodePage; +extern UINT OutputCodePage; + +// /* Global variables */ +// extern BOOL bCtrlBreak; +// extern BOOL bIgnoreEcho; +// extern BOOL bExit; + +VOID ConInDummy (VOID); +VOID ConInDisable (VOID); +VOID ConInEnable (VOID); +VOID ConInFlush (VOID); +VOID ConInKey (PINPUT_RECORD); +VOID ConInString (LPTSTR, DWORD); + +VOID ConOutChar (TCHAR); +VOID ConOutPuts (LPTSTR); +VOID ConPrintf(LPTSTR, va_list, DWORD); +INT ConPrintfPaging(BOOL NewPage, LPTSTR, va_list, DWORD); +VOID ConOutPrintf (LPTSTR, ...); +INT ConOutPrintfPaging (BOOL NewPage, LPTSTR, ...); +VOID ConErrChar (TCHAR); +VOID ConErrPuts (LPTSTR); +VOID ConErrPrintf (LPTSTR, ...); +VOID ConOutFormatMessage (DWORD MessageId, ...); +VOID ConErrFormatMessage (DWORD MessageId, ...); + +SHORT GetCursorX (VOID); +SHORT GetCursorY (VOID); +VOID GetCursorXY (PSHORT, PSHORT); +VOID SetCursorXY (SHORT, SHORT); + +VOID GetScreenSize (PSHORT, PSHORT); +VOID SetCursorType (BOOL, BOOL); + +VOID ConOutResPuts (UINT resID); +VOID ConErrResPuts (UINT resID); +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 + +#ifdef INCLUDE_CMD_CLS +VOID ConClearScreen(HANDLE hOutput); +#endif + +#ifdef INCLUDE_CMD_COLOR +BOOL ConSetScreenColor(WORD wColor, BOOL bFill); +#endif + +// TCHAR cgetchar (VOID); +// BOOL CheckCtrlBreak (INT); + +// #define PROMPT_NO 0 +// #define PROMPT_YES 1 +// #define PROMPT_ALL 2 +// #define PROMPT_BREAK 3 + +// INT PagePrompt (VOID); +// INT FilePromptYN (UINT); +// INT FilePromptYNA (UINT); Propchange: trunk/reactos/base/shell/cmd/console.h ------------------------------------------------------------------------------ svn:eol-style = native

6 years, 11 months

[hbelusca] 76001: [CMD]: Addendum to r76000, with ConSetTitle.

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Sat Sep 30 14:26:34 2017 New Revision: 76001 URL: http://svn.reactos.org/svn/reactos?rev=76001&view=rev Log: [CMD]: Addendum to r76000, with ConSetTitle. Modified: trunk/reactos/base/shell/cmd/cmd.c trunk/reactos/base/shell/cmd/cmd.h trunk/reactos/base/shell/cmd/console.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] Sat Sep 30 14:26:34 2017 @@ -378,7 +378,7 @@ 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 @@ /* Restore the original console title */ if (!bTitleSet) - SetConsoleTitle(szWindowTitle); + ConSetTitle(szWindowTitle); return dwExitCode; } Modified: trunk/reactos/base/shell/cmd/cmd.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/cmd.h?rev=7… ============================================================================== --- trunk/reactos/base/shell/cmd/cmd.h [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/cmd.h [iso-8859-1] Sat Sep 30 14:26:34 2017 @@ -177,6 +177,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); Modified: trunk/reactos/base/shell/cmd/console.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/console.c?r… ============================================================================== --- trunk/reactos/base/shell/cmd/console.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/console.c [iso-8859-1] Sat Sep 30 14:26:34 2017 @@ -568,6 +568,12 @@ +BOOL ConSetTitle(IN LPCTSTR lpConsoleTitle) +{ + /* Now really set the console title */ + return SetConsoleTitle(lpConsoleTitle); +} + #ifdef INCLUDE_CMD_BEEP VOID ConRingBell(HANDLE hOutput) { 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] Sat Sep 30 14:26:34 2017 @@ -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 @@ /* 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 */

6 years, 11 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs September 2017