Ros-diffs

ros-diffs@reactos.org

81390 discussions

[hbelusca] 76004: [TIMEOUT]: Italian translation by Carlo Bramini. CORE-13856 #resolve #comment Committed in r76004, thanks!
by hbelusca＠svn.reactos.org 30 Sep '17

30 Sep '17

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

1 0

[hbelusca] 76003: [CMD]: Continue refactoring to lay out the way to using the CONUTILS library in CMD.
by hbelusca＠svn.reactos.org 30 Sep '17

30 Sep '17

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; }

1 0

[hbelusca] 76002: [CMD]: Move console management prototypes to their own header.
by hbelusca＠svn.reactos.org 30 Sep '17

30 Sep '17

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

1 0

[hbelusca] 76001: [CMD]: Addendum to r76000, with ConSetTitle.
by hbelusca＠svn.reactos.org 30 Sep '17

30 Sep '17

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 */

1 0

[hbelusca] 76000: [CMD]: Little refactoring to lay out the way to using the CONUTILS library in CMD. - Move the code used to beep, clear screen, and color the screen into console.c ; - Rename SetSc...
by hbelusca＠svn.reactos.org 30 Sep '17

30 Sep '17

Author: hbelusca Date: Sat Sep 30 14:10:21 2017 New Revision: 76000 URL: http://svn.reactos.org/svn/reactos?rev=76000&view=rev Log: [CMD]: Little refactoring to lay out the way to using the CONUTILS library in CMD. - Move the code used to beep, clear screen, and color the screen into console.c ; - Rename SetScreenColor into ConSetScreenColor, and invert its second parameter (bNoFill -> bFill); its default behaviour is to fill all the screen. Modified: trunk/reactos/base/shell/cmd/beep.c trunk/reactos/base/shell/cmd/cls.c trunk/reactos/base/shell/cmd/cmd.c trunk/reactos/base/shell/cmd/cmd.h trunk/reactos/base/shell/cmd/color.c trunk/reactos/base/shell/cmd/console.c Modified: trunk/reactos/base/shell/cmd/beep.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/beep.c?rev=… ============================================================================== --- trunk/reactos/base/shell/cmd/beep.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/beep.c [iso-8859-1] Sat Sep 30 14:10:21 2017 @@ -41,8 +41,8 @@ if (bc == NULL) return 1; #endif - MessageBeep (-1); + ConRingBell(GetStdHandle(STD_OUTPUT_HANDLE)); return 0; } Modified: trunk/reactos/base/shell/cmd/cls.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/cls.c?rev=7… ============================================================================== --- trunk/reactos/base/shell/cmd/cls.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/cls.c [iso-8859-1] Sat Sep 30 14:10:21 2017 @@ -32,34 +32,13 @@ INT cmd_cls(LPTSTR param) { - HANDLE hOutput = GetStdHandle(STD_OUTPUT_HANDLE); - CONSOLE_SCREEN_BUFFER_INFO csbi; - COORD coPos; - DWORD dwWritten; - if (!_tcsncmp(param, _T("/?"), 2)) { ConOutResPaging(TRUE, STRING_CLS_HELP); return 0; } - if (GetConsoleScreenBufferInfo(hOutput, &csbi)) - { - coPos.X = 0; - coPos.Y = 0; - FillConsoleOutputAttribute(hOutput, csbi.wAttributes, - csbi.dwSize.X * csbi.dwSize.Y, - coPos, &dwWritten); - FillConsoleOutputCharacter(hOutput, _T(' '), - csbi.dwSize.X * csbi.dwSize.Y, - coPos, &dwWritten); - SetConsoleCursorPosition(hOutput, coPos); - } - else - { - ConOutChar(_T('\f')); - } - + ConClearScreen(GetStdHandle(STD_OUTPUT_HANDLE)); return 0; } 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:10:21 2017 @@ -1956,7 +1956,7 @@ } if (wDefColor != 0) - SetScreenColor(wDefColor, FALSE); + ConSetScreenColor(wDefColor, TRUE); #endif if (!*ptr) 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:10:21 2017 @@ -143,7 +143,6 @@ LPCTSTR GetParsedEnvVar ( LPCTSTR varName, UINT* varNameLen, BOOL ModeSetA ); /* Prototypes for COLOR.C */ -BOOL SetScreenColor(WORD wColor, BOOL bNoFill); INT CommandColor(LPTSTR); VOID ConInDummy (VOID); @@ -178,6 +177,19 @@ VOID ConOutResPrintf (UINT resID, ...); VOID ConErrResPrintf (UINT resID, ...); VOID ConOutResPaging(BOOL NewPage, UINT resID); + +#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 COPY.C */ INT cmd_copy (LPTSTR); 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 14:10:21 2017 @@ -24,36 +24,6 @@ #ifdef INCLUDE_CMD_COLOR -BOOL SetScreenColor(WORD wColor, BOOL bNoFill) -{ - HANDLE hConsole = GetStdHandle(STD_OUTPUT_HANDLE); - DWORD dwWritten; - CONSOLE_SCREEN_BUFFER_INFO csbi; - COORD coPos; - - /* Foreground and Background colors can't be the same */ - if ((wColor & 0x0F) == (wColor & 0xF0) >> 4) - return FALSE; - - /* Fill the whole background if needed */ - if (bNoFill != TRUE) - { - GetConsoleScreenBufferInfo(hConsole, &csbi); - - coPos.X = 0; - coPos.Y = 0; - FillConsoleOutputAttribute(hConsole, - wColor & 0x00FF, - csbi.dwSize.X * csbi.dwSize.Y, - coPos, - &dwWritten); - } - - /* Set the text attribute */ - SetConsoleTextAttribute(hConsole, wColor & 0x00FF); - return TRUE; -} - /* * color * @@ -76,7 +46,7 @@ /* No parameter: Set the default colors */ if (rest[0] == _T('\0')) { - SetScreenColor(wDefColor, FALSE); + ConSetScreenColor(wDefColor, TRUE); return 0; } @@ -117,7 +87,7 @@ * Set the chosen color. Use also the following advanced flag: * /-F to avoid changing already buffered foreground/background. */ - if (SetScreenColor(wColor, (_tcsstr(rest, _T("/-F")) || _tcsstr(rest, _T("/-f")))) == FALSE) + if (ConSetScreenColor(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 14:10:21 2017 @@ -566,4 +566,79 @@ if (maxy) *maxy = csbi.dwSize.Y; } + + +#ifdef INCLUDE_CMD_BEEP +VOID ConRingBell(HANDLE hOutput) +{ +#if 0 + /* Emit an error beep sound */ + if (IsConsoleHandle(hOutput)) + Beep(800, 200); + else if (IsTTYHandle(hOutput)) + ConOutPuts(_T("\a")); // BEL character 0x07 + else +#endif + MessageBeep(-1); +} +#endif + +#ifdef INCLUDE_CMD_CLS +VOID ConClearScreen(HANDLE hOutput) +{ + CONSOLE_SCREEN_BUFFER_INFO csbi; + COORD coPos; + DWORD dwWritten; + + if (GetConsoleScreenBufferInfo(hOutput, &csbi)) + { + coPos.X = 0; + coPos.Y = 0; + FillConsoleOutputAttribute(hOutput, csbi.wAttributes, + csbi.dwSize.X * csbi.dwSize.Y, + coPos, &dwWritten); + FillConsoleOutputCharacter(hOutput, _T(' '), + csbi.dwSize.X * csbi.dwSize.Y, + coPos, &dwWritten); + SetConsoleCursorPosition(hOutput, coPos); + } + else + { + ConOutChar(_T('\f')); + } +} +#endif + +#ifdef INCLUDE_CMD_COLOR +BOOL ConSetScreenColor(WORD wColor, BOOL bFill) +{ + HANDLE hConsole = GetStdHandle(STD_OUTPUT_HANDLE); + DWORD dwWritten; + CONSOLE_SCREEN_BUFFER_INFO csbi; + COORD coPos; + + /* Foreground and Background colors can't be the same */ + if ((wColor & 0x0F) == (wColor & 0xF0) >> 4) + return FALSE; + + /* Fill the whole background if needed */ + if (bFill) + { + GetConsoleScreenBufferInfo(hConsole, &csbi); + + coPos.X = 0; + coPos.Y = 0; + FillConsoleOutputAttribute(hConsole, + wColor & 0x00FF, + csbi.dwSize.X * csbi.dwSize.Y, + coPos, + &dwWritten); + } + + /* Set the text attribute */ + SetConsoleTextAttribute(hConsole, wColor & 0x00FF); + return TRUE; +} +#endif + /* EOF */

