commit ad546918b45cf6130d2736a8da3a70fa164ca887
author Alexandre Julliard <julliard@winehq.org> Fri May 14 21:43:18 2004 +0000
committer Alexandre Julliard <julliard@winehq.org> Fri May 14 21:43:18 2004 +0000
tree d8d14b272127a85e3a22934da38b1871e61481d8
parent e83afa735c822981b57442bdc9c0b54a3df1fbed

Use environment variables instead of config file entries to specify
path, profile, temp, windows and system directories.
Convert existing config file entries to registry values under
HKCU\Environment.

dlls/kernel/process.c

diff --git a/dlls/kernel/process.c b/dlls/kernel/process.c
index f85f887..c09b655 100644
--- a/dlls/kernel/process.c
+++ b/dlls/kernel/process.c
@@ -45,6 +45,7 @@
 #include "wine/debug.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(process);
+WINE_DECLARE_DEBUG_CHANNEL(file);
 WINE_DECLARE_DEBUG_CHANNEL(server);
 WINE_DECLARE_DEBUG_CHANNEL(relay);
 
@@ -67,6 +68,9 @@
 int main_create_flags = 0;
 HMODULE kernel32_handle = 0;
 
+const WCHAR *DIR_Windows = NULL;
+const WCHAR *DIR_System = NULL;
+
 /* Process flags */
 #define PDB32_DEBUGGED      0x0001  /* Process is being debugged */
 #define PDB32_WIN16_PROC    0x0008  /* Win16 process */
@@ -79,7 +83,6 @@
 static const WCHAR batW[] = {'.','b','a','t',0};
 static const WCHAR winevdmW[] = {'w','i','n','e','v','d','m','.','e','x','e',0};
 
-extern int DIR_Init(void);
 extern void SHELL_LoadRegistry(void);
 extern void VOLUME_CreateDevices(void);
 extern void VERSION_Init( const WCHAR *appname );
@@ -780,6 +783,57 @@
 
 
 /***********************************************************************
+ *           init_windows_dirs
+ *
+ * Initialize the windows and system directories from the environment.
+ */
+static void init_windows_dirs(void)
+{
+    static const WCHAR windirW[] = {'w','i','n','d','i','r',0};
+    static const WCHAR winsysdirW[] = {'w','i','n','s','y','s','d','i','r',0};
+    static const WCHAR default_windirW[] = {'c',':','\\','w','i','n','d','o','w','s',0};
+    static const WCHAR default_sysdirW[] = {'c',':','\\','w','i','n','d','o','w','s','\\','s','y','s','t','e','m',0};
+
+    DWORD len;
+    WCHAR *buffer;
+
+    if ((len = GetEnvironmentVariableW( windirW, NULL, 0 )))
+    {
+        buffer = HeapAlloc( GetProcessHeap(), 0, len * sizeof(WCHAR) );
+        GetEnvironmentVariableW( windirW, buffer, len );
+        DIR_Windows = buffer;
+    }
+    else
+    {
+        DIR_Windows = default_windirW;
+        SetEnvironmentVariableW( windirW, DIR_Windows );
+    }
+
+    if ((len = GetEnvironmentVariableW( winsysdirW, NULL, 0 )))
+    {
+        buffer = HeapAlloc( GetProcessHeap(), 0, len * sizeof(WCHAR) );
+        GetEnvironmentVariableW( winsysdirW, buffer, len );
+        DIR_System = buffer;
+    }
+    else
+    {
+        DIR_System = default_sysdirW;
+        SetEnvironmentVariableW( winsysdirW, DIR_System );
+    }
+
+    if (GetFileAttributesW( DIR_Windows ) == INVALID_FILE_ATTRIBUTES)
+        MESSAGE( "Warning: the specified Windows directory %s is not accessible.\n",
+                 debugstr_w(DIR_Windows) );
+    if (GetFileAttributesW( DIR_System ) == INVALID_FILE_ATTRIBUTES)
+        MESSAGE( "Warning: the specified System directory %s is not accessible.\n",
+                 debugstr_w(DIR_System) );
+
+    TRACE_(file)( "WindowsDir = %s\n", debugstr_w(DIR_Windows) );
+    TRACE_(file)( "SystemDir  = %s\n", debugstr_w(DIR_System) );
+}
+
+
+/***********************************************************************
  *           process_init
  *
  * Main process initialisation code
@@ -876,9 +930,6 @@
     /* Create device symlinks */
     VOLUME_CreateDevices();
 
-    /* initialise DOS directories */
-    if (!DIR_Init()) return FALSE;
-
     init_current_directory( &params->CurrentDirectory );
 
     /* registry initialisation */
@@ -894,6 +945,8 @@
 
     if (!info_size) set_registry_environment();
 
+    init_windows_dirs();
+
     return TRUE;
 }