https://git.reactos.org/?p=reactos.git;a=commitdiff;h=4916c4cfd5433b4d05e78…
commit 4916c4cfd5433b4d05e78f1c105c14bea3d9e300
Author: Eric Kohl <eric.kohl(a)reactos.org>
AuthorDate: Thu Mar 22 22:29:33 2018 +0100
Commit: Eric Kohl <eric.kohl(a)reactos.org>
CommitDate: Thu Mar 22 22:29:33 2018 +0100
[CMD] Correct the action on shorcut Ctrl-M
Patch by Jacob S. Preciado.
CORE-10142
---
base/shell/cmd/cmdinput.c | 29 ++++++++++++++++++++++-------
1 file changed, 22 insertions(+), 7 deletions(-)
diff --git a/base/shell/cmd/cmdinput.c b/base/shell/cmd/cmdinput.c
index 6c2971eab6..5276d0d8af 100644
--- a/base/shell/cmd/cmdinput.c
+++ b/base/shell/cmd/cmdinput.c
@@ -205,8 +205,8 @@ BOOL ReadCommand(LPTSTR str, INT maxlen)
switch (ir.Event.KeyEvent.wVirtualKeyCode)
{
#ifdef FEATURE_HISTORY
- case 'K':
- /*add the current command line to the history*/
+ case _T('K'):
+ /* add the current command line to the history */
if (dwControlKeyState &
(LEFT_CTRL_PRESSED|RIGHT_CTRL_PRESSED))
{
@@ -221,8 +221,8 @@ BOOL ReadCommand(LPTSTR str, INT maxlen)
break;
}
- case 'D':
- /*delete current history entry*/
+ case _T('D'):
+ /* delete current history entry */
if (dwControlKeyState &
(LEFT_CTRL_PRESSED|RIGHT_CTRL_PRESSED))
{
@@ -234,8 +234,25 @@ BOOL ReadCommand(LPTSTR str, INT maxlen)
//bContinue=TRUE;
break;
}
+#endif /*FEATURE_HISTORY*/
+ case _T('M'):
+ /* ^M does the same as return */
+ if (dwControlKeyState &
+ (LEFT_CTRL_PRESSED|RIGHT_CTRL_PRESSED))
+ {
+ /* end input, return to main */
+#ifdef FEATURE_HISTORY
+ /* add to the history */
+ if (str[0])
+ History (0, str);
#endif /*FEATURE_HISTORY*/
+ str[charcount++] = _T('\n');
+ str[charcount] = _T('\0');
+ ConOutChar (_T('\n'));
+ bReturn = TRUE;
+ break;
+ }
}
}
@@ -432,9 +449,7 @@ BOOL ReadCommand(LPTSTR str, INT maxlen)
#endif
break;
- case _T('M'):
case _T('C'):
- /* ^M does the same as return */
bCharInput = TRUE;
if (!(ir.Event.KeyEvent.dwControlKeyState &
(RIGHT_CTRL_PRESSED|LEFT_CTRL_PRESSED)))
@@ -452,7 +467,7 @@ BOOL ReadCommand(LPTSTR str, INT maxlen)
str[charcount++] = _T('\n');
str[charcount] = _T('\0');
ConOutChar(_T('\n'));
- bReturn = TRUE;
+ bReturn = TRUE;
break;
case VK_ESCAPE:
https://git.reactos.org/?p=reactos.git;a=commitdiff;h=f9dd6dbe6dca0d4793838…
commit f9dd6dbe6dca0d4793838bf016f358a267b17502
Author: Alexander Shaposhnikov <sanchaez(a)reactos.org>
AuthorDate: Thu Mar 22 10:49:01 2018 +0200
Commit: GitHub <noreply(a)github.com>
CommitDate: Thu Mar 22 10:49:01 2018 +0200
[CONTRIBUTING] Clean accidental garbage
Addendum to f50f983f451e3df2e9bab55853f089755164c92b
---
CONTRIBUTING.md | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 3cbab7b9f7..49a1837d4e 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -65,7 +65,7 @@ Our commit style is defined in a __[commit template]__. Use it as a reference or
- *Use your __real name__ and __real email__.* We do not accept anonymous contributions!
- *Ensure your contribution is properly described.* Include the relevant issue number if applicable.
-- *Put only related changes.* It will make reviewing easier as the reviewer needs to recall less information about the existing source code that is changed./rapps-db/commit/7737182148cde7c559fb21170d3e5c3acf42648c.patch
+- *Put only related changes.* It will make reviewing easier as the reviewer needs to recall less information about the existing source code that is changed.
- *Search for similar pull requests/patches before submitting.* It may be that a similar pull request or issue was opened previously. Comment and review on that one instead.
- *Keep your contribution small and focused on the topic.* It can be tempting to fix existing issues as you come across them while reading the source code. Resist the temptation and put in a note in the source code instead, or (even better) put the issue in the issue tracking system.
- *Respect our __[Coding Style]__ and __[Programming Guidelines]__.*
https://git.reactos.org/?p=reactos.git;a=commitdiff;h=f50f983f451e3df2e9bab…
commit f50f983f451e3df2e9bab55853f089755164c92b
Author: Alexander Shaposhnikov <sanchaez(a)reactos.org>
AuthorDate: Thu Mar 22 10:44:01 2018 +0200
Commit: GitHub <noreply(a)github.com>
CommitDate: Thu Mar 22 10:44:01 2018 +0200
[CONTRIBUTING] Fix typo
---
CONTRIBUTING.md | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 2d4b903b40..3cbab7b9f7 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -49,7 +49,7 @@ Your contribution can be of numerous forms. We currently accept two ways to cont
### Pull Requests
-Since our [migration to GitHub] we gladly accept __[Pull Requests]__. Pull requests let you tell others about changes you have pushed to a repository on GitHub. Once a pull request is opened, you can discuss and review the potential changes with collaborators and add follow-up commits before the changes are merged into the repository. __Pull request is a prefered way to submit your work__ - it makes reviewing and merging your contribution much easier.
+Since our [migration to GitHub] we gladly accept __[Pull Requests]__. Pull requests let you tell others about changes you have pushed to a repository on GitHub. Once a pull request is opened, you can discuss and review the potential changes with collaborators and add follow-up commits before the changes are merged into the repository. __Pull request is a preferred way to submit your work__ - it makes reviewing and merging your contribution much easier.
### Patches
@@ -65,7 +65,7 @@ Our commit style is defined in a __[commit template]__. Use it as a reference or
- *Use your __real name__ and __real email__.* We do not accept anonymous contributions!
- *Ensure your contribution is properly described.* Include the relevant issue number if applicable.
-- *Put only related changes.* It will make reviewing easier as the reviewer needs to recall less information about the existing source code that is changed.
+- *Put only related changes.* It will make reviewing easier as the reviewer needs to recall less information about the existing source code that is changed./rapps-db/commit/7737182148cde7c559fb21170d3e5c3acf42648c.patch
- *Search for similar pull requests/patches before submitting.* It may be that a similar pull request or issue was opened previously. Comment and review on that one instead.
- *Keep your contribution small and focused on the topic.* It can be tempting to fix existing issues as you come across them while reading the source code. Resist the temptation and put in a note in the source code instead, or (even better) put the issue in the issue tracking system.
- *Respect our __[Coding Style]__ and __[Programming Guidelines]__.*