Alexandre Julliard : shell32: Default to the more modern location for the user profile directory.
Alexandre Julliard
julliard at winehq.org
Tue Feb 17 08:49:12 CST 2009
Module: wine
Branch: master
Commit: 853d993830509c3ecaa4113bed789bf08ec36d76
URL: http://source.winehq.org/git/wine.git/?a=commit;h=853d993830509c3ecaa4113bed789bf08ec36d76
Author: Alexandre Julliard <julliard at winehq.org>
Date: Tue Feb 17 13:50:07 2009 +0100
shell32: Default to the more modern location for the user profile directory.
---
dlls/shell32/shellpath.c | 20 +++++++++-----------
1 files changed, 9 insertions(+), 11 deletions(-)
diff --git a/dlls/shell32/shellpath.c b/dlls/shell32/shellpath.c
index d9fd6dd..2434e9a 100644
--- a/dlls/shell32/shellpath.c
+++ b/dlls/shell32/shellpath.c
@@ -801,11 +801,8 @@ static const WCHAR ProfilesDirectoryW[] = {'P','r','o','f','i','l','e','s','D','
static const WCHAR AllUsersProfileValueW[] = {'A','l','l','U','s','e','r','s','P','r','o','f','i','l','e','\0'};
static const WCHAR szSHFolders[] = {'S','o','f','t','w','a','r','e','\\','M','i','c','r','o','s','o','f','t','\\','W','i','n','d','o','w','s','\\','C','u','r','r','e','n','t','V','e','r','s','i','o','n','\\','E','x','p','l','o','r','e','r','\\','S','h','e','l','l',' ','F','o','l','d','e','r','s','\0'};
static const WCHAR szSHUserFolders[] = {'S','o','f','t','w','a','r','e','\\','M','i','c','r','o','s','o','f','t','\\','W','i','n','d','o','w','s','\\','C','u','r','r','e','n','t','V','e','r','s','i','o','n','\\','E','x','p','l','o','r','e','r','\\','U','s','e','r',' ','S','h','e','l','l',' ','F','o','l','d','e','r','s','\0'};
-/* This defaults to L"Documents and Settings" on Windows 2000/XP, but we're
- * acting more Windows 9x-like for now.
- */
-static const WCHAR szDefaultProfileDirW[] = {'p','r','o','f','i','l','e','s','\0'};
-static const WCHAR AllUsersW[] = {'A','l','l',' ','U','s','e','r','s','\0'};
+static const WCHAR szDefaultProfileDirW[] = {'u','s','e','r','s',0};
+static const WCHAR AllUsersW[] = {'P','u','b','l','i','c',0};
typedef enum _CSIDL_Type {
CSIDL_Type_User,
@@ -1568,13 +1565,14 @@ static HRESULT _SHExpandEnvironmentStrings(LPCWSTR szSrc, LPWSTR szDest)
hr = _SHOpenProfilesKey(&key);
if (SUCCEEDED(hr))
{
- WCHAR szDefaultProfilesPrefix[MAX_PATH];
+ WCHAR def_val[MAX_PATH];
+
+ /* get the system drive */
+ GetSystemDirectoryW(def_val, MAX_PATH);
+ if (def_val[1] == ':') strcpyW( def_val + 3, szDefaultProfileDirW );
+ else FIXME("non-drive system paths unsupported\n");
- GetWindowsDirectoryW(szDefaultProfilesPrefix, MAX_PATH);
- PathAddBackslashW(szDefaultProfilesPrefix);
- PathAppendW(szDefaultProfilesPrefix, szDefaultProfileDirW);
- hr = _SHGetProfilesValue(key, ProfilesDirectoryW, szProfilesPrefix,
- szDefaultProfilesPrefix);
+ hr = _SHGetProfilesValue(key, ProfilesDirectoryW, szProfilesPrefix, def_val );
}
*szDest = 0;
More information about the wine-cvs
mailing list