Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-05 22:23:01 +00:00
Code Issues Projects Releases Packages Wiki Activity

- Moved the code for updating the drive-specific current-directory environment variable out of RTL and into the CRT. Testing on Windows shows that neither RtlSetCurrentDirectory_U or SetCurrentDirectory update these variables, but _tchdir does.

Browse source 
svn path=/trunk/; revision=40184
This commit is contained in:
Jeffrey Morlan 2009-03-23 14:47:46 +00:00
parent d99f998d2d
commit 73694e1e38
3 changed files with 15 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

15
reactos/lib/rtl/path.c
View file

@ -207,7 +207,6 @@ NTSTATUS NTAPI
RtlSetCurrentDirectory_U(PUNICODE_STRING dir) RtlSetCurrentDirectory_U(PUNICODE_STRING dir)
{ {
UNICODE_STRING full; UNICODE_STRING full;
UNICODE_STRING envvar;
FILE_FS_DEVICE_INFORMATION device_info; FILE_FS_DEVICE_INFORMATION device_info;
OBJECT_ATTRIBUTES Attr; OBJECT_ATTRIBUTES Attr;
IO_STATUS_BLOCK iosb; IO_STATUS_BLOCK iosb;
@ -215,7 +214,6 @@ RtlSetCurrentDirectory_U(PUNICODE_STRING dir)
NTSTATUS Status; NTSTATUS Status;
ULONG size; ULONG size;
HANDLE handle = NULL; HANDLE handle = NULL;
WCHAR var[4];
PWSTR ptr; PWSTR ptr;
DPRINT("RtlSetCurrentDirectory %wZ\n", dir); DPRINT("RtlSetCurrentDirectory %wZ\n", dir);
@ -282,19 +280,6 @@ RtlSetCurrentDirectory_U(PUNICODE_STRING dir)
cd->DosPath.Buffer[size] = 0; cd->DosPath.Buffer[size] = 0;
cd->DosPath.Length = size * sizeof(WCHAR); cd->DosPath.Length = size * sizeof(WCHAR);
/* FIXME: whats this all about??? Wine doesnt have this. -Gunnar */
if (cd->DosPath.Buffer[1]==':')
{
envvar.Length = 2 * swprintf (var, L"=%c:", cd->DosPath.Buffer[0]);
envvar.MaximumLength = 8;
envvar.Buffer = var;
RtlSetEnvironmentVariable(NULL,
&envvar,
&cd->DosPath);
}
RtlFreeUnicodeString( &full); RtlFreeUnicodeString( &full);
RtlReleasePebLock(); RtlReleasePebLock();

19
reactos/lib/sdk/crt/direct/chdir.c
View file

@ -8,9 +8,20 @@
*/ */
int _tchdir(const _TCHAR* _path) int _tchdir(const _TCHAR* _path)
{ {
if (!SetCurrentDirectory(_path)) { WCHAR newdir[MAX_PATH];
_dosmaperr(_path?GetLastError():0);
return -1; if (!SetCurrentDirectory(_path))
} {
_dosmaperr(_path ? GetLastError() : 0);
return -1;
}
/* Update the drive-specific current directory variable */
if (GetCurrentDirectoryW(MAX_PATH, newdir) && newdir[1] == L':')
{
WCHAR envvar[4] = { L'=', towupper(newdir[0]), L':', L'\0' };
SetEnvironmentVariableW(envvar, newdir);
}
return 0; return 0;
} }

1
reactos/lib/sdk/crt/direct/wchdir.c
View file

@ -2,4 +2,3 @@
#define _UNICODE #define _UNICODE
#include "chdir.c" #include "chdir.c"