ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

shell32: Use xdg well known directories for my_xxx folder symbolic links.

This commit is contained in:
Lei Zhang 2008-03-11 13:51:43 -07:00 committed by Alexandre Julliard
parent f5ba1c21be
commit 78f5db2b51
1 changed files with 27 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
dlls/shell32/shellpath.c
View File

@ -46,6 +46,7 @@
#include "pidl.h" #include "pidl.h"
#include "wine/unicode.h" #include "wine/unicode.h"
#include "shlwapi.h" #include "shlwapi.h"
#include "xdg.h"
WINE_DEFAULT_DEBUG_CHANNEL(shell); WINE_DEFAULT_DEBUG_CHANNEL(shell);
@ -1993,8 +1994,9 @@ static inline BOOL _SHAppendToUnixPath(char *szBasePath, LPCWSTR pwszSubPath) {
* point directly to $HOME. We assume the user to be a unix hacker who does not * point directly to $HOME. We assume the user to be a unix hacker who does not
* want wine to create anything anywhere besides the .wine directory. So, if * want wine to create anything anywhere besides the .wine directory. So, if
* there already is a 'My Music' directory in $HOME, we symlink the 'My Music' * there already is a 'My Music' directory in $HOME, we symlink the 'My Music'
* shell folder to it. But if not, we symlink it to $HOME directly. The same * shell folder to it. But if not, then we check XDG_MUSIC_DIR - "well known"
* holds fo 'My Pictures' and 'My Video'. * directory, and try to link to that. If that fails, then we symlink to
* $HOME directly. The same holds fo 'My Pictures' and 'My Video'.
* - The Desktop shell folder is symlinked to '$HOME/Desktop', if that does * - The Desktop shell folder is symlinked to '$HOME/Desktop', if that does
* exists and left alone if not. * exists and left alone if not.
* ('My Music',... above in fact means LoadString(IDS_MYMUSIC)) * ('My Music',... above in fact means LoadString(IDS_MYMUSIC))
@ -2003,6 +2005,7 @@ static void _SHCreateSymbolicLinks(void)
{ {
UINT aidsMyStuff[] = { IDS_MYPICTURES, IDS_MYVIDEO, IDS_MYMUSIC }, i; UINT aidsMyStuff[] = { IDS_MYPICTURES, IDS_MYVIDEO, IDS_MYMUSIC }, i;
int acsidlMyStuff[] = { CSIDL_MYPICTURES, CSIDL_MYVIDEO, CSIDL_MYMUSIC }; int acsidlMyStuff[] = { CSIDL_MYPICTURES, CSIDL_MYVIDEO, CSIDL_MYMUSIC };
static const char * xdg_dirs[] = { "PICTURES", "VIDEOS", "MUSIC" };
WCHAR wszTempPath[MAX_PATH]; WCHAR wszTempPath[MAX_PATH];
char szPersonalTarget[FILENAME_MAX], *pszPersonal; char szPersonalTarget[FILENAME_MAX], *pszPersonal;
char szMyStuffTarget[FILENAME_MAX], *pszMyStuff; char szMyStuffTarget[FILENAME_MAX], *pszMyStuff;
@ -2010,6 +2013,8 @@ static void _SHCreateSymbolicLinks(void)
struct stat statFolder; struct stat statFolder;
const char *pszHome; const char *pszHome;
HRESULT hr; HRESULT hr;
const unsigned int num = sizeof(xdg_dirs) / sizeof(xdg_dirs[0]);
char ** xdg_results = NULL;
/* Create all necessary profile sub-dirs up to 'My Documents' and get the unix path. */ /* Create all necessary profile sub-dirs up to 'My Documents' and get the unix path. */
hr = SHGetFolderPathW(NULL, CSIDL_PERSONAL|CSIDL_FLAG_CREATE, NULL, hr = SHGetFolderPathW(NULL, CSIDL_PERSONAL|CSIDL_FLAG_CREATE, NULL,
@ -2018,6 +2023,8 @@ static void _SHCreateSymbolicLinks(void)
pszPersonal = wine_get_unix_file_name(wszTempPath); pszPersonal = wine_get_unix_file_name(wszTempPath);
if (!pszPersonal) return; if (!pszPersonal) return;
XDG_UserDirLookup(xdg_dirs, num, &xdg_results);
pszHome = getenv("HOME"); pszHome = getenv("HOME");
if (pszHome && !stat(pszHome, &statFolder) && S_ISDIR(statFolder.st_mode)) { if (pszHome && !stat(pszHome, &statFolder) && S_ISDIR(statFolder.st_mode)) {
strcpy(szPersonalTarget, pszHome); strcpy(szPersonalTarget, pszHome);
@ -2073,9 +2080,17 @@ static void _SHCreateSymbolicLinks(void)
} }
else else
{ {
/* Else link to where 'My Documents' itself links to. */
rmdir(pszMyStuff); rmdir(pszMyStuff);
symlink(szPersonalTarget, pszMyStuff); if (xdg_results && xdg_results[i])
{
/* the folder specified by XDG_XXX_DIR exists, link to it. */
symlink(xdg_results[i], pszMyStuff);
}
else
{
/* Else link to where 'My Documents' itself links to. */
symlink(szPersonalTarget, pszMyStuff);
}
} }
HeapFree(GetProcessHeap(), 0, pszMyStuff); HeapFree(GetProcessHeap(), 0, pszMyStuff);
} }
@ -2099,6 +2114,14 @@ static void _SHCreateSymbolicLinks(void)
HeapFree(GetProcessHeap(), 0, pszDesktop); HeapFree(GetProcessHeap(), 0, pszDesktop);
} }
} }
/* Free resources allocated by XDG_UserDirLookup() */
if (xdg_results)
{
for (i = 0; i < num; i++)
HeapFree(GetProcessHeap(), 0, xdg_results[i]);
HeapFree(GetProcessHeap(), 0, xdg_results);
}
} }
/* Register the default values in the registry, as some apps seem to depend /* Register the default values in the registry, as some apps seem to depend