Ros-diffs September 2017

ros-diffs@reactos.org

17 participants
284 discussions

[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

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

6 years, 11 months

[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

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

6 years, 11 months

[tkreuzer] 75998: [MSVCRT] Export _pwctype How did CRTDLL, which forwards _pwctype_dll to msvcrt._pwctype, ever link?

by tkreuzer＠svn.reactos.org

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)

6 years, 11 months

[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

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

6 years, 11 months

[hbelusca] 75996: [ASM]: CORE-13850 #comment Fix MASM compilation errors with the CFI annotation macros substitutes (broken by r75989).

by hbelusca＠svn.reactos.org

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

6 years, 11 months

[hbelusca] 75995: [ASM]: Code formatting only.

by hbelusca＠svn.reactos.org

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

6 years, 11 months

[hbelusca] 75994: [CMD]: Fix translations for the COLOR command. For few translations, the COLOR command help contained a deprecated /F switch, which was changed long time ago to the /-F switch ("D...

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Sat Sep 30 09:50:08 2017 New Revision: 75994 URL: http://svn.reactos.org/svn/reactos?rev=75994&view=rev Log: [CMD]: Fix translations for the COLOR command. For few translations, the COLOR command help contained a deprecated /F switch, which was changed long time ago to the /-F switch ("Does not fill the console blank space with color attribute"). Also, remove a now-unneeded localized informative string for the COLOR command (which rendered it Windows-incompatible). Modified: trunk/reactos/base/shell/cmd/color.c trunk/reactos/base/shell/cmd/lang/cs-CZ.rc trunk/reactos/base/shell/cmd/lang/de-DE.rc trunk/reactos/base/shell/cmd/lang/el-GR.rc trunk/reactos/base/shell/cmd/lang/en-US.rc trunk/reactos/base/shell/cmd/lang/es-ES.rc trunk/reactos/base/shell/cmd/lang/fr-FR.rc trunk/reactos/base/shell/cmd/lang/hu-HU.rc trunk/reactos/base/shell/cmd/lang/id-ID.rc trunk/reactos/base/shell/cmd/lang/it-IT.rc trunk/reactos/base/shell/cmd/lang/ja-JP.rc trunk/reactos/base/shell/cmd/lang/no-NO.rc trunk/reactos/base/shell/cmd/lang/pl-PL.rc trunk/reactos/base/shell/cmd/lang/ro-RO.rc trunk/reactos/base/shell/cmd/lang/ru-RU.rc trunk/reactos/base/shell/cmd/lang/sk-SK.rc trunk/reactos/base/shell/cmd/lang/sq-AL.rc trunk/reactos/base/shell/cmd/lang/sv-SE.rc trunk/reactos/base/shell/cmd/lang/tr-TR.rc trunk/reactos/base/shell/cmd/lang/uk-UA.rc trunk/reactos/base/shell/cmd/lang/zh-CN.rc trunk/reactos/base/shell/cmd/lang/zh-TW.rc trunk/reactos/base/shell/cmd/resource.h 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 09:50:08 2017 @@ -73,7 +73,7 @@ /* Let's prepare %ERRORLEVEL% */ nErrorLevel = 0; - /* No parameter. Set the default colors */ + /* No parameter: Set the default colors */ if (rest[0] == _T('\0')) { SetScreenColor(wDefColor, FALSE); @@ -111,11 +111,7 @@ return 1; } - /* Print the chosen color if we are in echo mode (NOTE: Not Windows-compliant) */ - if ((bc && bc->bEcho) || !bc) - { - ConErrResPrintf(STRING_COLOR_ERROR3, wColor); - } + TRACE("Color %02x\n", wColor); /* * Set the chosen color. Use also the following advanced flag: Modified: trunk/reactos/base/shell/cmd/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/lang/cs-CZ.… ============================================================================== --- trunk/reactos/base/shell/cmd/lang/cs-CZ.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/lang/cs-CZ.rc [iso-8859-1] Sat Sep 30 09:50:08 2017 @@ -76,9 +76,9 @@ (cannot be terminated).\n\ /T:bf Sets the background/foreground color (see COLOR command).\n" STRING_COLOR_HELP1 "Sets the default foreground and background colors.\n\n\ -COLOR [attr [/-F]] \n\n\ - attr Specifies color attribute of console output\n\ - /-F Does not fill the console blank space with color attribute\n\n\ +COLOR [attr [/-F]]\n\n\ + attr Specifies color attribute of console output.\n\ + /-F Does not fill the console blank space with color attribute.\n\n\ There are three ways to specify the colors:\n\ 1) [bright] name on [bright] name (only the first three letters are required)\n\ 2) decimal on decimal\n\ @@ -479,8 +479,7 @@ STRING_CMD_ERROR4 "SpouÅ¡tÃ se %s...\n" STRING_CMD_ERROR5 "SpouÅ¡tÃ se cmdexit.bat...\n" STRING_COLOR_ERROR1 "Chyba stejnÃ½ch barev! (PozadÃ a popÅedÃ nemohou mÃt stejnou barvu)" - STRING_COLOR_ERROR2 "chyba ve specifikaci barvy" - STRING_COLOR_ERROR3 "Barva %02x\n" + STRING_COLOR_ERROR2 "Chyba ve specifikaci barvy" STRING_CONSOLE_ERROR "NeznÃ¡mÃ¡ chyba: %d\n" STRING_COPY_ERROR1 "Chyba: Nelze otevÅÃt zdroj - %s!\n" STRING_COPY_ERROR2 "Chyba: Zdroj a cÃl jsou shodnÃ©!\n" Modified: trunk/reactos/base/shell/cmd/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/lang/de-DE.… ============================================================================== --- trunk/reactos/base/shell/cmd/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/lang/de-DE.rc [iso-8859-1] Sat Sep 30 09:50:08 2017 @@ -74,9 +74,9 @@ (kann nicht beendet werden).\n\ /T:bf Ãndert die Hintergrund- und Vordergrund-Farbe (siehe COLOR Befehl)." STRING_COLOR_HELP1 "Legt die Standardhinter- und Vordergrundfarben fÃ¼r die Konsole fest.\n\n\ -COLOR [attr [/F]] \n\n\ +COLOR [attr [/-F]]\n\n\ attr Gibt die Farbattribute fÃ¼r die Konsolenausgabe an.\n\ - /F FÃ¼llt die Konsolenausgabe mit dem Farbattribut\n\n\ + /-F FÃ¼llt nicht die Konsolenausgabe mit dem Farbattribut.\n\n\ Es gibt 2 MÃ¶glichkeiten, die Farben festzulegen:\n\ 2) Zwei Dezimalzahlen\n\ 3) Zwei Hexadezimalziffern\n\n\ @@ -474,7 +474,6 @@ STRING_CMD_ERROR5 "AusfÃ¼hrend cmdexit.bat...\n" STRING_COLOR_ERROR1 "Fehler: Hinter- und Vordergrund kÃ¶nnen nicht die selben Farben haben!" STRING_COLOR_ERROR2 "Fehler in der Farbangabe" - STRING_COLOR_ERROR3 "Farbe %02x\n" STRING_CONSOLE_ERROR "Unbekannter Fehler: %d\n" STRING_COPY_ERROR1 "Fehler: Quelle kann nicht geÃ¶ffnet werden - %s!\n" STRING_COPY_ERROR2 "Fehler: Kann nicht Ã¼ber sich selbst kopiert werden.\n" Modified: trunk/reactos/base/shell/cmd/lang/el-GR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/lang/el-GR.… ============================================================================== --- trunk/reactos/base/shell/cmd/lang/el-GR.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/lang/el-GR.rc [iso-8859-1] Sat Sep 30 09:50:08 2017 @@ -76,9 +76,9 @@ (Î´Îµ Î¼ÏÎ¿ÏÎµÎ¯ Î½Î± ÏÎµÏÎ¼Î±ÏÎ¹ÏÏÎµÎ¯).\n\ /T:bf ÎÏÎ¯Î¶ÎµÎ¹ ÏÎ¿ ÏÏÏÎ¼Î± ÏÏÎ½ÏÎ¿Ï/ÏÏÏÏÎ¿Ï ÏÎ»Î¬Î½Î¿Ï (Î²Î»ÎÏÎµ ÏÎ·Î½ COLOR ÎµÎ½ÏÎ¿Î»Î®).\n" STRING_COLOR_HELP1 "ÎÏÎ¯Î¶ÎµÎ¹ ÏÎ± ÏÏÎ¿ÎµÏÎ¹Î»ÎµÎ³Î¼ÎÎ½Î± ÏÏÏÎ¼Î±ÏÎ± ÏÏÏÏÎ¿Ï ÏÎ»Î¬Î½Î¿Ï ÎºÎ±Î¹ ÏÏÎ½ÏÎ¿Ï Î³Î¹Î± ÏÎ·Î½ ÎºÎ¿Î½ÏÏÎ»Î±.\n\n\ -COLOR [ÏÎ±ÏÎ±ÎºÏÎ·ÏÎ¹ÏÏÎ¹ÎºÏ [/-F]] \n\n\ - ÏÎ±ÏÎ±ÎºÏÎ·ÏÎ¹ÏÏÎ¹ÎºÏ ÎÎ±Î¸Î¿ÏÎ¯Î¶ÎµÎ¹ ÏÎ¿ ÏÎ±ÏÎ±ÎºÏÎ·ÏÎ¹ÏÏÎ¹ÎºÏ ÏÏÏÎ¼Î±ÏÎ¿Ï Î³Î¹Î± ÏÎ·Î½ ÎÎ¾Î¿Î´Î¿ ÏÎ·Ï ÎºÎ¿Î½ÏÏÎ»Î±Ï\n\ - /-F Does not fill the console blank space with color attribute\n\n\ +COLOR [ÏÎ±ÏÎ±ÎºÏÎ·ÏÎ¹ÏÏÎ¹ÎºÏ [/-F]]\n\n\ + ÏÎ±ÏÎ±ÎºÏÎ·ÏÎ¹ÏÏÎ¹ÎºÏ ÎÎ±Î¸Î¿ÏÎ¯Î¶ÎµÎ¹ ÏÎ¿ ÏÎ±ÏÎ±ÎºÏÎ·ÏÎ¹ÏÏÎ¹ÎºÏ ÏÏÏÎ¼Î±ÏÎ¿Ï Î³Î¹Î± ÏÎ·Î½ ÎÎ¾Î¿Î´Î¿ ÏÎ·Ï ÎºÎ¿Î½ÏÏÎ»Î±Ï.\n\ + /-F Does not fill the console blank space with color attribute.\n\n\ Î¥ÏÎ¬ÏÏÎ¿ÏÎ½ 3 ÏÏÏÏÎ¿Î¹ Î³Î¹Î± Î½Î± Î¿ÏÎ¹ÏÏÎ¿ÏÎ½ ÏÎ± ÏÏÏÎ¼Î±ÏÎ±:\n\ 1) [Î±Î½Î¿Î¹ÏÏÏ] ÏÎ½Î¿Î¼Î± ÏÎµ [Î±Î½Î¿Î¹ÏÏÏ] ÏÎ½Î¿Î¼Î± (Î¼ÏÎ½Î¿ ÏÎ± ÏÏÏÏÎ± ÏÏÎ¯Î± Î³ÏÎ¬Î¼Î¼Î±ÏÎ± Î±ÏÎ±Î¹ÏÎ¿ÏÎ½ÏÎ±Î¹)\n\ 2) Î´ÎµÎºÎ±Î´Î¹ÎºÏ ÏÎµ Î´ÎµÎºÎ±Î´Î¹ÎºÏ\n\ @@ -478,8 +478,7 @@ STRING_CMD_ERROR4 "ÎÎºÏÎµÎ»ÎµÎ¯ÏÎ±Î¹ ÏÎ¿ %s...\n" STRING_CMD_ERROR5 "Running cmdexit.bat...\n" STRING_COLOR_ERROR1 "Same colors error! (Background and foreground can't be the same color)" - STRING_COLOR_ERROR2 "error in color specification" - STRING_COLOR_ERROR3 "Color %02x\n" + STRING_COLOR_ERROR2 "Error in color specification" STRING_CONSOLE_ERROR "ÎÎ³Î½ÏÏÏÎ¿ ÏÏÎ¬Î»Î¼Î±: %d\n" STRING_COPY_ERROR1 "Î£ÏÎ¬Î»Î¼Î±: ÎÎµÎ½ Î®ÏÎ±Î½ Î´ÏÎ½Î±ÏÏ ÏÎ¿ Î¬Î½Î¿Î¹Î³Î¼Î± ÏÎ·Ï ÏÎ·Î³Î®Ï - %s!\n" STRING_COPY_ERROR2 "Î£ÏÎ¬Î»Î¼Î±: Can't copy onto itself!\n" Modified: trunk/reactos/base/shell/cmd/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/lang/en-US.… ============================================================================== --- trunk/reactos/base/shell/cmd/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/lang/en-US.rc [iso-8859-1] Sat Sep 30 09:50:08 2017 @@ -71,9 +71,9 @@ (cannot be terminated).\n\ /T:bf Sets the background/foreground color (see COLOR command).\n" STRING_COLOR_HELP1 "Sets the default foreground and background colors.\n\n\ -COLOR [attr [/-F]] \n\n\ - attr Specifies color attribute of console output\n\ - /-F Does not fill the console blank space with color attribute\n\n\ +COLOR [attr [/-F]]\n\n\ + attr Specifies color attribute of console output.\n\ + /-F Does not fill the console blank space with color attribute.\n\n\ There are three ways to specify the colors:\n\ 1) [bright] name on [bright] name (only the first three letters are required)\n\ 2) decimal on decimal\n\ @@ -474,8 +474,7 @@ STRING_CMD_ERROR4 "Running %s...\n" STRING_CMD_ERROR5 "Running cmdexit.bat...\n" STRING_COLOR_ERROR1 "Same colors error! (Background and foreground can't be the same color)" - STRING_COLOR_ERROR2 "error in color specification" - STRING_COLOR_ERROR3 "Color %02x\n" + STRING_COLOR_ERROR2 "Error in color specification" STRING_CONSOLE_ERROR "Unknown error: %d\n" STRING_COPY_ERROR1 "Error: Cannot open source - %s!\n" STRING_COPY_ERROR2 "Error: Can't copy onto itself!\n" Modified: trunk/reactos/base/shell/cmd/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/lang/es-ES.… ============================================================================== --- trunk/reactos/base/shell/cmd/lang/es-ES.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/lang/es-ES.rc [iso-8859-1] Sat Sep 30 09:50:08 2017 @@ -73,7 +73,7 @@ (no puede ser cerrado).\n\ /T:bf Configura el color de fondo/primer plano (mirar el comando COLOR).\n" STRING_COLOR_HELP1 "Configura el color de primer plano y fondo.\n\n\ -COLOR [attr [/-F]] \n\n\ +COLOR [attr [/-F]]\n\n\ attr Especifica el atributo de color de salida de consola.\n\ /-F No rellena el espacio en blanco de la consola con el color del atributo.\n\n\ Hay tres maneras de especificar los colores:\n\ @@ -477,7 +477,6 @@ STRING_CMD_ERROR5 "Ejecutando cmdexit.bat...\n" STRING_COLOR_ERROR1 "Â¡Mismos colores! (El color de frente y de fondo no pueden ser el mismo)" STRING_COLOR_ERROR2 "Error en la especificaciÃ³n del color" - STRING_COLOR_ERROR3 "Color %02x\n" STRING_CONSOLE_ERROR "Error desconocido: %d\n" STRING_COPY_ERROR1 "Error: No se puede abrir el origen - %s!\n" STRING_COPY_ERROR2 "Error: Â¡No se puede copiar sobre si mismo!\n" Modified: trunk/reactos/base/shell/cmd/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/lang/fr-FR.… ============================================================================== --- trunk/reactos/base/shell/cmd/lang/fr-FR.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/lang/fr-FR.rc [iso-8859-1] Sat Sep 30 09:50:08 2017 @@ -76,9 +76,9 @@ /T:ap Changer la couleur d'arriÃ¨re/premier plan\n\ (voir la commande COLOR.)" STRING_COLOR_HELP1 "Change les couleurs de premier et d'arriÃ¨re plan.\n\n\ -COLOR [attr [/F]] \n\n\ - attr SpÃ©cifie l'attribut des couleurs de la console\n\ - /F remplit la console avec l'attribut de couleur\n\n\ +COLOR [attr [/-F]]\n\n\ + attr SpÃ©cifie l'attribut de couleur de la console.\n\ + /-F Ne remplit pas les espaces blancs avec l'attribut de couleur.\n\n\ Il y a trois faÃ§ons de spÃ©cifier les couleurs :\n\ 1) [bright] nom on [bright] nom (seules les trois premiÃ¨res lettres \n\ sont nÃ©cessaires)\n\ @@ -489,7 +489,6 @@ STRING_CMD_ERROR5 "Lance cmdexit.bat...\n" STRING_COLOR_ERROR1 "L'arriÃ¨re plan et l'avant plan ne peuvent Ãªtre de la mÃªme couleur" STRING_COLOR_ERROR2 "Erreur dans la spÃ©cification des couleurs" - STRING_COLOR_ERROR3 "Couleur %02x\n" STRING_CONSOLE_ERROR "Erreur inconnue : %d\n" STRING_COPY_ERROR1 "Erreur : Ne peut ouvrir la source - %s !\n" STRING_COPY_ERROR2 "Erreur : Ne peut copier le fichier sur lui-mÃªme !\n" Modified: trunk/reactos/base/shell/cmd/lang/hu-HU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/lang/hu-HU.… ============================================================================== --- trunk/reactos/base/shell/cmd/lang/hu-HU.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/lang/hu-HU.rc [iso-8859-1] Sat Sep 30 09:50:08 2017 @@ -70,9 +70,9 @@ /P Ãrtelmezi az autoexec.bat Ã¡llomÃ¡nyt Ã©s a memÃ³riÃ¡ban marad.\n\ /T:eh COLOR parancs hasznÃ¡lata.\n" STRING_COLOR_HELP1 "A konzol elÃµ- Ã©s hÃ¡ttÃ©rszÃnÃ©t Ã¡llÃtja be.\n\n\ -COLOR [eh [/-F]] \n\n\ +COLOR [eh [/-F]]\n\n\ eh A konzol elÃµ- Ã©s hÃ¡ttÃ©rszÃnÃ©t Ã¡llÃtja be.\n\ - /-F Nem frissÃti az egÃ©sz kÃ©pernyÃµt\n\n\ + /-F Nem frissÃti az egÃ©sz kÃ©pernyÃµt.\n\n\ A szÃnt kÃ©t hexadecimÃ¡lis szÃ¡mjeggyel lehet beÃ¡llÃtani\n\n\ Az elÃ©rhetÃµ szÃnek:\n\ hex nÃ©v hex nÃ©v\n\ @@ -459,7 +459,6 @@ STRING_CMD_ERROR5 "cmdexit.bat futtatÃ¡sa...\n" STRING_COLOR_ERROR1 "Ugyanaz a szÃn nem lehet! (Az elÃµ- Ã©s hÃ¡ttÃ©rszÃn nem lehet ugyanolyan)" STRING_COLOR_ERROR2 "HibÃ¡s szÃn megadÃ¡s" - STRING_COLOR_ERROR3 "SzÃn %02x\n" STRING_CONSOLE_ERROR "Ismeretlen hiba: %d\n" STRING_COPY_ERROR1 "Hiba: a forrÃ¡s nem nyithatÃ³ meg - %s!\n" STRING_COPY_ERROR2 "Hiba: nem mÃ¡solhatod Ã¶nmagÃ¡ra az Ã¡llomÃ¡nyt!\n" Modified: trunk/reactos/base/shell/cmd/lang/id-ID.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/lang/id-ID.… ============================================================================== --- trunk/reactos/base/shell/cmd/lang/id-ID.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/lang/id-ID.rc [iso-8859-1] Sat Sep 30 09:50:08 2017 @@ -73,9 +73,9 @@ (tidak bisa diakhiri).\n\ /T:bf Menyetel warna latar belakang/depan (lihat perintah COLOR).\n" STRING_COLOR_HELP1 "Menyetel warna standar latar belakang dan depan.\n\n\ -COLOR [attr [/-F]] \n\n\ - attr Menetapkan atribut warna output konsol\n\ - /-F Tidak memenuhi ruang kosong konsol dengan atribut warna\n\n\ +COLOR [attr [/-F]]\n\n\ + attr Menetapkan atribut warna output konsol.\n\ + /-F Tidak memenuhi ruang kosong konsol dengan atribut warna.\n\n\ Ada tiga cara untuk menetapkan warna:\n\ 1) [bright] nama pada [bright] nama (hanya tiga huruf pertama yang dipakai)\n\ 2) desimal pada desimal\n\ @@ -474,7 +474,6 @@ STRING_CMD_ERROR5 "Menjalankan cmdexit.bat...\n" STRING_COLOR_ERROR1 "Warna sama salah! (Latar belakang dan latar depan tidak bisa berwarna sama)" STRING_COLOR_ERROR2 "Kesalahan dalam spesifikasi warna" - STRING_COLOR_ERROR3 "Warna %02x\n" STRING_CONSOLE_ERROR "Kesalahan tidak dikenal: %d\n" STRING_COPY_ERROR1 "Salah: Tidak dapat membuka sumber - %s!\n" STRING_COPY_ERROR2 "Salah: Tidak dapat mengcopy ke dirinya sendiri!\n" Modified: trunk/reactos/base/shell/cmd/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/lang/it-IT.… ============================================================================== --- trunk/reactos/base/shell/cmd/lang/it-IT.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/lang/it-IT.rc [iso-8859-1] Sat Sep 30 09:50:08 2017 @@ -71,9 +71,9 @@ /T:bf Definisce i colori di primo piano e sfondo\n\ (vedi anche il comando COLOR).\n" STRING_COLOR_HELP1 "Definisce i colori predefiniti di primo piano e sfondo.\n\n\ -COLOR [attr [/-F]] \n\n\ - attr Indica gli attributi di colore per i messaggi su console\n\ - /-F Non riempie lo spazio vuoto della console con gli attributi di colore\n\n\ +COLOR [attr [/-F]]\n\n\ + attr Indica gli attributi di colore per i messaggi su console.\n\ + /-F Non riempie lo spazio vuoto della console con gli attributi di colore.\n\n\ Ci sono tre modi per indicare i colori:\n\ 1) [bright] nome su [bright] nome (sono necessarie solo le prime tre lettere)\n\ 2) decimale su decimale\n\ @@ -484,9 +484,8 @@ STRING_CMD_ERROR4 "Esecuzione di %s...\n" STRING_CMD_ERROR5 "Esecuzione di cmdexit.bat...\n" STRING_COLOR_ERROR1 "Il colore di primo piano e sfondo non possono essere uguali" - STRING_COLOR_ERROR2 "errore nella indicazione dei colori" - STRING_COLOR_ERROR3 "Colore %02x\n" - STRING_CONSOLE_ERROR "errore sconosciuto: %d\n" + STRING_COLOR_ERROR2 "Errore nella indicazione dei colori" + STRING_CONSOLE_ERROR "Errore sconosciuto: %d\n" STRING_COPY_ERROR1 "Errore: Impossibile aprire il file sorgente - %s!\n" STRING_COPY_ERROR2 "Errore: Impossibile copiare un file su se stesso!\n" STRING_COPY_ERROR3 "Errore durante la scrittura della destinazione!\n" Modified: trunk/reactos/base/shell/cmd/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/lang/ja-JP.… ============================================================================== --- trunk/reactos/base/shell/cmd/lang/ja-JP.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/lang/ja-JP.rc [iso-8859-1] Sat Sep 30 09:50:08 2017 @@ -72,7 +72,7 @@ /T:bf åæ¯è²ããã³èæ¯è²ãè¨å®ãã¾ã \n\ (è©³ç´°ã¯ COLOR /? ãåç§ãã¦ãã ãã)ã\n" STRING_COLOR_HELP1 "ã³ã³ã½ã¼ã«ã®ããã©ã«ãã®åæ¯è²ããã³èæ¯è²ãè¨å®ãã¾ãã\n\n\ -COLOR [å±æ§ [/-F]] \n\n\ +COLOR [å±æ§ [/-F]]\n\n\ å±æ§ ã³ã³ã½ã¼ã«åºåã®è²å±æ§ãæå®ãã¾ãã\n\ /-F ã³ã³ã½ã¼ã«ã®ç©ºãã¦ããç©ºéã«ã¯è²å±æ§ãé©ç¨ããªãã\n\n\ è²ã¯æ¬¡ã® 3 ç¨®é¡ã®æ¹æ³ã§æå®ãããã¨ãã§ãã¾ãã\n\ @@ -482,7 +482,6 @@ STRING_CMD_ERROR5 "cmdexit.bat ãå®è¡ãã¦ãã¾ã...\n" STRING_COLOR_ERROR1 "ã¨ã©ã¼! åãè²ãæå®ããã¾ããã\n (åæ¯è²ã¨èæ¯è²ãåãè²ã«ãããã¨ã¯ã§ãã¾ãã)" STRING_COLOR_ERROR2 "è²ã®æå®ã«åé¡ãããã¾ãã" - STRING_COLOR_ERROR3 "Color %02x\n" STRING_CONSOLE_ERROR "ä¸æãªã¨ã©ã¼: %d\n" STRING_COPY_ERROR1 "ã¨ã©ã¼: åã®ãã¡ã¤ã« %s ãéãã¾ãã!\n" STRING_COPY_ERROR2 "ã¨ã©ã¼: ã³ãã¼åã¨ã³ãã¼åãä¸ç·ã§ã!\n" Modified: trunk/reactos/base/shell/cmd/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/lang/no-NO.… ============================================================================== --- trunk/reactos/base/shell/cmd/lang/no-NO.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/lang/no-NO.rc [iso-8859-1] Sat Sep 30 09:50:08 2017 @@ -71,9 +71,9 @@ (kan ikke avsluttes).\n\ /T:bf Velg bakgrunn/forgrunn farge (se COLOR kommando).\n" STRING_COLOR_HELP1 "Velg standard forgrunns- og bakgrunnsfarger.\n\n\ -COLOR [attr [/-F]] \n\n\ - attr Spesifisere fargeattributter for konsollteksten\n\ - /-F Fyller ikke blank plass med fargeattributter\n\n\ +COLOR [attr [/-F]]\n\n\ + attr Spesifisere fargeattributter for konsollteksten.\n\ + /-F Fyller ikke blank plass med fargeattributter.\n\n\ Det er tre nÃ¥ter Ã¥ spesifisere fargene:\n\ 1) [bright] navn pÃ¥ [bright] navn (bare de tre fÃ¸rste bokstaver er krevet)\n\ 2) desimal pÃ¥ desimal\n\ @@ -472,8 +472,7 @@ STRING_CMD_ERROR4 "KjÃ¸rer %s...\n" STRING_CMD_ERROR5 "KjÃ¸rer cmdexit.bat...\n" STRING_COLOR_ERROR1 "Samme farge feil! (Bakgrunn og forgrunn kan ikke ha samme farge)" - STRING_COLOR_ERROR2 "feil i farge spesifikasjon" - STRING_COLOR_ERROR3 "Farge %02x\n" + STRING_COLOR_ERROR2 "Feil i farge spesifikasjon" STRING_CONSOLE_ERROR "Ukjent feil: %d\n" STRING_COPY_ERROR1 "Feil: kan ikke Ã¥pne kilden - %s!\n" STRING_COPY_ERROR2 "Feil: kan ikke kopiere til seg selv!\n" Modified: trunk/reactos/base/shell/cmd/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/lang/pl-PL.… ============================================================================== --- trunk/reactos/base/shell/cmd/lang/pl-PL.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/lang/pl-PL.rc [iso-8859-1] Sat Sep 30 09:50:08 2017 @@ -80,9 +80,9 @@ (okno nie moÅ¼e zostaÄ zamkniÄte).\n\ /T:bf Ustawia kolor tÅa/tekstu (patrz komenda COLOR).\n" STRING_COLOR_HELP1 "Ustawia domyÅlny kolor tÅa i tekstu.\n\n\ -COLOR [atr [/-F]] \n\n\ - atr Ustawienia koloru \n\ - /-F Nie uzupeÅnia kolorem pustych przestrzeni w konsoli\n\n\ +COLOR [atr [/-F]]\n\n\ + atr Ustawienia koloru.\n\ + /-F Nie uzupeÅnia kolorem pustych przestrzeni w konsoli.\n\n\ Ustawienia koloru moÅ¼na wyznaczyÄ na trzy sposoby:\n\ 1) [jasny] nazwa on [jasny] nazwa (wystarczÄ pierwsze trzy litery nazwy)\n\ 2) numer_dec on numer_dec\n\ @@ -479,7 +479,6 @@ STRING_CMD_ERROR5 "Wykonywanie cmdexit.bat...\n" STRING_COLOR_ERROR1 "BÅÄd! Kolor tÅa i tekstu nie moÅ¼e byÄ taki sam" STRING_COLOR_ERROR2 "BÅÄd w oznaczeniu kolorÃ³w." - STRING_COLOR_ERROR3 "Kolor %02x\n" STRING_CONSOLE_ERROR "Nieznany bÅÄd: %d\n" STRING_COPY_ERROR1 "BÅÄd: Nie moÅ¼na otworzyÄ ÅºrÃ³dÅa - %s!\n" STRING_COPY_ERROR2 "BÅÄd: Nie moÅ¼na przekopiowaÄ pliku na niego samego!\n" Modified: trunk/reactos/base/shell/cmd/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/lang/ro-RO.… ============================================================================== --- trunk/reactos/base/shell/cmd/lang/ro-RO.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/lang/ro-RO.rc [iso-8859-1] Sat Sep 30 09:50:08 2017 @@ -74,9 +74,9 @@ /T:culori StabileÈte culorile pentru text Èi fundal\n\ (a se vedea comanda COLOR).\n" STRING_COLOR_HELP1 "StabileÈte culorile implicite pentru text Èi fundal.\n\n\ -COLOR [attr [/-F]] \n\n\ - attr Atributele de culoare pentru consolÄ\n\ - /-F Omite umplerea spaÈiului gol al consolei\n\n\ +COLOR [attr [/-F]]\n\n\ + attr Atributele de culoare pentru consolÄ.\n\ + /-F Omite umplerea spaÈiului gol al consolei.\n\n\ ExistÄ trei moduri de formulare a atributelor de culoare:\n\ 1) nume_englez ON nume_englez\n\ (sunt suficiente doar primele trei litere per cuvÃ¢nt)\n\ @@ -506,7 +506,6 @@ STRING_CMD_ERROR5 "Â«cmdexit.batÂ» Ã®n execuÈie...\n" STRING_COLOR_ERROR1 "Eroare de culoare identicÄ! (Culorile nu trebuie sÄ fie identice)" STRING_COLOR_ERROR2 "Eroare la specificarea culorii" - STRING_COLOR_ERROR3 "Culoare %02x\n" STRING_CONSOLE_ERROR "Eroare necunoscutÄ: %d\n" STRING_COPY_ERROR1 "Eroare: FiÈierul - Â«%sÂ» nu a putut fi deschis!\n" STRING_COPY_ERROR2 "Eroare: Nu poate fi copiat peste el Ã®nsuÈi!\n" Modified: trunk/reactos/base/shell/cmd/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/lang/ru-RU.… ============================================================================== --- trunk/reactos/base/shell/cmd/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/lang/ru-RU.rc [iso-8859-1] Sat Sep 30 09:50:08 2017 @@ -73,9 +73,9 @@ (Ð¿ÑÐ¾ÑÐµÑÑ Ð½ÐµÐ¼Ð¾Ð¶ÐµÑ Ð±ÑÑÑ Ð·Ð°Ð²ÐµÑÑÐµÐ½).\n\ /T:bf ÐÑÐ±Ð¾Ñ ÑÐ²ÐµÑÐ° ÑÐµÐºÑÑÐ°/ÑÐ¾Ð½Ð° (Ð±Ð¾Ð»ÐµÐµ Ð¿Ð¾Ð´ÑÐ¾Ð±Ð½Ð¾ ÑÐ¼. COLOR /?).\n" STRING_COLOR_HELP1 "Ð£ÑÑÐ°Ð½Ð¾Ð²ÐºÐ° ÑÐ²ÐµÑÐ¾Ð² Ð¿Ð¾ ÑÐ¼Ð¾Ð»ÑÐ°Ð½Ð¸Ñ Ð´Ð»Ñ ÑÐµÐºÑÑÐ° Ð¸ ÑÐ¾Ð½Ð°.\n\n\ -COLOR [ÑÐ²ÐµÑÐ° [/-F]] \n\n\ - ÑÐ²ÐµÑÐ° ÐÑÑÐ¸Ð±ÑÑÑ ÑÐ²ÐµÑÐ¾Ð² Ð´Ð»Ñ ÑÐµÐºÑÑÐ¾Ð²ÑÑ Ð¾ÐºÐ¾Ð½\n\ - /-F ÐÐµ Ð·Ð°Ð»Ð¸Ð²Ð°ÑÑ Ð½ÐµÐ·Ð°Ð¿Ð¾Ð»Ð½ÐµÐ½Ð½ÑÐµ Ð¼ÐµÑÑÐ° ÑÐ²ÐµÑÐ¾Ð¼\n\n\ +COLOR [ÑÐ²ÐµÑÐ° [/-F]]\n\n\ + ÑÐ²ÐµÑÐ° ÐÑÑÐ¸Ð±ÑÑÑ ÑÐ²ÐµÑÐ¾Ð² Ð´Ð»Ñ ÑÐµÐºÑÑÐ¾Ð²ÑÑ Ð¾ÐºÐ¾Ð½.\n\ + /-F ÐÐµ Ð·Ð°Ð»Ð¸Ð²Ð°ÑÑ Ð½ÐµÐ·Ð°Ð¿Ð¾Ð»Ð½ÐµÐ½Ð½ÑÐµ Ð¼ÐµÑÑÐ° ÑÐ²ÐµÑÐ¾Ð¼.\n\n\ ÐÑÑÑ ÑÑÐ¸ ÑÐ¿Ð¾ÑÐ¾Ð±Ð° Ð¾Ð±Ð¾Ð·Ð½Ð°ÑÐ°ÑÑ ÑÐ²ÐµÑÐ°:\n\ 1) Ð¿Ð¾ Ð½Ð°Ð·Ð²Ð°Ð½Ð¸Ñ Ð½Ð° Ð°Ð½Ð³Ð»Ð¸Ð¹ÑÐºÐ¾Ð¼ ÑÐ·ÑÐºÐµ (ÑÑÐµÐ±ÑÑÑÑÑ ÑÐ¾Ð»ÑÐºÐ¾ Ð¿ÐµÑÐ²ÑÐµ ÑÑÐ¸ Ð±ÑÐºÐ²Ñ ÑÐ²ÐµÑÐ°)\n\ 2) Ð² Ð²Ð¸Ð´Ðµ Ð´ÐµÑÑÑÐ¸ÑÐ½ÑÑ ÑÐ¸ÑÐµÐ» (decimal on decimal)\n\ @@ -485,7 +485,6 @@ STRING_CMD_ERROR5 "ÐÐ°Ð¿ÑÑÐº cmdexit.bat...\n" STRING_COLOR_ERROR1 "ÐÐ´Ð¸Ð½Ð°ÐºÐ¾Ð²ÑÐµ ÑÐ²ÐµÑÐ°! (Ð¦Ð²ÐµÑÐ° ÑÐ¾Ð½Ð° Ð¸ ÑÐµÐºÑÑÐ° Ð½Ðµ Ð¼Ð¾Ð³ÑÑ Ð±ÑÑÑ Ð¾Ð´Ð¸Ð½Ð°ÐºÐ¾Ð²ÑÐ¼Ð¸)" STRING_COLOR_ERROR2 "ÐÑÐ¸Ð±ÐºÐ° Ð² ÑÐºÐ°Ð·Ð°Ð½Ð¸Ð¸ ÑÐ²ÐµÑÐ°" - STRING_COLOR_ERROR3 "Ð¦Ð²ÐµÑ %02x\n" STRING_CONSOLE_ERROR "ÐÐµÐ¸Ð·Ð²ÐµÑÑÐ½Ð°Ñ Ð¾ÑÐ¸Ð±ÐºÐ°: %d\n" STRING_COPY_ERROR1 "ÐÑÐ¸Ð±ÐºÐ°: ÐÐµÐ²Ð¾Ð·Ð¼Ð¾Ð¶Ð½Ð¾ Ð¾ÑÐºÑÑÑÑ Ð¸ÑÑÐ¾ÑÐ½Ð¸Ðº - %s!\n" STRING_COPY_ERROR2 "ÐÑÐ¸Ð±ÐºÐ°: ÐÐµÐ²Ð¾Ð·Ð¼Ð¾Ð¶Ð½Ð¾ ÐºÐ¾Ð¿Ð¸ÑÐ¾Ð²Ð°ÑÑ Ð² ÑÐµÐ±Ñ!\n" Modified: trunk/reactos/base/shell/cmd/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/lang/sk-SK.… ============================================================================== --- trunk/reactos/base/shell/cmd/lang/sk-SK.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/lang/sk-SK.rc [iso-8859-1] Sat Sep 30 09:50:08 2017 @@ -77,9 +77,9 @@ (cannot be terminated).\n\ /T:bf Sets the background/foreground color (see COLOR command).\n" STRING_COLOR_HELP1 "Sets the default foreground and background colors.\n\n\ -COLOR [attr [/-F]] \n\n\ - attr Specifies color attribute of console output\n\ - /-F Does not fill the console blank space with color attribute\n\n\ +COLOR [attr [/-F]]\n\n\ + attr Specifies color attribute of console output.\n\ + /-F Does not fill the console blank space with color attribute.\n\n\ There are three ways to specify the colors:\n\ 1) [bright] name on [bright] name (only the first three letters are required)\n\ 2) decimal on decimal\n\ @@ -480,8 +480,7 @@ STRING_CMD_ERROR4 "Running %s...\n" STRING_CMD_ERROR5 "Running cmdexit.bat...\n" STRING_COLOR_ERROR1 "Same colors error! (Background and foreground can't be the same color)" - STRING_COLOR_ERROR2 "error in color specification" - STRING_COLOR_ERROR3 "Color %02x\n" + STRING_COLOR_ERROR2 "Error in color specification" STRING_CONSOLE_ERROR "NeznÃ¡ma chyba: %d\n" STRING_COPY_ERROR1 "Chyba: Cannot open source - %s!\n" STRING_COPY_ERROR2 "Chyba: Can't copy onto itself!\n" Modified: trunk/reactos/base/shell/cmd/lang/sq-AL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/lang/sq-AL.… ============================================================================== --- trunk/reactos/base/shell/cmd/lang/sq-AL.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/lang/sq-AL.rc [iso-8859-1] Sat Sep 30 09:50:08 2017 @@ -75,9 +75,9 @@ (nuk mund tÃ« ndÃ«rpritet).\n\ /T:bf PÃ«rcakton ngjyrÃ«n e sfondit/parasfondin(shih NGJYRAT e komandave).\n" STRING_COLOR_HELP1 "VÃ« parazgjedhjene e ngjyrave tÃ« sfondit dhe parasfondit.\n\n\ -COLOR [attr [/-F]] \n\n\ - attr PÃ«rcakton atributin e ngjyrave tÃ« prodhimit nga konsoli\n\ - /-F Nuk e mbush hapÃ«sirÃ«n bosh tÃ« konsolit me atribute ngjyrash\n\n\ +COLOR [attr [/-F]]\n\n\ + attr PÃ«rcakton atributin e ngjyrave tÃ« prodhimit nga konsoli.\n\ + /-F Nuk e mbush hapÃ«sirÃ«n bosh tÃ« konsolit me atribute ngjyrash.\n\n\ Ka tre mÃ«nyra pÃ«r tÃ« specifikuar ngjyrat:\n\ 1) [e ndritshem] emri [e ndritshem] emri (vetÃ«m tre letrat e para janÃ« tÃ« nevojshme)\n\ 2) decimal nÃ« decimal\n\ @@ -478,8 +478,7 @@ STRING_CMD_ERROR4 "Fillo %s...\n" STRING_CMD_ERROR5 "Fillo cmdexit.bat...\n" STRING_COLOR_ERROR1 "Error i njÃ«ta ngjyra! (Historiku dhe prioritetit nuk mund tÃ« jetÃ« ngjyrÃ« tÃ« njÃ«jtÃ«)" - STRING_COLOR_ERROR2 "gabim nÃ« specifikim ngjyra" - STRING_COLOR_ERROR3 "Ngjyra %02x\n" + STRING_COLOR_ERROR2 "Gabim nÃ« specifikim ngjyra" STRING_CONSOLE_ERROR "Error i paditur: %d\n" STRING_COPY_ERROR1 "Error: Nuk mund tÃ« hapni burim - %s!\n" STRING_COPY_ERROR2 "Error: Nuk mund tÃ« kopjoni mbi veten!\n" Modified: trunk/reactos/base/shell/cmd/lang/sv-SE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/lang/sv-SE.… ============================================================================== --- trunk/reactos/base/shell/cmd/lang/sv-SE.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/lang/sv-SE.rc [iso-8859-1] Sat Sep 30 09:50:08 2017 @@ -71,9 +71,9 @@ (kan inte avsluttes).\n\ /T:bf StÃ¤ller in bakgrunn/forgrunn fÃ¤rg (se COLOR kommando).\n" STRING_COLOR_HELP1 "StÃ¤ller in standard forgrunns- och bakgrunnsfarger.\n\n\ -COLOR [attr [/-F]] \n\n\ - attr Anger fargeattributter for konsollteksten\n\ - /-F Fyller inte blank plass med fargeattributter\n\n\ +COLOR [attr [/-F]]\n\n\ + attr Anger fargeattributter for konsollteksten.\n\ + /-F Fyller inte blank plass med fargeattributter.\n\n\ Det finns tre sÃ¤tt att ange fÃ¤rgerna:\n\ 1) [bright] namn pÃ¥ [bright] namn (bara de tre fÃ¶rsta bokstÃ¤verna krÃ¤vs)\n\ 2) decimal pÃ¥ decimal\n\ @@ -472,8 +472,7 @@ STRING_CMD_ERROR4 "KÃ¶r %s...\n" STRING_CMD_ERROR5 "KÃ¶r cmdexit.bat...\n" STRING_COLOR_ERROR1 "Samme farge feil! (Bakgrunn och forgrunn kan inte ha samme farge)" - STRING_COLOR_ERROR2 "feil i farge spesifikasjon" - STRING_COLOR_ERROR3 "Farge %02x\n" + STRING_COLOR_ERROR2 "Feil i farge spesifikasjon" STRING_CONSOLE_ERROR "Ukjent feil: %d\n" STRING_COPY_ERROR1 "Feil: kan inte Ã¥pne kilden - %s!\n" STRING_COPY_ERROR2 "Feil: kan inte kopiere til seg selv!\n" Modified: trunk/reactos/base/shell/cmd/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/lang/tr-TR.… ============================================================================== --- trunk/reactos/base/shell/cmd/lang/tr-TR.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/lang/tr-TR.rc [iso-8859-1] Sat Sep 30 09:50:08 2017 @@ -73,7 +73,7 @@ (sonlandÄ±rÄ±lamaz).\n\ /T:aÃ¶ Arka plan/Ã¶n plan rengini ayarlar (COLOR komutuna bakÄ±nÄ±z).\n" STRING_COLOR_HELP1 "Ãn tanÄ±mlÄ± Ã¶n plan ve arka plan renklerini ayarlar.\n\n\ -COLOR [Ã¶znt [/-F]] \n\n\ +COLOR [Ã¶znt [/-F]]\n\n\ Ã¶znt Konsol Ã§Ä±ktÄ±sÄ±nÄ±n renk Ã¶z niteliÄini belirtir.\n\ /-F Konsol boÅ alanÄ± renk Ã¶z niteliÄiyle doldurma.\n\n\ Renkleri belirtmek iÃ§in Ã¼Ã§ yol var:\n\ @@ -480,7 +480,6 @@ STRING_CMD_ERROR5 "cmdexit.bat Ã§alÄ±ÅtÄ±rÄ±lÄ±yor...\n" STRING_COLOR_ERROR1 "AynÄ± renk yanlÄ±ÅlÄ±ÄÄ±! (Arka plan ve Ã¶n plan aynÄ± renk olamaz.)" STRING_COLOR_ERROR2 "Renk belirtmede yanlÄ±ÅlÄ±k" - STRING_COLOR_ERROR3 "Renk %02x\n" STRING_CONSOLE_ERROR "Bilinmeyen yanlÄ±ÅlÄ±k: %d\n" STRING_COPY_ERROR1 "YanlÄ±ÅlÄ±k: %s kaynaÄÄ± aÃ§Ä±lamÄ±yor!\n" STRING_COPY_ERROR2 "YanlÄ±ÅlÄ±k: Kendisinin Ã¼stÃ¼ne Ã§oÄaltÄ±lamÄ±yor!\n" Modified: trunk/reactos/base/shell/cmd/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/lang/uk-UA.… ============================================================================== --- trunk/reactos/base/shell/cmd/lang/uk-UA.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/lang/uk-UA.rc [iso-8859-1] Sat Sep 30 09:50:08 2017 @@ -79,9 +79,9 @@ (Ð¿ÑÐ¾ÑÐµÑ Ð½Ðµ Ð¼Ð¾Ð¶Ðµ Ð±ÑÑÐ¸ Ð·Ð°Ð²ÐµÑÑÐµÐ½Ð¸Ð¹).\n\ /T:ÐºÐ» ÐÐ¸Ð±iÑ ÐºÐ¾Ð»ÑÐ¾ÑÑ ÑÐµÐºÑÑÑ/ÑÐ»Ð° (Ð´ÐµÑÐ°Ð»ÑÐ½iÑÐµ Ð´Ð¸Ð². COLOR /?).\n" STRING_COLOR_HELP1 "ÐÑÑÐ°Ð½Ð¾Ð²Ð»ÐµÐ½Ð½Ñ ÐºÐ¾Ð»ÑÐ¾ÑiÐ² Ð¿Ð¾ Ð·Ð°Ð¼Ð¾Ð²ÑÑÐ²Ð°Ð½Ð½Ñ Ð´Ð»Ñ ÑÐµÐºÑÑÑ ÑÐ° ÑÐ»Ð°.\n\n\ -COLOR [attr [/-F]] \n\n\ - attr ÐÑÑÐ¸Ð±ÑÑÐ¸ ÐºÐ¾Ð»ÑÐ¾ÑiÐ² Ð´Ð»Ñ ÑÐµÐºÑÑÐ¾Ð²Ð¸Ñ Ð²iÐºÐ¾Ð½\n\ - /-F ÐÐµ Ð·Ð°Ð»Ð¸Ð²Ð°ÑÐ¸ Ð½ÐµÐ·Ð°Ð¿Ð¾Ð²Ð½ÐµÐ½i Ð¼iÑÑÑ ÐºÐ¾Ð»ÑÐ¾ÑÐ¾Ð¼\n\n\ +COLOR [attr [/-F]]\n\n\ + attr ÐÑÑÐ¸Ð±ÑÑÐ¸ ÐºÐ¾Ð»ÑÐ¾ÑiÐ² Ð´Ð»Ñ ÑÐµÐºÑÑÐ¾Ð²Ð¸Ñ Ð²iÐºÐ¾Ð½.\n\ + /-F ÐÐµ Ð·Ð°Ð»Ð¸Ð²Ð°ÑÐ¸ Ð½ÐµÐ·Ð°Ð¿Ð¾Ð²Ð½ÐµÐ½i Ð¼iÑÑÑ ÐºÐ¾Ð»ÑÐ¾ÑÐ¾Ð¼.\n\n\ IÑÐ½ÑÑ ÑÑÐ¸ ÑÐ¿Ð¾ÑÐ¾Ð±Ð¸ Ð·Ð°Ð´Ð°Ð½Ð½Ñ ÐºÐ¾Ð»ÑÐ¾ÑiÐ²:\n\ 1) Ð·Ð° Ð½Ð°Ð·Ð²Ð¾Ñ Ð½Ð° Ð°Ð½Ð³Ð»iÐ¹ÑÑÐºiÐ¹ Ð¼Ð¾Ð²i (Ð¿Ð¾ÑÑiÐ±Ð½Ð¾ Ð»Ð¸ÑÐµ Ð¿ÐµÑÑi ÑÑÐ¸ Ð±ÑÐºÐ²Ð¸ Ð½Ð°Ð·Ð²Ð¸)\n\ 2) Ð² Ð²Ð¸Ð³Ð»ÑÐ´i Ð´ÐµÑÑÑÐºÐ¾Ð²Ð¸Ñ ÑÐ¸ÑÐµÐ» (decimal on decimal)\n\ @@ -483,9 +483,8 @@ STRING_CMD_ERROR3 "ÐÐµ Ð¼Ð¾Ð¶Ñ Ð¿ÐµÑÐµÐ½Ð°Ð¿ÑÐ°Ð²Ð¸ÑÐ¸ Ð² ÑÐ°Ð¹Ð» %s\n" STRING_CMD_ERROR4 "ÐÐ°Ð¿ÑÑÐº %s...\n" STRING_CMD_ERROR5 "ÐÐ°Ð¿ÑÑÐº cmdexit.bat...\n" - STRING_COLOR_ERROR1 "Ð¿Ð¾Ð¼Ð¸Ð»ÐºÐ° - Ð¾Ð´Ð½Ð°ÐºÐ¾Ð²i ÐºÐ¾Ð»ÑÐ¾ÑÐ¸! (ÑÐ»Ð¾ ÑÐ° ÑÐµÐºÑÑ Ð½Ðµ Ð¼Ð¾Ð¶ÑÑÑ Ð±ÑÑÐ¸ Ð¾Ð´Ð½Ð°ÐºÐ¾Ð²Ð¾Ð³Ð¾ ÐºÐ¾Ð»ÑÐ¾ÑÑ)" - STRING_COLOR_ERROR2 "Ð¿Ð¾Ð¼Ð¸Ð»ÐºÐ° Ð¿ÑÐ¸ Ð²ÐºÐ°Ð·Ð°Ð½Ð½i ÐºÐ¾Ð»ÑÐ¾ÑÑ" - STRING_COLOR_ERROR3 "ÐÐ¾Ð»iÑ %02x\n" + STRING_COLOR_ERROR1 "ÐÐ¾Ð¼Ð¸Ð»ÐºÐ° - Ð¾Ð´Ð½Ð°ÐºÐ¾Ð²i ÐºÐ¾Ð»ÑÐ¾ÑÐ¸! (ÑÐ»Ð¾ ÑÐ° ÑÐµÐºÑÑ Ð½Ðµ Ð¼Ð¾Ð¶ÑÑÑ Ð±ÑÑÐ¸ Ð¾Ð´Ð½Ð°ÐºÐ¾Ð²Ð¾Ð³Ð¾ ÐºÐ¾Ð»ÑÐ¾ÑÑ)" + STRING_COLOR_ERROR2 "ÐÐ¾Ð¼Ð¸Ð»ÐºÐ° Ð¿ÑÐ¸ Ð²ÐºÐ°Ð·Ð°Ð½Ð½i ÐºÐ¾Ð»ÑÐ¾ÑÑ" STRING_CONSOLE_ERROR "ÐÐµÐ²iÐ´Ð¾Ð¼Ð° Ð¿Ð¾Ð¼Ð¸Ð»ÐºÐ°: %d\n" STRING_COPY_ERROR1 "ÐÐ¾Ð¼Ð¸Ð»ÐºÐ°: ÐÐµÐ¼Ð¾Ð¶Ð»Ð¸Ð²Ð¾ Ð²iÐ´ÐºÑÐ¸ÑÐ¸ Ð´Ð¶ÐµÑÐµÐ»Ð¾ - %s!\n" STRING_COPY_ERROR2 "ÐÐ¾Ð¼Ð¸Ð»ÐºÐ°: ÐÐµÐ¼Ð¾Ð¶Ð»Ð¸Ð²Ð¾ ÐºÐ¾Ð¿iÑÐ²Ð°ÑÐ¸ Ð² ÑÐµÐ±Ðµ!\n" Modified: trunk/reactos/base/shell/cmd/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/lang/zh-CN.… ============================================================================== --- trunk/reactos/base/shell/cmd/lang/zh-CN.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/lang/zh-CN.rc [iso-8859-1] Sat Sep 30 09:50:08 2017 @@ -70,7 +70,7 @@ /P æ°¸ä¹ä¿ç CMD å¹¶è¿è¡ autoexec.bat (æ æ³ç»æ¢)ã\n\ /T:bf è®¾ç½®åæ¯/èæ¯é¢è² (åè§ COLOR å½ä»¤)ã\n" STRING_COLOR_HELP1 "è®¾ç½®é»è®¤åæ¯åèæ¯é¢è²ã\n\n\ -COLOR [å±æ§ [/-F]] \n\n\ +COLOR [å±æ§ [/-F]]\n\n\ å±æ§ æå®æ§å¶å°è¾åºçé¢è²å±æ§ã\n\ /-F ä¸è¦ä½¿ç¨é¢è²å¡«åæ§å¶å°çç©ºç½åºåã\n\n\ æ3ç§æ¹æ³æå®é¢è²ï¼\n\ @@ -444,7 +444,6 @@ STRING_CMD_ERROR5 "æ£å¨è¿è¡ cmdexit.bat...\n" STRING_COLOR_ERROR1 "åæ ·é¢è²éè¯¯ï¼ (èæ¯ååæ¯ä¸è½åè²)" STRING_COLOR_ERROR2 "é¢è²æå®éè¯¯" - STRING_COLOR_ERROR3 "é¢è² %02x\n" STRING_CONSOLE_ERROR "æªç¥éè¯¯ï¼%d\n" STRING_COPY_ERROR1 "éè¯¯ï¼æ æ³æå¼æº - %sï¼\n" STRING_COPY_ERROR2 "éè¯¯ï¼æ æ³å¤å¶å°èªèº«ï¼\n" Modified: trunk/reactos/base/shell/cmd/lang/zh-TW.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/lang/zh-TW.… ============================================================================== --- trunk/reactos/base/shell/cmd/lang/zh-TW.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/lang/zh-TW.rc [iso-8859-1] Sat Sep 30 09:50:08 2017 @@ -70,7 +70,7 @@ /P æ°¸ä¹ä¿ç CMD ä¸¦éè¡ autoexec.bat (ç¡æ³çµæ¢)ã\n\ /T:bf è¨å®åæ¯/èæ¯é¡è² (åè¦ COLOR å½ä»¤)ã\n" STRING_COLOR_HELP1 "è¨å®é»èªåæ¯åèæ¯é¡è²ã\n\n\ -COLOR [å±¬æ§ [/-F]] \n\n\ +COLOR [å±¬æ§ [/-F]]\n\n\ å±¬æ§ æå®æ§å¶æª¯è¼¸åºçé¡è²å±¬æ§ã\n\ /-F ä¸è¦ä½¿ç¨é¡è²å¡«åæ§å¶æª¯çç©ºç½ååã\n\n\ æ3ç¨®æ¹æ³æå®é¡è²ï¼\n\ @@ -444,7 +444,6 @@ STRING_CMD_ERROR5 "æ£å¨éè¡ cmdexit.bat...\n" STRING_COLOR_ERROR1 "åæ¨£é¡è²é¯èª¤ï¼ (èæ¯ååæ¯ä¸è½åè²)" STRING_COLOR_ERROR2 "é¡è²æå®é¯èª¤" - STRING_COLOR_ERROR3 "é¡è² %02x\n" STRING_CONSOLE_ERROR "æªç¥é¯èª¤ï¼%d\n" STRING_COPY_ERROR1 "é¯èª¤ï¼ç¡æ³éåæº - %sï¼\n" STRING_COPY_ERROR2 "é¯èª¤ï¼ç¡æ³è¤è£½å°èªèº«ï¼\n" Modified: trunk/reactos/base/shell/cmd/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/resource.h?… ============================================================================== --- trunk/reactos/base/shell/cmd/resource.h [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/resource.h [iso-8859-1] Sat Sep 30 09:50:08 2017 @@ -31,8 +31,7 @@ #define STRING_CMD_ERROR5 313 #define STRING_COLOR_ERROR1 314 #define STRING_COLOR_ERROR2 315 -#define STRING_COLOR_ERROR3 316 -#define STRING_CONSOLE_ERROR 317 +#define STRING_CONSOLE_ERROR 316 #define STRING_COPY_ERROR1 320 #define STRING_COPY_ERROR2 321 #define STRING_COPY_ERROR3 322

6 years, 11 months

[hbelusca] 75993: [CMD]: Fix few comments & use ARRAYSIZE(str) instead of sizeof(str)/sizeof(str[0]) for strings.

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Sat Sep 30 09:13:04 2017 New Revision: 75993 URL: http://svn.reactos.org/svn/reactos?rev=75993&view=rev Log: [CMD]: Fix few comments & use ARRAYSIZE(str) instead of sizeof(str)/sizeof(str[0]) for strings. Modified: trunk/reactos/base/shell/cmd/del.c trunk/reactos/base/shell/cmd/dir.c trunk/reactos/base/shell/cmd/locale.c trunk/reactos/base/shell/cmd/msgbox.c Modified: trunk/reactos/base/shell/cmd/del.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/del.c?rev=7… ============================================================================== --- trunk/reactos/base/shell/cmd/del.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/del.c [iso-8859-1] Sat Sep 30 09:13:04 2017 @@ -84,7 +84,7 @@ static VOID LoadStrings(VOID) { LoadString(CMD_ModuleHandle, STRING_DELETE_WIPE, szDeleteWipe, ARRAYSIZE(szDeleteWipe)); - GetModuleFileName(NULL, CMDPath, MAX_PATH); + GetModuleFileName(NULL, CMDPath, ARRAYSIZE(CMDPath)); StringsLoaded = TRUE; } 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 09:13:04 2017 @@ -389,10 +389,10 @@ ptrEnd = Line; /* Copy it to the entries list */ - temp = cmd_alloc((ptrEnd - ptrStart + 1) * sizeof (TCHAR)); + temp = cmd_alloc((ptrEnd - ptrStart + 1) * sizeof(TCHAR)); if (!temp) return FALSE; - memcpy(temp, ptrStart, (ptrEnd - ptrStart) * sizeof (TCHAR)); + memcpy(temp, ptrStart, (ptrEnd - ptrStart) * sizeof(TCHAR)); temp[ptrEnd - ptrStart] = _T('\0'); StripQuotes(temp); if (!add_entry(entries, params, temp)) @@ -419,7 +419,7 @@ continue; } /* Process parameter switch */ - switch(cCurSwitch) + switch (cCurSwitch) { case _T('A'): /* Switch parameters for /A (attributes filter) */ if (cCurChar == _T('-')) @@ -583,7 +583,7 @@ if (lpFlags->bBareFormat) return TRUE; - if (GetFullPathName(szPath, sizeof(szFullDir) / sizeof(TCHAR), szFullDir, &pszFilePart) == 0) + if (GetFullPathName(szPath, ARRAYSIZE(szFullDir), szFullDir, &pszFilePart) == 0) { ErrorMessage(GetLastError(), _T("Failed to build full directory path")); return FALSE; @@ -593,7 +593,7 @@ *pszFilePart = _T('\0'); /* get the media ID of the drive */ - if (!GetVolumePathName(szFullDir, szRootName, sizeof(szRootName) / sizeof(TCHAR)) || + if (!GetVolumePathName(szFullDir, szRootName, ARRAYSIZE(szRootName)) || !GetVolumeInformation(szRootName, szVolName, 80, &dwSerialNr, NULL, NULL, NULL, 0)) { @@ -780,7 +780,7 @@ /* Take this code offline to fix /S does not print double info */ if (TotalSummary && lpFlags->bRecursive) { - ConvertULargeInteger(u64Bytes, szBuffer, sizeof(szBuffer), lpFlags->bTSeparator); + ConvertULargeInteger(u64Bytes, szBuffer, ARRAYSIZE(szBuffer), lpFlags->bTSeparator); LoadString(CMD_ModuleHandle, STRING_DIR_HELP5, szMsg, ARRAYSIZE(szMsg)); DirPrintf(lpFlags, szMsg, ulFiles, szBuffer); } @@ -798,7 +798,7 @@ if (!lpFlags->bRecursive || TotalSummary) { GetUserDiskFreeSpace(szPath, &uliFree); - ConvertULargeInteger(uliFree.QuadPart, szBuffer, sizeof(szBuffer), lpFlags->bTSeparator); + ConvertULargeInteger(uliFree.QuadPart, szBuffer, ARRAYSIZE(szBuffer), lpFlags->bTSeparator); LoadString(CMD_ModuleHandle, STRING_DIR_HELP6, szMsg, ARRAYSIZE(szMsg)); DirPrintf(lpFlags, szMsg, ulDirs, szBuffer); } @@ -1136,7 +1136,7 @@ /* Condition to print header: We are not printing in bare format and if we are in recursive mode... we must have results */ - if (!(lpFlags->bBareFormat ) && !((lpFlags->bRecursive) && (dwCount <= 0))) + if (!lpFlags->bBareFormat && !(lpFlags->bRecursive && (dwCount <= 0))) { LoadString(CMD_ModuleHandle, STRING_DIR_HELP7, szMsg, ARRAYSIZE(szMsg)); if (DirPrintf(lpFlags, szMsg, szTemp)) @@ -1186,11 +1186,11 @@ long iComp = 0; /* The comparison result */ /* Calculate criteria by order given from user */ - for (i = 0;i < lpFlags->stOrderBy.sCriteriaCount;i++) + for (i = 0; i < lpFlags->stOrderBy.sCriteriaCount; i++) { /* Calculate criteria */ - switch(lpFlags->stOrderBy.eCriteria[i]) + switch (lpFlags->stOrderBy.eCriteria[i]) { case ORDER_SIZE: /* Order by size /o:s */ /* concat the 32bit integers to a 64bit */ @@ -1223,7 +1223,7 @@ case ORDER_TIME: /* Order by file's time /o:t */ /* We compare files based on the time field selected by /t */ - switch(lpFlags->stTimeField.eTimeField) + switch (lpFlags->stTimeField.eTimeField) { case TF_CREATIONDATE: /* concat the 32bit integers to a 64bit */ @@ -1323,7 +1323,7 @@ DirList(LPTSTR szPath, /* [IN] The path that dir starts */ LPDIRSWITCHFLAGS lpFlags) /* [IN] The flags of the listing */ { - BOOL fPoint; /* If szPath is a file with extension fPoint will be True*/ + BOOL fPoint; /* If szPath is a file with extension fPoint will be True */ HANDLE hSearch; /* The handle of the search */ HANDLE hRecSearch; /* The handle for searching recursively */ HANDLE hStreams; /* The handle for alternate streams */ @@ -1331,7 +1331,7 @@ PDIRFINDINFO * ptrFileArray; /* An array of pointers with all the files */ PDIRFINDLISTNODE ptrStartNode; /* The pointer to the first node */ PDIRFINDLISTNODE ptrNextNode; /* A pointer used for relatives references */ - TCHAR szFullPath[MAX_PATH]; /* The full path that we are listing with trailing \ */ + TCHAR szFullPath[MAX_PATH]; /* The full path that we are listing with trailing '\' */ TCHAR szSubPath[MAX_PATH]; LPTSTR pszFilePart; DWORD dwCount; /* A counter of files found in directory */ @@ -1355,7 +1355,7 @@ fPoint= FALSE; /* Create szFullPath */ - if (GetFullPathName(szPath, sizeof(szFullPath) / sizeof(TCHAR), szFullPath, &pszFilePart) == 0) + if (GetFullPathName(szPath, ARRAYSIZE(szFullPath), szFullPath, &pszFilePart) == 0) { _tcscpy (szFullPath, szPath); pszFilePart = NULL; @@ -1381,7 +1381,7 @@ ptrStartNode->stInfo.ptrHead = NULL; ptrNextNode = ptrStartNode; - /*Checking ir szPath is a File with/wout extension*/ + /* Checking if szPath is a File with/wout extension */ if (szPath[_tcslen(szPath) - 1] == _T('.')) fPoint= TRUE; @@ -1391,7 +1391,7 @@ { do { - /*If retrieved FileName has extension,and szPath doesnt have extension then JUMP the retrieved FileName*/ + /* If retrieved FileName has extension,and szPath doesnt have extension then JUMP the retrieved FileName */ if (_tcschr(wfdFileInfo.cFileName,_T('.'))&&(fPoint==TRUE)) { continue; @@ -1600,15 +1600,16 @@ if (CheckCtrlBreak(BREAK_INPUT)) return 1; - - /* Add statistics to recursive statistics*/ + /* Add statistics to recursive statistics */ recurse_dir_cnt += dwCountDirs; recurse_file_cnt += dwCountFiles; recurse_bytes += u64CountBytes; - /* Do the recursive job if requested - the recursive is be done on ALL(independent of their attribs) - directories of the current one.*/ + /* + * Do the recursive job if requested. + * The recursion is done on ALL (independent of their attributes) + * directories of the current one. + */ if (lpFlags->bRecursive) { /* The new search is involving any *.* file */ @@ -1638,7 +1639,7 @@ return 1; } } - } while(FindNextFile(hRecSearch, &wfdFileInfo)); + } while (FindNextFile(hRecSearch, &wfdFileInfo)); } FindClose(hRecSearch); } @@ -1718,7 +1719,7 @@ if (stFlags.bPause) ConOutPrintfPaging(TRUE, _T("")); - for(loop = 0; loop < (UINT)entries; loop++) + for (loop = 0; loop < (UINT)entries; loop++) { if (CheckCtrlBreak(BREAK_INPUT)) { @@ -1757,14 +1758,14 @@ ChangedVolume = TRUE; if (!stFlags.bBareFormat && - GetVolumePathName(params[loop], path, sizeof(path) / sizeof(TCHAR))) + GetVolumePathName(params[loop], path, ARRAYSIZE(path))) { if (!_tcscmp(path, prev_volume)) ChangedVolume = FALSE; else _tcscpy(prev_volume, path); } - else if (GetFullPathName(params[loop], sizeof(path) / sizeof(TCHAR), path, &pszFilePart) != 0) + else if (GetFullPathName(params[loop], ARRAYSIZE(path), path, &pszFilePart) != 0) { if (pszFilePart != NULL) *pszFilePart = _T('\0'); @@ -1784,7 +1785,7 @@ } /* do the actual dir */ - if (DirList (params[loop], &stFlags)) + if (DirList(params[loop], &stFlags)) { nErrorLevel = 1; goto cleanup; Modified: trunk/reactos/base/shell/cmd/locale.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/locale.c?re… ============================================================================== --- trunk/reactos/base/shell/cmd/locale.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/locale.c [iso-8859-1] Sat Sep 30 09:13:04 2017 @@ -22,33 +22,33 @@ INT nNumberGroups; -VOID InitLocale (VOID) +VOID InitLocale(VOID) { TCHAR szBuffer[256]; /* date settings */ - GetLocaleInfo (LOCALE_USER_DEFAULT, LOCALE_SDATE, szBuffer, sizeof(szBuffer) / sizeof(szBuffer[0])); + GetLocaleInfo(LOCALE_USER_DEFAULT, LOCALE_SDATE, szBuffer, ARRAYSIZE(szBuffer)); cDateSeparator = szBuffer[0]; - GetLocaleInfo (LOCALE_USER_DEFAULT, LOCALE_IDATE | LOCALE_RETURN_NUMBER, (LPTSTR)&nDateFormat, sizeof(nDateFormat) / sizeof(TCHAR)); + GetLocaleInfo(LOCALE_USER_DEFAULT, LOCALE_IDATE | LOCALE_RETURN_NUMBER, (LPTSTR)&nDateFormat, sizeof(nDateFormat) / sizeof(TCHAR)); /* time settings */ - GetLocaleInfo (LOCALE_USER_DEFAULT, LOCALE_STIME, szBuffer, sizeof(szBuffer) / sizeof(szBuffer[0])); + GetLocaleInfo(LOCALE_USER_DEFAULT, LOCALE_STIME, szBuffer, ARRAYSIZE(szBuffer)); cTimeSeparator = szBuffer[0]; - GetLocaleInfo (LOCALE_USER_DEFAULT, LOCALE_ITIME | LOCALE_RETURN_NUMBER, (LPTSTR)&nTimeFormat, sizeof(nTimeFormat) / sizeof(TCHAR)); + GetLocaleInfo(LOCALE_USER_DEFAULT, LOCALE_ITIME | LOCALE_RETURN_NUMBER, (LPTSTR)&nTimeFormat, sizeof(nTimeFormat) / sizeof(TCHAR)); /* number settings */ - GetLocaleInfo (LOCALE_USER_DEFAULT, LOCALE_STHOUSAND, szBuffer, sizeof(szBuffer) / sizeof(szBuffer[0])); + GetLocaleInfo(LOCALE_USER_DEFAULT, LOCALE_STHOUSAND, szBuffer, ARRAYSIZE(szBuffer)); cThousandSeparator = szBuffer[0]; - GetLocaleInfo (LOCALE_USER_DEFAULT, LOCALE_SDECIMAL, szBuffer, sizeof(szBuffer) / sizeof(szBuffer[0])); + GetLocaleInfo(LOCALE_USER_DEFAULT, LOCALE_SDECIMAL, szBuffer, ARRAYSIZE(szBuffer)); cDecimalSeparator = szBuffer[0]; - GetLocaleInfo (LOCALE_USER_DEFAULT, LOCALE_SGROUPING, szBuffer, sizeof(szBuffer) / sizeof(szBuffer[0])); + GetLocaleInfo(LOCALE_USER_DEFAULT, LOCALE_SGROUPING, szBuffer, ARRAYSIZE(szBuffer)); nNumberGroups = _ttoi(szBuffer); #if 0 /* days of week */ for (i = 0; i < 7; i++) { - GetLocaleInfo (LOCALE_USER_DEFAULT, LOCALE_SABBREVDAYNAME1 + i, szBuffer, sizeof(szBuffer) / sizeof(szBuffer[0])); - _tcscpy (aszDayNames[(i+1)%7], szBuffer); /* little hack */ + GetLocaleInfo(LOCALE_USER_DEFAULT, LOCALE_SABBREVDAYNAME1 + i, szBuffer, ARRAYSIZE(szBuffer)); + _tcscpy(aszDayNames[(i+1)%7], szBuffer); /* little hack */ } #endif } @@ -62,7 +62,7 @@ INT len; GetLocalTime(&t); - len = GetDateFormat(LOCALE_USER_DEFAULT, 0, &t, _T("ddd"), szDate, sizeof(szDate) / sizeof(szDate[0])); + len = GetDateFormat(LOCALE_USER_DEFAULT, 0, &t, _T("ddd"), szDate, ARRAYSIZE(szDate)); szDate[len - 1] = _T(' '); FormatDate(&szDate[len], &t, TRUE); return szDate; Modified: trunk/reactos/base/shell/cmd/msgbox.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/msgbox.c?re… ============================================================================== --- trunk/reactos/base/shell/cmd/msgbox.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/msgbox.c [iso-8859-1] Sat Sep 30 09:13:04 2017 @@ -37,7 +37,7 @@ UINT uType = U_TYPE_INIT; /* set default title to window title */ - GetConsoleTitle(buff, 128); + GetConsoleTitle(buff, ARRAYSIZE(buff)); title = buff; if (_tcsncmp (param, _T("/?"), 2) == 0)

6 years, 11 months

[cfinck] 75992: [ROSTESTS] Use the new header with SPDX license identifier for my printing-related API tests

by cfinck＠svn.reactos.org

Author: cfinck Date: Fri Sep 29 18:33:04 2017 New Revision: 75992 URL: http://svn.reactos.org/svn/reactos?rev=75992&view=rev Log: [ROSTESTS] Use the new header with SPDX license identifier for my printing-related API tests Modified: trunk/rostests/apitests/localspl/dll/fpEnumPrinters.c trunk/rostests/apitests/localspl/dll/fpGetPrintProcessorDirectory.c trunk/rostests/apitests/localspl/dll/main.c trunk/rostests/apitests/localspl/localspl_apitest.h trunk/rostests/apitests/localspl/service.c trunk/rostests/apitests/localspl/testlist.c trunk/rostests/apitests/localspl/tests.c trunk/rostests/apitests/netapi32/DsRoleGetPrimaryDomainInformation.c trunk/rostests/apitests/netapi32/testlist.c trunk/rostests/apitests/spoolss/AlignRpcPtr.c trunk/rostests/apitests/spoolss/PackStrings.c trunk/rostests/apitests/spoolss/ReallocSplStr.c trunk/rostests/apitests/spoolss/SplInitializeWinSpoolDrv.c trunk/rostests/apitests/spoolss/testlist.c trunk/rostests/apitests/winprint/EnumPrintProcessorDatatypesW.c trunk/rostests/apitests/winprint/main.c trunk/rostests/apitests/winprint/testlist.c trunk/rostests/apitests/winspool/ClosePrinter.c trunk/rostests/apitests/winspool/EnumPrintProcessorDatatypes.c trunk/rostests/apitests/winspool/EnumPrinters.c trunk/rostests/apitests/winspool/GetDefaultPrinter.c trunk/rostests/apitests/winspool/GetPrintProcessorDirectory.c trunk/rostests/apitests/winspool/GetPrinterData.c trunk/rostests/apitests/winspool/IsValidDevmode.c trunk/rostests/apitests/winspool/OpenPrinter.c trunk/rostests/apitests/winspool/StartDocPrinter.c trunk/rostests/apitests/winspool/testlist.c Modified: trunk/rostests/apitests/localspl/dll/fpEnumPrinters.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/localspl/dll/fpE… ============================================================================== --- trunk/rostests/apitests/localspl/dll/fpEnumPrinters.c [iso-8859-1] (original) +++ trunk/rostests/apitests/localspl/dll/fpEnumPrinters.c [iso-8859-1] Fri Sep 29 18:33:04 2017 @@ -1,8 +1,8 @@ /* * PROJECT: ReactOS Local Spooler API Tests Injected DLL - * LICENSE: GNU GPLv2 or any later version as published by the Free Software Foundation + * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) * PURPOSE: Tests for fpEnumPrinters - * COPYRIGHT: Copyright 2015-2017 Colin Finck <colin(a)reactos.org> + * COPYRIGHT: Copyright 2015-2017 Colin Finck (colin(a)reactos.org) */ #include <apitest.h> Modified: trunk/rostests/apitests/localspl/dll/fpGetPrintProcessorDirectory.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/localspl/dll/fpG… ============================================================================== --- trunk/rostests/apitests/localspl/dll/fpGetPrintProcessorDirectory.c [iso-8859-1] (original) +++ trunk/rostests/apitests/localspl/dll/fpGetPrintProcessorDirectory.c [iso-8859-1] Fri Sep 29 18:33:04 2017 @@ -1,8 +1,8 @@ /* * PROJECT: ReactOS Local Spooler API Tests Injected DLL - * LICENSE: GNU GPLv2 or any later version as published by the Free Software Foundation + * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) * PURPOSE: Tests for fpGetPrintProcessorDirectory - * COPYRIGHT: Copyright 2016-2017 Colin Finck <colin(a)reactos.org> + * COPYRIGHT: Copyright 2016-2017 Colin Finck (colin(a)reactos.org) */ #include <apitest.h> Modified: trunk/rostests/apitests/localspl/dll/main.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/localspl/dll/mai… ============================================================================== --- trunk/rostests/apitests/localspl/dll/main.c [iso-8859-1] (original) +++ trunk/rostests/apitests/localspl/dll/main.c [iso-8859-1] Fri Sep 29 18:33:04 2017 @@ -1,8 +1,8 @@ /* * PROJECT: ReactOS Local Spooler API Tests Injected DLL - * LICENSE: GNU GPLv2 or any later version as published by the Free Software Foundation + * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) * PURPOSE: Main functions - * COPYRIGHT: Copyright 2015-2016 Colin Finck <colin(a)reactos.org> + * COPYRIGHT: Copyright 2015-2016 Colin Finck (colin(a)reactos.org) */ #define __ROS_LONG64__ Modified: trunk/rostests/apitests/localspl/localspl_apitest.h URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/localspl/localsp… ============================================================================== --- trunk/rostests/apitests/localspl/localspl_apitest.h [iso-8859-1] (original) +++ trunk/rostests/apitests/localspl/localspl_apitest.h [iso-8859-1] Fri Sep 29 18:33:04 2017 @@ -1,8 +1,8 @@ /* * PROJECT: ReactOS Local Spooler API Tests - * LICENSE: GNU GPLv2 or any later version as published by the Free Software Foundation + * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) * PURPOSE: Shared definitions for the test program and the test DLL - * COPYRIGHT: Copyright 2015 Colin Finck <colin(a)reactos.org> + * COPYRIGHT: Copyright 2015 Colin Finck (colin(a)reactos.org) */ #ifndef _LOCALSPL_APITEST_H Modified: trunk/rostests/apitests/localspl/service.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/localspl/service… ============================================================================== --- trunk/rostests/apitests/localspl/service.c [iso-8859-1] (original) +++ trunk/rostests/apitests/localspl/service.c [iso-8859-1] Fri Sep 29 18:33:04 2017 @@ -1,8 +1,8 @@ /* * PROJECT: ReactOS Local Spooler API Tests - * LICENSE: GNU GPLv2 or any later version as published by the Free Software Foundation + * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) * PURPOSE: Functions needed to run our code as a service. This is needed to run in SYSTEM security context. - * COPYRIGHT: Copyright 2015 Colin Finck <colin(a)reactos.org> + * COPYRIGHT: Copyright 2015 Colin Finck (colin(a)reactos.org) */ #include <apitest.h> Modified: trunk/rostests/apitests/localspl/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/localspl/testlis… ============================================================================== --- trunk/rostests/apitests/localspl/testlist.c [iso-8859-1] (original) +++ trunk/rostests/apitests/localspl/testlist.c [iso-8859-1] Fri Sep 29 18:33:04 2017 @@ -1,8 +1,8 @@ /* * PROJECT: ReactOS Local Spooler API Tests - * LICENSE: GNU GPLv2 or any later version as published by the Free Software Foundation + * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) * PURPOSE: Test list - * COPYRIGHT: Copyright 2015-2016 Colin Finck <colin(a)reactos.org> + * COPYRIGHT: Copyright 2015-2016 Colin Finck (colin(a)reactos.org) */ #define __ROS_LONG64__ Modified: trunk/rostests/apitests/localspl/tests.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/localspl/tests.c… ============================================================================== --- trunk/rostests/apitests/localspl/tests.c [iso-8859-1] (original) +++ trunk/rostests/apitests/localspl/tests.c [iso-8859-1] Fri Sep 29 18:33:04 2017 @@ -1,8 +1,8 @@ /* * PROJECT: ReactOS Local Spooler API Tests - * LICENSE: GNU GPLv2 or any later version as published by the Free Software Foundation + * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) * PURPOSE: Test list - * COPYRIGHT: Copyright 2015-2016 Colin Finck <colin(a)reactos.org> + * COPYRIGHT: Copyright 2015-2016 Colin Finck (colin(a)reactos.org) */ /* Modified: trunk/rostests/apitests/netapi32/DsRoleGetPrimaryDomainInformation.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/netapi32/DsRoleG… ============================================================================== --- trunk/rostests/apitests/netapi32/DsRoleGetPrimaryDomainInformation.c [iso-8859-1] (original) +++ trunk/rostests/apitests/netapi32/DsRoleGetPrimaryDomainInformation.c [iso-8859-1] Fri Sep 29 18:33:04 2017 @@ -1,8 +1,8 @@ /* * PROJECT: ReactOS netapi32.dll API Tests - * LICENSE: GNU GPLv2 or any later version as published by the Free Software Foundation + * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) * PURPOSE: Tests for DsRoleGetPrimaryDomainInformation - * COPYRIGHT: Copyright 2017 Colin Finck <colin(a)reactos.org> + * COPYRIGHT: Copyright 2017 Colin Finck (colin(a)reactos.org) */ #include <apitest.h> Modified: trunk/rostests/apitests/netapi32/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/netapi32/testlis… ============================================================================== --- trunk/rostests/apitests/netapi32/testlist.c [iso-8859-1] (original) +++ trunk/rostests/apitests/netapi32/testlist.c [iso-8859-1] Fri Sep 29 18:33:04 2017 @@ -1,8 +1,8 @@ /* * PROJECT: ReactOS netapi32.dll API Tests - * LICENSE: GNU GPLv2 or any later version as published by the Free Software Foundation + * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) * PURPOSE: Test list - * COPYRIGHT: Copyright 2017 Colin Finck <colin(a)reactos.org> + * COPYRIGHT: Copyright 2017 Colin Finck (colin(a)reactos.org) */ #define __ROS_LONG64__ Modified: trunk/rostests/apitests/spoolss/AlignRpcPtr.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/spoolss/AlignRpc… ============================================================================== --- trunk/rostests/apitests/spoolss/AlignRpcPtr.c [iso-8859-1] (original) +++ trunk/rostests/apitests/spoolss/AlignRpcPtr.c [iso-8859-1] Fri Sep 29 18:33:04 2017 @@ -1,8 +1,8 @@ /* * PROJECT: ReactOS Spooler Router API Tests - * LICENSE: GNU GPLv2 or any later version as published by the Free Software Foundation + * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) * PURPOSE: Tests for AlignRpcPtr/UndoAlignRpcPtr - * COPYRIGHT: Copyright 2017 Colin Finck <colin(a)reactos.org> + * COPYRIGHT: Copyright 2017 Colin Finck (colin(a)reactos.org) */ #include <apitest.h> Modified: trunk/rostests/apitests/spoolss/PackStrings.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/spoolss/PackStri… ============================================================================== --- trunk/rostests/apitests/spoolss/PackStrings.c [iso-8859-1] (original) +++ trunk/rostests/apitests/spoolss/PackStrings.c [iso-8859-1] Fri Sep 29 18:33:04 2017 @@ -1,8 +1,8 @@ /* * PROJECT: ReactOS Spooler Router API Tests - * LICENSE: GNU GPLv2 or any later version as published by the Free Software Foundation + * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) * PURPOSE: Tests for PackStrings - * COPYRIGHT: Copyright 2015-2017 Colin Finck <colin(a)reactos.org> + * COPYRIGHT: Copyright 2015-2017 Colin Finck (colin(a)reactos.org) */ #include <apitest.h> Modified: trunk/rostests/apitests/spoolss/ReallocSplStr.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/spoolss/ReallocS… ============================================================================== --- trunk/rostests/apitests/spoolss/ReallocSplStr.c [iso-8859-1] (original) +++ trunk/rostests/apitests/spoolss/ReallocSplStr.c [iso-8859-1] Fri Sep 29 18:33:04 2017 @@ -1,8 +1,8 @@ /* * PROJECT: ReactOS Spooler Router API Tests - * LICENSE: GNU GPLv2 or any later version as published by the Free Software Foundation + * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) * PURPOSE: Tests for ReallocSplStr - * COPYRIGHT: Copyright 2015 Colin Finck <colin(a)reactos.org> + * COPYRIGHT: Copyright 2015 Colin Finck (colin(a)reactos.org) */ #include <apitest.h> Modified: trunk/rostests/apitests/spoolss/SplInitializeWinSpoolDrv.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/spoolss/SplIniti… ============================================================================== --- trunk/rostests/apitests/spoolss/SplInitializeWinSpoolDrv.c [iso-8859-1] (original) +++ trunk/rostests/apitests/spoolss/SplInitializeWinSpoolDrv.c [iso-8859-1] Fri Sep 29 18:33:04 2017 @@ -1,8 +1,8 @@ /* * PROJECT: ReactOS Spooler Router API Tests - * LICENSE: GNU GPLv2 or any later version as published by the Free Software Foundation + * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) * PURPOSE: Tests for SplInitializeWinSpoolDrv - * COPYRIGHT: Copyright 2015 Colin Finck <colin(a)reactos.org> + * COPYRIGHT: Copyright 2015 Colin Finck (colin(a)reactos.org) */ #include <apitest.h> Modified: trunk/rostests/apitests/spoolss/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/spoolss/testlist… ============================================================================== --- trunk/rostests/apitests/spoolss/testlist.c [iso-8859-1] (original) +++ trunk/rostests/apitests/spoolss/testlist.c [iso-8859-1] Fri Sep 29 18:33:04 2017 @@ -1,8 +1,8 @@ /* - * PROJECT: ReactOS Print Spooler Router API Tests - * LICENSE: GNU GPLv2 or any later version as published by the Free Software Foundation + * PROJECT: ReactOS Spooler Router API Tests + * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) * PURPOSE: Test list - * COPYRIGHT: Copyright 2015-2017 Colin Finck <colin(a)reactos.org> + * COPYRIGHT: Copyright 2015-2017 Colin Finck (colin(a)reactos.org) */ #define __ROS_LONG64__ Modified: trunk/rostests/apitests/winprint/EnumPrintProcessorDatatypesW.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/winprint/EnumPri… ============================================================================== --- trunk/rostests/apitests/winprint/EnumPrintProcessorDatatypesW.c [iso-8859-1] (original) +++ trunk/rostests/apitests/winprint/EnumPrintProcessorDatatypesW.c [iso-8859-1] Fri Sep 29 18:33:04 2017 @@ -1,8 +1,8 @@ /* * PROJECT: ReactOS Standard Print Processor API Tests - * LICENSE: GNU GPLv2 or any later version as published by the Free Software Foundation + * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) * PURPOSE: Tests for EnumPrintProcessorDatatypesW - * COPYRIGHT: Copyright 2015-2016 Colin Finck <colin(a)reactos.org> + * COPYRIGHT: Copyright 2015-2016 Colin Finck (colin(a)reactos.org) */ #include <apitest.h> Modified: trunk/rostests/apitests/winprint/main.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/winprint/main.c?… ============================================================================== --- trunk/rostests/apitests/winprint/main.c [iso-8859-1] (original) +++ trunk/rostests/apitests/winprint/main.c [iso-8859-1] Fri Sep 29 18:33:04 2017 @@ -1,8 +1,8 @@ /* * PROJECT: ReactOS Standard Print Processor API Tests - * LICENSE: GNU GPLv2 or any later version as published by the Free Software Foundation + * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) * PURPOSE: Main functions - * COPYRIGHT: Copyright 2016 Colin Finck <colin(a)reactos.org> + * COPYRIGHT: Copyright 2016 Colin Finck (colin(a)reactos.org) */ #include <apitest.h> Modified: trunk/rostests/apitests/winprint/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/winprint/testlis… ============================================================================== --- trunk/rostests/apitests/winprint/testlist.c [iso-8859-1] (original) +++ trunk/rostests/apitests/winprint/testlist.c [iso-8859-1] Fri Sep 29 18:33:04 2017 @@ -1,8 +1,8 @@ /* * PROJECT: ReactOS Standard Print Processor API Tests - * LICENSE: GNU GPLv2 or any later version as published by the Free Software Foundation + * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) * PURPOSE: Test list - * COPYRIGHT: Copyright 2015-2016 Colin Finck <colin(a)reactos.org> + * COPYRIGHT: Copyright 2015-2016 Colin Finck (colin(a)reactos.org) */ /* Modified: trunk/rostests/apitests/winspool/ClosePrinter.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/winspool/ClosePr… ============================================================================== --- trunk/rostests/apitests/winspool/ClosePrinter.c [iso-8859-1] (original) +++ trunk/rostests/apitests/winspool/ClosePrinter.c [iso-8859-1] Fri Sep 29 18:33:04 2017 @@ -1,8 +1,8 @@ /* * PROJECT: ReactOS Print Spooler DLL API Tests - * LICENSE: GNU GPLv2 or any later version as published by the Free Software Foundation + * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) * PURPOSE: Tests for ClosePrinter - * COPYRIGHT: Copyright 2015 Colin Finck <colin(a)reactos.org> + * COPYRIGHT: Copyright 2015 Colin Finck (colin(a)reactos.org) */ #include <apitest.h> Modified: trunk/rostests/apitests/winspool/EnumPrintProcessorDatatypes.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/winspool/EnumPri… ============================================================================== --- trunk/rostests/apitests/winspool/EnumPrintProcessorDatatypes.c [iso-8859-1] (original) +++ trunk/rostests/apitests/winspool/EnumPrintProcessorDatatypes.c [iso-8859-1] Fri Sep 29 18:33:04 2017 @@ -1,8 +1,8 @@ /* * PROJECT: ReactOS Print Spooler DLL API Tests - * LICENSE: GNU GPLv2 or any later version as published by the Free Software Foundation + * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) * PURPOSE: Tests for EnumPrintProcessorDatatypesA/EnumPrintProcessorDatatypesW - * COPYRIGHT: Copyright 2015 Colin Finck <colin(a)reactos.org> + * COPYRIGHT: Copyright 2015 Colin Finck (colin(a)reactos.org) */ #include <apitest.h> Modified: trunk/rostests/apitests/winspool/EnumPrinters.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/winspool/EnumPri… ============================================================================== --- trunk/rostests/apitests/winspool/EnumPrinters.c [iso-8859-1] (original) +++ trunk/rostests/apitests/winspool/EnumPrinters.c [iso-8859-1] Fri Sep 29 18:33:04 2017 @@ -1,8 +1,8 @@ /* * PROJECT: ReactOS Print Spooler DLL API Tests - * LICENSE: GNU GPLv2 or any later version as published by the Free Software Foundation + * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) * PURPOSE: Tests for EnumPrintersA/EnumPrintersW - * COPYRIGHT: Copyright 2015-2017 Colin Finck <colin(a)reactos.org> + * COPYRIGHT: Copyright 2015-2017 Colin Finck (colin(a)reactos.org) */ #include <apitest.h> Modified: trunk/rostests/apitests/winspool/GetDefaultPrinter.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/winspool/GetDefa… ============================================================================== --- trunk/rostests/apitests/winspool/GetDefaultPrinter.c [iso-8859-1] (original) +++ trunk/rostests/apitests/winspool/GetDefaultPrinter.c [iso-8859-1] Fri Sep 29 18:33:04 2017 @@ -1,8 +1,8 @@ /* * PROJECT: ReactOS Print Spooler DLL API Tests - * LICENSE: GNU GPLv2 or any later version as published by the Free Software Foundation + * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) * PURPOSE: Tests for GetDefaultPrinterA/GetDefaultPrinterW/SetDefaultPrinterA/SetDefaultPrinterW - * COPYRIGHT: Copyright 2017 Colin Finck <colin(a)reactos.org> + * COPYRIGHT: Copyright 2017 Colin Finck (colin(a)reactos.org) */ #include <apitest.h> Modified: trunk/rostests/apitests/winspool/GetPrintProcessorDirectory.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/winspool/GetPrin… ============================================================================== --- trunk/rostests/apitests/winspool/GetPrintProcessorDirectory.c [iso-8859-1] (original) +++ trunk/rostests/apitests/winspool/GetPrintProcessorDirectory.c [iso-8859-1] Fri Sep 29 18:33:04 2017 @@ -1,8 +1,8 @@ /* * PROJECT: ReactOS Print Spooler DLL API Tests - * LICENSE: GNU GPLv2 or any later version as published by the Free Software Foundation + * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) * PURPOSE: Tests for GetPrintProcessorDirectoryA/GetPrintProcessorDirectoryW - * COPYRIGHT: Copyright 2015-2016 Colin Finck <colin(a)reactos.org> + * COPYRIGHT: Copyright 2015-2016 Colin Finck (colin(a)reactos.org) */ #include <apitest.h> Modified: trunk/rostests/apitests/winspool/GetPrinterData.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/winspool/GetPrin… ============================================================================== --- trunk/rostests/apitests/winspool/GetPrinterData.c [iso-8859-1] (original) +++ trunk/rostests/apitests/winspool/GetPrinterData.c [iso-8859-1] Fri Sep 29 18:33:04 2017 @@ -1,8 +1,8 @@ /* * PROJECT: ReactOS Print Spooler DLL API Tests - * LICENSE: GNU GPLv2 or any later version as published by the Free Software Foundation + * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) * PURPOSE: Tests for GetPrinterData(Ex)A/GetPrinterData(Ex)W/SetPrinterData(Ex)A/SetPrinterData(Ex)W - * COPYRIGHT: Copyright 2017 Colin Finck <colin(a)reactos.org> + * COPYRIGHT: Copyright 2017 Colin Finck (colin(a)reactos.org) */ #include <apitest.h> Modified: trunk/rostests/apitests/winspool/IsValidDevmode.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/winspool/IsValid… ============================================================================== --- trunk/rostests/apitests/winspool/IsValidDevmode.c [iso-8859-1] (original) +++ trunk/rostests/apitests/winspool/IsValidDevmode.c [iso-8859-1] Fri Sep 29 18:33:04 2017 @@ -1,8 +1,8 @@ /* * PROJECT: ReactOS Print Spooler DLL API Tests - * LICENSE: GNU GPLv2 or any later version as published by the Free Software Foundation + * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) * PURPOSE: Tests for IsValidDevmodeA/IsValidDevmodeW - * COPYRIGHT: Copyright 2016 Colin Finck <colin(a)reactos.org> + * COPYRIGHT: Copyright 2016 Colin Finck (colin(a)reactos.org) */ #include <apitest.h> Modified: trunk/rostests/apitests/winspool/OpenPrinter.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/winspool/OpenPri… ============================================================================== --- trunk/rostests/apitests/winspool/OpenPrinter.c [iso-8859-1] (original) +++ trunk/rostests/apitests/winspool/OpenPrinter.c [iso-8859-1] Fri Sep 29 18:33:04 2017 @@ -1,8 +1,8 @@ /* * PROJECT: ReactOS Print Spooler DLL API Tests - * LICENSE: GNU GPLv2 or any later version as published by the Free Software Foundation + * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) * PURPOSE: Tests for OpenPrinterA/OpenPrinterW - * COPYRIGHT: Copyright 2015 Colin Finck <colin(a)reactos.org> + * COPYRIGHT: Copyright 2015 Colin Finck (colin(a)reactos.org) */ #include <apitest.h> Modified: trunk/rostests/apitests/winspool/StartDocPrinter.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/winspool/StartDo… ============================================================================== --- trunk/rostests/apitests/winspool/StartDocPrinter.c [iso-8859-1] (original) +++ trunk/rostests/apitests/winspool/StartDocPrinter.c [iso-8859-1] Fri Sep 29 18:33:04 2017 @@ -1,8 +1,8 @@ /* * PROJECT: ReactOS Print Spooler DLL API Tests - * LICENSE: GNU GPLv2 or any later version as published by the Free Software Foundation + * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) * PURPOSE: Tests for StartDocPrinterA/StartDocPrinterW - * COPYRIGHT: Copyright 2015 Colin Finck <colin(a)reactos.org> + * COPYRIGHT: Copyright 2015 Colin Finck (colin(a)reactos.org) */ #include <apitest.h> Modified: trunk/rostests/apitests/winspool/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/winspool/testlis… ============================================================================== --- trunk/rostests/apitests/winspool/testlist.c [iso-8859-1] (original) +++ trunk/rostests/apitests/winspool/testlist.c [iso-8859-1] Fri Sep 29 18:33:04 2017 @@ -1,8 +1,8 @@ /* * PROJECT: ReactOS Print Spooler DLL API Tests - * LICENSE: GNU GPLv2 or any later version as published by the Free Software Foundation + * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) * PURPOSE: Test list - * COPYRIGHT: Copyright 2015-2016 Colin Finck <colin(a)reactos.org> + * COPYRIGHT: Copyright 2015-2017 Colin Finck (colin(a)reactos.org) */ #define __ROS_LONG64__

6 years, 11 months

[cfinck] 75991: [ROSAUTOTEST] Use the new header with SPDX license identifier and remove dead source files.

by cfinck＠svn.reactos.org

Author: cfinck Date: Fri Sep 29 18:13:54 2017 New Revision: 75991 URL: http://svn.reactos.org/svn/reactos?rev=75991&view=rev Log: [ROSAUTOTEST] Use the new header with SPDX license identifier and remove dead source files. Removed: trunk/rostests/rosautotest/CTest.cpp trunk/rostests/rosautotest/CTestInfo.cpp Modified: trunk/rostests/rosautotest/CConfiguration.cpp trunk/rostests/rosautotest/CConfiguration.h trunk/rostests/rosautotest/CFatalException.cpp trunk/rostests/rosautotest/CFatalException.h trunk/rostests/rosautotest/CInvalidParameterException.cpp trunk/rostests/rosautotest/CInvalidParameterException.h trunk/rostests/rosautotest/CJournaledTestList.cpp trunk/rostests/rosautotest/CJournaledTestList.h trunk/rostests/rosautotest/CMakeLists.txt trunk/rostests/rosautotest/CPipe.cpp trunk/rostests/rosautotest/CPipe.h trunk/rostests/rosautotest/CPipedProcess.cpp trunk/rostests/rosautotest/CPipedProcess.h trunk/rostests/rosautotest/CProcess.cpp trunk/rostests/rosautotest/CProcess.h trunk/rostests/rosautotest/CSimpleException.cpp trunk/rostests/rosautotest/CSimpleException.h trunk/rostests/rosautotest/CTest.h trunk/rostests/rosautotest/CTestException.h trunk/rostests/rosautotest/CTestInfo.h trunk/rostests/rosautotest/CTestList.cpp trunk/rostests/rosautotest/CTestList.h trunk/rostests/rosautotest/CVirtualTestList.cpp trunk/rostests/rosautotest/CVirtualTestList.h trunk/rostests/rosautotest/CWebService.cpp trunk/rostests/rosautotest/CWebService.h trunk/rostests/rosautotest/CWineTest.cpp trunk/rostests/rosautotest/CWineTest.h trunk/rostests/rosautotest/auto_array_ptr.h trunk/rostests/rosautotest/main.cpp trunk/rostests/rosautotest/misc.cpp trunk/rostests/rosautotest/precomp.h trunk/rostests/rosautotest/shutdown.cpp trunk/rostests/rosautotest/tools.cpp Modified: trunk/rostests/rosautotest/CConfiguration.cpp URL: http://svn.reactos.org/svn/reactos/trunk/rostests/rosautotest/CConfiguratio… ============================================================================== --- trunk/rostests/rosautotest/CConfiguration.cpp [iso-8859-1] (original) +++ trunk/rostests/rosautotest/CConfiguration.cpp [iso-8859-1] Fri Sep 29 18:13:54 2017 @@ -1,8 +1,8 @@ /* * PROJECT: ReactOS Automatic Testing Utility - * LICENSE: GNU GPLv2 or any later version as published by the Free Software Foundation + * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) * PURPOSE: Class for managing all the configuration parameters - * COPYRIGHT: Copyright 2009-2011 Colin Finck <colin(a)reactos.org> + * COPYRIGHT: Copyright 2009-2011 Colin Finck (colin(a)reactos.org) */ #include "precomp.h" Modified: trunk/rostests/rosautotest/CConfiguration.h URL: http://svn.reactos.org/svn/reactos/trunk/rostests/rosautotest/CConfiguratio… ============================================================================== --- trunk/rostests/rosautotest/CConfiguration.h [iso-8859-1] (original) +++ trunk/rostests/rosautotest/CConfiguration.h [iso-8859-1] Fri Sep 29 18:13:54 2017 @@ -1,8 +1,8 @@ /* * PROJECT: ReactOS Automatic Testing Utility - * LICENSE: GNU GPLv2 or any later version as published by the Free Software Foundation + * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) * PURPOSE: Class for managing all the configuration parameters - * COPYRIGHT: Copyright 2009 Colin Finck <colin(a)reactos.org> + * COPYRIGHT: Copyright 2009 Colin Finck (colin(a)reactos.org) */ class CConfiguration Modified: trunk/rostests/rosautotest/CFatalException.cpp URL: http://svn.reactos.org/svn/reactos/trunk/rostests/rosautotest/CFatalExcepti… ============================================================================== --- trunk/rostests/rosautotest/CFatalException.cpp [iso-8859-1] (original) +++ trunk/rostests/rosautotest/CFatalException.cpp [iso-8859-1] Fri Sep 29 18:13:54 2017 @@ -1,8 +1,8 @@ /* * PROJECT: ReactOS Automatic Testing Utility - * LICENSE: GNU GPLv2 or any later version as published by the Free Software Foundation + * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) * PURPOSE: Fatal program exception with automatically added information - * COPYRIGHT: Copyright 2009 Colin Finck <colin(a)reactos.org> + * COPYRIGHT: Copyright 2009 Colin Finck (colin(a)reactos.org) */ #include "precomp.h" Modified: trunk/rostests/rosautotest/CFatalException.h URL: http://svn.reactos.org/svn/reactos/trunk/rostests/rosautotest/CFatalExcepti… ============================================================================== --- trunk/rostests/rosautotest/CFatalException.h [iso-8859-1] (original) +++ trunk/rostests/rosautotest/CFatalException.h [iso-8859-1] Fri Sep 29 18:13:54 2017 @@ -1,8 +1,8 @@ /* * PROJECT: ReactOS Automatic Testing Utility - * LICENSE: GNU GPLv2 or any later version as published by the Free Software Foundation + * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) * PURPOSE: Fatal program exception with automatically added information - * COPYRIGHT: Copyright 2009 Colin Finck <colin(a)reactos.org> + * COPYRIGHT: Copyright 2009 Colin Finck (colin(a)reactos.org) */ class CFatalException Modified: trunk/rostests/rosautotest/CInvalidParameterException.cpp URL: http://svn.reactos.org/svn/reactos/trunk/rostests/rosautotest/CInvalidParam… ============================================================================== --- trunk/rostests/rosautotest/CInvalidParameterException.cpp [iso-8859-1] (original) +++ trunk/rostests/rosautotest/CInvalidParameterException.cpp [iso-8859-1] Fri Sep 29 18:13:54 2017 @@ -1,14 +1,14 @@ /* * PROJECT: ReactOS Automatic Testing Utility - * LICENSE: GNU GPLv2 or any later version as published by the Free Software Foundation + * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) * PURPOSE: Empty exception thrown when the parameter processor detects an invalid parameter - * COPYRIGHT: Copyright 2009 Colin Finck <colin(a)reactos.org> + * COPYRIGHT: Copyright 2009 Colin Finck (colin(a)reactos.org) */ #include "precomp.h" /** - * Constructs an empty CInvalidParameterException object, which is catched in wmain as an exception. + * Constructs an empty CInvalidParameterException object, which is caught in wmain as an exception. */ CInvalidParameterException::CInvalidParameterException() { Modified: trunk/rostests/rosautotest/CInvalidParameterException.h URL: http://svn.reactos.org/svn/reactos/trunk/rostests/rosautotest/CInvalidParam… ============================================================================== --- trunk/rostests/rosautotest/CInvalidParameterException.h [iso-8859-1] (original) +++ trunk/rostests/rosautotest/CInvalidParameterException.h [iso-8859-1] Fri Sep 29 18:13:54 2017 @@ -1,8 +1,8 @@ /* * PROJECT: ReactOS Automatic Testing Utility - * LICENSE: GNU GPLv2 or any later version as published by the Free Software Foundation + * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) * PURPOSE: Empty exception thrown when the parameter processor detects an invalid parameter - * COPYRIGHT: Copyright 2009 Colin Finck <colin(a)reactos.org> + * COPYRIGHT: Copyright 2009 Colin Finck (colin(a)reactos.org) */ class CInvalidParameterException Modified: trunk/rostests/rosautotest/CJournaledTestList.cpp URL: http://svn.reactos.org/svn/reactos/trunk/rostests/rosautotest/CJournaledTes… ============================================================================== --- trunk/rostests/rosautotest/CJournaledTestList.cpp [iso-8859-1] (original) +++ trunk/rostests/rosautotest/CJournaledTestList.cpp [iso-8859-1] Fri Sep 29 18:13:54 2017 @@ -1,8 +1,8 @@ /* * PROJECT: ReactOS Automatic Testing Utility - * LICENSE: GNU GPLv2 or any later version as published by the Free Software Foundation + * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) * PURPOSE: Class implementing a journaled test list for the Crash Recovery feature - * COPYRIGHT: Copyright 2009 Colin Finck <colin(a)reactos.org> + * COPYRIGHT: Copyright 2009 Colin Finck (colin(a)reactos.org) */ #include "precomp.h" Modified: trunk/rostests/rosautotest/CJournaledTestList.h URL: http://svn.reactos.org/svn/reactos/trunk/rostests/rosautotest/CJournaledTes… ============================================================================== --- trunk/rostests/rosautotest/CJournaledTestList.h [iso-8859-1] (original) +++ trunk/rostests/rosautotest/CJournaledTestList.h [iso-8859-1] Fri Sep 29 18:13:54 2017 @@ -1,8 +1,8 @@ /* * PROJECT: ReactOS Automatic Testing Utility - * LICENSE: GNU GPLv2 or any later version as published by the Free Software Foundation + * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) * PURPOSE: Class implementing a journaled test list for the Crash Recovery feature - * COPYRIGHT: Copyright 2009 Colin Finck <colin(a)reactos.org> + * COPYRIGHT: Copyright 2009 Colin Finck (colin(a)reactos.org) */ class CJournaledTestList : public CTestList Modified: trunk/rostests/rosautotest/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/rosautotest/CMakeLists.tx… ============================================================================== --- trunk/rostests/rosautotest/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/rosautotest/CMakeLists.txt [iso-8859-1] Fri Sep 29 18:13:54 2017 @@ -10,8 +10,6 @@ CPipedProcess.cpp CProcess.cpp CSimpleException.cpp - CTest.cpp - CTestInfo.cpp CTestList.cpp CVirtualTestList.cpp CWebService.cpp Modified: trunk/rostests/rosautotest/CPipe.cpp URL: http://svn.reactos.org/svn/reactos/trunk/rostests/rosautotest/CPipe.cpp?rev… ============================================================================== --- trunk/rostests/rosautotest/CPipe.cpp [iso-8859-1] (original) +++ trunk/rostests/rosautotest/CPipe.cpp [iso-8859-1] Fri Sep 29 18:13:54 2017 @@ -1,8 +1,8 @@ /* * PROJECT: ReactOS Automatic Testing Utility - * LICENSE: GNU GPLv2 or any later version as published by the Free Software Foundation - * PURPOSE: Class that managed an unidirectional anonymous byte stream pipe - * COPYRIGHT: Copyright 2015 Thomas Faber <thomas.faber(a)reactos.org> + * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) + * PURPOSE: Class that manages an unidirectional anonymous byte stream pipe + * COPYRIGHT: Copyright 2015 Thomas Faber (thomas.faber(a)reactos.org) */ #include "precomp.h" Modified: trunk/rostests/rosautotest/CPipe.h URL: http://svn.reactos.org/svn/reactos/trunk/rostests/rosautotest/CPipe.h?rev=7… ============================================================================== --- trunk/rostests/rosautotest/CPipe.h [iso-8859-1] (original) +++ trunk/rostests/rosautotest/CPipe.h [iso-8859-1] Fri Sep 29 18:13:54 2017 @@ -1,8 +1,8 @@ /* * PROJECT: ReactOS Automatic Testing Utility - * LICENSE: GNU GPLv2 or any later version as published by the Free Software Foundation - * PURPOSE: Class that managed an unidirectional anonymous byte stream pipe - * COPYRIGHT: Copyright 2015 Thomas Faber <thomas.faber(a)reactos.org> + * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) + * PURPOSE: Class that manages an unidirectional anonymous byte stream pipe + * COPYRIGHT: Copyright 2015 Thomas Faber (thomas.faber(a)reactos.org) */ class CPipe Modified: trunk/rostests/rosautotest/CPipedProcess.cpp URL: http://svn.reactos.org/svn/reactos/trunk/rostests/rosautotest/CPipedProcess… ============================================================================== --- trunk/rostests/rosautotest/CPipedProcess.cpp [iso-8859-1] (original) +++ trunk/rostests/rosautotest/CPipedProcess.cpp [iso-8859-1] Fri Sep 29 18:13:54 2017 @@ -1,8 +1,8 @@ /* * PROJECT: ReactOS Automatic Testing Utility - * LICENSE: GNU GPLv2 or any later version as published by the Free Software Foundation + * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) * PURPOSE: Class that creates a process and redirects its output to a pipe - * COPYRIGHT: Copyright 2015 Thomas Faber <thomas.faber(a)reactos.org> + * COPYRIGHT: Copyright 2015 Thomas Faber (thomas.faber(a)reactos.org) */ #include "precomp.h" Modified: trunk/rostests/rosautotest/CPipedProcess.h URL: http://svn.reactos.org/svn/reactos/trunk/rostests/rosautotest/CPipedProcess… ============================================================================== --- trunk/rostests/rosautotest/CPipedProcess.h [iso-8859-1] (original) +++ trunk/rostests/rosautotest/CPipedProcess.h [iso-8859-1] Fri Sep 29 18:13:54 2017 @@ -1,8 +1,8 @@ /* * PROJECT: ReactOS Automatic Testing Utility - * LICENSE: GNU GPLv2 or any later version as published by the Free Software Foundation + * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) * PURPOSE: Class that creates a process and redirects its output to a pipe - * COPYRIGHT: Copyright 2015 Thomas Faber <thomas.faber(a)reactos.org> + * COPYRIGHT: Copyright 2015 Thomas Faber (thomas.faber(a)reactos.org) */ class CPipedProcess : public CProcess Modified: trunk/rostests/rosautotest/CProcess.cpp URL: http://svn.reactos.org/svn/reactos/trunk/rostests/rosautotest/CProcess.cpp?… ============================================================================== --- trunk/rostests/rosautotest/CProcess.cpp [iso-8859-1] (original) +++ trunk/rostests/rosautotest/CProcess.cpp [iso-8859-1] Fri Sep 29 18:13:54 2017 @@ -1,8 +1,8 @@ /* * PROJECT: ReactOS Automatic Testing Utility - * LICENSE: GNU GPLv2 or any later version as published by the Free Software Foundation + * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) * PURPOSE: Class able to create a new process and closing its handles on destruction (exception-safe) - * COPYRIGHT: Copyright 2009 Colin Finck <colin(a)reactos.org> + * COPYRIGHT: Copyright 2009 Colin Finck (colin(a)reactos.org) */ #include "precomp.h" Modified: trunk/rostests/rosautotest/CProcess.h URL: http://svn.reactos.org/svn/reactos/trunk/rostests/rosautotest/CProcess.h?re… ============================================================================== --- trunk/rostests/rosautotest/CProcess.h [iso-8859-1] (original) +++ trunk/rostests/rosautotest/CProcess.h [iso-8859-1] Fri Sep 29 18:13:54 2017 @@ -1,8 +1,8 @@ /* * PROJECT: ReactOS Automatic Testing Utility - * LICENSE: GNU GPLv2 or any later version as published by the Free Software Foundation + * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) * PURPOSE: Class able to create a new process and closing its handles on destruction (exception-safe) - * COPYRIGHT: Copyright 2009 Colin Finck <colin(a)reactos.org> + * COPYRIGHT: Copyright 2009 Colin Finck (colin(a)reactos.org) */ class CProcess Modified: trunk/rostests/rosautotest/CSimpleException.cpp URL: http://svn.reactos.org/svn/reactos/trunk/rostests/rosautotest/CSimpleExcept… ============================================================================== --- trunk/rostests/rosautotest/CSimpleException.cpp [iso-8859-1] (original) +++ trunk/rostests/rosautotest/CSimpleException.cpp [iso-8859-1] Fri Sep 29 18:13:54 2017 @@ -1,8 +1,8 @@ /* * PROJECT: ReactOS Automatic Testing Utility - * LICENSE: GNU GPLv2 or any later version as published by the Free Software Foundation + * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) * PURPOSE: Simple exception containing just a message - * COPYRIGHT: Copyright 2009 Colin Finck <colin(a)reactos.org> + * COPYRIGHT: Copyright 2009 Colin Finck (colin(a)reactos.org) */ #include "precomp.h" Modified: trunk/rostests/rosautotest/CSimpleException.h URL: http://svn.reactos.org/svn/reactos/trunk/rostests/rosautotest/CSimpleExcept… ============================================================================== --- trunk/rostests/rosautotest/CSimpleException.h [iso-8859-1] (original) +++ trunk/rostests/rosautotest/CSimpleException.h [iso-8859-1] Fri Sep 29 18:13:54 2017 @@ -1,8 +1,8 @@ /* * PROJECT: ReactOS Automatic Testing Utility - * LICENSE: GNU GPLv2 or any later version as published by the Free Software Foundation + * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) * PURPOSE: Simple exception containing just a message - * COPYRIGHT: Copyright 2009 Colin Finck <colin(a)reactos.org> + * COPYRIGHT: Copyright 2009 Colin Finck (colin(a)reactos.org) */ class CSimpleException Removed: trunk/rostests/rosautotest/CTest.cpp URL: http://svn.reactos.org/svn/reactos/trunk/rostests/rosautotest/CTest.cpp?rev… ============================================================================== --- trunk/rostests/rosautotest/CTest.cpp [iso-8859-1] (original) +++ trunk/rostests/rosautotest/CTest.cpp (removed) @@ -1,8 +0,0 @@ -/* - * PROJECT: ReactOS Automatic Testing Utility - * LICENSE: GNU GPLv2 or any later version as published by the Free Software Foundation - * PURPOSE: Class implementing a generic Test, needs to be used by a derived class - * COPYRIGHT: Copyright 2009 Colin Finck <colin(a)reactos.org> - */ - -#include "precomp.h" Modified: trunk/rostests/rosautotest/CTest.h URL: http://svn.reactos.org/svn/reactos/trunk/rostests/rosautotest/CTest.h?rev=7… ============================================================================== --- trunk/rostests/rosautotest/CTest.h [iso-8859-1] (original) +++ trunk/rostests/rosautotest/CTest.h [iso-8859-1] Fri Sep 29 18:13:54 2017 @@ -1,8 +1,8 @@ /* * PROJECT: ReactOS Automatic Testing Utility - * LICENSE: GNU GPLv2 or any later version as published by the Free Software Foundation + * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) * PURPOSE: Class implementing a generic Test, needs to be used by a derived class - * COPYRIGHT: Copyright 2009 Colin Finck <colin(a)reactos.org> + * COPYRIGHT: Copyright 2009 Colin Finck (colin(a)reactos.org) */ class CTest Modified: trunk/rostests/rosautotest/CTestException.h URL: http://svn.reactos.org/svn/reactos/trunk/rostests/rosautotest/CTestExceptio… ============================================================================== --- trunk/rostests/rosautotest/CTestException.h [iso-8859-1] (original) +++ trunk/rostests/rosautotest/CTestException.h [iso-8859-1] Fri Sep 29 18:13:54 2017 @@ -1,8 +1,8 @@ /* * PROJECT: ReactOS Automatic Testing Utility - * LICENSE: GNU GPLv2 or any later version as published by the Free Software Foundation + * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) * PURPOSE: Simple exception during test execution that can be skipped over - * COPYRIGHT: Copyright 2015 Thomas Faber <thomas.faber(a)reactos.org> + * COPYRIGHT: Copyright 2015 Thomas Faber (thomas.faber(a)reactos.org) */ class CTestException : public CSimpleException Removed: trunk/rostests/rosautotest/CTestInfo.cpp URL: http://svn.reactos.org/svn/reactos/trunk/rostests/rosautotest/CTestInfo.cpp… ============================================================================== --- trunk/rostests/rosautotest/CTestInfo.cpp [iso-8859-1] (original) +++ trunk/rostests/rosautotest/CTestInfo.cpp (removed) @@ -1,8 +0,0 @@ -/* - * PROJECT: ReactOS Automatic Testing Utility - * LICENSE: GNU GPLv2 or any later version as published by the Free Software Foundation - * PURPOSE: Class implementing a bucket for Test information - * COPYRIGHT: Copyright 2009 Colin Finck <colin(a)reactos.org> - */ - -#include "precomp.h" Modified: trunk/rostests/rosautotest/CTestInfo.h URL: http://svn.reactos.org/svn/reactos/trunk/rostests/rosautotest/CTestInfo.h?r… ============================================================================== --- trunk/rostests/rosautotest/CTestInfo.h [iso-8859-1] (original) +++ trunk/rostests/rosautotest/CTestInfo.h [iso-8859-1] Fri Sep 29 18:13:54 2017 @@ -1,8 +1,8 @@ /* * PROJECT: ReactOS Automatic Testing Utility - * LICENSE: GNU GPLv2 or any later version as published by the Free Software Foundation + * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) * PURPOSE: Class implementing a bucket for Test information - * COPYRIGHT: Copyright 2009 Colin Finck <colin(a)reactos.org> + * COPYRIGHT: Copyright 2009 Colin Finck (colin(a)reactos.org) */ class CTestInfo Modified: trunk/rostests/rosautotest/CTestList.cpp URL: http://svn.reactos.org/svn/reactos/trunk/rostests/rosautotest/CTestList.cpp… ============================================================================== --- trunk/rostests/rosautotest/CTestList.cpp [iso-8859-1] (original) +++ trunk/rostests/rosautotest/CTestList.cpp [iso-8859-1] Fri Sep 29 18:13:54 2017 @@ -1,8 +1,8 @@ /* * PROJECT: ReactOS Automatic Testing Utility - * LICENSE: GNU GPLv2 or any later version as published by the Free Software Foundation + * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) * PURPOSE: Class implementing a generic Test list, needs to be used by a derived class - * COPYRIGHT: Copyright 2009 Colin Finck <colin(a)reactos.org> + * COPYRIGHT: Copyright 2009 Colin Finck (colin(a)reactos.org) */ #include "precomp.h" Modified: trunk/rostests/rosautotest/CTestList.h URL: http://svn.reactos.org/svn/reactos/trunk/rostests/rosautotest/CTestList.h?r… ============================================================================== --- trunk/rostests/rosautotest/CTestList.h [iso-8859-1] (original) +++ trunk/rostests/rosautotest/CTestList.h [iso-8859-1] Fri Sep 29 18:13:54 2017 @@ -1,8 +1,8 @@ /* * PROJECT: ReactOS Automatic Testing Utility - * LICENSE: GNU GPLv2 or any later version as published by the Free Software Foundation + * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) * PURPOSE: Class implementing a generic Test list, needs to be used by a derived class - * COPYRIGHT: Copyright 2009 Colin Finck <colin(a)reactos.org> + * COPYRIGHT: Copyright 2009 Colin Finck (colin(a)reactos.org) */ class CTestList Modified: trunk/rostests/rosautotest/CVirtualTestList.cpp URL: http://svn.reactos.org/svn/reactos/trunk/rostests/rosautotest/CVirtualTestL… ============================================================================== --- trunk/rostests/rosautotest/CVirtualTestList.cpp [iso-8859-1] (original) +++ trunk/rostests/rosautotest/CVirtualTestList.cpp [iso-8859-1] Fri Sep 29 18:13:54 2017 @@ -1,8 +1,8 @@ /* * PROJECT: ReactOS Automatic Testing Utility - * LICENSE: GNU GPLv2 or any later version as published by the Free Software Foundation + * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) * PURPOSE: Class implementing a virtual test list for the tests to be ran - * COPYRIGHT: Copyright 2009 Colin Finck <colin(a)reactos.org> + * COPYRIGHT: Copyright 2009 Colin Finck (colin(a)reactos.org) */ #include "precomp.h" Modified: trunk/rostests/rosautotest/CVirtualTestList.h URL: http://svn.reactos.org/svn/reactos/trunk/rostests/rosautotest/CVirtualTestL… ============================================================================== --- trunk/rostests/rosautotest/CVirtualTestList.h [iso-8859-1] (original) +++ trunk/rostests/rosautotest/CVirtualTestList.h [iso-8859-1] Fri Sep 29 18:13:54 2017 @@ -1,8 +1,8 @@ /* * PROJECT: ReactOS Automatic Testing Utility - * LICENSE: GNU GPLv2 or any later version as published by the Free Software Foundation + * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) * PURPOSE: Class implementing a virtual test list for the tests to be ran - * COPYRIGHT: Copyright 2009 Colin Finck <colin(a)reactos.org> + * COPYRIGHT: Copyright 2009 Colin Finck (colin(a)reactos.org) */ class CVirtualTestList : public CTestList Modified: trunk/rostests/rosautotest/CWebService.cpp URL: http://svn.reactos.org/svn/reactos/trunk/rostests/rosautotest/CWebService.c… ============================================================================== --- trunk/rostests/rosautotest/CWebService.cpp [iso-8859-1] (original) +++ trunk/rostests/rosautotest/CWebService.cpp [iso-8859-1] Fri Sep 29 18:13:54 2017 @@ -1,8 +1,8 @@ /* * PROJECT: ReactOS Automatic Testing Utility - * LICENSE: GNU GPLv2 or any later version as published by the Free Software Foundation + * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) * PURPOSE: Class implementing the interface to the "testman" Web Service - * COPYRIGHT: Copyright 2009-2015 Colin Finck <colin(a)reactos.org> + * COPYRIGHT: Copyright 2009-2015 Colin Finck (colin(a)reactos.org) */ #include "precomp.h" Modified: trunk/rostests/rosautotest/CWebService.h URL: http://svn.reactos.org/svn/reactos/trunk/rostests/rosautotest/CWebService.h… ============================================================================== --- trunk/rostests/rosautotest/CWebService.h [iso-8859-1] (original) +++ trunk/rostests/rosautotest/CWebService.h [iso-8859-1] Fri Sep 29 18:13:54 2017 @@ -1,8 +1,8 @@ /* * PROJECT: ReactOS Automatic Testing Utility - * LICENSE: GNU GPLv2 or any later version as published by the Free Software Foundation + * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) * PURPOSE: Class implementing the interface to the "testman" Web Service - * COPYRIGHT: Copyright 2009-2015 Colin Finck <colin(a)reactos.org> + * COPYRIGHT: Copyright 2009-2015 Colin Finck (colin(a)reactos.org) */ class CWebService Modified: trunk/rostests/rosautotest/CWineTest.cpp URL: http://svn.reactos.org/svn/reactos/trunk/rostests/rosautotest/CWineTest.cpp… ============================================================================== --- trunk/rostests/rosautotest/CWineTest.cpp [iso-8859-1] (original) +++ trunk/rostests/rosautotest/CWineTest.cpp [iso-8859-1] Fri Sep 29 18:13:54 2017 @@ -1,8 +1,8 @@ /* * PROJECT: ReactOS Automatic Testing Utility - * LICENSE: GNU GPLv2 or any later version as published by the Free Software Foundation + * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) * PURPOSE: Class implementing functions for handling Wine tests - * COPYRIGHT: Copyright 2009-2015 Colin Finck <colin(a)reactos.org> + * COPYRIGHT: Copyright 2009-2015 Colin Finck (colin(a)reactos.org) */ #include "precomp.h" Modified: trunk/rostests/rosautotest/CWineTest.h URL: http://svn.reactos.org/svn/reactos/trunk/rostests/rosautotest/CWineTest.h?r… ============================================================================== --- trunk/rostests/rosautotest/CWineTest.h [iso-8859-1] (original) +++ trunk/rostests/rosautotest/CWineTest.h [iso-8859-1] Fri Sep 29 18:13:54 2017 @@ -1,8 +1,8 @@ /* * PROJECT: ReactOS Automatic Testing Utility - * LICENSE: GNU GPLv2 or any later version as published by the Free Software Foundation + * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) * PURPOSE: Class implementing functions for handling Wine tests - * COPYRIGHT: Copyright 2009 Colin Finck <colin(a)reactos.org> + * COPYRIGHT: Copyright 2009 Colin Finck (colin(a)reactos.org) */ class CWineTest : public CTest Modified: trunk/rostests/rosautotest/auto_array_ptr.h URL: http://svn.reactos.org/svn/reactos/trunk/rostests/rosautotest/auto_array_pt… ============================================================================== --- trunk/rostests/rosautotest/auto_array_ptr.h [iso-8859-1] (original) +++ trunk/rostests/rosautotest/auto_array_ptr.h [iso-8859-1] Fri Sep 29 18:13:54 2017 @@ -1,8 +1,8 @@ /* * PROJECT: ReactOS Automatic Testing Utility - * LICENSE: GNU GPLv2 or any later version as published by the Free Software Foundation + * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) * PURPOSE: Template similar to std::auto_ptr for arrays - * COPYRIGHT: Copyright 2009 Colin Finck <colin(a)reactos.org> + * COPYRIGHT: Copyright 2009 Colin Finck (colin(a)reactos.org) */ template<typename Type> Modified: trunk/rostests/rosautotest/main.cpp URL: http://svn.reactos.org/svn/reactos/trunk/rostests/rosautotest/main.cpp?rev=… ============================================================================== --- trunk/rostests/rosautotest/main.cpp [iso-8859-1] (original) +++ trunk/rostests/rosautotest/main.cpp [iso-8859-1] Fri Sep 29 18:13:54 2017 @@ -1,8 +1,8 @@ /* * PROJECT: ReactOS Automatic Testing Utility - * LICENSE: GNU GPLv2 or any later version as published by the Free Software Foundation + * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) * PURPOSE: Main implementation file - * COPYRIGHT: Copyright 2008-2009 Colin Finck <colin(a)reactos.org> + * COPYRIGHT: Copyright 2008-2009 Colin Finck (colin(a)reactos.org) */ #include "precomp.h" Modified: trunk/rostests/rosautotest/misc.cpp URL: http://svn.reactos.org/svn/reactos/trunk/rostests/rosautotest/misc.cpp?rev=… ============================================================================== --- trunk/rostests/rosautotest/misc.cpp [iso-8859-1] (original) +++ trunk/rostests/rosautotest/misc.cpp [iso-8859-1] Fri Sep 29 18:13:54 2017 @@ -1,9 +1,8 @@ /* - * PROJECT: ReactOS Automatic Testing Utility - * LICENSE: GPL - See COPYING in the top level directory - * FILE: base/applications/rapps/misc.c - * PURPOSE: Misc functions - * PROGRAMMERS: Dmitry Chapyshev (dmitry(a)reactos.org) + * PROJECT: ReactOS Automatic Testing Utility + * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) + * PURPOSE: Functions for writing to the Event Log + * COPYRIGHT: Copyright 2009 Dmitry Chapyshev (dmitry(a)reactos.org) */ #include "precomp.h" Modified: trunk/rostests/rosautotest/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/rostests/rosautotest/precomp.h?rev… ============================================================================== --- trunk/rostests/rosautotest/precomp.h [iso-8859-1] (original) +++ trunk/rostests/rosautotest/precomp.h [iso-8859-1] Fri Sep 29 18:13:54 2017 @@ -1,3 +1,10 @@ +/* + * PROJECT: ReactOS Automatic Testing Utility + * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) + * PURPOSE: Main header file + * COPYRIGHT: Copyright 2009-2015 Colin Finck (colin(a)reactos.org) + */ + #ifndef _ROSAUTOTEST_H_ #define _ROSAUTOTEST_H_ Modified: trunk/rostests/rosautotest/shutdown.cpp URL: http://svn.reactos.org/svn/reactos/trunk/rostests/rosautotest/shutdown.cpp?… ============================================================================== --- trunk/rostests/rosautotest/shutdown.cpp [iso-8859-1] (original) +++ trunk/rostests/rosautotest/shutdown.cpp [iso-8859-1] Fri Sep 29 18:13:54 2017 @@ -1,8 +1,8 @@ /* * PROJECT: ReactOS Automatic Testing Utility - * LICENSE: GNU GPLv2 or any later version as published by the Free Software Foundation + * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) * PURPOSE: Helper function for shutting down the system - * COPYRIGHT: Copyright 2008-2009 Colin Finck <colin(a)reactos.org> + * COPYRIGHT: Copyright 2008-2009 Colin Finck (colin(a)reactos.org) */ #include "precomp.h" Modified: trunk/rostests/rosautotest/tools.cpp URL: http://svn.reactos.org/svn/reactos/trunk/rostests/rosautotest/tools.cpp?rev… ============================================================================== --- trunk/rostests/rosautotest/tools.cpp [iso-8859-1] (original) +++ trunk/rostests/rosautotest/tools.cpp [iso-8859-1] Fri Sep 29 18:13:54 2017 @@ -1,8 +1,8 @@ /* * PROJECT: ReactOS Automatic Testing Utility - * LICENSE: GNU GPLv2 or any later version as published by the Free Software Foundation + * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) * PURPOSE: Various helper functions - * COPYRIGHT: Copyright 2008-2015 Colin Finck <colin(a)reactos.org> + * COPYRIGHT: Copyright 2008-2015 Colin Finck (colin(a)reactos.org) */ #include "precomp.h"

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