[ros-diffs] [ekohl] 47220: [WINLOGON] - Add a hack to fix the APPDATA environment variable. This hack will be removed after bug #5372 has been fixed. Fixes bug #4102.

[ekohl at svn.reactos.org]

Author: ekohl
Date: Sat May 15 18:02:14 2010
New Revision: 47220

URL: http://svn.reactos.org/svn/reactos?rev=47220&view=rev
Log:
[WINLOGON]
- Add a hack to fix the APPDATA environment variable. This hack will be removed after bug #5372 has been fixed. Fixes bug #4102.

Modified:
    trunk/reactos/base/system/winlogon/environment.c

Modified: trunk/reactos/base/system/winlogon/environment.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/winlogon/environment.c?rev=47220&r1=47219&r2=47220&view=diff
==============================================================================
--- trunk/reactos/base/system/winlogon/environment.c [iso-8859-1] (original)
+++ trunk/reactos/base/system/winlogon/environment.c [iso-8859-1] Sat May 15 18:02:14 2010
@@ -31,15 +31,15 @@
     HINSTANCE hShell32 = NULL;
     PFSHGETFOLDERPATHW pfSHGetFolderPathW = NULL;
     WCHAR szPath[MAX_PATH + 1];
+    WCHAR szExpandedPath[MAX_PATH + 1];
     LPCWSTR wstr;
     SIZE_T size;
-
     WCHAR szEnvKey[MAX_PATH];
     WCHAR szEnvValue[1024];
-
     SIZE_T length;
     LPWSTR eqptr, endptr;
 
+    /* Parse the environment variables and add them to the volatile environment key */
     if (Session->Profile->dwType == WLX_PROFILE_TYPE_V2_0 &&
         Session->Profile->pszEnvironment != NULL)
     {
@@ -80,7 +80,7 @@
         }
     }
 
-
+    /* Load shell32.dll and call SHGetFolderPathW to get the users appdata folder path */
     hShell32 = LoadLibraryW(L"shell32.dll");
     if (hShell32 != NULL)
     {
@@ -94,12 +94,21 @@
                                    0,
                                    szPath) == S_OK)
             {
+                /* FIXME: Expand %USERPROFILE% here. SHGetFolderPathW should do it for us. See Bug #5372.*/
+                TRACE("APPDATA path: %S\n", szPath);
+                ExpandEnvironmentStringsForUserW(Session->UserToken,
+                                                 szPath,
+                                                 szExpandedPath,
+                                                 MAX_PATH);
+
+                /* Add the appdata folder path to the users volatile environment key */
+                TRACE("APPDATA expanded path: %S\n", szExpandedPath);
                 RegSetValueExW(hKey,
                                L"APPDATA",
                                0,
                                REG_SZ,
-                               (LPBYTE)szPath,
-                               (wcslen(szPath) + 1) * sizeof(WCHAR));
+                               (LPBYTE)szExpandedPath,
+                               (wcslen(szExpandedPath) + 1) * sizeof(WCHAR));
             }
         }