Ros-diffs

ros-diffs@reactos.org

81390 discussions

[reactos] 03/03: [CMD] Fix batch/CALL arguments initialization.
by Hermès Bélusca-Maïto 27 Sep '20

27 Sep '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=f0fccb752fe41ce4e2c25… commit f0fccb752fe41ce4e2c2529b07a2493ddbc0bfb5 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sun Aug 9 21:13:13 2020 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sun Sep 27 19:06:10 2020 +0200 [CMD] Fix batch/CALL arguments initialization. - Move initialization of bc->raw_params also in BatchParams(). - The bc->raw_params, i.e. the unparsed batch/CALL parameters obtained with %*, has any leading and trailing whitespace trimmed (since Windows 2000+). --- base/shell/cmd/batch.c | 93 ++++++++++++++++++++++++++++++++------------------ 1 file changed, 59 insertions(+), 34 deletions(-) diff --git a/base/shell/cmd/batch.c b/base/shell/cmd/batch.c index 714480cb6c7..671be4189d9 100644 --- a/base/shell/cmd/batch.c +++ b/base/shell/cmd/batch.c @@ -112,55 +112,85 @@ FindArg( /* - * Batch_params builds a parameter list in newly allocated memory. - * The parameters consist of null terminated strings with a final - * NULL character signalling the end of the parameters. - * + * Builds the batch parameter list in newly allocated memory. + * The parameters consist of NULL terminated strings with a + * final NULL character signalling the end of the parameters. */ -static LPTSTR BatchParams(LPTSTR s1, LPTSTR s2) +static BOOL +BatchParams( + IN PCTSTR Arg0, + IN PCTSTR Args, + OUT PTSTR* RawParams, + OUT PTSTR* ParamList) { - LPTSTR dp = (LPTSTR)cmd_alloc((_tcslen(s1) + _tcslen(s2) + 3) * sizeof (TCHAR)); + PTSTR dp; + SIZE_T len; + + *RawParams = NULL; + *ParamList = NULL; + + /* Make a raw copy of the parameters, but trim any leading and trailing whitespace */ + // Args += _tcsspn(Args, _T(" \t")); + while (_istspace(*Args)) + ++Args; + dp = (PTSTR)Args + _tcslen(Args); + while ((dp > Args) && _istspace(*(dp - 1))) + --dp; + len = dp - Args; + *RawParams = (PTSTR)cmd_alloc((len + 1)* sizeof(TCHAR)); + if (!*RawParams) + { + WARN("Cannot allocate memory for RawParams!\n"); + error_out_of_memory(); + return FALSE; + } + _tcsncpy(*RawParams, Args, len); + (*RawParams)[len] = _T('\0'); + + /* Parse the parameters as well */ + Args = *RawParams; - /* JPP 20-Jul-1998 added error checking */ - if (dp == NULL) + *ParamList = (PTSTR)cmd_alloc((_tcslen(Arg0) + _tcslen(Args) + 3) * sizeof(TCHAR)); + if (!*ParamList) { - WARN("Cannot allocate memory for dp!\n"); + WARN("Cannot allocate memory for ParamList!\n"); error_out_of_memory(); - return NULL; + cmd_free(*RawParams); + *RawParams = NULL; + return FALSE; } - if (s1 && *s1) + dp = *ParamList; + + if (Arg0 && *Arg0) { - s1 = _stpcpy (dp, s1); - *s1++ = _T('\0'); + dp = _stpcpy(dp, Arg0); + *dp++ = _T('\0'); } - else - s1 = dp; - while (*s2) + while (*Args) { BOOL inquotes = FALSE; /* Find next parameter */ - while (_istspace(*s2) || (*s2 && _tcschr(STANDARD_SEPS, *s2))) - s2++; - if (!*s2) + while (_istspace(*Args) || (*Args && _tcschr(STANDARD_SEPS, *Args))) + ++Args; + if (!*Args) break; /* Copy it */ do { - if (!inquotes && (_istspace(*s2) || _tcschr(STANDARD_SEPS, *s2))) + if (!inquotes && (_istspace(*Args) || _tcschr(STANDARD_SEPS, *Args))) break; - inquotes ^= (*s2 == _T('"')); - *s1++ = *s2++; - } while (*s2); - *s1++ = _T('\0'); + inquotes ^= (*Args == _T('"')); + *dp++ = *Args++; + } while (*Args); + *dp++ = _T('\0'); } + *dp = _T('\0'); - *s1 = _T('\0'); - - return dp; + return TRUE; } /* @@ -368,14 +398,9 @@ INT Batch(LPTSTR fullname, LPTSTR firstword, LPTSTR param, PARSED_COMMAND *Cmd) for (i = 0; i < 10; i++) bc->shiftlevel[i] = i; - /* Parse the parameters and make a raw copy of them without modifications */ - bc->params = BatchParams(firstword, param); - bc->raw_params = cmd_dup(param); - if (bc->raw_params == NULL) - { - error_out_of_memory(); + /* Parse the batch parameters */ + if (!BatchParams(firstword, param, &bc->raw_params, &bc->params)) return 1; - } /* If we are calling from inside a FOR, hide the FOR variables */ saved_fc = fc;

1 0

[reactos] 02/03: [CMD] CALL: Fix the implementation of the CALL command, make it more compatible with Windows' CMD.
by Hermès Bélusca-Maïto 27 Sep '20

27 Sep '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=37bda06eedb789df05c5a… commit 37bda06eedb789df05c5a318460341e41ca48655 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sun Jul 26 20:30:21 2020 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sun Sep 27 19:05:23 2020 +0200 [CMD] CALL: Fix the implementation of the CALL command, make it more compatible with Windows' CMD. - Fail if no parameter is provided. - The "CALL :label args..." syntax is available only when command extensions are enabled. Fail if this syntax is used outside of a batch context. - Reparse the CALL command parameter with the command parser, in order to accurately parse and interpret it as a possible command (including escape carets, etc...) and not duplicate the logic. ** CURRENT Windows' CMD-compatibility LIMITATION ** (may be lifted in a "ROS-specific" running mode of CMD): only allow standard commands to be specified as parameter of the CALL command. This reparsing behaviour can be observed in Windows' CMD, by dumping the interpreted commands after enabling the cmd!fDumpParse flag from a debugger (using public symbols). - When reparsing, we should tell the parser to NOT ignore lines that start with a colon, because in this situation these are to be considered as valid "commands" (for parsing "CALL :label"). * For Windows' CMD-compatibility, the remaining escape carets need to be doubled again so that, after the new parser step, they are escaped back to their original form. But then we also need to do it the "buggy" way à la Windows, where carets in quotes are doubled either! However when being re-parsed, since they are in quotes they remain doubled!! (see "Phase 6" in https://stackoverflow.com/a/4095133/13530036 ). * A MSCMD_CALL_QUIRKS define allows to disable this buggy behaviour, and instead tell the parser to not not interpret the escape carets. - When initializing a new batch context when the "CALL :label" syntax is used, ensure that we reuse the same batch file position pointer as its parent, so as to have correct call label ordering behaviour. That is, :label ECHO hi CALL :label :label ECHO bye should display: hi bye bye i.e., the CALL calls the second label instead of the first one (and thus entering into an infinite loop). Finally, the "CALL :label" syntax strips the first ':' away, so, as a side-effect, the command "CALL :EOF" fails (otherwise it would perform a "GOTO :EOF" and succeeds), while "CALL ::EOF" succeeds. Fixes some cmd_winetests. --- base/shell/cmd/batch.c | 33 ++++++++- base/shell/cmd/call.c | 185 +++++++++++++++++++++++++++++++++++++++++------- base/shell/cmd/cmd.h | 3 + base/shell/cmd/goto.c | 19 ++++- base/shell/cmd/parser.c | 12 +++- 5 files changed, 218 insertions(+), 34 deletions(-) diff --git a/base/shell/cmd/batch.c b/base/shell/cmd/batch.c index 1876b84deab..714480cb6c7 100644 --- a/base/shell/cmd/batch.c +++ b/base/shell/cmd/batch.c @@ -399,9 +399,28 @@ INT Batch(LPTSTR fullname, LPTSTR firstword, LPTSTR param, PARSED_COMMAND *Cmd) #endif } - /* Check if this is a "CALL :label" */ - if (*firstword == _T(':')) - ret = cmd_goto(firstword); + /* If this is a "CALL :label args ...", call a subroutine of + * the current batch file, only if extensions are enabled. */ + if (bEnableExtensions && (*firstword == _T(':'))) + { + LPTSTR expLabel; + + /* Position at the place of the parent file (which is the same as the caller) */ + bc->mempos = (bc->prev ? bc->prev->mempos : 0); + + /* + * Jump to the label. Strip the label's colon; as a side-effect + * this will forbid "CALL :EOF"; however "CALL ::EOF" will work! + */ + bc->current = Cmd; + ++firstword; + + /* Expand the label only! (simulate a GOTO command as in Windows' CMD) */ + expLabel = DoDelayedExpansion(firstword); + ret = cmd_goto(expLabel ? expLabel : firstword); + if (expLabel) + cmd_free(expLabel); + } /* If we have created a new context, don't return * until this batch file has completed. */ @@ -548,8 +567,16 @@ LPTSTR ReadBatchLine(VOID) TRACE("ReadBatchLine(): textline: \'%s\'\n", debugstr_aw(textline)); +#if 1 + // + // FIXME: This is redundant, but keep it for the moment until we correctly + // hande the end-of-file situation here, in ReadLine() and in the parser. + // (In an EOF, the previous BatchGetString() call will return FALSE but + // we want not to run the ExitBatch() at first, but wait later to do it.) + // if (textline[_tcslen(textline) - 1] != _T('\n')) _tcscat(textline, _T("\n")); +#endif return textline; } diff --git a/base/shell/cmd/call.c b/base/shell/cmd/call.c index 55f39d086f1..c9b11937492 100644 --- a/base/shell/cmd/call.c +++ b/base/shell/cmd/call.c @@ -30,58 +30,189 @@ #include "precomp.h" +/* Enable this define for "buggy" Windows' CMD CALL-command compatibility */ +#define MSCMD_CALL_QUIRKS + + /* * Perform CALL command. */ - INT cmd_call(LPTSTR param) { - TCHAR line[CMDLINE_LENGTH + 1]; - TCHAR *first; - BOOL bInQuote = FALSE; + PARSED_COMMAND* Cmd = NULL; + BOOL bOldIgnoreParserComments; +#ifndef MSCMD_CALL_QUIRKS + BOOL bOldHandleContinuations; +#else + SIZE_T nNumCarets; +#endif + PTSTR first; + + TRACE("cmd_call(\'%s\')\n", debugstr_aw(param)); - TRACE ("cmd_call: (\'%s\')\n", debugstr_aw(param)); - if (!_tcsncmp (param, _T("/?"), 2)) + if (!_tcsncmp(param, _T("/?"), 2)) { - ConOutResPaging(TRUE,STRING_CALL_HELP); + ConOutResPaging(TRUE, STRING_CALL_HELP); return 0; } - /* Do a second round of %-variable substitutions */ - if (!SubstituteVars(param, line, _T('%'))) + /* Fail if no command or label has been provided */ + if (*param == _T('\0')) return (nErrorLevel = 1); - /* Find start and end of first word */ - first = line; - while (_istspace(*first)) - first++; + /* Ignore parser comments (starting with a colon) */ + bOldIgnoreParserComments = bIgnoreParserComments; + bIgnoreParserComments = FALSE; + +#ifndef MSCMD_CALL_QUIRKS + /* Disable parsing of escape carets */ + bOldHandleContinuations = bHandleContinuations; + bHandleContinuations = FALSE; + first = param; +#else + /* + * As the original escape carets have been dealt with during the first + * command parsing step, the remaining ones need to be doubled so that + * they can again survive the new parsing step done below. + * But do it the Windows' CMD "buggy" way: **all** carets are doubled, + * even those inside quotes. However, this causes carets inside quotes + * to remain doubled after the parsing step... + */ + + /* Count all the carets */ + nNumCarets = 0; + first = param; + while (first) + { + first = _tcschr(first, _T('^')); + if (first) + { + ++nNumCarets; + ++first; + } + } + + /* Re-allocate a large enough parameter string if needed */ + if (nNumCarets > 0) + { + PTCHAR Src, Dest, End; + + // TODO: Improvement: Use the scratch TempBuf if the string is not too long. + first = cmd_alloc((_tcslen(param) + nNumCarets + 1) * sizeof(TCHAR)); + if (!first) + { + WARN("Cannot allocate memory for new CALL parameter string!\n"); + error_out_of_memory(); + return (nErrorLevel = 1); + } + + /* Copy the parameter string and double the escape carets */ + Src = param; + Dest = first; + while (*Src) + { + if (*Src != _T('^')) + { + /* Copy everything before the next caret (or the end of the string) */ + End = _tcschr(Src, _T('^')); + if (!End) + End = Src + _tcslen(Src); + memcpy(Dest, Src, (End - Src) * sizeof(TCHAR)); + Dest += End - Src; + Src = End; + continue; + } + + /* Copy the original caret and double it */ + *Dest++ = *Src; + *Dest++ = *Src++; + } + *Dest = _T('\0'); + } + else + { + first = param; + } +#endif + + /* + * Reparse the CALL parameter string as a command. + * Note that this will trigger a second round of %-variable substitutions. + */ + Cmd = ParseCommand(first); + + /* Restore the global parsing state */ +#ifndef MSCMD_CALL_QUIRKS + bHandleContinuations = bOldHandleContinuations; +#endif + bIgnoreParserComments = bOldIgnoreParserComments; + + /* + * If no command is there, yet no error occurred, this means that + * a whitespace label was given. Do not consider this as a failure. + */ + if (!Cmd && !bParseError) + { +#ifdef MSCMD_CALL_QUIRKS + if (first != param) + cmd_free(first); +#endif + return (nErrorLevel = 0); + } + + /* Reset bParseError so as to continue running afterwards */ + bParseError = FALSE; - for (param = first; *param; param++) + /* + * Otherwise, if no command is there because a parse error occurred, + * or if this an unsupported command: not a standard one, including + * FOR and IF, fail and bail out. + */ + if (!Cmd || (Cmd->Type == C_FOR) || (Cmd->Type == C_IF) || + ((Cmd->Type != C_COMMAND) && (Cmd->Type != C_REM))) { - if (!bInQuote && (_istspace(*param) || _tcschr(_T(",;="), *param))) - break; - bInQuote ^= (*param == _T('"')); + // FIXME: Localize + ConErrPrintf(_T("%s was unexpected.\n"), first); + +#ifdef MSCMD_CALL_QUIRKS + if (first != param) + cmd_free(first); +#endif + if (Cmd) FreeCommand(Cmd); + return (nErrorLevel = 1); } - /* Separate first word from rest of line */ - memmove(param + 1, param, (_tcslen(param) + 1) * sizeof(TCHAR)); - *param++ = _T('\0'); +#ifdef MSCMD_CALL_QUIRKS + if (first != param) + cmd_free(first); +#endif + + first = Cmd->Command.First; + param = Cmd->Command.Rest; - if (*first == _T(':') && bc) + /* "CALL :label args ..." - Call a subroutine of the current batch file, only if extensions are enabled */ + if (bEnableExtensions && (*first == _T(':'))) { INT ret; - /* CALL :label - call a subroutine of the current batch file */ - while (*param == _T(' ')) - param++; + /* A batch context must be present */ + if (!bc) + { + // FIXME: Localize + ConErrPuts(_T("Invalid attempt to call batch label outside of batch script.\n")); + FreeCommand(Cmd); + return (nErrorLevel = 1); + } ret = Batch(bc->BatchFilePath, first, param, NULL); nErrorLevel = (ret != 0 ? ret : nErrorLevel); - - return nErrorLevel; + } + else + { + nErrorLevel = DoCommand(first, param, NULL); } - nErrorLevel = DoCommand(first, param, NULL); + FreeCommand(Cmd); return nErrorLevel; } diff --git a/base/shell/cmd/cmd.h b/base/shell/cmd/cmd.h index bb2221fb23d..0812596719b 100644 --- a/base/shell/cmd/cmd.h +++ b/base/shell/cmd/cmd.h @@ -424,6 +424,9 @@ VOID ParseErrorEx(IN PCTSTR s); extern BOOL bParseError; extern TCHAR ParseLine[CMDLINE_LENGTH]; +extern BOOL bIgnoreParserComments; +extern BOOL bHandleContinuations; + /* Prototypes from PATH.C */ INT cmd_path (LPTSTR); diff --git a/base/shell/cmd/goto.c b/base/shell/cmd/goto.c index 5174b62417f..777963344a2 100644 --- a/base/shell/cmd/goto.c +++ b/base/shell/cmd/goto.c @@ -41,7 +41,24 @@ INT cmd_goto(LPTSTR param) TRACE("cmd_goto(\'%s\')\n", debugstr_aw(param)); - if (!_tcsncmp(param, _T("/?"), 2)) + /* + * Keep the help message handling here too. + * This allows us to reproduce the Windows' CMD "bug" + * (from a batch script): + * + * SET label=/? + * CALL :%%label%% + * + * calls GOTO help, due to how CALL :label functionality + * is internally implemented. + * + * See https://stackoverflow.com/q/31987023/13530036 + * for more details. + * + * Note that the choice of help parsing forbids + * any label containing '/?' in it. + */ + if (_tcsstr(param, _T("/?"))) { ConOutResPaging(TRUE, STRING_GOTO_HELP1); return 0; diff --git a/base/shell/cmd/parser.c b/base/shell/cmd/parser.c index 1680c5be4d8..29797bf36ae 100644 --- a/base/shell/cmd/parser.c +++ b/base/shell/cmd/parser.c @@ -93,6 +93,9 @@ static BOOL bLineContinuations; static PTCHAR ParsePos; static PTCHAR OldParsePos; +BOOL bIgnoreParserComments = TRUE; +BOOL bHandleContinuations = TRUE; + static TCHAR CurrentToken[CMDLINE_LENGTH]; static TOK_TYPE CurrentTokenType = TOK_END; #ifndef MSCMD_PARSER_BUGS @@ -206,6 +209,9 @@ restart: if (!ReadLine(ParseLine, TRUE)) { /* ^C pressed, or line was too long */ + // + // FIXME: Distinguish with respect to BATCH end of file !! + // bParseError = TRUE; } else @@ -445,7 +451,7 @@ ParseToken( IN TCHAR ExtraEnd OPTIONAL, IN PCTSTR Separators OPTIONAL) { - return ParseTokenEx(0, ExtraEnd, Separators, TRUE); + return ParseTokenEx(0, ExtraEnd, Separators, bHandleContinuations); } @@ -1294,7 +1300,7 @@ ParseCommandBinaryOp( if (OpType == C_OP_LOWEST) // i.e. CP_MULTI { /* Ignore any parser-level comments */ - if (*CurrentToken == _T(':')) + if (bIgnoreParserComments && (*CurrentToken == _T(':'))) { /* Ignore the rest of the line, including line continuations */ while (ParseToken(0, NULL) != TOK_END) @@ -1445,7 +1451,7 @@ ParseCommandOp( /* Parse the prefix "quiet" operator '@' as a separate command. * Thus, @@foo@bar is parsed as: '@', '@', 'foo@bar'. */ - ParseTokenEx(_T('@'), _T('('), STANDARD_SEPS, TRUE); + ParseTokenEx(_T('@'), _T('('), STANDARD_SEPS, bHandleContinuations); return ParseCommandBinaryOp(OpType); }

1 0

[reactos] 01/03: [CMD_ROSTEST] Add tests for CALL label parsing, and for CALL and GOTO behaviour.
by Hermès Bélusca-Maïto 27 Sep '20

