[ekohl] 47116: [USERENV] - Create the environment variables 'ProgramFiles' and 'CommonProgramFiles' from the registry. Fixes bug #4008. See issue #2972 for more details.

Author: ekohl
Date: Fri May  7 02:17:04 2010
New Revision: 47116

URL: http://svn.reactos.org/svn/reactos?rev=47116&view=rev
Log:
[USERENV]
- Create the environment variables 'ProgramFiles' and 'CommonProgramFiles' from the registry.

Fixes bug #4008.
See issue #2972 for more details.

Modified:
    trunk/reactos/dll/win32/userenv/environment.c

Modified: trunk/reactos/dll/win32/userenv/environment.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/userenv/environme...
==============================================================================
--- trunk/reactos/dll/win32/userenv/environment.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/userenv/environment.c [iso-8859-1] Fri May  7 02:17:04 2010
@@ -317,9 +317,13 @@
                        BOOL bInherit)
 {
     WCHAR Buffer[MAX_PATH];
+    WCHAR szValue[1024];
     DWORD Length;
+    DWORD dwType;
+    HKEY hKey;
     HKEY hKeyUser;
     NTSTATUS Status;
+    LONG lError;

DPRINT("CreateEnvironmentBlock() called\n");

@@ -349,17 +353,6 @@
                                    FALSE);
     }

-    if (hToken == NULL)
-        return TRUE;
-
-    hKeyUser = GetCurrentUserKey(hToken);
-    if (hKeyUser == NULL)
-    {
-        DPRINT1("GetCurrentUserKey() failed\n");
-        RtlDestroyEnvironment(*lpEnvironment);
-        return FALSE;
-    }
-
     /* Set 'ALLUSERSPROFILE' variable */
     Length = MAX_PATH;
     if (GetAllUsersProfileDirectoryW(Buffer,
@@ -369,6 +362,57 @@
                                    L"ALLUSERSPROFILE",
                                    Buffer,
                                    FALSE);
+    }
+
+    lError = RegOpenKeyExW(HKEY_LOCAL_MACHINE,
+                           L"SOFTWARE\Microsoft\Windows\CurrentVersion",
+                           0,
+                           KEY_READ,
+                           &hKey);
+    if (lError == ERROR_SUCCESS)
+    {
+        Length = 1024 * sizeof(WCHAR);
+        lError = RegQueryValueExW(hKey,
+                                  L"ProgramFilesDir",
+                                  NULL,
+                                  &dwType,
+                                  (LPBYTE)szValue,
+                                  &Length);
+        if (lError == ERROR_SUCCESS)
+        {
+            SetUserEnvironmentVariable(lpEnvironment,
+                                       L"ProgramFiles",
+                                       szValue,
+                                       FALSE);
+        }
+
+        Length = 1024 * sizeof(WCHAR);
+        lError = RegQueryValueExW(hKey,
+                                  L"CommonFilesDir",
+                                  NULL,
+                                  &dwType,
+                                  (LPBYTE)szValue,
+                                  &Length);
+        if (lError == ERROR_SUCCESS)
+        {
+            SetUserEnvironmentVariable(lpEnvironment,
+                                       L"CommonProgramFiles",
+                                       szValue,
+                                       FALSE);
+        }
+
+        RegCloseKey(hKey);
+    }
+
+    if (hToken == NULL)
+        return TRUE;
+
+    hKeyUser = GetCurrentUserKey(hToken);
+    if (hKeyUser == NULL)
+    {
+        DPRINT1("GetCurrentUserKey() failed\n");
+        RtlDestroyEnvironment(*lpEnvironment);
+        return FALSE;
     }

/* Set 'USERPROFILE' variable */