1 0

[hbelusca] 75999: [CMD]: Minor modifications in the files I'm going to touch next: - Use ARRAYSIZE() instead of hardcoding string buffer max. number of chars. - Un-globalize a variable; remove dead...
by hbelusca＠svn.reactos.org 30 Sep '17

30 Sep '17

Author: hbelusca Date: Sat Sep 30 14:04:24 2017 New Revision: 75999 URL: http://svn.reactos.org/svn/reactos?rev=75999&view=rev Log: [CMD]: Minor modifications in the files I'm going to touch next: - Use ARRAYSIZE() instead of hardcoding string buffer max. number of chars. - Un-globalize a variable; remove dead defines. - Minor code formatting fixes. Modified: trunk/reactos/base/shell/cmd/beep.c trunk/reactos/base/shell/cmd/cls.c trunk/reactos/base/shell/cmd/cmd.c trunk/reactos/base/shell/cmd/cmd.h trunk/reactos/base/shell/cmd/color.c Modified: trunk/reactos/base/shell/cmd/beep.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/beep.c?rev=… ============================================================================== --- trunk/reactos/base/shell/cmd/beep.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/beep.c [iso-8859-1] Sat Sep 30 14:04:24 2017 @@ -28,12 +28,11 @@ #ifdef INCLUDE_CMD_BEEP - -INT cmd_beep (LPTSTR param) +INT cmd_beep(LPTSTR param) { - if (_tcsncmp (param, _T("/?"), 2) == 0) + if (_tcsncmp(param, _T("/?"), 2) == 0) { - ConOutResPaging(TRUE,STRING_BEEP_HELP); + ConOutResPaging(TRUE, STRING_BEEP_HELP); return 0; } @@ -46,4 +45,5 @@ return 0; } + #endif Modified: trunk/reactos/base/shell/cmd/cls.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/cls.c?rev=7… ============================================================================== --- trunk/reactos/base/shell/cmd/cls.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/cls.c [iso-8859-1] Sat Sep 30 14:04:24 2017 @@ -30,16 +30,16 @@ #ifdef INCLUDE_CMD_CLS -INT cmd_cls (LPTSTR param) +INT cmd_cls(LPTSTR param) { HANDLE hOutput = GetStdHandle(STD_OUTPUT_HANDLE); CONSOLE_SCREEN_BUFFER_INFO csbi; COORD coPos; DWORD dwWritten; - if (!_tcsncmp (param, _T("/?"), 2)) + if (!_tcsncmp(param, _T("/?"), 2)) { - ConOutResPaging(TRUE,STRING_CLS_HELP); + ConOutResPaging(TRUE, STRING_CLS_HELP); return 0; } @@ -62,4 +62,5 @@ return 0; } + #endif 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:04:24 2017 @@ -144,10 +144,6 @@ #include "precomp.h" #include <reactos/buildno.h> #include <reactos/version.h> - -#ifndef NT_SUCCESS -#define NT_SUCCESS(StatCode) ((NTSTATUS)(StatCode) >= 0) -#endif typedef NTSTATUS (WINAPI *NtQueryInformationProcessProc)(HANDLE, PROCESSINFOCLASS, PVOID, ULONG, PULONG); @@ -167,7 +163,6 @@ BOOL bTitleSet = FALSE; DWORD dwChildProcessId = 0; HANDLE hIn; -HANDLE hOut; LPTSTR lpOriginalEnvironment; HANDLE CMD_ModuleHandle; @@ -379,6 +374,7 @@ return 1; } + /* Save the original console title and build a new one */ GetConsoleTitle(szWindowTitle, ARRAYSIZE(szWindowTitle)); bTitleSet = FALSE; _stprintf(szNewTitle, _T("%s - %s%s"), szWindowTitle, First, Rest); @@ -480,6 +476,8 @@ /* Get code page if it has been changed */ InputCodePage= GetConsoleCP(); OutputCodePage = GetConsoleOutputCP(); + + /* Restore the original console title */ if (!bTitleSet) SetConsoleTitle(szWindowTitle); @@ -565,7 +563,7 @@ * process the command line and execute the appropriate functions * full input/output redirection and piping are supported */ -INT ParseCommandLine (LPTSTR cmd) +INT ParseCommandLine(LPTSTR cmd) { INT Ret = 0; PARSED_COMMAND *Cmd = ParseCommand(cmd); @@ -591,7 +589,7 @@ PROCESS_INFORMATION prci; /* Get the path to cmd.exe */ - GetModuleFileName(NULL, CmdPath, MAX_PATH); + GetModuleFileName(NULL, CmdPath, ARRAYSIZE(CmdPath)); /* Build the parameter string to pass to cmd.exe */ ParamsEnd = _stpcpy(CmdParams, _T("/S/D/C\"")); @@ -1414,7 +1412,7 @@ } static VOID -ProcessInput() +ProcessInput(VOID) { PARSED_COMMAND *Cmd; @@ -1487,15 +1485,15 @@ } -VOID AddBreakHandler (VOID) -{ - SetConsoleCtrlHandler ((PHANDLER_ROUTINE)BreakHandler, TRUE); -} - - -VOID RemoveBreakHandler (VOID) -{ - SetConsoleCtrlHandler ((PHANDLER_ROUTINE)BreakHandler, FALSE); +VOID AddBreakHandler(VOID) +{ + SetConsoleCtrlHandler(BreakHandler, TRUE); +} + + +VOID RemoveBreakHandler(VOID) +{ + SetConsoleCtrlHandler(BreakHandler, FALSE); } @@ -1505,7 +1503,7 @@ */ #if 0 static VOID -ShowCommands (VOID) +ShowCommands(VOID) { /* print command list */ ConOutResPuts(STRING_CMD_HELP1); @@ -1802,6 +1800,8 @@ TCHAR ModuleName[_MAX_PATH + 1]; INT nExitCode; + HANDLE hOut; + TCHAR *ptr, *cmdLine, option = 0; BOOL AlwaysStrip = FALSE; BOOL AutoRun = TRUE; @@ -1993,29 +1993,29 @@ static VOID Cleanup(VOID) { - /* run cmdexit.bat */ - if (IsExistingFile (_T("cmdexit.bat"))) + /* Run cmdexit.bat */ + if (IsExistingFile(_T("cmdexit.bat"))) { ConErrResPuts(STRING_CMD_ERROR5); - ParseCommandLine (_T("cmdexit.bat")); - } - else if (IsExistingFile (_T("\\cmdexit.bat"))) - { - ConErrResPuts (STRING_CMD_ERROR5); - ParseCommandLine (_T("\\cmdexit.bat")); + ParseCommandLine(_T("cmdexit.bat")); + } + else if (IsExistingFile(_T("\\cmdexit.bat"))) + { + ConErrResPuts(STRING_CMD_ERROR5); + ParseCommandLine(_T("\\cmdexit.bat")); } #ifdef FEATURE_DIRECTORY_STACK - /* destroy directory stack */ - DestroyDirectoryStack (); + /* Destroy directory stack */ + DestroyDirectoryStack(); #endif #ifdef FEATURE_HISTORY CleanHistory(); #endif - /* free GetEnvVar's buffer */ + /* Free GetEnvVar's buffer */ GetEnvVar(NULL); /* Remove ctrl break handler */ 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:04:24 2017 @@ -52,7 +52,6 @@ #define BUFF_SIZE 16384 /* Global variables */ -extern HANDLE hOut; extern HANDLE hIn; extern LPTSTR lpOriginalEnvironment; extern WORD wColor; @@ -145,7 +144,7 @@ /* Prototypes for COLOR.C */ BOOL SetScreenColor(WORD wColor, BOOL bNoFill); -INT CommandColor (LPTSTR); +INT CommandColor(LPTSTR); VOID ConInDummy (VOID); VOID ConInDisable (VOID); 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 14:04:24 2017 @@ -102,7 +102,7 @@ return 1; } } - /* Color string: advanced choice: two-digits, "Color ON Color" , "Foreground ON Background" */ + /* Color string: advanced choice: two-digits, "Color ON Color", "Foreground ON Background" */ else if (StringToColor(&wColor, &rest) == FALSE) { /* Invalid color string */