27 Sep '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=4f4af5d271551859cfed8… commit 4f4af5d271551859cfed84f1817aead9530d32bc Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Mon Jul 27 01:23:13 2020 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sun Sep 27 19:04:51 2020 +0200 [CMD_ROSTEST] Add tests for CALL label parsing, and for CALL and GOTO behaviour. Tests adapted from https://stackoverflow.com/q/31987023/13530036 and from https://stackoverflow.com/a/38938416/13530036 . - Test when CALL with a label containing /? actually calls GOTO's help, and test when CALL's help is displayed instead. - Test when CALL with a label containing /?, but specified by variables, do NOT trigger GOTO's or CALL's help. - Test the effect of the presence of escape carets in CALL label string. - Test that CALL indeed supports double delayed expansion. Adapted from https://stackoverflow.com/a/31990563/13530036 . --- modules/rostests/win32/cmd/test_goto_call.cmd | 271 +++++++++++++++++++++- modules/rostests/win32/cmd/test_goto_call.cmd.exp | 46 ++++ 2 files changed, 316 insertions(+), 1 deletion(-) diff --git a/modules/rostests/win32/cmd/test_goto_call.cmd b/modules/rostests/win32/cmd/test_goto_call.cmd index d2356a1b447..3d5fac295d5 100644 --- a/modules/rostests/win32/cmd/test_goto_call.cmd +++ b/modules/rostests/win32/cmd/test_goto_call.cmd @@ -54,10 +54,71 @@ goto :EOF :: and the label name, as well as leading and trailing whitespace. :@tab@continue@space@@space@ +:: CALL does an extra round of variable substitution. + +:: Existing labels (see below) +set VAR=TOTO +call :dest%VAR% +call :dest%%VAR%% +call :dest!VAR! +call :dest!!VAR!! + +set VAR=1 +call :dest%VAR% +call :dest%%VAR%% +call :dest!VAR! +call :dest!!VAR!! + +:: Exercise different whitespace separations +call :dest1@space@@tab@ a b c +call @space@:dest1@space@@space@ + +:: Similar to GOTO, whitespace between ':' and the label name parameter are NOT ignored. +call :setError 0 +call @space@:@space@dest1@space@@space@ +if %errorlevel% equ 0 (echo Unexpected: CALL did not fail^^!) else echo OK + +:: Only GOTO understands '+' instead of ':'. +:: Here '+dest1' is understood as a (non-existing) command. +call :setError 0 +call @space@+dest1@space@@space@ +if %errorlevel% equ 0 (echo Unexpected: CALL did not fail^^!) else echo OK + + +:: Calling a label with escape carets. +call :la^^bel1 :: Jumping to a label with escape carets. goto :la^^bel2 + +:: Label with percents (should not be called) +:dest%%VAR%% +echo Unexpected CALL/GOTO jump^^! + +:: Valid label (called from the variable substitution tests above) +:destTOTO +echo Hi there^^! +:: We exit this CALL invocation +goto :EOF + +:: Valid label with arbitrary first character before ':' +:: (not just '@' as supposed by cmd_winetests!) +?:de^st1 +echo goto with unrelated first character, and escape carets worked +echo Params: '%0', '%1', '%2', '%3' +:: We exit this CALL invocation +goto :EOF + + +:: Label with escape carets +:la^bel1 +echo Unexpected CALL jump^^! +:la^^bel1 +echo CALL with escape caret worked +:: We exit this CALL invocation +goto :EOF + :la^bel2 echo Unexpected GOTO jump^^! :la^^bel2 @@ -117,6 +178,17 @@ echo --------- Testing :EOF support --------- :: Use an auxiliary CMD file to test GOTO :EOF mkdir foobar && cd foobar +:: This CALL will fail: :EOF is indeed a reserved label for GOTO only. +call :setError 0 +call :EOF +if %errorlevel% equ 0 (echo Unexpected: CALL :EOF did not fail^^!) else echo OK + +:: This CALL will succeed silently: only the first ':' of ::EOF is stripped, +:: thus calling in a new batch context GOTO :EOF. +call :setError 0 +call ::EOF +if %errorlevel% neq 0 (echo Unexpected: CALL ::EOF did fail^^!) else echo OK + :: GOTO :EOF is available only if commands extensions are enabled echo @echo off> tmp.cmd echo setlocal disableextensions>> tmp.cmd @@ -366,7 +438,7 @@ echo --------- Testing EXIT within IF --------- :: Use a CALL context, and we will only check EXIT /B. call :doExitIfTest 1 call :doExitIfTest 2 -goto :finished +goto :continue :doExitIfTest if %1==1 ( @@ -382,6 +454,203 @@ echo You won't see this^^! exit /b +:: +:: Next suite of tests. +:: +:continue + +echo --------- Testing CALL (triggers GOTO /?) --------- + +:: +:: Test that shows that CALL :label with the label name containing /? +:: at delayed time, internally calls GOTO, and will end up calling GOTO /?, +:: then jumps to the next command. +:: +:: Adapted from https://stackoverflow.com/q/31987023/13530036 +:: and from https://stackoverflow.com/a/38938416/13530036 +:: The author of this test calls that "anonymous functions". +:: +set "label=/?" + +:: Test 1: GOTO /? will be called. +:: Since it is expected that the code below the CALL will also be called in +:: its context, but we want its output to be redirected to STDOUT, we use a +:: different redirection file so that it does not go into the tmp.txt file. +echo --- Direct label, redirection + +:: Use an auxiliary CMD file +mkdir foobar && cd foobar + +:: Call the label and redirect STDOUT to a file for later filtering. +call :%%label%% argument > tmp.txt +:: The following commands are called also within the CALL context. +:: The message will be displayed both in the CALL context, and in the main one. +echo Test message -- '%0','%*'>> tmpMsg.txt +:: Within the CALL context, this is the expected value of %0. Quit early. +if "%0" == ":/?" ( + echo Arguments: '%*'>> tmpMsg.txt + exit /B +) + +:: Back to the main context. +:: Display the redirected messages, filtering out the batch file name. +for /f "delims=" %%x in (tmpMsg.txt) do ( + set "msg=%%x" + echo !msg:%0=! +) + +:: Check whether CALL displayed GOTO help or CALL help. +:: We differentiate between both, because GOTO /? mentions CALL /?, but CALL +:: help does not mention GOTO, and contains the substring "CALL [" (part of the +:: syntax example) that allows to discriminate between both cases. +find "GOTO" tmp.txt > NUL && echo OK, GOTO help.|| echo Unexpected, no GOTO help^^! +find "CALL [" tmp.txt > NUL && echo Unexpected CALL help^^! + +:: Cleanup +del tmp.txt tmpMsg.txt > NUL + +:: Test 2: CALL /? will be called if piping. +echo --- Direct label, piping + +call :%%label%% argument | (find "CALL [" > NUL && echo OK, CALL help.|| echo Unexpected, no CALL help^^!) +echo Test message -- '%0','%*'>> tmpMsg.txt +if "%0" == ":/?" ( + echo Arguments: '%*'>> tmpMsg.txt + exit /B +) + +:: Back to the main context. +:: Display the redirected messages, filtering out the batch file name. +for /f "delims=" %%x in (tmpMsg.txt) do ( + set "msg=%%x" + echo !msg:%0=! +) + +:: Cleanup +del tmpMsg.txt > NUL +cd .. & rd /s/q foobar + + +:: +:: Repeat the same tests as above, but now with a slightly different label. +:: +echo --------- Testing CALL with escape carets (triggers GOTO /?) --------- + +set "help=^ /? ^^^^arg" + +:: Test 1: GOTO /? will be called. +:: See the explanations in the previous tests above +echo --- Direct label, redirection + +:: Use an auxiliary CMD file +mkdir foobar && cd foobar + +:: Call the label and redirect STDOUT to a file for later filtering. +call :myLabel%%help%% ^^^^argument > tmp.txt +echo Test message -- '%0','%*'>> tmpMsg.txt +if "%0" == ":myLabel /?" ( + echo Arguments: '%*'>> tmpMsg.txt + exit /B +) + +:: Back to the main context. +:: Display the redirected messages, filtering out the batch file name. +for /f "delims=" %%x in (tmpMsg.txt) do ( + set "msg=%%x" + echo !msg:%0=! +) + +:: Check whether CALL displayed GOTO help or CALL help. +find "GOTO" tmp.txt > NUL && echo OK, GOTO help.|| echo Unexpected, no GOTO help^^! +find "CALL [" tmp.txt > NUL && echo Unexpected CALL help^^! + +:: Cleanup +del tmp.txt tmpMsg.txt > NUL + +:: Test 2: CALL /? will be called if piping. +echo --- Direct label, piping + +call :myLabel%%help%% ^^^^argument | (find "CALL [" > NUL && echo OK, CALL help.|| echo Unexpected, no CALL help^^!) +echo Test message -- '%0','%*'>> tmpMsg.txt +if "%0" == ":myLabel /?" ( + echo Arguments: '%*'>> tmpMsg.txt + exit /B +) + +:: Back to the main context. +:: Display the redirected messages, filtering out the batch file name. +for /f "delims=" %%x in (tmpMsg.txt) do ( + set "msg=%%x" + echo !msg:%0=! +) + +:: Cleanup +del tmpMsg.txt > NUL +cd .. & rd /s/q foobar + +goto :continue + +:/? +:myLabel +echo Unexpected CALL or GOTO! Arguments: '%*' +exit /b 0 + + +:: +:: Next suite of tests. +:: +:continue + +:: +:: This test will actually call the label. +:: Adapted from https://stackoverflow.com/a/38938416/13530036 +:: +echo --------- Testing CALL (NOT triggering GOTO /? or CALL /?) --------- + +set "var=/?" +call :sub %%var%% +goto :otherTest + +:sub +echo Arguments: '%*' +exit /b + + +:otherTest +call :sub2 "/?" Hello World +goto :continue + +:sub2 +:: 'args' contains the list of arguments +set "args=%*" +:: !args:%1=! will remove the first argument specified by %1 and keep the rest. +echo %~1 | (find "ECHO [" > NUL && echo OK, ECHO help.|| echo Unexpected, no ECHO help^^!) +echo/ +echo !args:%1=! +exit /b + + +:: +:: Next suite of tests. +:: +:continue + +:: +:: CALL supports double delayed expansion. +:: Test from https://stackoverflow.com/a/31990563/13530036 +:: +echo --------- Testing CALL double delayed expansion --------- + +set "label=myLabel" +set "pointer=^!label^!" +call :!pointer! +goto :finished + +:myLabel +echo It works^^! +exit /b + + :: :: Finished! diff --git a/modules/rostests/win32/cmd/test_goto_call.cmd.exp b/modules/rostests/win32/cmd/test_goto_call.cmd.exp index 3e94300fd76..bf49a971931 100644 --- a/modules/rostests/win32/cmd/test_goto_call.cmd.exp +++ b/modules/rostests/win32/cmd/test_goto_call.cmd.exp @@ -2,6 +2,25 @@ Test GOTO ok --------- Testing CALL within batch --------- Test CALL ok from :test_call +Hi there! +Hi there! +Hi there! +Hi there! +goto with unrelated first character, and escape carets worked +Params: ':dest1', '', '', '' +goto with unrelated first character, and escape carets worked +Params: ':dest1', '', '', '' +goto with unrelated first character, and escape carets worked +Params: ':dest1', '', '', '' +goto with unrelated first character, and escape carets worked +Params: ':dest1', '', '', '' +goto with unrelated first character, and escape carets worked +Params: ':dest1', 'a', 'b', 'c' +goto with unrelated first character, and escape carets worked +Params: ':dest1', '', '', '' +OK +OK +CALL with escape caret worked GOTO with escape caret worked Hi there! Hi there! @@ -15,6 +34,8 @@ OK OK OK OK +OK +OK --------- Testing GOTO within block --------- Block-test 1: Single-line Block-test 2: Multi-line @@ -228,4 +249,29 @@ B --------- Testing EXIT within IF --------- First block Second block +--------- Testing CALL (triggers GOTO /?) --------- +--- Direct label, redirection +Test message -- ':/?','argument' +Arguments: 'argument' +Test message -- '','' +OK, GOTO help. +--- Direct label, piping +OK, CALL help.@space@ +Test message -- '','' +--------- Testing CALL with escape carets (triggers GOTO /?) --------- +--- Direct label, redirection +Test message -- ':myLabel /?','^arg ^argument' +Arguments: '^arg ^argument' +Test message -- '','' +OK, GOTO help. +--- Direct label, piping +OK, CALL help.@space@ +Test message -- '','' +--------- Testing CALL (NOT triggering GOTO /? or CALL /?) --------- +Arguments: '/?' +OK, ECHO help.@space@ + + Hello World +--------- Testing CALL double delayed expansion --------- +It works! --------- Finished --------------

1 0

[reactos] 01/01: [SHLWAPI] Follow-up of #3230 (f496a5f)
by Katayama Hirofumi MZ 27 Sep '20

27 Sep '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=fe41acdc11592659f78ba… commit fe41acdc11592659f78ba66180b810eb6ff34c54 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Sun Sep 27 15:47:10 2020 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Sun Sep 27 15:47:10 2020 +0900 [SHLWAPI] Follow-up of #3230 (f496a5f) CORE-9281 --- dll/win32/shlwapi/autocomp.cpp | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/dll/win32/shlwapi/autocomp.cpp b/dll/win32/shlwapi/autocomp.cpp index bc2c3ca3f14..da045a7f309 100644 --- a/dll/win32/shlwapi/autocomp.cpp +++ b/dll/win32/shlwapi/autocomp.cpp @@ -42,7 +42,7 @@ AutoComplete_AddMRU(CComPtr<IObjMgr> pManager, LPCWSTR pszKey) } static HRESULT -IUnknown_SetOptions(CComPtr<IUnknown> punk, DWORD dwACLO) +IUnknown_AddOptions(CComPtr<IUnknown> punk, DWORD dwACLO) { CComPtr<IACList2> pList; HRESULT hr = punk->QueryInterface(IID_IACList2, (LPVOID *)&pList); @@ -52,7 +52,10 @@ IUnknown_SetOptions(CComPtr<IUnknown> punk, DWORD dwACLO) return hr; } - hr = pList->SetOptions(dwACLO); + DWORD dwOptions = 0; + pList->GetOptions(&dwOptions); + dwOptions |= dwACLO; + hr = pList->SetOptions(dwOptions); if (FAILED(hr)) ERR("pList->SetOptions failed: 0x%08lX\n", hr); return hr; @@ -97,8 +100,8 @@ AutoComplete_LoadList(DWORD dwSHACF, DWORD dwACLO) if (SUCCEEDED(hr)) { pManager->Append(pHistory); // Add to the manager - // Set ACLO_* options - IUnknown_SetOptions(pHistory, dwACLO | ACLO_CURRENTDIR | ACLO_MYCOMPUTER); + // Add ACLO_* options + IUnknown_AddOptions(pHistory, dwACLO); } else { @@ -115,8 +118,8 @@ AutoComplete_LoadList(DWORD dwSHACF, DWORD dwACLO) if (SUCCEEDED(hr)) { pManager->Append(pISF); // Add to the manager - // Set ACLO_* options - IUnknown_SetOptions(pISF, dwACLO | ACLO_CURRENTDIR | ACLO_MYCOMPUTER); + // Add ACLO_* options + IUnknown_AddOptions(pISF, dwACLO); } else {

1 0

[reactos] 01/01: [CMD] Make the command-line parser more compatible with Windows' CMD one.
by Hermès Bélusca-Maïto 27 Sep '20

