From 0d6632cdfbcf5db053928565d9169c5d36dbc8c8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Herm=C3=A8s=20B=C3=A9lusca-Ma=C3=AFto?=
 <hermes.belusca-maito@reactos.org>
Date: Tue, 18 Oct 2016 17:12:57 +0000
Subject: [PATCH] [CONSRV]: Minor fixes: - Use GetSystemWindowsDirectoryW
 instead of GetWindowsDirectoryW inside "TranslateConsoleName"; - Don't add
 scrollbars by default to the console window when it's being created; - Fix
 the 2nd parameter of MapVirtualKeyW call; - Two code style changes in text.c
 and tuiterm.c.

svn path=/trunk/; revision=72983
---
 reactos/win32ss/user/winsrv/concfg/settings.c              | 2 +-
 reactos/win32ss/user/winsrv/consrv/frontends/gui/guiterm.c | 2 +-
 reactos/win32ss/user/winsrv/consrv/frontends/gui/text.c    | 4 ++--
 reactos/win32ss/user/winsrv/consrv/frontends/tui/tuiterm.c | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/reactos/win32ss/user/winsrv/concfg/settings.c b/reactos/win32ss/user/winsrv/concfg/settings.c
index 58808259825..0b810c49cb9 100644
--- a/reactos/win32ss/user/winsrv/concfg/settings.c
+++ b/reactos/win32ss/user/winsrv/concfg/settings.c
@@ -100,7 +100,7 @@ TranslateConsoleName(OUT LPWSTR DestString,
         return;
     }
 
-    wLength = GetWindowsDirectoryW(DestString, MaxStrLen);
+    wLength = GetSystemWindowsDirectoryW(DestString, MaxStrLen);
     if ((wLength > 0) && (_wcsnicmp(ConsoleName, DestString, wLength) == 0))
     {
         StringCchCopyW(DestString, MaxStrLen, L"%SystemRoot%");
diff --git a/reactos/win32ss/user/winsrv/consrv/frontends/gui/guiterm.c b/reactos/win32ss/user/winsrv/consrv/frontends/gui/guiterm.c
index 6b635145d61..61f4ade07d9 100644
--- a/reactos/win32ss/user/winsrv/consrv/frontends/gui/guiterm.c
+++ b/reactos/win32ss/user/winsrv/consrv/frontends/gui/guiterm.c
@@ -194,7 +194,7 @@ GuiConsoleInputThread(PVOID Param)
                 NewWindow = CreateWindowExW(WS_EX_CLIENTEDGE,
                                             GUI_CONWND_CLASS,
                                             Console->Title.Buffer,
-                                            WS_OVERLAPPEDWINDOW | WS_HSCROLL | WS_VSCROLL,
+                                            WS_OVERLAPPEDWINDOW,
                                             CW_USEDEFAULT,
                                             CW_USEDEFAULT,
                                             CW_USEDEFAULT,
diff --git a/reactos/win32ss/user/winsrv/consrv/frontends/gui/text.c b/reactos/win32ss/user/winsrv/consrv/frontends/gui/text.c
index b59277f2127..a206fcd00b0 100644
--- a/reactos/win32ss/user/winsrv/consrv/frontends/gui/text.c
+++ b/reactos/win32ss/user/winsrv/consrv/frontends/gui/text.c
@@ -80,7 +80,7 @@ CopyBlock(PTEXTMODE_SCREEN_BUFFER Buffer,
         DPRINT1("This case must never happen, because selHeight is at least == 1\n");
     }
 
-    size += 1; /* Null-termination */
+    size++; /* Null-termination */
     size *= sizeof(WCHAR);
 
     /* Allocate some memory area to be given to the clipboard, so it will not be freed here */
@@ -319,7 +319,7 @@ GuiPasteToTextModeBuffer(PTEXTMODE_SCREEN_BUFFER Buffer,
         /* Pressing the character key, with the control keys maintained pressed */
         er.Event.KeyEvent.bKeyDown = TRUE;
         er.Event.KeyEvent.wVirtualKeyCode = LOBYTE(VkKey);
-        er.Event.KeyEvent.wVirtualScanCode = MapVirtualKeyW(LOBYTE(VkKey), MAPVK_VK_TO_CHAR);
+        er.Event.KeyEvent.wVirtualScanCode = MapVirtualKeyW(LOBYTE(VkKey), MAPVK_VK_TO_VSC);
         er.Event.KeyEvent.uChar.UnicodeChar = CurChar;
         er.Event.KeyEvent.dwControlKeyState = 0;
         if (HIBYTE(VkKey) & 1)
diff --git a/reactos/win32ss/user/winsrv/consrv/frontends/tui/tuiterm.c b/reactos/win32ss/user/winsrv/consrv/frontends/tui/tuiterm.c
index 7518819a29e..e1e96d6e550 100644
--- a/reactos/win32ss/user/winsrv/consrv/frontends/tui/tuiterm.c
+++ b/reactos/win32ss/user/winsrv/consrv/frontends/tui/tuiterm.c
@@ -452,7 +452,7 @@ TuiInit(DWORD OemCP)
     }
 
 Quit:
-    if (Ret == FALSE)
+    if (!Ret)
     {
         DeleteCriticalSection(&ActiveVirtConsLock);
         CloseHandle(ConsoleDeviceHandle);