1 0

[tkreuzer] 75998: [MSVCRT] Export _pwctype How did CRTDLL, which forwards _pwctype_dll to msvcrt._pwctype, ever link?
by tkreuzer＠svn.reactos.org 30 Sep '17

30 Sep '17

Author: tkreuzer Date: Sat Sep 30 12:43:08 2017 New Revision: 75998 URL: http://svn.reactos.org/svn/reactos?rev=75998&view=rev Log: [MSVCRT] Export _pwctype How did CRTDLL, which forwards _pwctype_dll to msvcrt._pwctype, ever link? Modified: trunk/reactos/dll/win32/msvcrt/msvcrt.spec Modified: trunk/reactos/dll/win32/msvcrt/msvcrt.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msvcrt/msvcrt.sp… ============================================================================== --- trunk/reactos/dll/win32/msvcrt/msvcrt.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msvcrt/msvcrt.spec [iso-8859-1] Sat Sep 30 12:43:08 2017 @@ -587,7 +587,7 @@ @ cdecl _putw(long ptr) @ cdecl _putwch(long) @ cdecl _putws(wstr) -# extern _pwctype +@ extern _pwctype @ cdecl _read(long ptr long) @ cdecl _resetstkoflw() @ cdecl _rmdir(str)

1 0

[hbelusca] 75997: [CMD]: Diverse improvements: - Add pre-support for "enable extensions". - Load CMD settings at startup from the registry (from HKLM and HKCU Software\\Microsoft\\Command Processor...
by hbelusca＠svn.reactos.org 30 Sep '17

30 Sep '17

Author: hbelusca Date: Sat Sep 30 11:39:08 2017 New Revision: 75997 URL: http://svn.reactos.org/svn/reactos?rev=75997&view=rev Log: [CMD]: Diverse improvements: - Add pre-support for "enable extensions". - Load CMD settings at startup from the registry (from HKLM and HKCU Software\\Microsoft\\Command Processor reg key), as done by Windows' CMD.EXE. - Add support for CMD.EXE /E(:OFF), /X, /Y command-line switches. - Correctly set the console colors when using CMD.EXE /T: switch. - Start support for two control characters for the completion: the standard CompletionChar and the PathCompletionChar (if one desires to autocomplete *just* directory names -- or associated -- but not everything), as Windows' CMD.EXE offers. Modified: trunk/reactos/base/shell/cmd/cmd.c trunk/reactos/base/shell/cmd/cmd.h trunk/reactos/base/shell/cmd/cmdinput.c trunk/reactos/base/shell/cmd/setlocal.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 11:39:08 2017 @@ -162,6 +162,7 @@ CRITICAL_SECTION ChildProcessRunningLock; BOOL bUnicodeOutput = FALSE; BOOL bDisableBatchEcho = FALSE; +BOOL bEnableExtensions = TRUE; BOOL bDelayedExpansion = FALSE; BOOL bTitleSet = FALSE; DWORD dwChildProcessId = 0; @@ -174,7 +175,7 @@ static NtReadVirtualMemoryProc NtReadVirtualMemoryPtr = NULL; #ifdef INCLUDE_CMD_COLOR -WORD wDefColor; /* default color */ +WORD wDefColor = 0; /* Default color */ #endif /* @@ -1532,14 +1533,164 @@ } #endif + static VOID -ExecuteAutoRunFile(HKEY hkeyRoot) +LoadRegistrySettings(HKEY hKeyRoot) +{ + LONG lRet; + HKEY hKey; + /* + * 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"), + 0, + KEY_QUERY_VALUE, + &hKey); + if (lRet != ERROR_SUCCESS) + return; + +#ifdef INCLUDE_CMD_COLOR + len = sizeof(Buffer); + lRet = RegQueryValueEx(hKey, + _T("DefaultColor"), + NULL, + &dwType, + (LPBYTE)&Buffer, + &len); + if (lRet == ERROR_SUCCESS) + { + /* Overwrite the default attributes */ + if (dwType == REG_DWORD) + wDefColor = (WORD)*(PDWORD)Buffer; + else if (dwType == REG_SZ) + wDefColor = (WORD)_tcstol((PTSTR)Buffer, NULL, 0); + } + // else, use the default attributes retrieved before. +#endif + +#if 0 + len = sizeof(Buffer); + lRet = RegQueryValueEx(hKey, + _T("DisableUNCCheck"), + NULL, + &dwType, + (LPBYTE)&Buffer, + &len); + if (lRet == ERROR_SUCCESS) + { + /* Overwrite the default setting */ + if (dwType == REG_DWORD) + bDisableUNCCheck = !!*(PDWORD)Buffer; + else if (dwType == REG_SZ) + bDisableUNCCheck = (_ttol((PTSTR)Buffer) == 1); + } + // else, use the default setting set globally. +#endif + + len = sizeof(Buffer); + lRet = RegQueryValueEx(hKey, + _T("DelayedExpansion"), + NULL, + &dwType, + (LPBYTE)&Buffer, + &len); + if (lRet == ERROR_SUCCESS) + { + /* Overwrite the default setting */ + if (dwType == REG_DWORD) + bDelayedExpansion = !!*(PDWORD)Buffer; + else if (dwType == REG_SZ) + bDelayedExpansion = (_ttol((PTSTR)Buffer) == 1); + } + // else, use the default setting set globally. + + len = sizeof(Buffer); + lRet = RegQueryValueEx(hKey, + _T("EnableExtensions"), + NULL, + &dwType, + (LPBYTE)&Buffer, + &len); + if (lRet == ERROR_SUCCESS) + { + /* Overwrite the default setting */ + if (dwType == REG_DWORD) + bEnableExtensions = !!*(PDWORD)Buffer; + else if (dwType == REG_SZ) + bEnableExtensions = (_ttol((PTSTR)Buffer) == 1); + } + // else, use the default setting set globally. + + len = sizeof(Buffer); + lRet = RegQueryValueEx(hKey, + _T("CompletionChar"), + NULL, + &dwType, + (LPBYTE)&Buffer, + &len); + if (lRet == ERROR_SUCCESS) + { + /* Overwrite the default setting */ + if (dwType == REG_DWORD) + AutoCompletionChar = (TCHAR)*(PDWORD)Buffer; + else if (dwType == REG_SZ) + AutoCompletionChar = (TCHAR)_tcstol((PTSTR)Buffer, NULL, 0); + } + // else, use the default setting set globally. + + /* Validity check */ + if (IS_COMPLETION_DISABLED(AutoCompletionChar)) + { + /* Disable autocompletion */ + AutoCompletionChar = 0x20; + } + + len = sizeof(Buffer); + lRet = RegQueryValueEx(hKey, + _T("PathCompletionChar"), + NULL, + &dwType, + (LPBYTE)&Buffer, + &len); + if (lRet == ERROR_SUCCESS) + { + /* Overwrite the default setting */ + if (dwType == REG_DWORD) + PathCompletionChar = (TCHAR)*(PDWORD)Buffer; + else if (dwType == REG_SZ) + PathCompletionChar = (TCHAR)_tcstol((PTSTR)Buffer, NULL, 0); + } + // else, use the default setting set globally. + + /* Validity check */ + if (IS_COMPLETION_DISABLED(PathCompletionChar)) + { + /* Disable autocompletion */ + PathCompletionChar = 0x20; + } + + /* Adjust completion chars */ + if (PathCompletionChar >= 0x20 && AutoCompletionChar < 0x20) + PathCompletionChar = AutoCompletionChar; + else if (AutoCompletionChar >= 0x20 && PathCompletionChar < 0x20) + AutoCompletionChar = PathCompletionChar; + + RegCloseKey(hKey); +} + +static VOID +ExecuteAutoRunFile(HKEY hKeyRoot) { TCHAR autorun[2048]; DWORD len = sizeof autorun; HKEY hkey; - if (RegOpenKeyEx(hkeyRoot, + if (RegOpenKeyEx(hKeyRoot, _T("SOFTWARE\\Microsoft\\Command Processor"), 0, KEY_READ, @@ -1612,18 +1763,45 @@ _tcscpy(commandline, ptr); } + +#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 + * Set up global initializations and process parameters */ static VOID -Initialize() +Initialize(VOID) { HMODULE NtDllModule; TCHAR commandline[CMDLINE_LENGTH]; TCHAR ModuleName[_MAX_PATH + 1]; INT nExitCode; - //INT len; TCHAR *ptr, *cmdLine, option = 0; BOOL AlwaysStrip = FALSE; BOOL AutoRun = TRUE; @@ -1641,9 +1819,14 @@ NtReadVirtualMemoryPtr = (NtReadVirtualMemoryProc)GetProcAddress(NtDllModule, "NtReadVirtualMemory"); } + /* Load the registry settings */ + LoadRegistrySettings(HKEY_LOCAL_MACHINE); + LoadRegistrySettings(HKEY_CURRENT_USER); + + /* Initialize our locale */ InitLocale(); - /* get default input and output console handles */ + /* Get default input and output console handles */ hOut = GetStdHandle(STD_OUTPUT_HANDLE); hIn = GetStdHandle(STD_INPUT_HANDLE); @@ -1651,17 +1834,17 @@ InitPrompt(); #ifdef FEATURE_DIR_STACK - /* initialize directory stack */ + /* Initialize directory stack */ InitDirectoryStack(); #endif #ifdef FEATURE_HISTORY - /*initialize history*/ + /* Initialize history */ InitHistory(); #endif /* Set COMSPEC environment variable */ - if (0 != GetModuleFileName (NULL, ModuleName, _MAX_PATH + 1)) + if (GetModuleFileName(NULL, ModuleName, ARRAYSIZE(ModuleName)) != 0) { ModuleName[_MAX_PATH] = _T('\0'); SetEnvironmentVariable (_T("COMSPEC"), ModuleName); @@ -1731,9 +1914,8 @@ #ifdef INCLUDE_CMD_COLOR else if (!_tcsnicmp(ptr, _T("/T:"), 3)) { - /* process /T (color) argument */ + /* Process /T (color) argument; overwrite any previous settings */ wDefColor = (WORD)_tcstoul(&ptr[3], &ptr, 16); - SetScreenColor(wDefColor, FALSE); } #endif else if (option == _T('U')) @@ -1742,10 +1924,40 @@ } else if (option == _T('V')) { + // FIXME: Check validity of the parameter given to V ! bDelayedExpansion = _tcsnicmp(&ptr[2], _T(":OFF"), 4); } - } - } + else if (option == _T('E')) + { + // FIXME: Check validity of the parameter given to E ! + bEnableExtensions = _tcsnicmp(&ptr[2], _T(":OFF"), 4); + } + else if (option == _T('X')) + { + /* '/X' is identical to '/E:ON' */ + bEnableExtensions = TRUE; + } + else if (option == _T('Y')) + { + /* '/Y' is identical to '/E:OFF' */ + bEnableExtensions = FALSE; + } + } + } + +#ifdef INCLUDE_CMD_COLOR + if (wDefColor == 0) + { + /* + * If we still do not have the console colour attribute set, + * retrieve the default one. + */ + ConGetDefaultAttributes(&wDefColor); + } + + if (wDefColor != 0) + SetScreenColor(wDefColor, FALSE); +#endif if (!*ptr) { @@ -1779,7 +1991,7 @@ } -static VOID Cleanup() +static VOID Cleanup(VOID) { /* run cmdexit.bat */ if (IsExistingFile (_T("cmdexit.bat"))) @@ -1823,52 +2035,33 @@ */ int _tmain(int argc, const TCHAR *argv[]) { - HANDLE hConsole; TCHAR startPath[MAX_PATH]; - CONSOLE_SCREEN_BUFFER_INFO Info; InitializeCriticalSection(&ChildProcessRunningLock); lpOriginalEnvironment = DuplicateEnvironment(); - GetCurrentDirectory(MAX_PATH,startPath); + GetCurrentDirectory(ARRAYSIZE(startPath), startPath); _tchdir(startPath); SetFileApisToOEM(); - InputCodePage = 0; - OutputCodePage = 0; - - hConsole = CreateFile(_T("CONOUT$"), GENERIC_READ|GENERIC_WRITE, - FILE_SHARE_READ|FILE_SHARE_WRITE, NULL, - OPEN_EXISTING, 0, NULL); - if (hConsole != INVALID_HANDLE_VALUE) - { - if (!GetConsoleScreenBufferInfo(hConsole, &Info)) - { - ConErrFormatMessage(GetLastError()); - CloseHandle(hConsole); - return(1); - } - wDefColor = Info.wAttributes; - CloseHandle(hConsole); - } - InputCodePage = GetConsoleCP(); OutputCodePage = GetConsoleOutputCP(); + CMD_ModuleHandle = GetModuleHandle(NULL); - /* check switches on command-line */ + /* Perform general initialization, parse switches on command-line */ Initialize(); - /* call prompt routine */ + /* Call prompt routine */ ProcessInput(); - /* do the cleanup */ + /* Do the cleanup */ Cleanup(); cmd_free(lpOriginalEnvironment); cmd_exit(nErrorLevel); - return(nErrorLevel); + return nErrorLevel; } /* EOF */ 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 11:39:08 2017 @@ -51,7 +51,7 @@ /* 16k = max buffer size */ #define BUFF_SIZE 16384 -/* global variables */ +/* Global variables */ extern HANDLE hOut; extern HANDLE hIn; extern LPTSTR lpOriginalEnvironment; @@ -61,6 +61,7 @@ extern BOOL bIgnoreEcho; extern BOOL bExit; extern BOOL bDisableBatchEcho; +extern BOOL bEnableExtensions; extern BOOL bDelayedExpansion; extern INT nErrorLevel; extern SHORT maxx; @@ -115,6 +116,12 @@ /* Prototypes for CMDINPUT.C */ BOOL ReadCommand (LPTSTR, INT); + +extern TCHAR AutoCompletionChar; +extern TCHAR PathCompletionChar; + +#define IS_COMPLETION_DISABLED(CompletionCtrl) \ + ((CompletionCtrl) == 0x00 || (CompletionCtrl) == 0x0D || (CompletionCtrl) >= 0x20) /* Prototypes for CMDTABLE.C */ Modified: trunk/reactos/base/shell/cmd/cmdinput.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/cmdinput.c?… ============================================================================== --- trunk/reactos/base/shell/cmd/cmdinput.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/cmdinput.c [iso-8859-1] Sat Sep 30 11:39:08 2017 @@ -101,6 +101,16 @@ */ #include "precomp.h" + +/* + * See https://technet.microsoft.com/en-us/library/cc978715.aspx + * and https://technet.microsoft.com/en-us/library/cc940805.aspx + * to know the differences between those two settings. + * Values 0x00, 0x0D (carriage return) and 0x20 (space) disable completion. + */ +TCHAR AutoCompletionChar = _T('\t'); // Default is 0x20 +TCHAR PathCompletionChar = _T('\t'); // Default is 0x20 + SHORT maxx; SHORT maxy; Modified: trunk/reactos/base/shell/cmd/setlocal.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/setlocal.c?… ============================================================================== --- trunk/reactos/base/shell/cmd/setlocal.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/setlocal.c [iso-8859-1] Sat Sep 30 11:39:08 2017 @@ -12,6 +12,7 @@ typedef struct _SETLOCAL { struct _SETLOCAL *Prev; + BOOL EnableExtensions; BOOL DelayedExpansion; LPTSTR Environment; } SETLOCAL; @@ -52,6 +53,7 @@ return 1; } Saved->Prev = bc->setlocal; + Saved->EnableExtensions = bEnableExtensions; Saved->DelayedExpansion = bDelayedExpansion; Saved->Environment = DuplicateEnvironment(); if (!Saved->Environment) @@ -68,9 +70,11 @@ for (i = 0; i < argc; i++) { if (!_tcsicmp(arg[i], _T("enableextensions"))) - /* not implemented, ignore */; + /* FIXME: not implemented! */ + bEnableExtensions = TRUE; else if (!_tcsicmp(arg[i], _T("disableextensions"))) - /* not implemented, ignore */; + /* FIXME: not implemented! */ + bEnableExtensions = FALSE; else if (!_tcsicmp(arg[i], _T("enabledelayedexpansion"))) bDelayedExpansion = TRUE; else if (!_tcsicmp(arg[i], _T("disabledelayedexpansion"))) @@ -97,6 +101,7 @@ return 0; bc->setlocal = Saved->Prev; + bEnableExtensions = Saved->EnableExtensions; bDelayedExpansion = Saved->DelayedExpansion; /* First, clear out the environment. Since making any changes to the

1 0

[hbelusca] 75996: [ASM]: CORE-13850 #comment Fix MASM compilation errors with the CFI annotation macros substitutes (broken by r75989).
by hbelusca＠svn.reactos.org 30 Sep '17

30 Sep '17

Author: hbelusca Date: Sat Sep 30 10:29:50 2017 New Revision: 75996 URL: http://svn.reactos.org/svn/reactos?rev=75996&view=rev Log: [ASM]: CORE-13850 #comment Fix MASM compilation errors with the CFI annotation macros substitutes (broken by r75989). Modified: trunk/reactos/sdk/include/asm/asm.inc Modified: trunk/reactos/sdk/include/asm/asm.inc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/include/asm/asm.inc?re… ============================================================================== --- trunk/reactos/sdk/include/asm/asm.inc [iso-8859-1] (original) +++ trunk/reactos/sdk/include/asm/asm.inc [iso-8859-1] Sat Sep 30 10:29:50 2017 @@ -201,16 +201,26 @@ #define NUL 0 /* For compatibility with GAS */ -#define CFI_STARTPROC -#define CFI_ENDPROC -#define CFI_ADJUST_CFA_OFFSET -#define CFI_OFFSET -#define CFI_REGISTER -#define CFI_DEF_CFA_REGISTER -#define CFI_DEF_CFA -#define CFI_REL_OFFSET -#define CFI_SAME_VALUE -#define CFI_DEF_CFA_OFFSET +CFI_STARTPROC MACRO start +ENDM +CFI_ENDPROC MACRO +ENDM +CFI_DEF_CFA MACRO reg:REQ, offset:REQ +ENDM +CFI_DEF_CFA_OFFSET MACRO offset:REQ +ENDM +CFI_DEF_CFA_REGISTER MACRO reg:REQ +ENDM +CFI_ADJUST_CFA_OFFSET MACRO offset:REQ +ENDM +CFI_OFFSET MACRO reg:REQ, offset:REQ +ENDM +CFI_REGISTER MACRO reg1:REQ, reg2:REQ +ENDM +CFI_REL_OFFSET MACRO reg:REQ, offset:REQ +ENDM +CFI_SAME_VALUE MACRO reg:REQ +ENDM #else /***********************************************************************/ @@ -387,14 +397,14 @@ /* CFI annotations */ #define CFI_STARTPROC .cfi_startproc #define CFI_ENDPROC .cfi_endproc +#define CFI_DEF_CFA .cfi_def_cfa +#define CFI_DEF_CFA_OFFSET .cfi_def_cfa_offset +#define CFI_DEF_CFA_REGISTER .cfi_def_cfa_register #define CFI_ADJUST_CFA_OFFSET .cfi_adjust_cfa_offset #define CFI_OFFSET .cfi_offset #define CFI_REGISTER .cfi_register -#define CFI_DEF_CFA_REGISTER .cfi_def_cfa_register -#define CFI_DEF_CFA .cfi_def_cfa #define CFI_REL_OFFSET .cfi_rel_offset #define CFI_SAME_VALUE .cfi_same_value -#define CFI_DEF_CFA_OFFSET .cfi_def_cfa_offset #endif

1 0

[hbelusca] 75995: [ASM]: Code formatting only.
by hbelusca＠svn.reactos.org 30 Sep '17

30 Sep '17

Author: hbelusca Date: Sat Sep 30 10:29:06 2017 New Revision: 75995 URL: http://svn.reactos.org/svn/reactos?rev=75995&view=rev Log: [ASM]: Code formatting only. Modified: trunk/reactos/sdk/include/asm/asm.inc Modified: trunk/reactos/sdk/include/asm/asm.inc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/include/asm/asm.inc?re… ============================================================================== --- trunk/reactos/sdk/include/asm/asm.inc [iso-8859-1] (original) +++ trunk/reactos/sdk/include/asm/asm.inc [iso-8859-1] Sat Sep 30 10:29:06 2017 @@ -11,9 +11,9 @@ /* Common definitions for FPO macro see http://msdn.microsoft.com/en-us/library/ms679352%28VS.85%29.aspx */ -#define FRAME_FPO 0 -#define FRAME_TRAP 1 -#define FRAME_TSS 2 +#define FRAME_FPO 0 +#define FRAME_TRAP 1 +#define FRAME_TSS 2 #define FRAME_NONFPO 3 #ifdef _USE_ML @@ -193,7 +193,6 @@ __absolute__address__ = __absolute__address__ + size ENDM - /* We need this to distinguish repeat from macros */ #define ENDR ENDM @@ -201,7 +200,7 @@ #define LF 10 #define NUL 0 -/* For compatibility with gas */ +/* For compatibility with GAS */ #define CFI_STARTPROC #define CFI_ENDPROC #define CFI_ADJUST_CFA_OFFSET @@ -237,7 +236,7 @@ .macro .PROC name .func \name #ifdef _X86_ - /* x86 gas expects a label with _ prefix */ + /* x86 GAS expects a label with _ prefix */ _\name: #endif \name: @@ -381,8 +380,8 @@ #define else .else #define elseif .elseif -#define CR "\r" -#define LF "\n" +#define CR "\r" +#define LF "\n" #define NUL "\0" /* CFI annotations */

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs