Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-03 21:36:11 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fixed the length of the command line.

Browse source 
svn path=/trunk/; revision=2782
This commit is contained in:
Hartmut Birr 2002-03-25 21:11:13 +00:00
parent f4a1a5dd8e
commit 5ede96eff7
1 changed files with 28 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

49
reactos/lib/kernel32/process/cmdline.c
View file

@ -1,4 +1,4 @@
/* $Id: cmdline.c,v 1.12 2000/06/29 23:35:26 dwelch Exp $ /* $Id: cmdline.c,v 1.13 2002/03/25 21:11:13 hbirr Exp $
* *
* COPYRIGHT: See COPYING in the top level directory * COPYRIGHT: See COPYING in the top level directory
* PROJECT: ReactOS system libraries * PROJECT: ReactOS system libraries
@ -29,9 +29,6 @@
static UNICODE_STRING CommandLineStringW; static UNICODE_STRING CommandLineStringW;
static ANSI_STRING CommandLineStringA; static ANSI_STRING CommandLineStringA;
static WCHAR CommandLineW[MAX_PATH];
static CHAR CommandLineA[MAX_PATH];
static WINBOOL bCommandLineInitialized = FALSE; static WINBOOL bCommandLineInitialized = FALSE;
@ -41,26 +38,36 @@ static VOID
InitCommandLines (VOID) InitCommandLines (VOID)
{ {
PRTL_USER_PROCESS_PARAMETERS Params; PRTL_USER_PROCESS_PARAMETERS Params;
// initialize command line buffers
CommandLineW[0] = 0;
CommandLineStringW.Buffer = CommandLineW;
CommandLineStringW.Length = 0;
CommandLineStringW.MaximumLength = MAX_PATH * sizeof(WCHAR);
CommandLineA[0] = 0;
CommandLineStringA.Buffer = CommandLineA;
CommandLineStringA.Length = 0;
CommandLineStringA.MaximumLength = MAX_PATH;
// get command line // get command line
Params = NtCurrentPeb()->ProcessParameters; Params = NtCurrentPeb()->ProcessParameters;
RtlNormalizeProcessParams (Params); RtlNormalizeProcessParams (Params);
// initialize command line buffers
CommandLineStringW.Length = Params->CommandLine.Length;
CommandLineStringW.MaximumLength = CommandLineStringW.Length + sizeof(WCHAR);
CommandLineStringW.Buffer = RtlAllocateHeap(GetProcessHeap(),
HEAP_GENERATE_EXCEPTIONS|HEAP_ZERO_MEMORY,
CommandLineStringW.MaximumLength);
RtlInitAnsiString(&CommandLineStringA, NULL);
// copy command line
RtlCopyUnicodeString (&CommandLineStringW, RtlCopyUnicodeString (&CommandLineStringW,
&(Params->CommandLine)); &(Params->CommandLine));
RtlUnicodeStringToAnsiString (&CommandLineStringA, CommandLineStringW.Buffer[CommandLineStringW.Length / sizeof(WCHAR)] = 0;
&CommandLineStringW,
FALSE); /* convert unicode string to ansi (or oem) */
if (bIsFileApiAnsi)
RtlUnicodeStringToAnsiString (&CommandLineStringA,
&CommandLineStringW,
TRUE);
else
RtlUnicodeStringToOemString (&CommandLineStringA,
&CommandLineStringW,
TRUE);
CommandLineStringA.Buffer[CommandLineStringA.Length] = 0;
bCommandLineInitialized = TRUE; bCommandLineInitialized = TRUE;
} }
@ -73,9 +80,9 @@ LPSTR STDCALL GetCommandLineA(VOID)
InitCommandLines (); InitCommandLines ();
} }
DPRINT ("CommandLine \'%s\'\n", CommandLineA); DPRINT ("CommandLine \'%s\'\n", CommandLineStringA.Buffer);
return(CommandLineA); return(CommandLineStringA.Buffer);
} }
LPWSTR STDCALL GetCommandLineW (VOID) LPWSTR STDCALL GetCommandLineW (VOID)
@ -85,9 +92,9 @@ LPWSTR STDCALL GetCommandLineW (VOID)
InitCommandLines (); InitCommandLines ();
} }
DPRINT ("CommandLine \'%S\'\n", CommandLineW); DPRINT ("CommandLine \'%S\'\n", CommandLineStringW.Buffer);
return(CommandLineW); return(CommandLineStringW.Buffer);
} }
/* EOF */ /* EOF */