Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-07-21 11:48:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert last patch.

Browse source 
svn path=/trunk/; revision=3186
This commit is contained in:
Eric Kohl 2002-07-06 17:38:06 +00:00
parent 8fc03ec0f6
commit 5e114ab271
1 changed files with 135 additions and 177 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

312
reactos/lib/ntdll/rtl/env.c
View file

@ -1,4 +1,4 @@
/* $Id: env.c,v 1.14 2002/07/05 17:23:05 ekohl Exp $ /* $Id: env.c,v 1.15 2002/07/06 17:38:06 ekohl 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
@ -112,82 +112,83 @@ RtlExpandEnvironmentStrings_U(PWSTR Environment,
PUNICODE_STRING Destination, PUNICODE_STRING Destination,
PULONG Length) PULONG Length)
{ {
UNICODE_STRING var; UNICODE_STRING var;
UNICODE_STRING val; UNICODE_STRING val;
NTSTATUS Status = STATUS_SUCCESS; NTSTATUS Status = STATUS_SUCCESS;
BOOLEAN flag = FALSE; BOOLEAN flag = FALSE;
PWSTR s; PWSTR s;
PWSTR d; PWSTR d;
PWSTR w; PWSTR w;
int src_len; int src_len;
int dst_max; int dst_max;
int tail; int tail;
DPRINT ("RtlExpandEnvironmentStrings_U %p %wZ %p %p\n", DPRINT("RtlExpandEnvironmentStrings_U %p %wZ %p %p\n",
Environment, Source, Destination, Length); Environment, Source, Destination, Length);
src_len = Source->Length / sizeof(WCHAR); src_len = Source->Length / sizeof(WCHAR);
s = Source->Buffer; s = Source->Buffer;
dst_max = Destination->MaximumLength / sizeof(WCHAR); dst_max = Destination->MaximumLength / sizeof(WCHAR);
d = Destination->Buffer; d = Destination->Buffer;
while (src_len) while (src_len)
{
if (*s == L'%')
{ {
if (*s == L'%') if (flag)
{ {
if (flag) flag = FALSE;
{ goto copy;
flag = FALSE; }
goto copy; w = s + 1;
} tail = src_len - 1;
w = s + 1; while (*w != L'%' && tail)
tail = src_len - 1; {
while (*w != L'%' && tail) w++;
{ tail--;
w++; }
tail--; if (!tail)
} goto copy;
if (!tail)
goto copy;
var.Length = (w - ( s + 1)) * sizeof(WCHAR); var.Length = (w - ( s + 1)) * sizeof(WCHAR);
var.MaximumLength = var.Length; var.MaximumLength = var.Length;
var.Buffer = s + 1; var.Buffer = s + 1;
val.Length = 0; val.Length = 0;
val.MaximumLength = dst_max * sizeof(WCHAR); val.MaximumLength = dst_max * sizeof(WCHAR);
val.Buffer = d; val.Buffer = d;
Status = RtlQueryEnvironmentVariable_U (Environment, &var, &val); Status = RtlQueryEnvironmentVariable_U (Environment, &var, &val);
if (NT_SUCCESS(Status)) if (NT_SUCCESS(Status))
{ {
d += val.Length / sizeof(WCHAR); d += val.Length / sizeof(WCHAR);
dst_max -= val.Length / sizeof(WCHAR); dst_max -= val.Length / sizeof(WCHAR);
s = w + 1; s = w + 1;
src_len = tail - 1; src_len = tail - 1;
continue; continue;
} }
/* variable not found or buffer too small, just copy %var% */ /* variable not found or buffer too small, just copy %var% */
flag = TRUE; flag = TRUE;
} }
copy: copy:
if (!dst_max) if (!dst_max)
{ {
Status = STATUS_BUFFER_TOO_SMALL; Status = STATUS_BUFFER_TOO_SMALL;
break; break;
}
*d++ = *s++;
dst_max--;
src_len--;
} }
Destination->Length = (d - Destination->Buffer) * sizeof(WCHAR);
if (Length != NULL)
*Length = Destination->Length;
if (dst_max)
Destination->Buffer[Destination->Length / sizeof(WCHAR)] = 0;
DPRINT ("Destination %wZ\n", Destination); *d++ = *s++;
return Status; dst_max--;
src_len--;
}
Destination->Length = (d - Destination->Buffer) * sizeof(WCHAR);
if (Length != NULL)
*Length = Destination->Length;
if (dst_max)
Destination->Buffer[Destination->Length / sizeof(WCHAR)] = 0;
DPRINT("Destination %wZ\n", Destination);
return(Status);
} }
@ -218,7 +219,7 @@ RtlSetEnvironmentVariable(PWSTR *Environment,
PUNICODE_STRING Value) PUNICODE_STRING Value)
{ {
MEMORY_BASIC_INFORMATION mbi; MEMORY_BASIC_INFORMATION mbi;
UNICODE_STRING var, ExpandedValue; UNICODE_STRING var;
int hole_len, new_len, env_len = 0; int hole_len, new_len, env_len = 0;
WCHAR *new_env = 0, *env_end = 0, *wcs, *env, *val = 0, *tail = 0, *hole = 0; WCHAR *new_env = 0, *env_end = 0, *wcs, *env, *val = 0, *tail = 0, *hole = 0;
PWSTR head = NULL; PWSTR head = NULL;
@ -283,45 +284,11 @@ RtlSetEnvironmentVariable(PWSTR *Environment,
} }
found: found:
/* Perform inline replacement if Value references existing vars */ if (Value->Length > 0)
/* ex: SET PATH=C:\MinGW\Bin;%PATH% */
ExpandedValue.MaximumLength = (env_len + Value->Length) * 2 * sizeof(WCHAR);
ExpandedValue.Buffer = RtlAllocateHeap(RtlGetProcessHeap(),
0,
ExpandedValue.MaximumLength + 1);
if (ExpandedValue.Buffer == NULL)
{
if (Environment == NULL)
{
RtlReleasePebLock();
}
return(STATUS_INSUFFICIENT_RESOURCES);
}
ExpandedValue.Length = 0;
ExpandedValue.Buffer[0] = (WCHAR)'\0';
Status = RtlExpandEnvironmentStrings_U(env,
Value,
&ExpandedValue,
NULL);
if (!NT_SUCCESS(Status))
{
RtlFreeHeap(RtlGetProcessHeap(),
0,
ExpandedValue.Buffer);
if (Environment == NULL)
{
RtlReleasePebLock();
}
return(Status);
}
if (ExpandedValue.Length > 0)
{ {
hole_len = tail - hole; hole_len = tail - hole;
/* calculate new environment size */ /* calculate new environment size */
new_size = ExpandedValue.Length + sizeof(WCHAR); new_size = Value->Length + sizeof(WCHAR);
/* adding new variable */ /* adding new variable */
if (f) if (f)
new_size += Name->Length + sizeof(WCHAR); new_size += Name->Length + sizeof(WCHAR);
@ -345,9 +312,6 @@ found:
NULL); NULL);
if (!NT_SUCCESS(Status)) if (!NT_SUCCESS(Status))
{ {
RtlFreeHeap(RtlGetProcessHeap(),
0,
ExpandedValue.Buffer);
if (Environment == NULL) if (Environment == NULL)
{ {
RtlReleasePebLock(); RtlReleasePebLock();
@ -367,9 +331,6 @@ found:
PAGE_READWRITE); PAGE_READWRITE);
if (!NT_SUCCESS(Status)) if (!NT_SUCCESS(Status))
{ {
RtlFreeHeap(RtlGetProcessHeap(),
0,
ExpandedValue.Buffer);
if (Environment == NULL) if (Environment == NULL)
{ {
RtlReleasePebLock(); RtlReleasePebLock();
@ -428,9 +389,9 @@ found:
/* copy value */ /* copy value */
memmove(hole, memmove(hole,
ExpandedValue.Buffer, Value->Buffer,
ExpandedValue.Length); Value->Length);
hole += ExpandedValue.Length / sizeof(WCHAR); hole += Value->Length / sizeof(WCHAR);
*hole = 0; *hole = 0;
} }
else else
@ -448,9 +409,6 @@ found:
} }
} }
RtlFreeHeap(RtlGetProcessHeap(),
0,
ExpandedValue.Buffer);
if (Environment == NULL) if (Environment == NULL)
{ {
RtlReleasePebLock(); RtlReleasePebLock();
@ -465,74 +423,74 @@ RtlQueryEnvironmentVariable_U(PWSTR Environment,
PUNICODE_STRING Name, PUNICODE_STRING Name,
PUNICODE_STRING Value) PUNICODE_STRING Value)
{ {
NTSTATUS Status; NTSTATUS Status;
PWSTR wcs; PWSTR wcs;
PWSTR var; PWSTR var;
PWSTR val; PWSTR val;
int varlen; int varlen;
int len; 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",
Environment, Name, Value); Environment, Name, Value);
if (Environment == NULL) if (Environment == NULL)
{
Environment = NtCurrentPeb()->ProcessParameters->Environment;
SysEnvUsed = TRUE;
}
if (Environment == NULL)
return(STATUS_VARIABLE_NOT_FOUND);
Value->Length = 0;
if (SysEnvUsed == TRUE)
RtlAcquirePebLock();
wcs = Environment;
len = Name->Length / sizeof(WCHAR);
while (*wcs)
{
for (var = wcs++; *wcs && *wcs != L'='; wcs++)
;
if (*wcs)
{ {
Environment = NtCurrentPeb()->ProcessParameters->Environment; varlen = wcs - var;
SysEnvUsed = TRUE; for (val = ++wcs; *wcs; wcs++)
} ;
if (Environment == NULL) if (varlen == len &&
return STATUS_VARIABLE_NOT_FOUND; !_wcsnicmp(var, Name->Buffer, len))
{
Value->Length = 0; Value->Length = (wcs - val) * sizeof(WCHAR);
if (SysEnvUsed == TRUE) if (Value->Length < Value->MaximumLength)
RtlAcquirePebLock();
wcs = Environment;
len = Name->Length / sizeof(WCHAR);
while (*wcs)
{
for (var = wcs++; *wcs && *wcs != L'='; wcs++)
;
if (*wcs)
{ {
varlen = wcs - var; wcscpy(Value->Buffer, val);
for (val = ++wcs; *wcs; wcs++) DPRINT("Value %S\n", val);
; DPRINT("Return STATUS_SUCCESS\n");
Status = STATUS_SUCCESS;
if (varlen == len &&
!_wcsnicmp (var, Name->Buffer, len))
{
Value->Length = (wcs - val) * sizeof(WCHAR);
if (Value->Length < Value->MaximumLength)
{
wcscpy (Value->Buffer, val);
DPRINT("Value %S\n", val);
DPRINT("Return STATUS_SUCCESS\n");
Status = STATUS_SUCCESS;
}
else
{
DPRINT("Return STATUS_BUFFER_TOO_SMALL\n");
Status = STATUS_BUFFER_TOO_SMALL;
}
if (SysEnvUsed == TRUE)
RtlReleasePebLock ();
return Status;
}
} }
wcs++; else
{
DPRINT("Return STATUS_BUFFER_TOO_SMALL\n");
Status = STATUS_BUFFER_TOO_SMALL;
}
if (SysEnvUsed == TRUE)
RtlReleasePebLock();
return(Status);
}
} }
wcs++;
}
if (SysEnvUsed == TRUE) if (SysEnvUsed == TRUE)
RtlReleasePebLock (); RtlReleasePebLock();
DPRINT("Return STATUS_VARIABLE_NOT_FOUND\n"); DPRINT("Return STATUS_VARIABLE_NOT_FOUND\n");
return STATUS_VARIABLE_NOT_FOUND; return(STATUS_VARIABLE_NOT_FOUND);
} }
/* EOF */ /* EOF */