27 Sep '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=d029a626e964ad459e346… commit d029a626e964ad459e3462156b958664ae6da776 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sat May 23 00:35:54 2020 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sun Sep 27 02:27:15 2020 +0200 [CMD] Make the command-line parser more compatible with Windows' CMD one. All these modifications have been verified with Windows' CMD, either by using written cmd_rostests and the existing cmd_winetests, or manually by enabling the flags cmd!fDumpTokens and cmd!fDumpParse (available in the public symbols) and analyzing how the tokens are being parsed, as well as the generated command tree. See also the following links for more details (but remember that these observations have to be double-checked in Windows' CMD!): * Parser rules: https://stackoverflow.com/a/4095133/13530036 * Discussion: https://www.dostips.com/forum/viewtopic.php?f=3&t=8355 * Numbers parsing: https://www.dostips.com/forum/viewtopic.php?t=3758 * Label names vs. GOTO and CALL: https://www.dostips.com/forum/viewtopic.php?f=3&t=3803 and: https://www.dostips.com/forum/viewtopic.php?f=3&t=3803&p=55405#p55405 - Fix REM command parsing. A C_COMMAND-like structure should still be built, so that it can show up during batch command echo. However some specific handling needs to be done, so use instead a new C_REM command type. Escape carets are parsed differently than usual: they are explicitly kept in the command line and don't participate in line continuations. Also, the Windows' CMD behaviour is to discards everything before the last line continuation. - Prefix operator '@' (the "silent" operator) is parsed as a separate command. Thus, the command @@foo@bar is parsed as: '@', '@', 'foo@bar'. - Improve the checks for numbered redirection. For this purpose, we check whether this is a number, that is in first position in the current parsing buffer or is preceded by a whitespace- like separator, including standard command operators (excepting '@' !) and double-quotes. - Empty command blocks, i.e. "( )", standing by themselves, or present in IF or FOR commands, are considered invalid. (The closing parenthesis is considered "unexpected".) - Ignore single closing parenthesis when being outside of command blocks, thus interpreting it as a command, and ignore explicitly everything following on the same line, including line continuations. This very specific situation can happen e.g. while running in batch mode, when jumping to a label present inside a command block. See the code for a thorough explanation. - Detect whether a parenthesized block is not terminated at the end of a command stream (getting a NUL character instead of a newline), and if so, bail out early instead of entering into an infinite loop. - Perform a similar check for the parenthesized list in FOR commands. - Initialize the static 'InsideBlock' value to a known value. - The '&' operator (multi-commmand) is allowed to have an empty RHS. When such situation occurs, turn the CurrentTokenType to TOK_END so as to avoid a parse error later on. - The main body of a IF statement, or its 'else' clause, as well as the main body of a FOR statement, must not be empty, otherwise this is considered a syntax error. If so, call ParseError() that sets the 'bParseError' flag, and forcing all batch execution to stop. --- base/shell/cmd/cmd.c | 17 +- base/shell/cmd/cmd.h | 76 ++- base/shell/cmd/internal.c | 2 +- base/shell/cmd/parser.c | 1205 +++++++++++++++++++++++++++++++++++---------- 4 files changed, 1002 insertions(+), 298 deletions(-) diff --git a/base/shell/cmd/cmd.c b/base/shell/cmd/cmd.c index ba4e90dd05e..a3253026f10 100644 --- a/base/shell/cmd/cmd.c +++ b/base/shell/cmd/cmd.c @@ -664,7 +664,7 @@ ExecuteAsync(PARSED_COMMAND *Cmd) /* Build the parameter string to pass to cmd.exe */ ParamsEnd = _stpcpy(CmdParams, _T("/S/D/C\"")); - ParamsEnd = Unparse(Cmd, ParamsEnd, &CmdParams[CMDLINE_LENGTH - 2]); + ParamsEnd = UnparseCommand(Cmd, ParamsEnd, &CmdParams[CMDLINE_LENGTH - 2]); if (!ParamsEnd) { error_out_of_memory(); @@ -785,12 +785,13 @@ ExecuteCommand( LPTSTR First, Rest; INT Ret = 0; + /* If we don't have any command, or if this is REM, ignore it */ + if (!Cmd || (Cmd->Type == C_REM)) + return 0; /* * Do not execute any command if we are about to exit CMD, or about to * change batch execution context, e.g. in case of a CALL / GOTO / EXIT. */ - if (!Cmd) - return 0; if (bExit || SeenGoto()) return 0; @@ -812,6 +813,8 @@ ExecuteCommand( } cmd_free(First); } + /* Fall through */ + case C_REM: break; case C_QUIET: @@ -842,13 +845,13 @@ ExecuteCommand( Ret = ExecutePipeline(Cmd); break; - case C_IF: - Ret = ExecuteIf(Cmd); - break; - case C_FOR: Ret = ExecuteFor(Cmd); break; + + case C_IF: + Ret = ExecuteIf(Cmd); + break; } UndoRedirection(Cmd->Redirections, NULL); diff --git a/base/shell/cmd/cmd.h b/base/shell/cmd/cmd.h index 93fefe4f4c6..bb2221fb23d 100644 --- a/base/shell/cmd/cmd.h +++ b/base/shell/cmd/cmd.h @@ -259,7 +259,8 @@ INT CommandHistory(LPTSTR param); /* Prototypes for IF.C */ #define IFFLAG_NEGATE 1 /* NOT */ #define IFFLAG_IGNORECASE 2 /* /I - Extended */ -enum { +typedef enum _IF_OPERATOR +{ /** Unary operators **/ /* Standard */ IF_ERRORLEVEL, IF_EXIST, @@ -271,7 +272,8 @@ enum { IF_STRINGEQ, /* == */ /* Extended */ IF_EQU, IF_NEQ, IF_LSS, IF_LEQ, IF_GTR, IF_GEQ -}; +} IF_OPERATOR; + INT ExecuteIf(struct _PARSED_COMMAND *Cmd); /* Prototypes for INTERNAL.C */ @@ -345,42 +347,78 @@ INT CommandMsgbox (LPTSTR); /* These three characters act like spaces to the parser in most contexts */ #define STANDARD_SEPS _T(",;=") -enum { C_COMMAND, C_QUIET, C_BLOCK, C_MULTI, C_OR, C_AND, C_PIPE, C_IF, C_FOR }; +typedef enum _COMMAND_TYPE +{ + /* Standard command */ + C_COMMAND, + /* Quiet operator */ + C_QUIET, + /* Parenthesized block */ + C_BLOCK, + /* Operators */ + C_MULTI, C_OR, C_AND, C_PIPE, + /* Special parsed commands */ + C_FOR, C_IF, C_REM +} COMMAND_TYPE; + typedef struct _PARSED_COMMAND { + /* + * For IF : this is the 'main' case (the 'else' is obtained via SubCmd->Next). + * For FOR: this is the list of all the subcommands in the DO. + */ struct _PARSED_COMMAND *Subcommands; - struct _PARSED_COMMAND *Next; + + struct _PARSED_COMMAND *Next; // Next command(s) in the chain. struct _REDIRECTION *Redirections; - BYTE Type; + COMMAND_TYPE Type; union { struct { - TCHAR *Rest; + PTSTR Rest; TCHAR First[]; } Command; struct - { - BYTE Flags; - BYTE Operator; - TCHAR *LeftArg; - TCHAR *RightArg; - } If; - struct { BYTE Switches; TCHAR Variable; - LPTSTR Params; - LPTSTR List; + PTSTR Params; + PTSTR List; struct _FOR_CONTEXT *Context; } For; + struct + { + BYTE Flags; + IF_OPERATOR Operator; + PTSTR LeftArg; + PTSTR RightArg; + } If; }; } PARSED_COMMAND; -PARSED_COMMAND *ParseCommand(LPTSTR Line); -VOID EchoCommand(PARSED_COMMAND *Cmd); -TCHAR *Unparse(PARSED_COMMAND *Cmd, TCHAR *Out, TCHAR *OutEnd); -VOID FreeCommand(PARSED_COMMAND *Cmd); +PARSED_COMMAND* +ParseCommand( + IN PCTSTR Line); + +VOID +DumpCommand( + IN PARSED_COMMAND* Cmd, + IN ULONG SpacePad); + +VOID +EchoCommand( + IN PARSED_COMMAND* Cmd); + +PTCHAR +UnparseCommand( + IN PARSED_COMMAND* Cmd, + OUT PTCHAR Out, + IN PTCHAR OutEnd); + +VOID +FreeCommand( + IN OUT PARSED_COMMAND* Cmd); VOID ParseErrorEx(IN PCTSTR s); extern BOOL bParseError; diff --git a/base/shell/cmd/internal.c b/base/shell/cmd/internal.c index 87fe7df9d81..2bb99144d4a 100644 --- a/base/shell/cmd/internal.c +++ b/base/shell/cmd/internal.c @@ -694,7 +694,7 @@ INT CommandExit(LPTSTR param) */ INT CommandRem (LPTSTR param) { - if (!_tcsncmp (param, _T("/?"), 2)) + if (_tcsstr(param, _T("/?")) == param) { ConOutResPaging(TRUE,STRING_REM_HELP); } diff --git a/base/shell/cmd/parser.c b/base/shell/cmd/parser.c index 37bc548f2a1..1680c5be4d8 100644 --- a/base/shell/cmd/parser.c +++ b/base/shell/cmd/parser.c @@ -1,12 +1,31 @@ /* - * PARSER.C - command parsing. + * PARSER.C - Command-line Lexical Analyzer/Tokenizer and Parser. */ #include "precomp.h" -/* Enable this define for "buggy" Windows' CMD command echoer compatibility */ +/* + * Defines for enabling different Windows' CMD compatibility behaviours. + */ + +/* Enable this define for command echoer compatibility */ #define MSCMD_ECHO_COMMAND_COMPAT +/* Enable this define for parser quirks (see UnParseToken() for more details) */ +#define MSCMD_PARSER_BUGS + +/* Enable this define for parenthesized blocks parsing quirks */ +// #define MSCMD_PARENS_PARSE_BUGS + +/* Enable this define for redirection parsing quirks */ +#define MSCMD_REDIR_PARSE_BUGS + +/* Enable this define for allowing '&' commands with an empty RHS. + * The default behaviour is to just return the LHS instead. + * See ParseCommandBinaryOp() for details. */ +// #define MSCMD_MULTI_EMPTY_RHS + + /* * Parser debugging support. These flags are global so that their values can be * modified at runtime from a debugger. They correspond to the public Windows' @@ -22,8 +41,10 @@ static const TCHAR OpString[][3] = { _T("&"), _T("||"), _T("&&"), _T("|") }; static const TCHAR RedirString[][3] = { _T("<"), _T(">"), _T(">>") }; -static const TCHAR *const IfOperatorString[] = +static const TCHAR* const IfOperatorString[] = { + /** Unary operators **/ + /* Standard */ _T("errorlevel"), _T("exist"), @@ -33,6 +54,8 @@ static const TCHAR *const IfOperatorString[] = _T("defined"), #define IF_MAX_UNARY IF_DEFINED + /** Binary operators **/ + /* Standard */ _T("=="), @@ -46,12 +69,12 @@ static const TCHAR *const IfOperatorString[] = #define IF_MAX_COMPARISON IF_GEQ }; -static BOOL IsSeparator(TCHAR Char) +static __inline BOOL IsSeparator(TCHAR Char) { - return _istspace(Char) || (Char && _tcschr(STANDARD_SEPS, Char)); + return _istspace(Char) || (Char && !!_tcschr(STANDARD_SEPS, Char)); } -enum +typedef enum _TOK_TYPE { TOK_END, TOK_NORMAL, @@ -59,7 +82,7 @@ enum TOK_REDIRECTION, TOK_BEGIN_BLOCK, TOK_END_BLOCK -}; +} TOK_TYPE; /* Scratch buffer for temporary command substitutions / expansions */ static TCHAR TempBuf[CMDLINE_LENGTH]; @@ -67,19 +90,103 @@ static TCHAR TempBuf[CMDLINE_LENGTH]; /*static*/ BOOL bParseError; static BOOL bLineContinuations; /*static*/ TCHAR ParseLine[CMDLINE_LENGTH]; -static TCHAR *ParsePos; -static TCHAR CurChar; +static PTCHAR ParsePos; +static PTCHAR OldParsePos; static TCHAR CurrentToken[CMDLINE_LENGTH]; -static int CurrentTokenType; -static int InsideBlock; +static TOK_TYPE CurrentTokenType = TOK_END; +#ifndef MSCMD_PARSER_BUGS +static BOOL bReparseToken = FALSE; +static PTCHAR LastCurTokPos; +#endif +static INT InsideBlock = 0; + +static VOID ResetParser(IN PTCHAR Pos) +{ + bParseError = FALSE; + ParsePos = Pos; + OldParsePos = ParsePos; +} + +/* + * This function "refetches" the last parsed token back into the stream + * for later reparsing -- since the way of lexing it is context-dependent. + * This "feature" is at the root of many obscure CMD parsing quirks, + * due to the fact this feature is in opposition with line-continuation. + * Indeed, when a stream of characters has a line-continuation, the lexer- + * parser will parse the stream up to the end of the line, then will + * reset the parser state and position back to the beginning of the line + * before accepting the rest of the character stream and continuing + * parsing them. This means that all the non-parsed characters before the + * line-continuation have been lost. Of course, their parsed form is now + * within the current parsed token. However, suppose now we need to + * unparse this token for reparsing it a different way later on. If we + * somehow pushed the already-parsed current token back into the beginning + * of the character stream, besides the complications of moving up the + * characters in the stream buffer, we would basically have "new" data + * that has been already parsed one way, to be now parsed another way. + * If instead we had saved somehow the unparsed form of the token, and + * we push back that form into the stream buffer for reparsing, we would + * encounter again the line-continuation, that, depending on which + * context the token is reparsed, would cause problems: + * e.g. in the case of REM command parsing, the parser would stop at the + * first line-continuation. + * + * When MSCMD_PARSER_BUGS is undefined, the UnParseToken() / ParseToken() + * cycle keeps the current token in its buffer, but also saves the start + * position corresponding to the batch of characters that have been parsed + * during the last line-continuation. The next ParseToken() would then + * reparse these latest charcters and the result replaces the last part + * in the current token. + * + * For example, a first parsing of + * foo^\n + * bar^\n + * baz + * would result in the current token "foobarbaz", where the start position + * corresponding to the batch of characters parsed during the last line-continuation + * being pointing at "baz". The stream buffer only contains "baz" (and following data). + * Then UnParseToken() saves this info so that at the next ParseToken(), the "baz" + * part of the stream buffer gets reparsed (possibly differently) and the result + * would replace the "baz" part in the current token. + * + * If MSCMD_PARSER_BUGS is defined however, then the behaviour of the Windows' CMD + * parser applies: in the example above, the last ParseToken() call would completely + * replace the current token "foobarbaz" with the new result of the parsing of "baz". + */ +static VOID UnParseToken(VOID) +{ + ParsePos = OldParsePos; + + /* Debugging support */ + if (fDumpTokens) + ConOutPrintf(_T("Ungetting: '%s'\n"), ParsePos); + +#ifndef MSCMD_PARSER_BUGS + bReparseToken = TRUE; +#endif +} + +static VOID InitParser(VOID) +{ + *CurrentToken = 0; + CurrentTokenType = TOK_END; + InsideBlock = 0; + +#ifndef MSCMD_PARSER_BUGS + bReparseToken = FALSE; + LastCurTokPos = NULL; +#endif + + ResetParser(ParseLine); +} -static TCHAR ParseChar(void) +static TCHAR ParseChar(VOID) { TCHAR Char; if (bParseError) - return (CurChar = 0); + return 0; restart: /* @@ -93,23 +200,22 @@ restart: } while (Char == _T('\r')); - if (!Char) + if (!Char) --ParsePos; + if (!Char && bLineContinuations) { - ParsePos--; - if (bLineContinuations) + if (!ReadLine(ParseLine, TRUE)) { - if (!ReadLine(ParseLine, TRUE)) - { - /* ^C pressed, or line was too long */ - bParseError = TRUE; - } - else if (*(ParsePos = ParseLine)) - { + /* ^C pressed, or line was too long */ + bParseError = TRUE; + } + else + { + ResetParser(ParseLine); + if (*ParsePos) goto restart; - } } } - return (CurChar = Char); + return Char; } VOID ParseErrorEx(IN PCTSTR s) @@ -125,41 +231,79 @@ static __inline VOID ParseError(VOID) ParseErrorEx(CurrentTokenType != TOK_END ? CurrentToken : NULL); } -/* - * Yes, cmd has a Lexical Analyzer. Whenever the parser gives an "xxx was - * unexpected at this time." message, it shows what the last token read was. - */ -static int ParseToken(TCHAR ExtraEnd, TCHAR *Separators) +static TOK_TYPE +ParseTokenEx( + IN TCHAR PrefixOperator OPTIONAL, + IN TCHAR ExtraEnd OPTIONAL, + IN PCTSTR Separators OPTIONAL, + IN BOOL bHandleContinuations) { - TCHAR *Out = CurrentToken; + TOK_TYPE Type; + PTCHAR CurrentTokStart = CurrentToken; + PTCHAR Out = CurrentTokStart; TCHAR Char; - int Type; BOOL bInQuote = FALSE; - for (Char = CurChar; Char && Char != _T('\n'); Char = ParseChar()) +#ifndef MSCMD_PARSER_BUGS + if (bReparseToken) + { + bReparseToken = FALSE; + + /* + * We will append the part to be reparsed to the old one + * (still present in CurrentToken). + */ + CurrentTokStart = LastCurTokPos; + Out = CurrentTokStart; + } + else + { + LastCurTokPos = CurrentToken; + } +#endif + + /* Start with what we have at current ParsePos */ + OldParsePos = ParsePos; + + for (Char = ParseChar(); Char && Char != _T('\n'); Char = ParseChar()) { bInQuote ^= (Char == _T('"')); if (!bInQuote) { if (Separators != NULL) { - if (_istspace(Char) || _tcschr(Separators, Char)) + if (_istspace(Char) || !!_tcschr(Separators, Char)) { /* Skip leading separators */ - if (Out == CurrentToken) + if (Out == CurrentTokStart) continue; break; } } - /* Check for numbered redirection */ - if ((Char >= _T('0') && Char <= _T('9') && - (ParsePos == &ParseLine[1] || IsSeparator(ParsePos[-2])) - && (*ParsePos == _T('<') || *ParsePos == _T('>')))) + /* Check for prefix operator */ + if ((Out == CurrentTokStart) && (Char == PrefixOperator)) + break; + + /* + * Check for numbered redirection. + * + * For this purpose, we check whether this is a number, that is + * in first position in the current parsing buffer (remember that + * ParsePos points to the next character) or is preceded by a + * whitespace-like separator, including standard command operators + * (excepting '@' !) and double-quotes. + */ + if ( _istdigit(Char) && + (ParsePos == &OldParsePos[1] || + IsSeparator(ParsePos[-2]) || + !!_tcschr(_T("()&|\""), ParsePos[-2])) && + (*ParsePos == _T('<') || *ParsePos == _T('>')) ) { break; } + /* Check for other delimiters / operators */ if (Char == ExtraEnd) break; if (InsideBlock && Char == _T(')')) @@ -167,59 +311,90 @@ static int ParseToken(TCHAR ExtraEnd, TCHAR *Separators) if (_tcschr(_T("&|<>"), Char)) break; - if (Char == _T('^')) + if (bHandleContinuations && (Char == _T('^'))) { Char = ParseChar(); /* Eat up a \n, allowing line continuation */ if (Char == _T('\n')) + { +#ifndef MSCMD_PARSER_BUGS + LastCurTokPos = Out; +#endif Char = ParseChar(); + } /* Next character is a forced literal */ + + if (Out == CurrentTokStart) + { + /* Ignore any prefix operator if we don't start a new command block */ + if (CurrentTokenType != TOK_BEGIN_BLOCK) + PrefixOperator = 0; + } } } if (Out == &CurrentToken[CMDLINE_LENGTH - 1]) break; *Out++ = Char; + + // PrefixOperator = 0; } - /* Check if we got at least one character before reaching a special one. - * If so, return them and leave the special for the next call. */ - if (Out != CurrentToken) + /* + * We exited the parsing loop. If the current character is the first one + * (Out == CurrentTokStart), interpret it as an operator. Otherwise, + * terminate the current token (type TOK_NORMAL) and keep the current + * character so that it can be refetched as an operator at the next call. + */ + + if (Out != CurrentTokStart) { Type = TOK_NORMAL; } + /* + * Else we have an operator. + */ + else if (Char == _T('@')) + { + Type = TOK_OPERATOR; // TOK_QUIET / TOK_PREFIX_OPERATOR + *Out++ = Char; + Char = ParseChar(); + } else if (Char == _T('(')) { Type = TOK_BEGIN_BLOCK; *Out++ = Char; - ParseChar(); + Char = ParseChar(); } else if (Char == _T(')')) { Type = TOK_END_BLOCK; *Out++ = Char; - ParseChar(); + Char = ParseChar(); } else if (Char == _T('&') || Char == _T('|')) { Type = TOK_OPERATOR; *Out++ = Char; Char = ParseChar(); - /* check for && or || */ + /* Check for '&&' or '||' */ if (Char == Out[-1]) { *Out++ = Char; - ParseChar(); + Char = ParseChar(); } } - else if ((Char >= _T('0') && Char <= _T('9')) - || (Char == _T('<') || Char == _T('>'))) + else if ( _istdigit(Char) || + (Char == _T('<') || Char == _T('>')) ) { Type = TOK_REDIRECTION; - if (Char >= _T('0') && Char <= _T('9')) + if (_istdigit(Char)) { *Out++ = Char; Char = ParseChar(); } + /* By construction (see the while-loop above), + * the next character must be a redirection. */ + ASSERT(Char == _T('<') || Char == _T('>')); *Out++ = Char; Char = ParseChar(); if (Char == Out[-1]) @@ -234,19 +409,30 @@ static int ParseToken(TCHAR ExtraEnd, TCHAR *Separators) *Out++ = Char; while (IsSeparator(Char = ParseChar())) ; - if (Char >= _T('0') && Char <= _T('9')) + if (_istdigit(Char)) { *Out++ = Char; - ParseChar(); + Char = ParseChar(); } } } else { Type = TOK_END; + *Out++ = Char; } *Out = _T('\0'); + /* + * Rewind the parsing position, so that the current character can be + * refetched later on. However do this only if it is not NULL and if + * this is not TOK_END, since we do not want to reparse later the line + * termination (we could enter into infinite loops, or, in case of line + * continuation, get unwanted "More?" prompts). + */ + if (Char != 0 && Type != TOK_END) + --ParsePos; + /* Debugging support */ if (fDumpTokens) ConOutPrintf(_T("ParseToken: (%d) '%s'\n"), Type, CurrentToken); @@ -254,14 +440,127 @@ static int ParseToken(TCHAR ExtraEnd, TCHAR *Separators) return (CurrentTokenType = Type); } -static BOOL ParseRedirection(REDIRECTION **List) +static __inline INT +ParseToken( + IN TCHAR ExtraEnd OPTIONAL, + IN PCTSTR Separators OPTIONAL) { - TCHAR *Tok = CurrentToken; - BYTE Number; + return ParseTokenEx(0, ExtraEnd, Separators, TRUE); +} + + +static PARSED_COMMAND* +AllocCommand( + IN COMMAND_TYPE Type, + IN PCTSTR CmdHead OPTIONAL, + IN PCTSTR CmdTail OPTIONAL) +{ + PARSED_COMMAND* Cmd; + + switch (Type) + { + case C_COMMAND: + case C_REM: + { + SIZE_T CmdHeadLen = _tcslen(CmdHead) + 1; + SIZE_T CmdTailLen = _tcslen(CmdTail) + 1; + + Cmd = cmd_alloc(FIELD_OFFSET(PARSED_COMMAND, + Command.First[CmdHeadLen + CmdTailLen])); + if (!Cmd) + return NULL; + + Cmd->Type = Type; + Cmd->Next = NULL; + Cmd->Subcommands = NULL; + Cmd->Redirections = NULL; /* Is assigned by the calling function */ + memcpy(Cmd->Command.First, CmdHead, CmdHeadLen * sizeof(TCHAR)); + Cmd->Command.Rest = Cmd->Command.First + CmdHeadLen; + memcpy(Cmd->Command.Rest, CmdTail, CmdTailLen * sizeof(TCHAR)); + return Cmd; + } + + case C_QUIET: + case C_BLOCK: + case C_MULTI: + case C_OR: + case C_AND: + case C_PIPE: + { + Cmd = cmd_alloc(sizeof(PARSED_COMMAND)); + if (!Cmd) + return NULL; + + Cmd->Type = Type; + Cmd->Next = NULL; + Cmd->Subcommands = NULL; + Cmd->Redirections = NULL; /* For C_BLOCK only: is assigned by the calling function */ + return Cmd; + } + + case C_FOR: + case C_IF: + { + Cmd = cmd_alloc(sizeof(PARSED_COMMAND)); + if (!Cmd) + return NULL; + + memset(Cmd, 0, sizeof(PARSED_COMMAND)); + Cmd->Type = Type; + return Cmd; + } + + default: + ERR("Unknown command type 0x%x\n", Type); + ASSERT(FALSE); + return NULL; + } +} + +VOID +FreeCommand( + IN OUT PARSED_COMMAND* Cmd) +{ + if (Cmd->Subcommands) + FreeCommand(Cmd->Subcommands); + if (Cmd->Next) + FreeCommand(Cmd->Next); + FreeRedirection(Cmd->Redirections); + if (Cmd->Type == C_FOR) + { + cmd_free(Cmd->For.Params); + cmd_free(Cmd->For.List); + } + else if (Cmd->Type == C_IF) + { + cmd_free(Cmd->If.LeftArg); + cmd_free(Cmd->If.RightArg); + } + cmd_free(Cmd); +} + + +/* Parse redirections and append them to the list */ +static BOOL +ParseRedirection( + IN OUT REDIRECTION** List) +{ + PTSTR Tok = CurrentToken; + REDIRECTION* Redir; REDIR_MODE RedirMode; - REDIRECTION *Redir; + BYTE Number; + + if ( !(*Tok == _T('<') || *Tok == _T('>')) && + !(_istdigit(*Tok) && + (Tok[1] == _T('<') || Tok[1] == _T('>')) ) ) + { + ASSERT(CurrentTokenType != TOK_REDIRECTION); + return FALSE; + } + ASSERT((CurrentTokenType == TOK_REDIRECTION) || + (CurrentTokenType == TOK_NORMAL)); - if (*Tok >= _T('0') && *Tok <= _T('9')) + if (_istdigit(*Tok)) Number = *Tok++ - _T('0'); else Number = *Tok == _T('<') ? 0 : 1; @@ -269,6 +568,7 @@ static BOOL ParseRedirection(REDIRECTION **List) if (*Tok++ == _T('<')) { RedirMode = REDIR_READ; + /* Forbid '<<' */ if (*Tok == _T('<')) goto fail; } @@ -282,9 +582,20 @@ static BOOL ParseRedirection(REDIRECTION **List) } } + if (*Tok == _T('&')) + { + /* This is a handle redirection: the next character must be one single digit */ + if (!(_istdigit(Tok[1]) && !Tok[2])) + goto fail; + } + else +#ifndef MSCMD_REDIR_PARSE_BUGS if (!*Tok) + /* The file name was not part of this token, so it will be the next one */ +#else + /* Get rid of what possibly remains in the token, and retrieve the next one */ +#endif { - /* The file name was not part of this token, so it'll be the next one */ if (ParseToken(0, STANDARD_SEPS) != TOK_NORMAL) goto fail; Tok = CurrentToken; @@ -323,31 +634,60 @@ fail: return FALSE; } -static PARSED_COMMAND *ParseCommandOp(int OpType); +static __inline PARSED_COMMAND* +ParseCommandOp( + IN COMMAND_TYPE OpType); /* Parse a parenthesized block */ -static PARSED_COMMAND *ParseBlock(REDIRECTION *RedirList) +static PARSED_COMMAND* +ParseBlock( + IN OUT REDIRECTION** RedirList) { PARSED_COMMAND *Cmd, *Sub, **NextPtr; - Cmd = cmd_alloc(sizeof(PARSED_COMMAND)); + Cmd = AllocCommand(C_BLOCK, NULL, NULL); if (!Cmd) { WARN("Cannot allocate memory for Cmd!\n"); ParseError(); - FreeRedirection(RedirList); return NULL; } - Cmd->Type = C_BLOCK; - Cmd->Next = NULL; - Cmd->Subcommands = NULL; - Cmd->Redirections = RedirList; /* Read the block contents */ NextPtr = &Cmd->Subcommands; - InsideBlock++; - while (1) + ++InsideBlock; + while (TRUE) { + /* + * Windows' CMD compatibility: Strip leading newlines in the block. + * + * Note that this behaviour is buggy, especially when MSCMD_PARSER_BUGS is defined! + * For example: + * (foo^\n + * bar) + * would be parsed ultimately as: '(', 'bar', ')' because the "foo^" + * part would be discarded due to the UnParseToken() call, since this + * function doesn't work across line continuations. + */ + while (ParseToken(0, STANDARD_SEPS) == TOK_END && *CurrentToken == _T('\n')) + ; + if (*CurrentToken && *CurrentToken != _T('\n')) + UnParseToken(); + + /* Break early if we have nothing else to read. We will also fail + * due to the fact we haven't encountered any closing parenthesis. */ + if (!*CurrentToken /* || *CurrentToken == _T('\n') */) + { + ASSERT(CurrentTokenType == TOK_END); + break; + } + + /* + * NOTE: Windows' CMD uses a "CRLF" operator when dealing with + * newlines in parenthesized blocks, as an alternative to the + * '&' command-separation operator. + */ + Sub = ParseCommandOp(C_OP_LOWEST); if (Sub) { @@ -356,7 +696,7 @@ static PARSED_COMMAND *ParseBlock(REDIRECTION *RedirList) } else if (bParseError) { - InsideBlock--; + --InsideBlock; FreeCommand(Cmd); return NULL; } @@ -365,36 +705,83 @@ static PARSED_COMMAND *ParseBlock(REDIRECTION *RedirList) break; /* Skip past the \n */ - ParseChar(); } - InsideBlock--; + --InsideBlock; + + /* Fail if the block was not terminated, or if we have + * an empty block, i.e. "( )", considered invalid. */ + if ((CurrentTokenType != TOK_END_BLOCK) || (Cmd->Subcommands == NULL)) + { + ParseError(); + FreeCommand(Cmd); + return NULL; + } - /* Process any trailing redirections */ + /* Process any trailing redirections and append them to the list */ +#ifndef MSCMD_REDIR_PARSE_BUGS while (ParseToken(0, STANDARD_SEPS) == TOK_REDIRECTION) { - if (!ParseRedirection(&Cmd->Redirections)) + if (!ParseRedirection(RedirList)) { FreeCommand(Cmd); return NULL; } } +#else + while (ParseToken(0, STANDARD_SEPS) != TOK_END) + { + if (!ParseRedirection(RedirList)) + { + /* If an actual error happened in ParseRedirection(), bail out */ + if (bParseError) + { + FreeCommand(Cmd); + return NULL; + } + /* Otherwise it just returned FALSE because the current token + * is not a redirection. Unparse the token and refetch it. */ + break; + } + } +#endif + if (CurrentTokenType != TOK_END) + { + /* + * Windows' CMD compatibility: Unparse the current token. + * + * Note that this behaviour is buggy, especially when MSCMD_PARSER_BUGS is defined! + * For example: + * (foo^\n + * bar) + * would be parsed ultimately as: '(', 'bar', ')' because the "foo^" + * part would be discarded due to the UnParseToken() call, since this + * function doesn't work across line continuations. + */ + UnParseToken(); + + /* + * Since it is expected that when ParseBlock() returns, the next + * token is already fetched, call ParseToken() again to compensate. + */ + ParseToken(0, STANDARD_SEPS); + } + return Cmd; } /* Parse an IF statement */ -static PARSED_COMMAND *ParseIf(void) +static PARSED_COMMAND* +ParseIf(VOID) { - PARSED_COMMAND *Cmd; + PARSED_COMMAND* Cmd; - Cmd = cmd_alloc(sizeof(PARSED_COMMAND)); + Cmd = AllocCommand(C_IF, NULL, NULL); if (!Cmd) { WARN("Cannot allocate memory for Cmd!\n"); ParseError(); return NULL; } - memset(Cmd, 0, sizeof(PARSED_COMMAND)); - Cmd->Type = C_IF; if (bEnableExtensions && (_tcsicmp(CurrentToken, _T("/I")) == 0)) { @@ -478,27 +865,28 @@ error: * Parse a FOR command. * Syntax is: FOR [options] %var IN (list) DO command */ -static PARSED_COMMAND *ParseFor(void) +static PARSED_COMMAND* +ParseFor(VOID) { - PARSED_COMMAND *Cmd; - TCHAR* List = TempBuf; - TCHAR *Pos = List; + PARSED_COMMAND* Cmd; - Cmd = cmd_alloc(sizeof(PARSED_COMMAND)); + /* Use the scratch buffer */ + PTSTR List = TempBuf; + PTCHAR Pos = List; + + Cmd = AllocCommand(C_FOR, NULL, NULL); if (!Cmd) { WARN("Cannot allocate memory for Cmd!\n"); ParseError(); return NULL; } - memset(Cmd, 0, sizeof(PARSED_COMMAND)); - Cmd->Type = C_FOR; /* Skip the extended FOR syntax if extensions are disabled */ if (!bEnableExtensions) goto parseForBody; - while (1) + while (TRUE) { if (_tcsicmp(CurrentToken, _T("/D")) == 0) { @@ -561,22 +949,19 @@ parseForBody: if (ParseToken(_T('('), STANDARD_SEPS) != TOK_BEGIN_BLOCK) goto error; - while (1) + while (TRUE) { /* Pretend we're inside a block so the tokenizer will stop on ')' */ - InsideBlock++; + ++InsideBlock; ParseToken(0, STANDARD_SEPS); - InsideBlock--; + --InsideBlock; if (CurrentTokenType == TOK_END_BLOCK) break; - if (CurrentTokenType == TOK_END) - { - /* Skip past the \n */ - ParseChar(); + /* Skip past the \n */ + if ((CurrentTokenType == TOK_END) && *CurrentToken == _T('\n')) continue; - } if (CurrentTokenType != TOK_NORMAL) goto error; @@ -608,177 +993,432 @@ error: } /* Parse a REM command */ -static PARSED_COMMAND *ParseRem(void) +static PARSED_COMMAND* +ParseRem(VOID) { - /* "Ignore" the rest of the line. - * (Line continuations will still be parsed, though.) */ - while (ParseToken(0, NULL) != TOK_END) - ; - return NULL; + PARSED_COMMAND* Cmd; + + /* The common scratch buffer already contains the name of the command */ + PTSTR ParsedLine = TempBuf; + + PTCHAR Pos = ParsedLine + _tcslen(ParsedLine) + 1; + SIZE_T TailOffset = Pos - ParsedLine; + + /* Build a minimal command for REM, so that it can still get through the batch echo unparsing */ + + /* Unparse the current token, so as to emulate the REM command parsing + * behaviour of Windows' CMD, that discards everything before the last + * line continuation. */ + UnParseToken(); + + /* + * Ignore the rest of the line, without any line continuation (but eat the caret). + * We cannot simply set bLineContinuations to TRUE or FALSE, because we want (only + * for the REM command), even when bLineContinuations == FALSE, to get the caret, + * otherwise it would be ignored. + */ + while (ParseTokenEx(0, 0, NULL, FALSE) != TOK_END) + { + if (Pos + _tcslen(CurrentToken) >= &ParsedLine[CMDLINE_LENGTH]) + { + ParseError(); + return NULL; + } + Pos = _stpcpy(Pos, CurrentToken); + } + *Pos = _T('\0'); + + Cmd = AllocCommand(C_REM, + ParsedLine, + ParsedLine + TailOffset); + if (!Cmd) + { + WARN("Cannot allocate memory for Cmd!\n"); + ParseError(); + return NULL; + } + return Cmd; } -static DECLSPEC_NOINLINE PARSED_COMMAND *ParseCommandPart(REDIRECTION *RedirList) +/* Parse a command */ +static PARSED_COMMAND* +ParseCommandPart( + IN OUT REDIRECTION** RedirList) { - TCHAR ParsedLine[CMDLINE_LENGTH]; - PARSED_COMMAND *Cmd; - PARSED_COMMAND *(*Func)(void); + PARSED_COMMAND* Cmd; + PARSED_COMMAND* (*Func)(VOID); - TCHAR *Pos = _stpcpy(ParsedLine, CurrentToken) + 1; - DWORD_PTR TailOffset = Pos - ParsedLine; + /* Use the scratch buffer */ + PTSTR ParsedLine = TempBuf; + + /* We need to copy the current token because it's going to be changed below by the ParseToken() calls */ + PTCHAR Pos = _stpcpy(ParsedLine, CurrentToken) + 1; + SIZE_T TailOffset = Pos - ParsedLine; /* Check for special forms */ - if ((Func = ParseFor, _tcsicmp(ParsedLine, _T("for")) == 0) || - (Func = ParseIf, _tcsicmp(ParsedLine, _T("if")) == 0) || - (Func = ParseRem, _tcsicmp(ParsedLine, _T("rem")) == 0)) + if ((Func = ParseFor, _tcsicmp(ParsedLine, _T("FOR")) == 0) || + (Func = ParseIf, _tcsicmp(ParsedLine, _T("IF")) == 0) || + (Func = ParseRem, _tcsicmp(ParsedLine, _T("REM")) == 0)) { + PTCHAR pHelp; + ParseToken(0, STANDARD_SEPS); - /* Do special parsing only if it's not followed by /? */ - if (_tcscmp(CurrentToken, _T("/?")) != 0) + + if ((pHelp = _tcsstr(CurrentToken, _T("/?"))) && + (Func == ParseIf ? (pHelp[2] == _T('/') || pHelp[2] == 0) : TRUE)) + { + /* /? was found within the first token */ + ParseToken(0, STANDARD_SEPS); + } + else + { + pHelp = NULL; + } + if (pHelp && (CurrentTokenType == TOK_NORMAL)) { - if (RedirList) + /* We encountered /? first, but is followed + * by another token: that's an error. */ + ParseError(); + return NULL; + } + + /* Do actual parsing only if no help is present */ + if (!pHelp) + { + /* FOR and IF commands cannot have leading redirection, but REM can */ + if (*RedirList && ((Func == ParseFor) || (Func == ParseIf))) { - ParseError(); - FreeRedirection(RedirList); + /* Display the culprit command and fail */ + ParseErrorEx(ParsedLine); return NULL; } + return Func(); } - Pos = _stpcpy(Pos, _T(" /?")); + + /* Otherwise, run FOR,IF,REM as regular commands only for help support */ + if (Pos + _tcslen(_T("/?")) >= &ParsedLine[CMDLINE_LENGTH]) + { + ParseError(); + return NULL; + } + Pos = _stpcpy(Pos, _T("/?")); + } + else + { + ParseToken(0, NULL); } /* Now get the tail */ - while (1) + while (CurrentTokenType != TOK_END) { - ParseToken(0, NULL); if (CurrentTokenType == TOK_NORMAL) { if (Pos + _tcslen(CurrentToken) >= &ParsedLine[CMDLINE_LENGTH]) { ParseError(); - FreeRedirection(RedirList); return NULL; } Pos = _stpcpy(Pos, CurrentToken); } +#ifndef MSCMD_REDIR_PARSE_BUGS else if (CurrentTokenType == TOK_REDIRECTION) { - if (!ParseRedirection(&RedirList)) - return NULL; + /* Process any trailing redirections and append them to the list */ + while (CurrentTokenType == TOK_REDIRECTION) + { + if (!ParseRedirection(RedirList)) + return NULL; + + ParseToken(0, STANDARD_SEPS); + } + if (CurrentTokenType == TOK_END) + break; + + /* Unparse the current token, and reparse it below with no separators */ + UnParseToken(); } else { + /* There is no need to do a UnParseToken() / ParseToken() cycle */ break; } +#else + else + { + /* Process any trailing redirections and append them to the list */ + BOOL bSuccess = FALSE; + + ASSERT(CurrentTokenType != TOK_END); + + while (CurrentTokenType != TOK_END) + { + if (!ParseRedirection(RedirList)) + { + /* If an actual error happened in ParseRedirection(), bail out */ + if (bParseError) + return NULL; + + /* Otherwise it just returned FALSE because the current token + * is not a redirection. Unparse the token and refetch it. */ + break; + } + bSuccess = TRUE; + + ParseToken(0, STANDARD_SEPS); + } + if (CurrentTokenType == TOK_END) + break; + + /* Unparse the current token, and reparse it below with no separators */ + UnParseToken(); + + /* If bSuccess == FALSE, we know that it's still the old fetched token, but + * it has been unparsed, so we need to refetch it before quitting the loop. */ + if (!bSuccess) + { + ParseToken(0, NULL); + break; + } + } +#endif + + ParseToken(0, NULL); } - *Pos++ = _T('\0'); + *Pos = _T('\0'); - Cmd = cmd_alloc(FIELD_OFFSET(PARSED_COMMAND, Command.First[Pos - ParsedLine])); + Cmd = AllocCommand(C_COMMAND, + ParsedLine, + ParsedLine + TailOffset); if (!Cmd) { WARN("Cannot allocate memory for Cmd!\n"); ParseError(); - FreeRedirection(RedirList); return NULL; } - Cmd->Type = C_COMMAND; - Cmd->Next = NULL; - Cmd->Subcommands = NULL; - Cmd->Redirections = RedirList; - memcpy(Cmd->Command.First, ParsedLine, (Pos - ParsedLine) * sizeof(TCHAR)); - Cmd->Command.Rest = Cmd->Command.First + TailOffset; return Cmd; } -static PARSED_COMMAND *ParsePrimary(void) +static PARSED_COMMAND* +ParsePrimary(VOID) { - REDIRECTION *RedirList = NULL; - int Type; - - while (IsSeparator(CurChar)) - { - if (CurChar == _T('\n')) - return NULL; - ParseChar(); - } - - if (!CurChar) - return NULL; - - if (CurChar == _T(':')) - { - /* "Ignore" the rest of the line. - * (Line continuations will still be parsed, though.) */ - while (ParseToken(0, NULL) != TOK_END) - ; - return NULL; - } + PARSED_COMMAND* Cmd = NULL; + REDIRECTION* RedirList = NULL; - if (CurChar == _T('@')) + /* In this context, '@' is considered as a separate token */ + if ((*CurrentToken == _T('@')) && (CurrentTokenType == TOK_OPERATOR)) { - PARSED_COMMAND *Cmd; - ParseChar(); - Cmd = cmd_alloc(sizeof(PARSED_COMMAND)); + Cmd = AllocCommand(C_QUIET, NULL, NULL); if (!Cmd) { WARN("Cannot allocate memory for Cmd!\n"); ParseError(); return NULL; } - Cmd->Type = C_QUIET; - Cmd->Next = NULL; /* @ acts like a unary operator with low precedence, * so call the top-level parser */ Cmd->Subcommands = ParseCommandOp(C_OP_LOWEST); - Cmd->Redirections = NULL; return Cmd; } /* Process leading redirections and get the head of the command */ - while ((Type = ParseToken(_T('('), STANDARD_SEPS)) == TOK_REDIRECTION) +#ifndef MSCMD_REDIR_PARSE_BUGS + while (CurrentTokenType == TOK_REDIRECTION) { if (!ParseRedirection(&RedirList)) return NULL; + + ParseToken(_T('('), STANDARD_SEPS); + } +#else + { + BOOL bSuccess = FALSE; + while (CurrentTokenType != TOK_END) + { + if (!ParseRedirection(&RedirList)) + { + /* If an actual error happened in ParseRedirection(), bail out */ + if (bParseError) + return NULL; + + /* Otherwise it just returned FALSE because + * the current token is not a redirection. */ + break; + } + bSuccess = TRUE; + + ParseToken(0, STANDARD_SEPS); + } + if (bSuccess) + { + /* Unparse the current token, and reparse it with support for parenthesis */ + if (CurrentTokenType != TOK_END) + UnParseToken(); + + ParseToken(_T('('), STANDARD_SEPS); } + } +#endif - if (Type == TOK_NORMAL) - return ParseCommandPart(RedirList); - else if (Type == TOK_BEGIN_BLOCK) - return ParseBlock(RedirList); - else if (Type == TOK_END_BLOCK && !RedirList) + if (CurrentTokenType == TOK_NORMAL) + Cmd = ParseCommandPart(&RedirList); + else if (CurrentTokenType == TOK_BEGIN_BLOCK) + Cmd = ParseBlock(&RedirList); + else if (CurrentTokenType == TOK_END_BLOCK && !RedirList) return NULL; + if (Cmd) + { + /* FOR and IF commands cannot have leading redirection + * (checked by ParseCommandPart(), errors out if so). */ + ASSERT(!RedirList || (Cmd->Type != C_FOR && Cmd->Type != C_IF)); + + /* Save the redirection list in the command */ + Cmd->Redirections = RedirList; + + /* Return the new command */ + return Cmd; + } + ParseError(); FreeRedirection(RedirList); return NULL; } -static PARSED_COMMAND *ParseCommandOp(int OpType) +static PARSED_COMMAND* +ParseCommandBinaryOp( + IN COMMAND_TYPE OpType) { - PARSED_COMMAND *Cmd, *Left, *Right; + PARSED_COMMAND* Cmd; + + if (OpType == C_OP_LOWEST) // i.e. CP_MULTI + { + /* Ignore any parser-level comments */ + if (*CurrentToken == _T(':')) + { + /* Ignore the rest of the line, including line continuations */ + while (ParseToken(0, NULL) != TOK_END) + ; +#ifdef MSCMD_PARENS_PARSE_BUGS + /* + * Return NULL in case we are NOT inside a parenthesized block, + * otherwise continue. The effects can be observed as follows: + * within a parenthesized block, every second ':'-prefixed command + * is not ignored, while the first of each "pair" is ignored. + * This first command **MUST NOT** be followed by an empty line, + * otherwise a syntax error is raised. + */ + if (InsideBlock == 0) + { +#endif + return NULL; +#ifdef MSCMD_PARENS_PARSE_BUGS + } + /* Get the next token */ + ParseToken(0, NULL); +#endif + } + + /* + * Ignore single closing parenthesis outside of command blocks, + * thus interpreted as a command. This very specific situation + * can happen e.g. while running in batch mode, when jumping to + * a label present inside a command block. + * + * NOTE: If necessary, this condition can be restricted to only + * when a batch context 'bc' is active. + * + * NOTE 2: For further security, Windows checks that we are NOT + * currently inside a parenthesized block, and also, ignores + * explicitly everything (ParseToken() loop) on the same line + * (including line continuations) after this closing parenthesis. + * + * Why doing so? Consider the following batch: + * + * IF 1==1 ( + * :label + * echo A + * ) ^ + * ELSE ( + * echo B + * exit /b + * ) + * GOTO :label + * + * First the IF block is executed. Since the condition is trivially + * true, only the first block "echo A" is executed, then execution + * goes after the IF block, that is, at the GOTO. Here, the GOTO + * jumps within the first IF-block, however, the running context now + * is NOT an IF. So parsing and execution will go through each command, + * starting with 'echo A'. But then one gets the ') ^\n ELSE (' part !! + * If we want to make sense of this without bailing out due to + * parsing error, we should ignore this line, **including** the line + * continuation. Hence we need to loop over all the tokens following + * the closing parenthesis, instead of just returning NULL straight ahead. + * Then execution continues with the other commands, 'echo B' and + * 'exit /b' (here to stop the code loop). Execution would also + * continue (if 'exit' was replaced by something else) and encounter + * the lone closing parenthesis ')', that should again be ignored. + * + * Note that this feature has been introduced in Win2k+. + */ + if (/** bc && **/ (_tcscmp(CurrentToken, _T(")")) == 0) && + (CurrentTokenType != TOK_END_BLOCK)) + { + ASSERT(InsideBlock == 0); + + /* Ignore the rest of the line, including line continuations */ + while (ParseToken(0, NULL) != TOK_END) + ; + return NULL; + } + +#ifdef MSCMD_PARENS_PARSE_BUGS + /* Check whether we have an empty line only if we are not inside + * a parenthesized block, and return NULL if so, otherwise do not + * do anything; a syntax error will be raised later. */ + if (InsideBlock == 0) +#endif + if (!*CurrentToken || *CurrentToken == _T('\n')) + { + ASSERT(CurrentTokenType == TOK_END); + return NULL; + } + } if (OpType == C_OP_HIGHEST) Cmd = ParsePrimary(); else - Cmd = ParseCommandOp(OpType + 1); + Cmd = ParseCommandBinaryOp(OpType + 1); if (Cmd && !_tcscmp(CurrentToken, OpString[OpType - C_OP_LOWEST])) { - Left = Cmd; + PARSED_COMMAND* Left = Cmd; + PARSED_COMMAND* Right; + Right = ParseCommandOp(OpType); if (!Right) { - if (!bParseError) - { - /* & is allowed to have an empty RHS */ - if (OpType == C_MULTI) - return Left; + /* + * The '&' operator is allowed to have an empty RHS. + * In this case, we directly return the LHS only. + * Note that Windows' CMD prefers building a '&' + * command with an empty RHS. + */ + if (!bParseError && (OpType != C_MULTI)) ParseError(); + if (bParseError) + { + FreeCommand(Left); + return NULL; } - FreeCommand(Left); - return NULL; + +#ifndef MSCMD_MULTI_EMPTY_RHS + return Left; +#endif } - Cmd = cmd_alloc(sizeof(PARSED_COMMAND)); + Cmd = AllocCommand(OpType, NULL, NULL); if (!Cmd) { WARN("Cannot allocate memory for Cmd!\n"); @@ -787,24 +1427,35 @@ static PARSED_COMMAND *ParseCommandOp(int OpType) FreeCommand(Right); return NULL; } - Cmd->Type = OpType; - Cmd->Next = NULL; - Cmd->Redirections = NULL; Cmd->Subcommands = Left; Left->Next = Right; +#ifdef MSCMD_MULTI_EMPTY_RHS + if (Right) +#endif Right->Next = NULL; } return Cmd; } +static __inline PARSED_COMMAND* +ParseCommandOp( + IN COMMAND_TYPE OpType) +{ + /* Start parsing: initialize the first token */ -VOID -DumpCommand(PARSED_COMMAND *Cmd, ULONG SpacePad); + /* Parse the prefix "quiet" operator '@' as a separate command. + * Thus, @@foo@bar is parsed as: '@', '@', 'foo@bar'. */ + ParseTokenEx(_T('@'), _T('('), STANDARD_SEPS, TRUE); + + return ParseCommandBinaryOp(OpType); +} -PARSED_COMMAND * -ParseCommand(LPTSTR Line) + +PARSED_COMMAND* +ParseCommand( + IN PCTSTR Line) { - PARSED_COMMAND *Cmd; + PARSED_COMMAND* Cmd; if (Line) { @@ -818,17 +1469,19 @@ ParseCommand(LPTSTR Line) return NULL; bLineContinuations = TRUE; } - bParseError = FALSE; - ParsePos = ParseLine; - CurChar = _T(' '); + + InitParser(); Cmd = ParseCommandOp(C_OP_LOWEST); if (Cmd) { bIgnoreEcho = FALSE; - if (CurrentTokenType != TOK_END) + if ((CurrentTokenType != TOK_END) && + (_tcscmp(CurrentToken, _T("\n")) != 0)) + { ParseError(); + } if (bParseError) { FreeCommand(Cmd); @@ -852,7 +1505,8 @@ ParseCommand(LPTSTR Line) * for dumping the command tree for debugging purposes. */ static VOID -DumpRedir(REDIRECTION* Redirections) +DumpRedir( + IN REDIRECTION* Redirections) { REDIRECTION* Redir; @@ -870,7 +1524,9 @@ DumpRedir(REDIRECTION* Redirections) } VOID -DumpCommand(PARSED_COMMAND *Cmd, ULONG SpacePad) +DumpCommand( + IN PARSED_COMMAND* Cmd, + IN ULONG SpacePad) { /* * This macro is like DumpCommand(Cmd, Pad); @@ -884,15 +1540,19 @@ do { \ goto dump; \ } while (0) - PARSED_COMMAND *Sub; + PARSED_COMMAND* Sub; dump: + if (!Cmd) + return; + /* Space padding */ ConOutPrintf(_T("%*s"), SpacePad, _T("")); switch (Cmd->Type) { case C_COMMAND: + case C_REM: { /* Generic command name, and Type */ #ifndef MSCMD_ECHO_COMMAND_COMPAT @@ -1026,6 +1686,22 @@ dump: return; } + case C_FOR: + { + ConOutPuts(_T("for")); + /* NOTE: FOR cannot have leading redirections */ + + if (Cmd->For.Switches & FOR_DIRS) ConOutPuts(_T(" /D")); + if (Cmd->For.Switches & FOR_F) ConOutPuts(_T(" /F")); + if (Cmd->For.Switches & FOR_LOOP) ConOutPuts(_T(" /L")); + if (Cmd->For.Switches & FOR_RECURSIVE) ConOutPuts(_T(" /R")); + if (Cmd->For.Params) + ConOutPrintf(_T(" %s"), Cmd->For.Params); + ConOutPrintf(_T(" %%%c in (%s) do\n"), Cmd->For.Variable, Cmd->For.List); + /*DumpCommand*/DUMP(Cmd->Subcommands, SpacePad + 2); + return; + } + case C_IF: { ConOutPuts(_T("if")); @@ -1110,22 +1786,6 @@ dump: return; } - case C_FOR: - { - ConOutPuts(_T("for")); - /* NOTE: FOR cannot have leading redirections */ - - if (Cmd->For.Switches & FOR_DIRS) ConOutPuts(_T(" /D")); - if (Cmd->For.Switches & FOR_F) ConOutPuts(_T(" /F")); - if (Cmd->For.Switches & FOR_LOOP) ConOutPuts(_T(" /L")); - if (Cmd->For.Switches & FOR_RECURSIVE) ConOutPuts(_T(" /R")); - if (Cmd->For.Params) - ConOutPrintf(_T(" %s"), Cmd->For.Params); - ConOutPrintf(_T(" %%%c in (%s) do\n"), Cmd->For.Variable, Cmd->For.List); - /*DumpCommand*/DUMP(Cmd->Subcommands, SpacePad + 2); - return; - } - default: ConOutPrintf(_T("*** Unknown type: %x\n"), Cmd->Type); break; @@ -1139,14 +1799,19 @@ dump: * batch file commands and FOR instances. */ VOID -EchoCommand(PARSED_COMMAND *Cmd) +EchoCommand( + IN PARSED_COMMAND* Cmd) { - PARSED_COMMAND *Sub; - REDIRECTION *Redir; + PARSED_COMMAND* Sub; + REDIRECTION* Redir; + + if (!Cmd) + return; switch (Cmd->Type) { case C_COMMAND: + case C_REM: { if (SubstituteForVars(Cmd->Command.First, TempBuf)) ConOutPrintf(_T("%s"), TempBuf); @@ -1224,6 +1889,23 @@ EchoCommand(PARSED_COMMAND *Cmd) break; } + case C_FOR: + { + ConOutPuts(_T("for")); + if (Cmd->For.Switches & FOR_DIRS) ConOutPuts(_T(" /D")); + if (Cmd->For.Switches & FOR_F) ConOutPuts(_T(" /F")); + if (Cmd->For.Switches & FOR_LOOP) ConOutPuts(_T(" /L")); + if (Cmd->For.Switches & FOR_RECURSIVE) ConOutPuts(_T(" /R")); + if (Cmd->For.Params) + ConOutPrintf(_T(" %s"), Cmd->For.Params); + if (Cmd->For.List && SubstituteForVars(Cmd->For.List, TempBuf)) + ConOutPrintf(_T(" %%%c in (%s) do "), Cmd->For.Variable, TempBuf); + else + ConOutPrintf(_T(" %%%c in (%s) do "), Cmd->For.Variable, Cmd->For.List); + EchoCommand(Cmd->Subcommands); + break; + } + case C_IF: { ConOutPuts(_T("if")); @@ -1246,23 +1928,6 @@ EchoCommand(PARSED_COMMAND *Cmd) break; } - case C_FOR: - { - ConOutPuts(_T("for")); - if (Cmd->For.Switches & FOR_DIRS) ConOutPuts(_T(" /D")); - if (Cmd->For.Switches & FOR_F) ConOutPuts(_T(" /F")); - if (Cmd->For.Switches & FOR_LOOP) ConOutPuts(_T(" /L")); - if (Cmd->For.Switches & FOR_RECURSIVE) ConOutPuts(_T(" /R")); - if (Cmd->For.Params) - ConOutPrintf(_T(" %s"), Cmd->For.Params); - if (Cmd->For.List && SubstituteForVars(Cmd->For.List, TempBuf)) - ConOutPrintf(_T(" %%%c in (%s) do "), Cmd->For.Variable, TempBuf); - else - ConOutPrintf(_T(" %%%c in (%s) do "), Cmd->For.Variable, Cmd->For.List); - EchoCommand(Cmd->Subcommands); - break; - } - default: ASSERT(FALSE); break; @@ -1287,15 +1952,15 @@ EchoCommand(PARSED_COMMAND *Cmd) /* * "Unparse" a command into a text form suitable for passing to CMD /C. - * Used for pipes. This is basically the same thing as EchoCommand, but - * writing into a string instead of to standard output. + * Used for pipes. This is basically the same thing as EchoCommand(), + * but writing into a string instead of to standard output. */ -TCHAR * -Unparse(PARSED_COMMAND *Cmd, TCHAR *Out, TCHAR *OutEnd) +PTCHAR +UnparseCommand( + IN PARSED_COMMAND* Cmd, + OUT PTCHAR Out, + IN PTCHAR OutEnd) { - PARSED_COMMAND *Sub; - REDIRECTION *Redir; - /* * Since this function has the annoying requirement that it must avoid * overflowing the supplied buffer, define some helper macros to make @@ -1319,13 +1984,21 @@ do { \ } while (0) #define RECURSE(Subcommand) \ do { \ - Out = Unparse(Subcommand, Out, OutEnd); \ + Out = UnparseCommand(Subcommand, Out, OutEnd); \ if (!Out) return NULL; \ } while (0) + PARSED_COMMAND* Sub; + REDIRECTION* Redir; + + if (!Cmd) + return Out; + switch (Cmd->Type) { case C_COMMAND: + case C_REM: + { /* This is fragile since there could be special characters, but * Windows doesn't bother escaping them, so for compatibility * we probably shouldn't do it either */ @@ -1334,13 +2007,17 @@ do { \ if (!SubstituteForVars(Cmd->Command.Rest, TempBuf)) return NULL; STRING(TempBuf); break; + } case C_QUIET: + { CHAR(_T('@')); RECURSE(Cmd->Subcommands); break; + } case C_BLOCK: + { CHAR(_T('(')); for (Sub = Cmd->Subcommands; Sub; Sub = Sub->Next) { @@ -1350,18 +2027,39 @@ do { \ } CHAR(_T(')')); break; + } case C_MULTI: case C_OR: case C_AND: case C_PIPE: + { Sub = Cmd->Subcommands; RECURSE(Sub); PRINTF(_T(" %s "), OpString[Cmd->Type - C_OP_LOWEST]); RECURSE(Sub->Next); break; + } + + case C_FOR: + { + STRING(_T("for")); + if (Cmd->For.Switches & FOR_DIRS) STRING(_T(" /D")); + if (Cmd->For.Switches & FOR_F) STRING(_T(" /F")); + if (Cmd->For.Switches & FOR_LOOP) STRING(_T(" /L")); + if (Cmd->For.Switches & FOR_RECURSIVE) STRING(_T(" /R")); + if (Cmd->For.Params) + PRINTF(_T(" %s"), Cmd->For.Params); + if (Cmd->For.List && SubstituteForVars(Cmd->For.List, TempBuf)) + PRINTF(_T(" %%%c in (%s) do "), Cmd->For.Variable, TempBuf); + else + PRINTF(_T(" %%%c in (%s) do "), Cmd->For.Variable, Cmd->For.List); + RECURSE(Cmd->Subcommands); + break; + } case C_IF: + { STRING(_T("if")); if (Cmd->If.Flags & IFFLAG_IGNORECASE) STRING(_T(" /I")); @@ -1380,21 +2078,7 @@ do { \ RECURSE(Sub->Next); } break; - - case C_FOR: - STRING(_T("for")); - if (Cmd->For.Switches & FOR_DIRS) STRING(_T(" /D")); - if (Cmd->For.Switches & FOR_F) STRING(_T(" /F")); - if (Cmd->For.Switches & FOR_LOOP) STRING(_T(" /L")); - if (Cmd->For.Switches & FOR_RECURSIVE) STRING(_T(" /R")); - if (Cmd->For.Params) - PRINTF(_T(" %s"), Cmd->For.Params); - if (Cmd->For.List && SubstituteForVars(Cmd->For.List, TempBuf)) - PRINTF(_T(" %%%c in (%s) do "), Cmd->For.Variable, TempBuf); - else - PRINTF(_T(" %%%c in (%s) do "), Cmd->For.Variable, Cmd->For.List); - RECURSE(Cmd->Subcommands); - break; + } default: ASSERT(FALSE); @@ -1415,24 +2099,3 @@ do { \ #undef PRINTF #undef RECURSE } - -VOID -FreeCommand(PARSED_COMMAND *Cmd) -{ - if (Cmd->Subcommands) - FreeCommand(Cmd->Subcommands); - if (Cmd->Next) - FreeCommand(Cmd->Next); - FreeRedirection(Cmd->Redirections); - if (Cmd->Type == C_IF) - { - cmd_free(Cmd->If.LeftArg); - cmd_free(Cmd->If.RightArg); - } - else if (Cmd->Type == C_FOR) - { - cmd_free(Cmd->For.Params); - cmd_free(Cmd->For.List); - } - cmd_free(Cmd); -}

