Set environment variables from the HKCU\Environment key too.

Moved current directory initialisation to process.c. Make sure to always pass the correct current directory in the process parameters for child processes.

Set environment variables from the HKCU\Environment key too.
6ab88272 · Alexandre Julliard · 106e13ab · 6ab88272 · 6ab88272
Commit 6ab88272 authored May 14, 2004 by Alexandre Julliard
Expand all Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 21 deletions

process.c dlls/kernel/process.c +0 -0

directory.c files/directory.c +0 -21

No files found.
--- a/dlls/kernel/process.c
+++ b/dlls/kernel/process.c
--- a/files/directory.c
+++ b/files/directory.c
@@ -107,7 +107,6 @@ int DIR_Init(void)
    OBJECT_ATTRIBUTES attr;
    UNICODE_STRING nameW;
    HKEY hkey;
-    char path[MAX_PATHNAME_LEN];
    WCHAR longpath[MAX_PATHNAME_LEN];
    WCHAR *tmp_dir, *profile_dir;
    static const WCHAR wineW[] = {'M','a','c','h','i','n','e','\\',
@@ -153,26 +152,6 @@ int DIR_Init(void)
        return 0;
    }

-    if (!getcwd( path, MAX_PATHNAME_LEN ))
-    {
-        MESSAGE("Warning: could not get current Unix working directory, "
-                "starting in the Windows directory.\n" );
-        SetCurrentDirectoryW( DIR_Windows );
-    }
-    else
-    {
-        MultiByteToWideChar( CP_UNIXCP, 0, path, -1, longpath, MAX_PATHNAME_LEN);
-        GetFullPathNameW( longpath, MAX_PATHNAME_LEN, longpath, NULL );
-        if (!SetCurrentDirectoryW( longpath ))
-        {
-            MESSAGE("Warning: could not find DOS drive for current working directory '%s', "
-                    "starting in the Windows directory.\n", path );
-            SetCurrentDirectoryW( DIR_Windows );
-        }
-        else if (!NtCurrentTeb()->Peb->ProcessParameters->CurrentDirectory.Handle)
-            chdir("/"); /* change to root directory so as not to lock cdroms */
-    }
-
    /* Set the environment variables */

    /* set COMSPEC only if it doesn't exist already */