Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-06-05 09:20:30 +00:00
Code Issues Projects Releases Packages Wiki Activity

[RTL]

Browse source 
Improve RtlCreateEnvironment, fixing some warnings from VS /analyze

svn path=/trunk/; revision=58321
This commit is contained in:
Timo Kreuzer 2013-02-16 17:53:05 +00:00
parent f37d3dd108
commit 856c07815b
1 changed files with 72 additions and 62 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

134
reactos/lib/rtl/env.c
View file

@ -17,75 +17,85 @@
/*
* @implemented
*/
NTSTATUS NTAPI
RtlCreateEnvironment(BOOLEAN Inherit,
PWSTR *Environment)
NTSTATUS
NTAPI
RtlCreateEnvironment(
BOOLEAN Inherit,
PWSTR *OutEnvironment)
{
MEMORY_BASIC_INFORMATION MemInfo;
PVOID EnvPtr = NULL;
NTSTATUS Status = STATUS_SUCCESS;
SIZE_T RegionSize = PAGE_SIZE;
MEMORY_BASIC_INFORMATION MemInfo;
PVOID CurrentEnvironment, NewEnvironment = NULL;
NTSTATUS Status = STATUS_SUCCESS;
SIZE_T RegionSize = PAGE_SIZE;
if (Inherit == TRUE)
{
RtlAcquirePebLock();
/* Check if we should inherit the current environment */
if (Inherit)
{
/* In this case we need to lock the PEB */
RtlAcquirePebLock();
if (NtCurrentPeb()->ProcessParameters->Environment != NULL)
{
Status = NtQueryVirtualMemory(NtCurrentProcess(),
NtCurrentPeb()->ProcessParameters->Environment,
MemoryBasicInformation,
&MemInfo,
sizeof(MEMORY_BASIC_INFORMATION),
NULL);
if (!NT_SUCCESS(Status))
{
RtlReleasePebLock();
*Environment = NULL;
return(Status);
}
/* Get a pointer to the current Environment and check if it's not NULL */
CurrentEnvironment = NtCurrentPeb()->ProcessParameters->Environment;
if (CurrentEnvironment != NULL)
{
/* Query the size of the current environment allocation */
Status = NtQueryVirtualMemory(NtCurrentProcess(),
CurrentEnvironment,
MemoryBasicInformation,
&MemInfo,
sizeof(MEMORY_BASIC_INFORMATION),
NULL);
if (!NT_SUCCESS(Status))
{
RtlReleasePebLock();
*OutEnvironment = NULL;
return Status;
}
RegionSize = MemInfo.RegionSize;
Status = NtAllocateVirtualMemory(NtCurrentProcess(),
&EnvPtr,
0,
&RegionSize,
MEM_RESERVE | MEM_COMMIT,
PAGE_READWRITE);
if (!NT_SUCCESS(Status))
{
RtlReleasePebLock();
*Environment = NULL;
return(Status);
}
/* Allocate a new region of the same size */
RegionSize = MemInfo.RegionSize;
Status = NtAllocateVirtualMemory(NtCurrentProcess(),
&NewEnvironment,
0,
&RegionSize,
MEM_RESERVE | MEM_COMMIT,
PAGE_READWRITE);
if (!NT_SUCCESS(Status))
{
RtlReleasePebLock();
*OutEnvironment = NULL;
return Status;
}
memmove(EnvPtr,
NtCurrentPeb ()->ProcessParameters->Environment,
MemInfo.RegionSize);
/* Copy the current environment */
RtlCopyMemory(NewEnvironment,
CurrentEnvironment,
MemInfo.RegionSize);
}
*Environment = EnvPtr;
}
/* We are done with the PEB, release the lock */
RtlReleasePebLock ();
}
RtlReleasePebLock ();
}
else
{
Status = NtAllocateVirtualMemory(NtCurrentProcess(),
&EnvPtr,
0,
&RegionSize,
MEM_RESERVE | MEM_COMMIT,
PAGE_READWRITE);
if (NT_SUCCESS(Status))
{
memset(EnvPtr,
0,
RegionSize);
*Environment = EnvPtr;
}
}
/* Check if we still need an environment */
if (NewEnvironment == NULL)
{
/* Allocate a new environment */
Status = NtAllocateVirtualMemory(NtCurrentProcess(),
&NewEnvironment,
0,
&RegionSize,
MEM_RESERVE | MEM_COMMIT,
PAGE_READWRITE);
if (NT_SUCCESS(Status))
{
RtlZeroMemory(NewEnvironment, RegionSize);
}
}
return(Status);
*OutEnvironment = NewEnvironment;
return Status;
}
@ -315,7 +325,7 @@ RtlSetEnvironmentVariable(PWSTR *Environment,
while (*env_end);
env_end++;
env_len = env_end - env;
DPRINT("environment length %ld characters\n", env_len);
DPRINT("environment length %lu characters\n", env_len);
/* find where to insert */
while (*wcs)