Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-07-12 07:35:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

[KERNEL32]: Fix the newline adding (see r63361).

Browse source 
svn path=/trunk/; revision=63363
This commit is contained in:
Hermès Bélusca-Maïto 2014-05-18 23:13:12 +00:00
parent ab209b91b5
commit 3384092338
1 changed files with 7 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
reactos/dll/win32/kernel32/client/vdm.c
View file

@ -284,14 +284,13 @@ BaseCheckVDM(IN ULONG BinaryType,
if (StartupInfo->dwFlags & STARTF_USESTDHANDLES) if (StartupInfo->dwFlags & STARTF_USESTDHANDLES)
{ {
/* Set the standard handles */ /* Set the standard handles */
CheckVdm->StdIn = StartupInfo->hStdInput; CheckVdm->StdIn = StartupInfo->hStdInput;
CheckVdm->StdOut = StartupInfo->hStdOutput; CheckVdm->StdOut = StartupInfo->hStdOutput;
CheckVdm->StdErr = StartupInfo->hStdError; CheckVdm->StdErr = StartupInfo->hStdError;
} }
/* Allocate memory for the ANSI strings */ /* Allocate memory for the ANSI strings */
// We need to add the two newline characters '\r\n' to the command line
/* For the command line we need to add two characters needed for newline '\r\n' */
AnsiCmdLine = (PCHAR)RtlAllocateHeap(RtlGetProcessHeap(), HEAP_ZERO_MEMORY, CheckVdm->CmdLen + 2); AnsiCmdLine = (PCHAR)RtlAllocateHeap(RtlGetProcessHeap(), HEAP_ZERO_MEMORY, CheckVdm->CmdLen + 2);
AnsiAppName = (PCHAR)RtlAllocateHeap(RtlGetProcessHeap(), HEAP_ZERO_MEMORY, CheckVdm->AppLen); AnsiAppName = (PCHAR)RtlAllocateHeap(RtlGetProcessHeap(), HEAP_ZERO_MEMORY, CheckVdm->AppLen);
AnsiCurDirectory = (PCHAR)RtlAllocateHeap(RtlGetProcessHeap(), HEAP_ZERO_MEMORY, CheckVdm->CurDirectoryLen); AnsiCurDirectory = (PCHAR)RtlAllocateHeap(RtlGetProcessHeap(), HEAP_ZERO_MEMORY, CheckVdm->CurDirectoryLen);
@ -325,11 +324,11 @@ BaseCheckVDM(IN ULONG BinaryType,
CheckVdm->CmdLen, CheckVdm->CmdLen,
NULL, NULL,
NULL); NULL);
/* Add a needed newline '\r\n' */ /* Add a needed newline '\r\n' and NULL-terminate */
CheckVdm->CmdLen--; // FIXME.... CheckVdm->CmdLen--; // Rewind back to the NULL character
AnsiCmdLine[CheckVdm->CmdLen ] = '\r'; AnsiCmdLine[CheckVdm->CmdLen++] = '\r';
AnsiCmdLine[CheckVdm->CmdLen + 1] = '\n'; AnsiCmdLine[CheckVdm->CmdLen++] = '\n';
CheckVdm->CmdLen += 2; AnsiCmdLine[CheckVdm->CmdLen++] = 0;
/* Convert the short application name into an ANSI string */ /* Convert the short application name into an ANSI string */
WideCharToMultiByte(CP_ACP, WideCharToMultiByte(CP_ACP,