1 0

[reactos] 01/01: [TRANSLATION] Polish translation update (#3233)
by Adam Słaboń 26 Sep '20

26 Sep '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=50ff45343447c3ecea03b… commit 50ff45343447c3ecea03bea5db2fd7225bfdeb49 Author: Adam Słaboń <asaillen456esx(a)gmail.com> AuthorDate: Sat Sep 26 20:42:36 2020 +0200 Commit: GitHub <noreply(a)github.com> CommitDate: Sat Sep 26 21:42:36 2020 +0300 [TRANSLATION] Polish translation update (#3233) --- base/applications/charmap/lang/pl-PL.rc | 2 +- base/applications/rapps/lang/pl-PL.rc | 34 +-- base/applications/rapps/rappsmsg.mc | 9 +- base/applications/utilman/lang/pl-PL.rc | 13 + base/applications/utilman/utilman.rc | 3 + boot/bootdata/hivesys.inf | 11 +- dll/cpl/hotplug/hotplug.rc | 3 + dll/cpl/hotplug/lang/pl-PL.rc | 30 ++ dll/cpl/joy/lang/pl-PL.rc | 6 +- dll/shellext/fontext/lang/pl-PL.rc | 12 +- dll/shellext/mydocs/lang/pl-PL.rc | 6 + dll/shellext/mydocs/mydocs.rc | 3 + dll/win32/msxml3r/lang/pl-PL.rc | 7 + dll/win32/msxml3r/msxml3r.rc | 3 + dll/win32/shell32/lang/pl-PL.rc | 2 +- dll/win32/syssetup/lang/pl-PL.rc | 20 +- drivers/filesystems/btrfs/btrfs.inf | 9 + media/inf/hal.inf | 4 +- modules/rostests/rosautotest/rosautotestmsg.mc | 9 +- .../win32/advapi32/eventlog/MyEventProvider.mc | 31 ++- sdk/include/reactos/mc/arp_msg.mc | 68 ++++- sdk/include/reactos/mc/bootmsg.mc | 12 + sdk/include/reactos/mc/net_msg.mc | 8 +- sdk/include/reactos/mc/pciclass.mc | 303 +++++++++++++++++++++ 24 files changed, 556 insertions(+), 52 deletions(-) diff --git a/base/applications/charmap/lang/pl-PL.rc b/base/applications/charmap/lang/pl-PL.rc index 50dbdc1f9d6..99510ec7bb6 100644 --- a/base/applications/charmap/lang/pl-PL.rc +++ b/base/applications/charmap/lang/pl-PL.rc @@ -61,5 +61,5 @@ BEGIN IDS_ABOUT "&O programie..." IDS_TITLE "Tablica znaków" IDS_UNICODE "Unicode" - IDS_ALL "All" + IDS_ALL "Wszystko" END diff --git a/base/applications/rapps/lang/pl-PL.rc b/base/applications/rapps/lang/pl-PL.rc index 78ff3c3fc1a..f6814786162 100644 --- a/base/applications/rapps/lang/pl-PL.rc +++ b/base/applications/rapps/lang/pl-PL.rc @@ -74,9 +74,9 @@ BEGIN EDITTEXT IDC_DOWNLOAD_DIR_EDIT, 15, 86, 166, 12, WS_CHILD | WS_VISIBLE | WS_GROUP PUSHBUTTON "&Wybierz", IDC_CHOOSE, 187, 85, 50, 14 AUTOCHECKBOX "&Usuń instalatory programów po ich zainstalowaniu", IDC_DEL_AFTER_INSTALL, 16, 100, 218, 12 - GROUPBOX "Software source", -1, 4, 118, 240, 46 - CONTROL "Use default", IDC_SOURCE_DEFAULT, "Button", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 15, 132, 74, 10 - CONTROL "Specified source", IDC_USE_SOURCE, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 15, 147, 74, 10 + GROUPBOX "Źródło oprogramowania", -1, 4, 118, 240, 46 + CONTROL "Używaj domyślnego", IDC_SOURCE_DEFAULT, "Button", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 15, 132, 76, 10 + CONTROL "Określone źródło", IDC_USE_SOURCE, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 15, 147, 74, 10 EDITTEXT IDC_SOURCE_URL, 97, 147, 140, 12, ES_AUTOHSCROLL | WS_DISABLED GROUPBOX "Proxy", -1, 4, 166, 240, 76 CONTROL "Ustawienia systemowe proxy", IDC_PROXY_DEFAULT, "Button", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 15, 180, 210, 10 @@ -149,7 +149,7 @@ BEGIN IDS_INFO_UNINSTALLSTR "\nKomenda deinstalacji: " IDS_INFO_MODIFYPATH "\nModyfikacja ścieżki instalacji: " IDS_INFO_INSTALLDATE "\nData instalacji: " - IDS_AINFO_PACKAGE_NAME "\nPackage Name: " + IDS_AINFO_PACKAGE_NAME "\nNazwa pakietu: " END STRINGTABLE @@ -202,7 +202,7 @@ BEGIN IDS_APPLICATIONS "Aplikacje" IDS_CHOOSE_FOLDER_TEXT "Wybierz katalog, w którym będa zapisywane pobrane programy:" IDS_CHOOSE_FOLDER_ERROR "Wybrałeś nieistniejący katalog! Czy chcesz utworzyć nowy?" - IDS_URL_INVALID "The URL you have specified is invalid or not supported. Please correct it!" + IDS_URL_INVALID "Określony adres URL jest nieprawidłowy lub nieobsługiwany. Popraw go." IDS_APP_REG_REMOVE "Czy na pewno chcesz usunąć wpis tego programu z rejestru?" IDS_INFORMATION "Informacja" IDS_UNABLE_TO_DOWNLOAD "Nie można pobrać pakietu! Nie znaleziono adresu!" @@ -219,9 +219,9 @@ BEGIN IDS_SELECTEDFORINST "Wybrane do instalacji" IDS_MISMATCH_CERT_INFO "Użyty certyfikat jest nieznany:\nSubject: %s\nIssuer: %s\nCzy chcesz mimo to kontynuować?" IDS_UNABLE_PATH "Niepoprawny format ścieżki." - IDS_APP_DISPLAY_DETAILS "details" - IDS_APP_DISPLAY_LIST "list" - IDS_APP_DISPLAY_TILE "tile" + IDS_APP_DISPLAY_DETAILS "szczegóły" + IDS_APP_DISPLAY_LIST "lista" + IDS_APP_DISPLAY_TILE "kafelki" END STRINGTABLE @@ -257,17 +257,17 @@ STRINGTABLE BEGIN IDS_DL_DIALOG_DB_DISP "Baza programów" IDS_DL_DIALOG_DB_DOWNLOAD_DISP "Aktualizowanie bazy programów…" - IDS_DL_DIALOG_DB_UNOFFICIAL_DOWNLOAD_DISP "Updating Database… (Unofficial source)" + IDS_DL_DIALOG_DB_UNOFFICIAL_DOWNLOAD_DISP "Aktualizowanie bazy programów… (nieoficjalne źródło)" END STRINGTABLE BEGIN - IDS_CMD_USAGE "Usage: " - IDS_CMD_NEED_PACKAGE_NAME "Error: option %1 expects one or more package name.\n" - IDS_CMD_NEED_FILE_NAME "Error: option %1 expects a file name.\n" - IDS_CMD_NEED_PARAMS "Error: option %1 expects one or more parameters.\n" - IDS_CMD_INVALID_OPTION "Error: Unknown or invalid command line option specified.\n" - IDS_CMD_FIND_RESULT_FOR "Find result for %1:\n" - IDS_CMD_PACKAGE_NOT_FOUND "Failed to find package %1.\n" - IDS_CMD_PACKAGE_INFO "Information about package %1:\n" + IDS_CMD_USAGE "Sposób użycia: " + IDS_CMD_NEED_PACKAGE_NAME "Błąd: oczekiwano jednej lub więcej nazw pakietu przy użyciu opcji %1.\n" + IDS_CMD_NEED_FILE_NAME "Błąd: oczekiwano nazwy pliku przy użyciu opcji %1.\n" + IDS_CMD_NEED_PARAMS "Błąd: oczekiwano jednego lub więcej parametrów przy użyciu opcji %1.\n" + IDS_CMD_INVALID_OPTION "Błąd: Określono nieprawidłową lub nieznaną opcję wiersza polecenia.\n" + IDS_CMD_FIND_RESULT_FOR "Wynik znajdowania dla %1:\n" + IDS_CMD_PACKAGE_NOT_FOUND "Nie można odnaleźć pakietu %1.\n" + IDS_CMD_PACKAGE_INFO "Informacje o pakiecie %1:\n" END diff --git a/base/applications/rapps/rappsmsg.mc b/base/applications/rapps/rappsmsg.mc index 433fc39bf3e..118238be870 100644 --- a/base/applications/rapps/rappsmsg.mc +++ b/base/applications/rapps/rappsmsg.mc @@ -7,7 +7,8 @@ Error=0x3:STATUS_SEVERITY_ERROR) FacilityNames=(System=0x0:FACILITY_SYSTEM) -LanguageNames=(English=0x409:MSG00409) +LanguageNames=(English=0x409:MSG00409 + Polish=0x415:MSG00415) MessageId=1 Severity=Success @@ -16,6 +17,9 @@ SymbolicName=MSG_SUCCESS_INSTALL Language=English Installation of the program "%1" is called. . +Language=Polish +Wywołano instalację programu "%1". +. MessageId=2 Severity=Success @@ -24,4 +28,7 @@ SymbolicName=MSG_SUCCESS_REMOVE Language=English Removal of the program "%1" is called. . +Language=Polish +Wywołano usunięcie programu "%1". +. diff --git a/base/applications/utilman/lang/pl-PL.rc b/base/applications/utilman/lang/pl-PL.rc new file mode 100644 index 00000000000..b8a9f9bfffe --- /dev/null +++ b/base/applications/utilman/lang/pl-PL.rc @@ -0,0 +1,13 @@ +/* + * PROJECT: ReactOS Utility Manager (Accessibility) + * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) + * PURPOSE: Polish translation resource + */ + +LANGUAGE LANG_POLISH, SUBLANG_DEFAULT + +STRINGTABLE +BEGIN + IDS_FAIL_INIT "Nie można zainicjować biblioteki Menedżera narzędzi! Kod błędu to %lu." + IDS_FAIL_INIT_TITLE "Błąd inicjowania" +END diff --git a/base/applications/utilman/utilman.rc b/base/applications/utilman/utilman.rc index a44ea7d2951..e71e236e569 100644 --- a/base/applications/utilman/utilman.rc +++ b/base/applications/utilman/utilman.rc @@ -34,6 +34,9 @@ IDI_ICON_UTILMAN ICON "res/utilman.ico" #ifdef LANGUAGE_JA_JP #include "lang/ja-JP.rc" #endif +#ifdef LANGUAGE_PL_PL + #include "lang/pl-PL.rc" +#endif #ifdef LANGUAGE_RO_RO #include "lang/ro-RO.rc" #endif diff --git a/boot/bootdata/hivesys.inf b/boot/bootdata/hivesys.inf index fd212c03001..e64bbb6bb11 100644 --- a/boot/bootdata/hivesys.inf +++ b/boot/bootdata/hivesys.inf @@ -2400,8 +2400,11 @@ AUDIO_SERVICE_DESCRIPTION="Zapewnia aplikacjom dostęp do urządzeń audio." BITS_SERVICE="Usługa inteligentnego transferu w tle" BITS_SERVICE_DESCRIPTION="Przenosi dane pomiędzy klientami a serwerami w tle." -DCOMLAUNCH_SERVICE="DcomLaunch service" -DCOMLAUNCH_SERVICE_DESCRIPTION="DcomLaunch service stub." +BROWSER_SERVICE="Przeglądarka komputera" +BROWSER_SERVICE_DESCRIPTION="Utrzymuje aktualną listę komputerów w sieci i dostarcza ją do komputerów wyznaczonych jako przeglądarki." + +DCOMLAUNCH_SERVICE="Usługa DcomLaunch" +DCOMLAUNCH_SERVICE_DESCRIPTION="Namiastka usługi DcomLaunch" EVENTLOG_SERVICE="Dziennik zdarzeń" EVENTLOG_SERVICE_DESCRIPTION="Zapisuje zdarzenia lub wiadomości wysyłane przez system operacyjny do bazy danych dostępnej za pomocą podglądu zdarzeń." @@ -2418,8 +2421,8 @@ PLUGPLAY_SERVICE_DESCRIPTION="Wykrywa zmiany w sprzęcie i instaluje potrzebne o RPCSS_SERVICE="Zdalne wykonywanie procedur" RPCSS_SERVICE_DESCRIPTION="Podsystem RPC, który jest odpowiedzialny za zdalne wykonywanie procedur na tym komputerze." -SAMSS_SERVICE="Security Accounts Manager" -SAMSS_SERVICE_DESCRIPTION="The startup of this service signals other services that the Security Accounts Manager (SAM) is ready to accept requests. Disabling this service will prevent other services in the system from being notified when the SAM is ready, which may in turn cause those services to fail to start correctly. This service should not be disabled." +SAMSS_SERVICE="Menedżer kont zabezpieczeń" +SAMSS_SERVICE_DESCRIPTION="Uruchomienie tej usługi informuje inne usługi, że Menedżer kont zabezpieczeń jest gotowy do akceptowania żądań. Wyłączenie tej usługi spowoduje, że inne usługi w systemie nie będą powiadamiane o gotowości Menedżera kont zabezpieczeń, przez co te usługi mogą być uruchamiane nieprawidłowo. Tej usługi nie należy wyłączać." SCHEDULE_SERVICE="Usługa Harmonogram" SCHEDULE_SERVICE_DESCRIPTION="Umożliwia uruchamianie programów w określonym czasie." diff --git a/dll/cpl/hotplug/hotplug.rc b/dll/cpl/hotplug/hotplug.rc index 5dbff6b0252..b9c6eca7b96 100644 --- a/dll/cpl/hotplug/hotplug.rc +++ b/dll/cpl/hotplug/hotplug.rc @@ -42,6 +42,9 @@ IDI_HOTPLUG ICON "resources/1.ico" #ifdef LANGUAGE_JA_JP #include "lang/ja-JP.rc" #endif +#ifdef LANGUAGE_PL_PL + #include "lang/pl-PL.rc" +#endif #ifdef LANGUAGE_PT_PT #include "lang/pt-PT.rc" #endif diff --git a/dll/cpl/hotplug/lang/pl-PL.rc b/dll/cpl/hotplug/lang/pl-PL.rc new file mode 100644 index 00000000000..15d2e5848f2 --- /dev/null +++ b/dll/cpl/hotplug/lang/pl-PL.rc @@ -0,0 +1,30 @@ +LANGUAGE LANG_POLISH, SUBLANG_DEFAULT + +IDD_SAFE_REMOVE_HARDWARE_DIALOG DIALOGEX 0, 0, 278, 245 +CAPTION "Bezpieczne usuwanie sprzętu" +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +FONT 8, "MS Shell Dlg" +BEGIN + ICON IDI_HOTPLUG, IDC_SAFE_REMOVE_ICON, 7, 10, 20, 20 + LTEXT "Wybierz urządzenie, które chcesz odłączyć lub wysunąć, a następnie kliknij przycisk Zatrzymaj. Odłącz urządzenie od komputera, gdy system ReactOS powiadomi Cię, że można to bezpiecznie uczynić.", IDC_STATIC, 36, 10, 234, 24, WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "&Urządzenia sprzętowe:", IDC_STATIC, 7, 42, 248, 8, WS_CHILD | WS_VISIBLE | WS_GROUP + CONTROL "", IDC_SAFE_REMOVE_DEVICE_TREE, "SysTreeView32", TVS_HASBUTTONS | TVS_HASLINES | TVS_DISABLEDRAGDROP | TVS_SHOWSELALWAYS | WS_CHILD | WS_VISIBLE | WS_BORDER | WS_GROUP | WS_TABSTOP, 7, 52, 264, 102 + LTEXT "", IDC_SAFE_REMOVE_TEXT, 7, 156, 264, 16, WS_CHILD | WS_VISIBLE | WS_GROUP + PUSHBUTTON "&Właściwości", IDC_SAFE_REMOVE_PROPERTIES, 158, 178, 55, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "&Zatrzymaj", IDC_SAFE_REMOVE_STOP, 216, 178, 55, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + CONTROL "", IDC_STATIC, "static", SS_CENTER | SS_SUNKEN | WS_CHILD | WS_VISIBLE, 7, 200, 264, 1 + AUTOCHECKBOX "Wyświetl s&kładniki urządzenia", IDC_SAFE_REMOVE_DISPLAY_COMPONENTS, 7, 208, 140, 10, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "Za&mknij", IDCLOSE, 216, 224, 55, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP +END + + +/* Menus */ + +IDM_POPUP_DEVICE_TREE MENU +BEGIN + POPUP "" + BEGIN + MENUITEM "Zatrzymaj", IDM_STOP + MENUITEM "Właściwości", IDM_PROPERTIES + END +END diff --git a/dll/cpl/joy/lang/pl-PL.rc b/dll/cpl/joy/lang/pl-PL.rc index bebdba06ccf..1fa957727e8 100644 --- a/dll/cpl/joy/lang/pl-PL.rc +++ b/dll/cpl/joy/lang/pl-PL.rc @@ -15,7 +15,7 @@ CAPTION "Kontrolery gier" FONT 8, "MS Shell Dlg" BEGIN ICON IDI_CPLSYSTEM, -1, 7, 7, 20, 20 - LTEXT "Te ustawienia pomogą ci skonfigurować kontolery gier, zainstalowane na tym komputerze.", -1, 33, 7, 214, 20, NOT WS_GROUP + LTEXT "Te ustawienia pomogą ci skonfigurować kontrolery gier, zainstalowane na tym komputerze.", -1, 33, 7, 214, 20, NOT WS_GROUP GROUPBOX "&Zainstalowane kontrolery gier", -1, 7, 34, 238, 117 CONTROL "List1", IDC_CONTROLLER_LIST, "SysListView32", WS_BORDER | WS_GROUP | WS_TABSTOP | 0x0000808D, 14, 44, 224, 80 PUSHBUTTON "&Dodaj.", IDC_ADD_BUTTON, 35, 129, 65, 14 @@ -62,7 +62,7 @@ BEGIN AUTORADIOBUTTON "Oś Z", IDC_Z_AXIS_RADIO, 81, 97, 35, 10, NOT WS_VISIBLE GROUPBOX "&Przyciski", -1, 137, 67, 116, 44 COMBOBOX IDC_BUTTONS_COMBO, 178, 79, 48, 50, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | CBS_SORT | WS_VSCROLL, WS_EX_CLIENTEDGE - AUTOCHECKBOX "&Zawiera kontrolę obszaru widoku", IDC_INC_POINT_CHECKBOX, 7, 123, 115, 10 + AUTOCHECKBOX "&Zawiera kontrolę obszaru widoku", IDC_INC_POINT_CHECKBOX, 7, 123, 117, 10 LTEXT "&Nazwa kontrolera:", -1, 7, 139, 200, 9 EDITTEXT IDC_CONTROLLER_NAME_EDIT, 7, 150, 116, 15, ES_AUTOHSCROLL, WS_EX_CLIENTEDGE | WS_EX_STATICEDGE DEFPUSHBUTTON "OK", IDOK, 137, 150, 50, 14 @@ -89,5 +89,5 @@ BEGIN IDS_CPLSYSTEMDESCRIPTION "Dodaje, usuwa i konfiguruje Kontrolery gier, takie jak joysticki, pady czy kierownice." IDS_CONTROLLER "Kontroler" IDS_STATUS "Stan" - IDS_NONE "(None)" + IDS_NONE "(Brak)" END diff --git a/dll/shellext/fontext/lang/pl-PL.rc b/dll/shellext/fontext/lang/pl-PL.rc index 73fe7c170fc..ef1af44d0df 100644 --- a/dll/shellext/fontext/lang/pl-PL.rc +++ b/dll/shellext/fontext/lang/pl-PL.rc @@ -9,20 +9,20 @@ END STRINGTABLE BEGIN - IDS_COL_NAME "Name" + IDS_COL_NAME "Nazwa" END STRINGTABLE BEGIN - IDS_COL_FILENAME "Filename" - IDS_COL_SIZE "Size" - IDS_COL_MODIFIED "Modified" - IDS_COL_ATTR "Attributes" + IDS_COL_FILENAME "Nazwa pliku" + IDS_COL_SIZE "Rozmiar" + IDS_COL_MODIFIED "Zmodyfikowano" + IDS_COL_ATTR "Atrybuty" IDS_COL_ATTR_LETTERS "RHSAC" END STRINGTABLE BEGIN - IDS_FONT_PREVIEW "Preview" + IDS_FONT_PREVIEW "Podgląd" END diff --git a/dll/shellext/mydocs/lang/pl-PL.rc b/dll/shellext/mydocs/lang/pl-PL.rc new file mode 100644 index 00000000000..bdc27ace976 --- /dev/null +++ b/dll/shellext/mydocs/lang/pl-PL.rc @@ -0,0 +1,6 @@ +LANGUAGE LANG_POLISH, SUBLANG_DEFAULT + +STRINGTABLE +{ + IDS_NOSRCFILEFOUND "Nie odnaleziono pliku lub folderu źródłowego '%ls'." +} diff --git a/dll/shellext/mydocs/mydocs.rc b/dll/shellext/mydocs/mydocs.rc index 9f6f11aad4c..e64e77cfe44 100644 --- a/dll/shellext/mydocs/mydocs.rc +++ b/dll/shellext/mydocs/mydocs.rc @@ -24,6 +24,9 @@ IDR_MYDOCS REGISTRY "res/mydocs.rgs" #ifdef LANGUAGE_JA_JP #include "lang/ja-JP.rc" #endif +#ifdef LANGUAGE_PL_PL + #include "lang/pl-PL.rc" +#endif #ifdef LANGUAGE_RU_RU #include "lang/ru-RU.rc" #endif diff --git a/dll/win32/msxml3r/lang/pl-PL.rc b/dll/win32/msxml3r/lang/pl-PL.rc new file mode 100644 index 00000000000..fc1a6ad753a --- /dev/null +++ b/dll/win32/msxml3r/lang/pl-PL.rc @@ -0,0 +1,7 @@ +LANGUAGE LANG_POLISH, SUBLANG_NEUTRAL + +STRINGTABLE +BEGIN + IDS_XML_FILE "Dokument XML" + IDS_XLS_FILE "Arkusz stylów XSL" +END diff --git a/dll/win32/msxml3r/msxml3r.rc b/dll/win32/msxml3r/msxml3r.rc index c3a7f7099cc..3a88788dd22 100644 --- a/dll/win32/msxml3r/msxml3r.rc +++ b/dll/win32/msxml3r/msxml3r.rc @@ -26,6 +26,9 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL #ifdef LANGUAGE_IT_IT #include "lang/it-IT.rc" #endif +#ifdef LANGUAGE_PL_PL + #include "lang/pl-PL.rc" +#endif #ifdef LANGUAGE_RO_RO #include "lang/ro-RO.rc" #endif diff --git a/dll/win32/shell32/lang/pl-PL.rc b/dll/win32/shell32/lang/pl-PL.rc index 2d6e65dce66..beb02fd2ba6 100644 --- a/dll/win32/shell32/lang/pl-PL.rc +++ b/dll/win32/shell32/lang/pl-PL.rc @@ -938,7 +938,7 @@ BEGIN IDS_EDIT_VERB "Edytuj" IDS_FIND_VERB "Wyszukaj" IDS_PRINT_VERB "Drukuj" - IDS_CMD_VERB "&Wiersz poleceń tutaj" + IDS_CMD_VERB "&Otwórz wiersz polecenia tutaj" IDS_FILE_FOLDER "%u Plików, %u Katalogów" IDS_PRINTERS "Drukarki" diff --git a/dll/win32/syssetup/lang/pl-PL.rc b/dll/win32/syssetup/lang/pl-PL.rc index 948850737ed..aaf74a18604 100644 --- a/dll/win32/syssetup/lang/pl-PL.rc +++ b/dll/win32/syssetup/lang/pl-PL.rc @@ -23,16 +23,16 @@ BEGIN END IDD_PRODUCT DIALOGEX 0, 0, 317, 143 -CAPTION "ReactOS Setup" +CAPTION "Instalator systemu ReactOS" STYLE DS_MODALFRAME | DS_SHELLFONT | WS_POPUPWINDOW | WS_CAPTION | WS_VISIBLE FONT 8, "MS Shell Dlg" BEGIN ICON "", IDC_PRODUCT_ICON, 5, 5, 20, 20 - LTEXT "Please choose a product option:", IDC_STATIC, 35, 7, 230, 12 - LTEXT "Product &Options:", IDC_STATIC, 5, 32, 85, 10 + LTEXT "Wybierz opcję produktu:", IDC_STATIC, 35, 7, 230, 12 + LTEXT "&Opcje produktu:", IDC_STATIC, 5, 32, 85, 10 COMBOBOX IDC_PRODUCT_OPTIONS, 95, 30, 170, 300, CBS_HASSTRINGS | CBS_AUTOHSCROLL | CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - GROUPBOX "Product Information", IDC_STATIC, 5, 50, 305, 85 - LTEXT "Description:", IDC_STATIC, 20, 65, 70, 10 + GROUPBOX "Informacje o produkcie", IDC_STATIC, 5, 50, 305, 85 + LTEXT "Opis:", IDC_STATIC, 20, 65, 70, 10 EDITTEXT IDC_PRODUCT_DESCRIPTION, 95, 65, 205, 60, ES_READONLY | ES_AUTOVSCROLL | ES_MULTILINE | WS_VSCROLL END @@ -242,11 +242,11 @@ END STRINGTABLE BEGIN - IDS_PRODUCTTITLE "Product Options" - IDS_PRODUCTSUBTITLE "You can choose a product option that affects the behaviour of the system." + IDS_PRODUCTTITLE "Opcje produktu" + IDS_PRODUCTSUBTITLE "Możesz wybrać opcję produktu, która wpłynie na sposób działania systemu." IDS_PRODUCTSERVERNAME "ReactOS Server" IDS_PRODUCTWORKSTATIONNAME "ReactOS Workstation" - IDS_PRODUCTSERVERINFO "The system will be recognized as a server. Private folders ""My Pictures"", ""My Videos"" and ""My Music"" are independent from ""My Documents""." - IDS_PRODUCTWORKSTATIONINFO "The system will be recognized as a workstation. Private folders ""My Pictures"", ""My Videos"" and ""My Music"" are in ""My Documents""." - IDS_DEFAULT "(Default)" + IDS_PRODUCTSERVERINFO "System będzie rozpoznawany jako serwer. Foldery prywatne ""Moje obrazy"", ""Moje wideo"" i ""Moja muzyka"" są niezależne od folderu ""Moje dokumenty""." + IDS_PRODUCTWORKSTATIONINFO "System będzie rozpoznawany jako stacja robocza. Foldery prywatne ""Moje obrazy"", ""Moje wideo"" i ""Moja muzyka"" są w folderze ""Moje dokumenty""." + IDS_DEFAULT "(Domyślnie)" END diff --git a/drivers/filesystems/btrfs/btrfs.inf b/drivers/filesystems/btrfs/btrfs.inf index e7f4833ee35..09c4f1bdde1 100644 --- a/drivers/filesystems/btrfs/btrfs.inf +++ b/drivers/filesystems/btrfs/btrfs.inf @@ -127,3 +127,12 @@ DriverName = "btrfs" DiskId1 = "Btrfs Device Installation Disk" VolumeName = "Btrfs volume" ControllerName = "Btrfs controller" + +[Strings.0415] +Me = "Mark Harmstone" +ServiceDescription = "Sterownik systemu plików Btrfs" +ServiceName = "btrfs" +DriverName = "btrfs" +DiskId1 = "Dysk instalacyjny urządzenia Btrfs" +VolumeName = "Wolumin Btrfs" +ControllerName = "Kontroler Btrfs" diff --git a/media/inf/hal.inf b/media/inf/hal.inf index 8049fddad96..2d27ea92785 100644 --- a/media/inf/hal.inf +++ b/media/inf/hal.inf @@ -95,9 +95,9 @@ acpipic_up.DeviceDesc = "Komputer PC z interfejsem ACPI" e_isa_up.DeviceDesc = "Standardowy komputer PC" MsftMfg = "Microsoft Corporation" -xbox.DeviceDesc = "Original Xbox (x86 based)" +xbox.DeviceDesc = "Oryginalny Xbox (oparty na procesorze x86)" -pc98_up.DeviceDesc = "Uniprocessor NEC PC-98" +pc98_up.DeviceDesc = "Komputer NEC PC-98" [Strings.0418] ReactOS = "Echipa ReactOS" diff --git a/modules/rostests/rosautotest/rosautotestmsg.mc b/modules/rostests/rosautotest/rosautotestmsg.mc index f560dadd689..d36c532355f 100644 --- a/modules/rostests/rosautotest/rosautotestmsg.mc +++ b/modules/rostests/rosautotest/rosautotestmsg.mc @@ -7,7 +7,8 @@ Error=0x3:STATUS_SEVERITY_ERROR) FacilityNames=(System=0x0:FACILITY_SYSTEM Application=0xFFF) -LanguageNames=(English=0x409:MSG00409) +LanguageNames=(English=0x409:MSG00409 + Polish=0x415:MSG00415) MessageId=1 Severity=Informational @@ -16,6 +17,9 @@ SymbolicName=MSG_TESTS_STARTED Language=English ReactOS Automatic Testing Utility is started. . +Language=Polish +Uruchomiono narzędzie automatycznych testów systemu ReactOS. +. MessageId=2 Severity=Success @@ -24,4 +28,7 @@ SymbolicName=MSG_TESTS_SUCCESSFUL Language=English ReactOS Automatic Testing Utility is successful. . +Language=Polish +Narzędzie automatycznych testów systemu ReactOS pomyślnie zakończyło działanie. +. diff --git a/modules/rostests/win32/advapi32/eventlog/MyEventProvider.mc b/modules/rostests/win32/advapi32/eventlog/MyEventProvider.mc index ad5e11af0d3..bec81bac503 100644 --- a/modules/rostests/win32/advapi32/eventlog/MyEventProvider.mc +++ b/modules/rostests/win32/advapi32/eventlog/MyEventProvider.mc @@ -16,7 +16,8 @@ FacilityNames=(System=0x0:FACILITY_SYSTEM Io=0x4:FACILITY_IO_ERROR_CODE ) -LanguageNames=(English=0x409:MSG00409) +LanguageNames=(English=0x409:MSG00409 + Polish=0x415:MSG00415) ; // The following are the categories of events. @@ -28,18 +29,27 @@ SymbolicName=NETWORK_CATEGORY Language=English Network Events . +Language=Polish +Zdarzenia sieciowe +. MessageId=0x2 SymbolicName=DATABASE_CATEGORY Language=English Database Events . +Language=Polish +Zdarzenia bazy danych +. MessageId=0x3 SymbolicName=UI_CATEGORY Language=English UI Events . +Language=Polish +Zdarzenia interfejsu użytkownika +. ; // The following are the message definitions. @@ -53,6 +63,9 @@ SymbolicName=MSG_INVALID_COMMAND Language=English The command is not valid. . +Language=Polish +To polecenie jest nieprawidłowe. +. MessageId=0x101 @@ -62,6 +75,9 @@ SymbolicName=MSG_BAD_FILE_CONTENTS Language=English File %1 contains content that is not valid. . +Language=Polish +Plik %1 ma nieprawidłową zawartość. +. MessageId=0x102 Severity=Warning @@ -71,6 +87,10 @@ Language=English There have been %1 retries with %2 success! Disconnect from the server and try again later. . +Language=Polish +Podjęto %1 ponownych prób, %2 zakończyło się sukcesem! Odłącz +od serwera i spróbuj ponownie później. +. MessageId=0x103 Severity=Informational @@ -79,6 +99,9 @@ SymbolicName=MSG_COMPUTE_CONVERSION Language=English %1 %%4096 = %2 %%4097. . +Language=Polish +%1 %%4096 = %2 %%4097. +. ; // The following are the parameter strings */ @@ -91,6 +114,9 @@ SymbolicName=QUARTS_UNITS Language=English quarts%0 . +Language=Polish +kwarty%0 +. MessageId=0x1001 Severity=Success @@ -99,4 +125,7 @@ SymbolicName=GALLONS_UNITS Language=English gallons%0 . +Language=Polish +galony%0 +. diff --git a/sdk/include/reactos/mc/arp_msg.mc b/sdk/include/reactos/mc/arp_msg.mc index a573c300440..920aaac7643 100644 --- a/sdk/include/reactos/mc/arp_msg.mc +++ b/sdk/include/reactos/mc/arp_msg.mc @@ -10,7 +10,7 @@ FacilityNames=(System=0x0:FACILITY_SYSTEM ) LanguageNames=(English=0x409:MSG00409 - ) + Polish=0x415:MSG00415) MessageId=10000 SymbolicName=MSG_ARP_SYNTAX @@ -47,6 +47,40 @@ Example: > arp -s 157.55.85.212 00-aa-00-62-c6-09 .... Adds a static entry. > arp -a .... Displays the arp table. . +Language=Polish +Wyświetla i modyfikuje tabelę translacji adresów IP na adresy +fizyczne, używane przez protokół rozróżniania adresów (ARP). + +ARP -s inet_addr eth_addr [if_addr] +ARP -d inet_addr [if_addr] +ARP -a [inet_addr] [-N if_addr] + + -a Wyświetla bieżące wpisy protokołu ARP przez odpytywanie + bieżących danych protokołu. Jeżeli inet_addr jest + określony, to wyświetlany jest adres IP i fizyczny dla + określonego komputera. Jeżeli więcej niż jeden interfejs + sieciowy korzysta z protokołu ARP, to wyświetlane są wpisy dla + każdej tabeli protokołu ARP. + -g To samo co -a. + inet_addr Określa adres internetowy. + -N if_addr Wyświetla wpisy protokołu ARP dla interfejsu sieciowego + określonego przez if_addr. + -d Usuwa hosta określonego przez inet_addr. W inet_addr można + użyć symbolu wieloznacznego * do usunięcia wszystkich hostów. + -s Dodaje hosta i kojarzy adres internetowy inet_addr + z fizycznym adresem internetowym eth_addr. Adres + fizyczny jest reprezentowany przez 6 szesnastkowych + bajtów oddzielonych znakami łącznika. Wpis dokonywany + jest na stałe. + eth_addr Określa adres fizyczny. + if_addr Jeżeli jest określony, to wskazuje adres interfejsu, którego + tabela translacji powinna zostać zmieniona. + Jeżeli nie jest określony, zostanie użyty pierwszy + odpowiadający interfejs. +Przykłady: + > arp -s 157.55.85.212 00-aa-00-62-c6-09 .... Dodaje statyczny wpis. + > arp -a .... Wyświetla tabelę arp. +. MessageId=10001 SymbolicName=MSG_ARP_BAD_IP_ADDRESS @@ -55,6 +89,9 @@ Facility=System Language=English ARP: bad IP address: %1 . +Language=Polish +ARP: zły adres IP: %1 +. MessageId=10002 SymbolicName=MSG_ARP_BAD_ARGUMENT @@ -63,6 +100,9 @@ Facility=System Language=English ARP: bad argument: %1 . +Language=Polish +ARP: zły argument: %1 +. MessageId=10003 SymbolicName=MSG_ARP_INTERFACE @@ -73,6 +113,11 @@ Language=English Interface: %1!s! --- 0x%2!lx! Internet Address Physical Address Type . +Language=Polish + +Interfejs: %1!s! --- 0x%2!lx! + Adres internetowy Adres fizyczny Typ +. MessageId=10004 SymbolicName=MSG_ARP_NO_MEMORY @@ -81,6 +126,9 @@ Facility=System Language=English ARP: not enough memory . +Language=Polish +ARP: za mało pamięci +. MessageId=10005 SymbolicName=MSG_ARP_OTHER @@ -89,6 +137,9 @@ Facility=System Language=English other%0 . +Language=Polish +inny%0 +. MessageId=10006 SymbolicName=MSG_ARP_INVALID @@ -97,6 +148,9 @@ Facility=System Language=English invalid%0 . +Language=Polish +nieprawidłowy%0 +. MessageId=10007 SymbolicName=MSG_ARP_DYNAMIC @@ -105,6 +159,9 @@ Facility=System Language=English dynamic%0 . +Language=Polish +dynamiczny%0 +. MessageId=10008 SymbolicName=MSG_ARP_STATIC @@ -113,6 +170,9 @@ Facility=System Language=English static%0 . +Language=Polish +statyczny%0 +. MessageId=10013 SymbolicName=MSG_ARP_ENTRY_FORMAT @@ -121,6 +181,9 @@ Facility=System Language=English %1!-20s! %2!-20s! %3!-10s! . +Language=Polish + %1!-20s! %2!-20s! %3!-10s! +. MessageId=10018 SymbolicName=MSG_ARP_NO_ENTRIES @@ -129,3 +192,6 @@ Facility=System Language=English No ARP entires found . +Language=Polish +Nie znaleziono żadnych wpisów ARP +. diff --git a/sdk/include/reactos/mc/bootmsg.mc b/sdk/include/reactos/mc/bootmsg.mc index 3ab18e6f039..0ee6ef810f6 100644 --- a/sdk/include/reactos/mc/bootmsg.mc +++ b/sdk/include/reactos/mc/bootmsg.mc @@ -1,17 +1,29 @@ +LanguageNames=(English=0x409:MSG00409 + Polish=0x415:MSG00415) + MessageId=9001 SymbolicName=BM_MSG_FIRST Language=English BM_MSG_FIRST . +Language=Polish +BM_MSG_FIRST +. MessageId=9002 SymbolicName=BM_MSG_BCD_ERROR Language=English The Boot Configuration Data for your PC is missing or contains errors. . +Language=Polish +Dane konfiguracji rozruchu komputera nie istnieją lub zawierają błędy. +. MessageId=9999 SymbolicName=BM_MSG_TEST Language=English We are A-ok!!! . +Language=Polish +Wszystko jest OK!!! +. diff --git a/sdk/include/reactos/mc/net_msg.mc b/sdk/include/reactos/mc/net_msg.mc index 1144a614a09..65cd066a00d 100644 --- a/sdk/include/reactos/mc/net_msg.mc +++ b/sdk/include/reactos/mc/net_msg.mc @@ -3173,11 +3173,11 @@ Options Are as follows: NET HELP command | MORE displays Help one screen at a time. . Language=Polish -NET USER tworzy i modyfikuje konta użytkowników na komputerach. -Stosowane bez przełączników, listy kont uzytkowników na komputerze. -Konto użytkownika informacje są przechowywane w bazie danych kont użytkowników. +NET USER tworzy i modyfikuje konta użytkowników na komputerach. Użyte bez +przełączników wyświetla listę kont użytkowników na komputerze. Informacja +o kontach użytkowników przechowywana jest w bazie danych kont użytkowników. -nazwaużytkownika +nazwa_użytkownika Nazwa konta użytkownika do dodania, usunięcia, modyfikacji lub wyświetlenia. Nazwa konta użytkownika może składać się maksymalnie z 20 znaków. diff --git a/sdk/include/reactos/mc/pciclass.mc b/sdk/include/reactos/mc/pciclass.mc index d41b6f35a78..7aa20297d7e 100644 --- a/sdk/include/reactos/mc/pciclass.mc +++ b/sdk/include/reactos/mc/pciclass.mc @@ -1,599 +1,902 @@ +LanguageNames=(English=0x409:MSG00409 + Polish=0x415:MSG00415) + MessageId=0 SymbolicName=NONE Language=English PCI Device . +Language=Polish +Urządzenie PCI +. MessageId=1 SymbolicName=NONE Language=English VGA Device . +Language=Polish +Urządzenie VGA +. MessageId=256 SymbolicName=NONE Language=English SCSI Controller . +Language=Polish +Kontroler SCSI +. MessageId=257 SymbolicName=NONE Language=English IDE Controller . +Language=Polish +Kontroler IDE +. MessageId=258 SymbolicName=NONE Language=English Floppy Controller . +Language=Polish +Kontroler dyskietek +. MessageId=259 SymbolicName=NONE Language=English IPI Controller . +Language=Polish +Kontroler IPI +. MessageId=260 SymbolicName=NONE Language=English RAID Controller . +Language=Polish +Kontroler RAID +. MessageId=261 SymbolicName=NONE Language=English ATA Controller . +Language=Polish +Kontroler ATA +. MessageId=262 SymbolicName=NONE Language=English Serial ATA Controller . +Language=Polish +Kontroler Serial ATA +. MessageId=263 SymbolicName=NONE Language=English SAS Controller . +Language=Polish +Kontroler SAS +. MessageId=384 SymbolicName=NONE Language=English Mass Storage Controller . +Language=Polish +Kontroler pamięci masowej +. MessageId=512 SymbolicName=NONE Language=English Ethernet Controller . +Language=Polish +Kontroler Ethernet +. MessageId=513 SymbolicName=NONE Language=English Token Ring Network Controller . +Language=Polish +Kontroler sieci typu Token Ring +. MessageId=514 SymbolicName=NONE Language=English FDDI Network Controller . +Language=Polish +Kontroler sieci typu FDDI +. MessageId=515 SymbolicName=NONE Language=English ATM Network Controller . +Language=Polish +Kontroler sieci typu ATM +. MessageId=516 SymbolicName=NONE Language=English ISDN Controller . +Language=Polish +Kontroler ISDN +. MessageId=517 SymbolicName=NONE Language=English WorldFip Controller . +Language=Polish +Kontroler WorldFip +. MessageId=640 SymbolicName=NONE Language=English Network Controller . +Language=Polish +Kontroler sieci +. MessageId=768 SymbolicName=NONE Language=English Video Controller (VGA Compatible) . +Language=Polish +Kontroler wideo (zgodny z VGA) +. MessageId=769 SymbolicName=NONE Language=English Video Controller (VGA Compatible) . +Language=Polish +Kontroler wideo (zgodny z VGA) +. MessageId=770 SymbolicName=NONE Language=English 3D Video Controller . +Language=Polish +Kontroler wideo 3W +. MessageId=896 SymbolicName=NONE Language=English Video Controller . +Language=Polish +Kontroler wideo +. MessageId=1024 SymbolicName=NONE Language=English Multimedia Video Controller . +Language=Polish +Kontroler multimediów wideo +. MessageId=1025 SymbolicName=NONE Language=English Multimedia Audio Controller . +Language=Polish +Kontroler multimediów audio +. MessageId=1026 SymbolicName=NONE Language=English Computer Telephony Device . +Language=Polish +Komputerowe urządzenie telefoniczne +. MessageId=1152 SymbolicName=NONE Language=English Multimedia Controller . +Language=Polish +Kontroler multimediów +. MessageId=1280 SymbolicName=NONE Language=English PCI Memory . +Language=Polish +Pamięć PCI +. MessageId=1281 SymbolicName=NONE Language=English PCI FLASH Memory . +Language=Polish +Pamięć PCI FLASH +. MessageId=1408 SymbolicName=NONE Language=English PCI Memory Controller . +Language=Polish +Kontroler pamięci PCI +. MessageId=1536 SymbolicName=NONE Language=English PCI HOST Bridge . +Language=Polish +Mostek PCI HOST +. MessageId=1537 SymbolicName=NONE Language=English PCI to ISA Bridge . +Language=Polish +Mostek PCI do ISA +. MessageId=1538 SymbolicName=NONE Language=English PCI to EISA Bridge . +Language=Polish +Mostek PCI do EISA +. MessageId=1539 SymbolicName=NONE Language=English PCI to Micro Channel Bridge . +Language=Polish +Mostek PCI do Micro Channel +. MessageId=1540 SymbolicName=NONE Language=English PCI to PCI Bridge . +Language=Polish +Mostek PCI do PCI +. MessageId=1541 SymbolicName=NONE Language=English PCI to PCMCIA Bridge . +Language=Polish +Mostek PCI do PCMCIA +. MessageId=1542 SymbolicName=NONE Language=English PCI to NUBUS Bridge . +Language=Polish +Mostek PCI do NUBUS +. MessageId=1543 SymbolicName=NONE Language=English PCI to CARDBUS Bridge . +Language=Polish +Mostek PCI do CARDBUS +. MessageId=1544 SymbolicName=NONE Language=English PCI to RACEway Bridge . +Language=Polish +Mostek PCI-RACEway +. MessageId=1545 SymbolicName=NONE Language=English Semi-transparent PCI to PCI Bridge . +Language=Polish +Półprzeźroczysty mostek PCI do PCI +. MessageId=1546 SymbolicName=NONE Language=English Infiniband to PCI Host Bridge . +Language=Polish +Mostek Infiniband do hosta PCI +. MessageId=1664 SymbolicName=NONE Language=English Other PCI Bridge Device . +Language=Polish +Inne urządzenie typu mostek PCI +. MessageId=1792 SymbolicName=NONE Language=English PCI Serial Port . +Language=Polish +Port szeregowy PCI +. MessageId=1793 SymbolicName=NONE Language=English PCI Parallel Port . +Language=Polish +Port równoległy PCI +. MessageId=1794 SymbolicName=NONE Language=English PCI Multiport Serial Controller . +Language=Polish +Wieloportowy kontroler szeregowy PCI +. MessageId=1795 SymbolicName=NONE Language=English PCI Modem . +Language=Polish +Modem PCI +. MessageId=1796 SymbolicName=NONE Language=English PCI GBIB Controller . +Language=Polish +Kontroler PCI GBIB +. MessageId=1797 SymbolicName=NONE Language=English PCI Smart Card . +Language=Polish +Karta inteligentna PCI +. MessageId=1920 SymbolicName=NONE Language=English PCI Simple Communications Controller . +Language=Polish +Kontroler PCI Simple Communications +. MessageId=2048 SymbolicName=NONE Language=English System Interrupt Controller . +Language=Polish +Kontroler przerwań systemowych +. MessageId=2049 SymbolicName=NONE Language=English System DMA Controller . +Language=Polish +Kontroler systemowy DMA +. MessageId=2050 SymbolicName=NONE Language=English System Timer . +Language=Polish +Czasomierz systemowy +. MessageId=2051 SymbolicName=NONE Language=English Real Time CLock . +Language=Polish +Zegar czasu rzeczywistego +. MessageId=2052 SymbolicName=NONE Language=English Generic PCI Hot-Plug Controller . +Language=Polish +Rodzajowy kontroler PCI Hot-Plug +. MessageId=2053 SymbolicName=NONE Language=English SD Host Controller . +Language=Polish +Kontroler hosta SD +. MessageId=2173 SymbolicName=NONE Language=English Base System Device . +Language=Polish +Podstawowe urządzenie systemowe +. MessageId=2304 SymbolicName=NONE Language=English PCI Keyboard Controller . +Language=Polish +Kontroler klawiatury PCI +. MessageId=2305 SymbolicName=NONE Language=English PCI Digitizer . +Language=Polish +Dyskretyzator PCI +. MessageId=2306 SymbolicName=NONE Language=English PCI Mouse Controller . +Language=Polish +Kontroler myszy PCI +. MessageId=2307 SymbolicName=NONE Language=English PCI Scanner Controller . +Language=Polish +Kontroler skanera PCI +. MessageId=2308 SymbolicName=NONE Language=English PCI Gameport Controller . +Language=Polish +Kontroler portu gier PCI +. MessageId=2432 SymbolicName=NONE Language=English PCI Input Device . +Language=Polish +Urządzenie wejściowe PCI +. MessageId=2560 SymbolicName=NONE Language=English Docking Station . +Language=Polish +Stacja dokująca +. MessageId=2688 SymbolicName=NONE Language=English Docking Station (Unknown type) . +Language=Polish +Stacja dokująca (nieznanego typu) +. MessageId=2816 SymbolicName=NONE Language=English 386 Processor . +Language=Polish +Procesor 386 +. MessageId=2817 SymbolicName=NONE Language=English 486 Processor . +Language=Polish +Procesor 486 +. MessageId=2818 SymbolicName=NONE Language=English Pentium Processor . +Language=Polish +Procesor Pentium +. MessageId=2832 SymbolicName=NONE Language=English ALPHA Processor . +Language=Polish +Procesor ALPHA +. MessageId=2848 SymbolicName=NONE Language=English PowerPC Processor . +Language=Polish +Procesor PowerPC +. MessageId=2880 SymbolicName=NONE Language=English Coprocessor . +Language=Polish +Koprocesor +. MessageId=3072 SymbolicName=NONE Language=English IEEE 1394 Controller . +Language=Polish +Kontroler IEEE 1394 +. MessageId=3073 SymbolicName=NONE Language=English ACCESS Bus Controller . +Language=Polish +Kontroler magistrali ACCESS +. MessageId=3074 SymbolicName=NONE Language=English SSA Controller . +Language=Polish +Kontroler SSA +. MessageId=3075 SymbolicName=NONE Language=English Universal Serial Bus (USB) Controller . +Language=Polish +Kontroler uniwersalnej magistrali szeregowej (USB) +. MessageId=3076 SymbolicName=NONE Language=English Fibre Channel Controller . +Language=Polish +Kontroler Fibre Channel +. MessageId=3077 SymbolicName=NONE Language=English SM Bus Controller . +Language=Polish +Kontroler magistrali zarządzania systemem +. MessageId=3078 SymbolicName=NONE Language=English Infiniband Controller . +Language=Polish +Kontroler Infiniband +. MessageId=3079 SymbolicName=NONE Language=English IPMI Interface . +Language=Polish +Interfejs IPMI +. MessageId=3080 SymbolicName=NONE Language=English SERCOS Interface . +Language=Polish +Interfejs SERCOS +. MessageId=3081 SymbolicName=NONE Language=English CANbus Controller . +Language=Polish +Kontroler CANbus +. MessageId=3328 SymbolicName=NONE Language=English iRDA Compatible Controller . +Language=Polish +Kontroler zgodny z iRDA +. MessageId=3329 SymbolicName=NONE Language=English Consumer IR Controller . +Language=Polish +Kontroler Consumer IR +. MessageId=3344 SymbolicName=NONE Language=English RF Controller . +Language=Polish +Kontroler częstotliwości radiowej +. MessageId=3345 SymbolicName=NONE Language=English Bluetooth Controller . +Language=Polish +Kontroler Bluetooth +. MessageId=3346 SymbolicName=NONE Language=English Broadband Controller . +Language=Polish +Kontroler szerokopasmowy +. MessageId=3360 SymbolicName=NONE Language=English Ethernet 802.11a Controller . +Language=Polish +Kontroler Ethernet 802.11a +. MessageId=3361 SymbolicName=NONE Language=English Ethernet 802.11b Controller . +Language=Polish +Kontroler Ethernet 802.11b +. MessageId=3456 SymbolicName=NONE Language=English PCI Wireless Controller . +Language=Polish +Kontroler bezprzewodowy PCI +. MessageId=3584 SymbolicName=NONE Language=English Intelligent I/O (I2O) Controller . +Language=Polish +Kontroler We/Wy Intelligent (I2O) +. MessageId=3841 SymbolicName=NONE Language=English Satellite Communications Television Controller . +Language=Polish +Kontroler telewizji dla komunikacji satelitarnej +. MessageId=3842 SymbolicName=NONE Language=English Satellite Communications Audio Controller . +Language=Polish +Kontroler audio dla komunikacji satelitarnej +. MessageId=3843 SymbolicName=NONE Language=English Satellite Communications Voice Controller . +Language=Polish +Kontroler głosu dla komunikacji satelitarnej +. MessageId=3844 SymbolicName=NONE Language=English Satellite Communications Data Controller . +Language=Polish +Kontroler danych dla komunikacji satelitarnej +. MessageId=4096 SymbolicName=NONE Language=English Network and Computing Encryption/Decryption Controller . +Language=Polish +Kontroler szyfrowania/odszyfrowywania danych sieciowych i komputerowych +. MessageId=4112 SymbolicName=NONE Language=English Entertainment Encryption/Decryption Controller . +Language=Polish +Kontroler szyfrowania/odszyfrowywania rozrywki +. MessageId=4224 SymbolicName=NONE Language=English PCI Encryption/Decryption Controller . +Language=Polish +Kontroler szyfrowania/odszyfrowywania PCI +. MessageId=4352 SymbolicName=NONE Language=English DPIO Module . +Language=Polish +Moduł DPIO +. MessageId=4353 SymbolicName=NONE Language=English Performance Counters . +Language=Polish +Liczniki wydajności +. MessageId=4368 SymbolicName=NONE Language=English PCI Communications Synchronization plus Time and Frequency Test/Measurement Controller . +Language=Polish +Kontroler PCI synchronizacji komunikacji oraz testowania/pomiaru czasu i częstotliwości +. MessageId=4384 SymbolicName=NONE Language=English Management Card . +Language=Polish +Karta zarządzania +. MessageId=4480 SymbolicName=NONE Language=English PCI Data Acquisition and Signal Processing Controller . +Language=Polish +Kontroler PCI gromadzenia danych i przetwarzania sygnałów +.

1 0

[reactos] 01/01: [CMD_ROSTEST] Add more tests for the command echoer and new tests for the parser.
by Hermès Bélusca-Maïto 26 Sep '20

26 Sep '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=7988a2ac54da88240b632… commit 7988a2ac54da88240b632d00c7597a7f6da13db9 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Mon Jul 27 19:29:59 2020 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sat Sep 26 17:51:07 2020 +0200 [CMD_ROSTEST] Add more tests for the command echoer and new tests for the parser. --- modules/rostests/win32/cmd/test_echoer_parser.cmd | 451 +++++++++++++++++++++ .../rostests/win32/cmd/test_echoer_parser.cmd.exp | 295 ++++++++++++++ 2 files changed, 746 insertions(+) diff --git a/modules/rostests/win32/cmd/test_echoer_parser.cmd b/modules/rostests/win32/cmd/test_echoer_parser.cmd index e94313871f7..ecb20a63afd 100644 --- a/modules/rostests/win32/cmd/test_echoer_parser.cmd +++ b/modules/rostests/win32/cmd/test_echoer_parser.cmd @@ -251,6 +251,457 @@ if 1==1 ( ) + +:: Parsing FOR, IF and REM commands. +:: +:: Note: wrong syntaxes for FOR, IF, REM or parsing operators +:: are considered syntactic errors and batch running stops. +:: For all other commands, execution continues. +:: + +@echo on + +echo --------- Parsing FOR, IF and REM commands --------- + +fOr@space@@space@@space@@tab@@tab@ /d@space@@space@@tab@ %%d iN (*)@space@@space@@tab@ do eCHo %%d +:for /asdf +:: for /d %%d in (*) do echo %%d +:: for /d %%d in (*) do echo %%~fd +for /d %%d in (*) do echo %%~ed +for /d %%d in (*) do echo %~d0: +fOr@tab@@space@@space@@space@@space@@space@@space@@space@@space@@tab@/l@space@@tab@ %%c@space@@space@@tab@ iN@tab@ (1,1,5)@space@@space@@tab@ Do@space@@space@@tab@@space@@tab@ echo@tab@@space@@space@@space@@space@@tab@@tab@%%c + + +iF@space@@space@@tab@ 457@space@@tab@@space@@tab@neQ@space@@space@@tab@ 458@space@@tab@ (@space@@tab@ echo@space@@tab@ %~d0 ) eLSe (@space@@space@@tab@ echo $~d0@space@@tab@ ) + +::: if 457 nea 458 (echo %~d0) eLSe (echo $~dp) +:if 457 nea 458 (echo yo) else (echo ya) +:if 457 leq 458 (rem/? /d) +:: if 457 leq 458 ( if 457 nea 458 (echo hi) else (echo yo) ) + +iF@space@@space@@tab@ "2147483647"@space@@space@@tab@ gEq@space@@tab@@space@@tab@ "2147483648"@space@@tab@ (Echo Larger)@space@@space@@tab@ Else@space@@tab@ (:Echo Smaller) +ecHO sMaLlEr) + +iF@space@@space@@tab@eRrOrlevel 0 echo hi! + + +:: rem@tab@@space@@tab@ /df@space@@space@@tab@ /d + +rEM /v@space@@tab@/d +REm@space@@space@@space@@tab@@tab@ /d +rEm REM2 /d +reM@space@@tab@ /d@space@@tab@ >@space@@tab@ NUL +:reM /?/d + +:: These commands, even commented out via the parser comment colon, +:: cause parsing errors even when being commented out. +:: Replace the two '%' by a single one to see the effects. +:: +:echo %~f0 %%~dp %~p1 +:echo %%~d0 $~dp +:echo %%~dp: +:echo %%~b0 + + + +:: +:: Parsing random commands +:: + +echo --------- Parsing random commands --------- + +:: Parsing these commands should fail (when being un-commmented). +:@a ( b & | +: a ( b & | + +:: If goto fails, batch stops. (Done OK in ROS' cmd) +:goto /asdf whatever + +dir > NUL &(b) + + +setlocal enabledelayedexpansion + +echo %~dp0 + +set SOMEVAR=C:\ReAcToS +rem %SOMEVAR% | + +Set "_var=first" +Set "_var=second" & Rem %_var% !_var! +Set "_var=third" & Echo %_var% !_var! + +endlocal + + + +:: +:: Parsing line continuations, either from parenthesized blocks +:: or via the escape caret. +:: It may be informative to manually run this test under CMD +:: with cmd!fDumpTokens and cmd!fDumpParse flags enabled. +:: + +echo --------- Parsing line continuations --------- + +( +a & b +c +d +) +:: +:: Parsed as: +:: '('[ '&'[a, CRLF[b, CRLF[c,d] ] ] ] +:: + + +( +a && b +c +d +) +:: +:: Parsed as: +:: '('[ CRLF['&&'[a,b], CRLF[c,d]] ] +:: + + +(a & b) + +( +a & b +) + + +( +a & b +c & d +) + + +(a & ^ +b +c & d +) +:: +:: Parsed as: +:: '('[ '&'[a, CRLF[b, '&'[c,d] ] ] +:: + + +( +a & b +c +d +) +:: +:: Parsed as: +:: '('[ '&'[a, CRLF[b, CRLF[c,d] ] ] ] +:: + + +( +a && b +c +d +) +:: +:: Parsed as: +:: '('[ CRLF['&&'[a,b], CRLF[c,d]] ] +:: + + +( +a || b +c +d +) +:: +:: Parsed as: +:: '('[ CRLF['||'[a,b], CRLF[c,d]] ] +:: + + +( +a +b & c +d +) +:: +:: Parsed as: +:: '('[ CRLF[a, '&'[b, CRLF[c,d]]] ] +:: + + +( +a +b && c +d +) +:: +:: Parsed as: +:: '('[ CRLF[a, CRLF['&&'[b,c], d]] ] +:: + + +( +a +b +c && d +) +:: +:: Parsed as: +:: '('[ CRLF[a, CRLF[b, '&&'[c,d]]] ] +:: + + +( +a +b +c & d +) +:: +:: Parsed as: +:: '('[ CRLF[a, CRLF[b, '&'[c,d]]] ] +:: + + +( +a +b + +c +d +) +:: +:: Parsed as: +:: '('[ CRLF[a, CRLF[b, CRLF[c,d] ] ] ] +:: + + + +REM foo^ +bar^ +baz trol^ + + +if 1==1 (echo a) else (echo b) + +if 1==1 (echo a +) else (echo b) + +if 1==1 (echo a) else ( +echo b) + +if 1==1 ( +echo a +) else ( +echo b +) + + +REM if 1==1 (^ +REM echo a +REM ) ^ +REM else +REM (^ +REM echo b +REM ) + + +REM if 1==1 (^ +REM echo a +REM ) ^ +REM else^ +REM (^ +REM echo b +REM ) + + +REM if 1==1 (^ +REM echo a +REM ) ^ +REM else^ +REM ( +REM echo b +REM ) + + +if 1==1 (^ +echo a +) + + +if 1==1 (^ +@echo a +) + + + +(foo ^ +bar +) + +(foo ^ +&& bar +baz +) + +(foo ^ + && bar +baz +) + +REM (foo^ +REM && bar +REM baz +REM ) + +(foo^ +bar +baz +) + + +(foo &^ +& bar +baz +) + + +(^ +foo +bar +) + + + +( + + +foo ^ +bar +) + + + +( + + +foo ^ +&& bar +baz +) + + + +( + + +foo ^ + && bar +baz +) + + + + +REM ( +REM +REM +REM foo^ +REM && bar +REM baz +REM ) + + + +( + + +foo^ +bar +baz +) + + + +( + + +foo &^ +& bar +baz +) + + + +( + + +^ +foo +bar +) + + + +:: +:: Tests for Character Escape and Line Continuation +:: + +(^"!pc::^=^!^") + +(^ +"!pc::^=^!^") + +( +^"!pc::^=^!^") + + +(^"!pc::^=^ +% New line % +!^") + +REM @ 2>&1 ( ( dir) ) && lol + + +echo & ^ +&&lol + + +REM echo & ^ +REM ^ +REM &&lol + + +trol ^ +&&lol + + +trol^ +&&lol + + +REM (echo hi)^ +REM &&lol + + +rem trol(^ +line +@rem trol2""^ +line2 +:trol3^ +line3 + +echo trol^ +line + +:echo trol^ +line + + + @echo off :: diff --git a/modules/rostests/win32/cmd/test_echoer_parser.cmd.exp b/modules/rostests/win32/cmd/test_echoer_parser.cmd.exp index 796b31eef76..65c909ea3e3 100644 --- a/modules/rostests/win32/cmd/test_echoer_parser.cmd.exp +++ b/modules/rostests/win32/cmd/test_echoer_parser.cmd.exp @@ -322,4 +322,299 @@ updated TN == TN updated TN == TN updated TN == TN updated TN == TN + +@pwd@>echo --------- Parsing FOR, IF and REM commands ---------@space@ +--------- Parsing FOR, IF and REM commands --------- + +@pwd@>fOr / %d iN (*) do eCHo %d@space@ + +@pwd@>eCHo script_testsuite@space@ +script_testsuite + +@pwd@>for / %d in (*) do echo %~ed@space@ + +@pwd@>echo %~ed@space@ +%~ed + +@pwd@>for / %d in (*) do echo D::@space@ + +@pwd@>echo D::@space@ +D:: + +@pwd@>fOr /L %c iN (1 1 5) Do echo@tab@@space@@space@@space@@space@@tab@@tab@%c@space@ + +@pwd@>echo@tab@@space@@space@@space@@space@@tab@@tab@1@space@ +@space@@space@@space@@space@@tab@@tab@1 + +@pwd@>echo@tab@@space@@space@@space@@space@@tab@@tab@2@space@ +@space@@space@@space@@space@@tab@@tab@2 + +@pwd@>echo@tab@@space@@space@@space@@space@@tab@@tab@3@space@ +@space@@space@@space@@space@@tab@@tab@3 + +@pwd@>echo@tab@@space@@space@@space@@space@@tab@@tab@4@space@ +@space@@space@@space@@space@@tab@@tab@4 + +@pwd@>echo@tab@@space@@space@@space@@space@@tab@@tab@5@space@ +@space@@space@@space@@space@@tab@@tab@5 + +@pwd@>iF 457 NEQ 458 (echo@space@@tab@ D: ) eLSe (echo $~d0@space@@tab@ )@space@ +@tab@ D:@space@ + +@pwd@>iF "2147483647" GEQ "2147483648" (Echo Larger ) Else (ecHO sMaLlEr )@space@ +sMaLlEr + +@pwd@>iF eRrOrlevel 0 echo hi!@space@ +hi + +@pwd@>rEM /v@space@@tab@/d@space@ + +@pwd@>REm@space@@space@@space@@tab@@tab@ /d@space@ + +@pwd@>rEm REM2 /d@space@ + +@pwd@>reM@space@@tab@ /d@space@@tab@ >@space@@tab@ NUL@space@ + +@pwd@>echo --------- Parsing random commands ---------@space@ +--------- Parsing random commands --------- + +@pwd@>dir 1>NUL & (b)@space@ + +@pwd@>setlocal enabledelayedexpansion@space@ + +@pwd@>echo @pwd@\@space@ +@pwd@\ + +@pwd@>set SOMEVAR=C:\ReAcToS@space@ + +@pwd@>rem C:\ReAcToS |@space@ + +@pwd@>Set "_var=first"@space@ + +@pwd@>Set "_var=second" & Rem first !_var!@space@ + +@pwd@>Set "_var=third" & Echo second !_var!@space@ +second third + +@pwd@>endlocal + +@pwd@>echo --------- Parsing line continuations ---------@space@ +--------- Parsing line continuations --------- + +@pwd@>(a & b@space@ + c@space@ + d)@space@ + +@pwd@>( +a && b@space@ + c@space@ + d +)@space@ + +@pwd@>(a & b)@space@ + +@pwd@>(a & b)@space@ + +@pwd@>(a & b@space@ + c & d)@space@ + +@pwd@>(a & b@space@ + c & d)@space@ + +@pwd@>(a & b@space@ + c@space@ + d)@space@ + +@pwd@>( +a && b@space@ + c@space@ + d +)@space@ + +@pwd@>( +a || b@space@ + c@space@ + d +)@space@ + +@pwd@>( +a@space@ + b & c@space@ + d +)@space@ + +@pwd@>( +a@space@ + b && c@space@ + d +)@space@ + +@pwd@>( +a@space@ + b@space@ + c && d +)@space@ + +@pwd@>( +a@space@ + b@space@ + c & d +)@space@ + +@pwd@>( +a@space@ + b@space@ + c@space@ + d +)@space@ + +@pwd@>REMbaz trol^@space@ + +@pwd@>if 1 == 1 (echo a ) else (echo b )@space@ +a + +@pwd@>if 1 == 1 (echo a ) else (echo b )@space@ +a + +@pwd@>if 1 == 1 (echo a ) else (echo b )@space@ +a + +@pwd@>if 1 == 1 (echo a ) else (echo b )@space@ +a + +@pwd@>REM if 1==1 (^@space@ + +@pwd@>REM echo a@space@ + +@pwd@>REM ) ^@space@ + +@pwd@>REM else@space@ + +@pwd@>REMREM echo b@space@ + +@pwd@>REM )@space@ + +@pwd@>REM if 1==1 (^@space@ + +@pwd@>REM echo a@space@ + +@pwd@>REM ) ^@space@ + +@pwd@>REMREM (^@space@ + +@pwd@>REM echo b@space@ + +@pwd@>REM )@space@ + +@pwd@>REM if 1==1 (^@space@ + +@pwd@>REM echo a@space@ + +@pwd@>REM ) ^@space@ + +@pwd@>REMREM (@space@ + +@pwd@>REM echo b@space@ + +@pwd@>REM )@space@ + +@pwd@>if 1 == 1 (echo a )@space@ +a + +@pwd@>if 1 == 1 ()@space@ +a + +@pwd@>(foo bar )@space@ + +@pwd@>(foo & & bar@space@ + baz)@space@ + +@pwd@>( +foo && bar@space@ + baz +)@space@ + +@pwd@>REMREM && bar@space@ + +@pwd@>REM baz@space@ + +@pwd@>REM )@space@ + +@pwd@>( +bar@space@ + baz +)@space@ + +@pwd@>(foo & & bar@space@@space@ + baz)@space@ + +@pwd@>( +foo@space@ + bar +)@space@ + +@pwd@>(foo bar )@space@ + +@pwd@>(foo & & bar@space@ + baz)@space@ + +@pwd@>( +foo && bar@space@ + baz +)@space@ + +@pwd@>REM (@space@ + +@pwd@>REM + +@pwd@>REM + +@pwd@>REMREM && bar@space@ + +@pwd@>REM baz@space@ + +@pwd@>REM )@space@ + +@pwd@>( +bar@space@ + baz +)@space@ + +@pwd@>(foo & & bar@space@@space@ + baz)@space@ + +@pwd@>( +foo@space@ + bar +)@space@ + +@pwd@>("!pc::=!")@space@ + +@pwd@>("!pc::^=^!^")@space@ + +@pwd@>("!pc::=!")@space@ + +@pwd@>(!")@space@ + +@pwd@>REM @ 2>&1 ( ( dir) ) && lol@space@ + +@pwd@>echo & & & lol +ECHO is on. + +@pwd@>REM echo & ^@space@ + +@pwd@>REMREM &&lol@space@ + +@pwd@>trol & & lol + +@pwd@>trol& & lol + +@pwd@>REM (echo hi)^@space@ + +@pwd@>REM &&lol@space@ + +@pwd@>remline@space@ + +@pwd@>echo trolline@space@ +trolline --------- Finished --------------

1 0

[reactos] 01/01: [ROSTEST] Fix copy paste bug in RtlBitmap.c
by Kyle Katarn 26 Sep '20

26 Sep '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=b217d8bd149b821b2d2d1… commit b217d8bd149b821b2d2d13662606c983e150d76e Author: Kyle Katarn <contact(a)kcsoftwares.com> AuthorDate: Mon Sep 21 23:36:29 2020 +0200 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Sat Sep 26 17:12:36 2020 +0200 [ROSTEST] Fix copy paste bug in RtlBitmap.c --- modules/rostests/apitests/ntdll/RtlBitmap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/rostests/apitests/ntdll/RtlBitmap.c b/modules/rostests/apitests/ntdll/RtlBitmap.c index 355ccee0aff..3b224be1e66 100644 --- a/modules/rostests/apitests/ntdll/RtlBitmap.c +++ b/modules/rostests/apitests/ntdll/RtlBitmap.c @@ -307,7 +307,7 @@ Test_RtlNumberOfSetBits(void) RtlInitializeBitMap(&BitMapHeader, Buffer, 0); ok_int(RtlNumberOfSetBits(&BitMapHeader), 0); - ok_hex(Buffer[0], IsBroken ? 0x7f00ff0f : 0x7f00ff0f); + ok_hex(Buffer[0], IsBroken ? 0x7f00ff0f : 0xff00ff0f); ok_hex(Buffer[1], 0x3F303F30); FreeGuarded(Buffer);

1 0

[reactos] 01/01: [COMDLG32] Support shortcut keys on Open/Save Dialog (#3238)
by Katayama Hirofumi MZ 26 Sep '20

26 Sep '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=c8e1460ac57e7862ccef0… commit c8e1460ac57e7862ccef0b5602764b6d72167a70 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Sat Sep 26 21:26:06 2020 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Sat Sep 26 21:26:06 2020 +0900 [COMDLG32] Support shortcut keys on Open/Save Dialog (#3238) Enable key accelerators on File Open/Save Dialog. CORE-14332 --- dll/win32/comdlg32/cdlg.h | 3 ++ dll/win32/comdlg32/cdlg32.c | 9 +++++ dll/win32/comdlg32/filedlg.c | 94 ++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 106 insertions(+) diff --git a/dll/win32/comdlg32/cdlg.h b/dll/win32/comdlg32/cdlg.h index 28bb7e75268..7570acebb9e 100644 --- a/dll/win32/comdlg32/cdlg.h +++ b/dll/win32/comdlg32/cdlg.h @@ -27,6 +27,9 @@ #define COMDLG32_Atom MAKEINTATOM(0xa000) /* MS uses this one to identify props */ extern HINSTANCE COMDLG32_hInstance DECLSPEC_HIDDEN; +#ifdef __REACTOS__ +extern CRITICAL_SECTION COMDLG32_OpenFileLock DECLSPEC_HIDDEN; +#endif void COMDLG32_SetCommDlgExtendedError(DWORD err) DECLSPEC_HIDDEN; LPVOID COMDLG32_AllocMem(int size) __WINE_ALLOC_SIZE(1) DECLSPEC_HIDDEN; diff --git a/dll/win32/comdlg32/cdlg32.c b/dll/win32/comdlg32/cdlg32.c index 1c21025cfd0..95692c00a37 100644 --- a/dll/win32/comdlg32/cdlg32.c +++ b/dll/win32/comdlg32/cdlg32.c @@ -40,6 +40,9 @@ WINE_DEFAULT_DEBUG_CHANNEL(commdlg); DECLSPEC_HIDDEN HINSTANCE COMDLG32_hInstance = 0; +#ifdef __REACTOS__ +CRITICAL_SECTION COMDLG32_OpenFileLock DECLSPEC_HIDDEN; +#endif static DWORD COMDLG32_TlsIndex = TLS_OUT_OF_INDEXES; @@ -76,6 +79,9 @@ BOOL WINAPI DllMain(HINSTANCE hInstance, DWORD Reason, LPVOID Reserved) DisableThreadLibraryCalls(hInstance); SHELL32_hInstance = GetModuleHandleA("SHELL32.DLL"); +#ifdef __REACTOS__ + InitializeCriticalSection(&COMDLG32_OpenFileLock); +#endif /* SHELL */ GPA(COMDLG32_SHSimpleIDListFromPathAW, SHELL32_hInstance, (LPCSTR)162); @@ -84,6 +90,9 @@ BOOL WINAPI DllMain(HINSTANCE hInstance, DWORD Reason, LPVOID Reserved) case DLL_PROCESS_DETACH: if (Reserved) break; if (COMDLG32_TlsIndex != TLS_OUT_OF_INDEXES) TlsFree(COMDLG32_TlsIndex); +#ifdef __REACTOS__ + DeleteCriticalSection(&COMDLG32_OpenFileLock); +#endif break; } return TRUE; diff --git a/dll/win32/comdlg32/filedlg.c b/dll/win32/comdlg32/filedlg.c index 6e5134f6ce3..49bd1d006b1 100644 --- a/dll/win32/comdlg32/filedlg.c +++ b/dll/win32/comdlg32/filedlg.c @@ -106,6 +106,78 @@ typedef struct tagLookInInfo UINT uSelectedItem; } LookInInfos; +#ifdef __REACTOS__ +/* We have to call IShellView::TranslateAccelerator to handle the standard + key bindings of File Open Dialog. We use hook to realize them. */ +static HHOOK s_hFileDialogHook = NULL; +static LONG s_nFileDialogHookCount = 0; + +#define MAX_TRANSLATE 8 +static HWND s_ahwndTranslate[MAX_TRANSLATE] = { NULL }; + +static void FILEDLG95_AddRemoveTranslate(HWND hwndOld, HWND hwndNew) +{ + LONG i; + for (i = 0; i < MAX_TRANSLATE; ++i) + { + if (s_ahwndTranslate[i] == hwndOld) + { + s_ahwndTranslate[i] = hwndNew; + break; + } + } +} + +static __inline BOOL +FILEDLG95_DoTranslate(LONG i, HWND hwndFocus, LPMSG pMsg) +{ + FileOpenDlgInfos *fodInfos; + HWND hwndView; + + if (s_ahwndTranslate[i] == NULL) + return FALSE; + + fodInfos = get_filedlg_infoptr(s_ahwndTranslate[i]); + if (fodInfos == NULL) + return FALSE; + + hwndView = fodInfos->ShellInfos.hwndView; + if (hwndView == hwndFocus || IsChild(hwndView, hwndFocus)) + { + IShellView_TranslateAccelerator(fodInfos->Shell.FOIShellView, pMsg); + return TRUE; + } + return FALSE; +} + +/* WH_MSGFILTER hook procedure */ +static LRESULT CALLBACK +FILEDLG95_TranslateMsgProc(INT nCode, WPARAM wParam, LPARAM lParam) +{ + LPMSG pMsg; + + if (nCode < 0) + return CallNextHookEx(s_hFileDialogHook, nCode, wParam, lParam); + if (nCode != MSGF_DIALOGBOX) + return 0; + + pMsg = (LPMSG)lParam; + if (WM_KEYFIRST <= pMsg->message && pMsg->message <= WM_KEYLAST) + { + LONG i; + HWND hwndFocus = GetFocus(); + EnterCriticalSection(&COMDLG32_OpenFileLock); + for (i = 0; i < MAX_TRANSLATE; ++i) + { + if (FILEDLG95_DoTranslate(i, hwndFocus, pMsg)) + break; + } + LeaveCriticalSection(&COMDLG32_OpenFileLock); + } + + return 0; +} +#endif /*********************************************************************** * Defines and global variables @@ -1428,6 +1500,17 @@ INT_PTR CALLBACK FileOpenDlgProc95(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM l if(fodInfos->ofnInfos->Flags & OFN_EXPLORER) SendCustomDlgNotificationMessage(hwnd,CDN_SELCHANGE); +#ifdef __REACTOS__ + /* Enable hook and translate */ + EnterCriticalSection(&COMDLG32_OpenFileLock); + if (++s_nFileDialogHookCount == 1) + { + s_hFileDialogHook = SetWindowsHookEx(WH_MSGFILTER, FILEDLG95_TranslateMsgProc, + 0, GetCurrentThreadId()); + } + FILEDLG95_AddRemoveTranslate(NULL, hwnd); + LeaveCriticalSection(&COMDLG32_OpenFileLock); +#endif return 0; } case WM_SIZE: @@ -1465,6 +1548,17 @@ INT_PTR CALLBACK FileOpenDlgProc95(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM l SendDlgItemMessageW(hwnd, IDC_TOOLBARPLACES, TB_SETIMAGELIST, 0, 0); ImageList_Destroy(himl); } +#ifdef __REACTOS__ + /* Disable hook and translate */ + EnterCriticalSection(&COMDLG32_OpenFileLock); + FILEDLG95_AddRemoveTranslate(hwnd, NULL); + if (--s_nFileDialogHookCount == 0) + { + UnhookWindowsHookEx(s_hFileDialogHook); + s_hFileDialogHook = NULL; + } + LeaveCriticalSection(&COMDLG32_OpenFileLock); +#endif return FALSE; }

1 0

[reactos] 01/01: [DRIVERS][SCSIPORT] Fix build fdc47e7
by Katayama Hirofumi MZ 26 Sep '20

26 Sep '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=1062a297bf9549b0bd9cd… commit 1062a297bf9549b0bd9cd8b16875bf28ccd4bb1f Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Sat Sep 26 11:19:58 2020 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Sat Sep 26 11:20:11 2020 +0900 [DRIVERS][SCSIPORT] Fix build fdc47e7 --- drivers/storage/port/scsiport/stubs.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/storage/port/scsiport/stubs.c b/drivers/storage/port/scsiport/stubs.c index e23fb369472..e2ac2107677 100644 --- a/drivers/storage/port/scsiport/stubs.c +++ b/drivers/storage/port/scsiport/stubs.c @@ -6,7 +6,7 @@ * PROGRAMMER: Timo Kreuzer (timo.kreuzer(a)reactos.org) */ -#include "precomp.h" +#include "scsiport.h" #include <srb.h>

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs