Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-10-06 01:13:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

- Minor fixes to get Wine NTDLL environment tests pass.

Browse source 
svn path=/trunk/; revision=12371
This commit is contained in:
Filip Navara 2004-12-27 20:43:42 +00:00
parent af72a293ff
commit dc88a45c29
1 changed files with 17 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1,4 +1,4 @@
/* $Id: env.c,v 1.4 2004/12/27 16:40:14 navaraf Exp $ /* $Id: env.c,v 1.5 2004/12/27 20:43:42 navaraf 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
@ -14,6 +14,7 @@
#include <ddk/ntddk.h> #include <ddk/ntddk.h>
#include <ntdll/rtl.h> #include <ntdll/rtl.h>
#include <napi/teb.h> #include <napi/teb.h>
#include <ntos/minmax.h>
#include <string.h> #include <string.h>
#define NDEBUG #define NDEBUG
@ -231,6 +232,8 @@ RtlExpandEnvironmentStrings_U(PWSTR Environment,
/* NULL-terminate the buffer. */ /* NULL-terminate the buffer. */
if (DestMax) if (DestMax)
*DestBuffer = 0; *DestBuffer = 0;
else
ReturnStatus = STATUS_BUFFER_TOO_SMALL;
Destination->Length = (DestBuffer - Destination->Buffer) * sizeof(WCHAR); Destination->Length = (DestBuffer - Destination->Buffer) * sizeof(WCHAR);
if (Length != NULL) if (Length != NULL)
@ -286,6 +289,15 @@ RtlSetEnvironmentVariable(PWSTR *Environment,
DPRINT("RtlSetEnvironmentVariable(Environment %p Name %wZ Value %wZ)\n", DPRINT("RtlSetEnvironmentVariable(Environment %p Name %wZ Value %wZ)\n",
Environment, Name, Value); Environment, Name, Value);
/* Variable names can't contain a '=' except as a first character. */
for (wcs = Name->Buffer + 1;
wcs < Name->Buffer + (Name->Length / sizeof(WCHAR));
wcs++)
{
if (*wcs == L'=')
return STATUS_INVALID_PARAMETER;
}
if (Environment) if (Environment)
{ {
env = *Environment; env = *Environment;
@ -346,7 +358,7 @@ RtlSetEnvironmentVariable(PWSTR *Environment,
} }
found: found:
if (Value->Length > 0) if (Value != NULL && Value->Length > 0)
{ {
hole_len = tail - hole; hole_len = tail - hole;
/* calculate new environment size */ /* calculate new environment size */
@ -492,7 +504,6 @@ RtlQueryEnvironmentVariable_U(PWSTR Environment,
PWSTR wcs; PWSTR wcs;
UNICODE_STRING var; UNICODE_STRING var;
PWSTR val; PWSTR val;
int len;
BOOLEAN SysEnvUsed = FALSE; BOOLEAN SysEnvUsed = FALSE;
DPRINT("RtlQueryEnvironmentVariable_U Environment %p Variable %wZ Value %p\n", DPRINT("RtlQueryEnvironmentVariable_U Environment %p Variable %wZ Value %p\n",
@ -512,7 +523,6 @@ RtlQueryEnvironmentVariable_U(PWSTR Environment,
RtlAcquirePebLock(); RtlAcquirePebLock();
wcs = Environment; wcs = Environment;
len = Name->Length / sizeof(WCHAR);
while (*wcs) while (*wcs)
{ {
var.Buffer = wcs++; var.Buffer = wcs++;
@ -530,9 +540,10 @@ RtlQueryEnvironmentVariable_U(PWSTR Environment,
if (RtlEqualUnicodeString(&var, Name, TRUE)) if (RtlEqualUnicodeString(&var, Name, TRUE))
{ {
Value->Length = (wcs - val) * sizeof(WCHAR); Value->Length = (wcs - val) * sizeof(WCHAR);
if (Value->Length < Value->MaximumLength) if (Value->Length <= Value->MaximumLength)
{ {
memcpy(Value->Buffer, val, Value->Length + sizeof(WCHAR)); memcpy(Value->Buffer, val,
min(Value->Length + sizeof(WCHAR), Value->MaximumLength));
DPRINT("Value %S\n", val); DPRINT("Value %S\n", val);
DPRINT("Return STATUS_SUCCESS\n"); DPRINT("Return STATUS_SUCCESS\n");
Status = STATUS_SUCCESS; Status = STATUS_SUCCESS;