Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 311346 - Add directory service key for "C:\Program Files" r=darin

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@181862 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
bsmedberg%covad.net
2005-10-09 19:00:19 +00:00
parent e315d2cc9a
commit e187f7297c
5 changed files with 15 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
mozilla/xpcom/io/nsDirectoryService.cpp
View File

@@ -367,6 +367,7 @@ nsIAtom* nsDirectoryService::sInternetSitesDirectory = nsnull;
#elif defined (XP_WIN)
nsIAtom* nsDirectoryService::sSystemDirectory = nsnull;
nsIAtom* nsDirectoryService::sWindowsDirectory = nsnull;
nsIAtom* nsDirectoryService::sWindowsProgramFiles = nsnull;
nsIAtom* nsDirectoryService::sDesktop = nsnull;
nsIAtom* nsDirectoryService::sPrograms = nsnull;
nsIAtom* nsDirectoryService::sControls = nsnull;
@@ -472,6 +473,7 @@ static const nsStaticAtom directory_atoms[] = {
#elif defined (XP_WIN)
{ NS_OS_SYSTEM_DIR, &nsDirectoryService::sSystemDirectory },
{ NS_WIN_WINDOWS_DIR, &nsDirectoryService::sWindowsDirectory },
{ NS_WIN_PROGRAM_FILES_DIR, &nsDirectoryService::sWindowsProgramFiles },
{ NS_WIN_DESKTOP_DIR, &nsDirectoryService::sDesktop },
{ NS_WIN_PROGRAMS_DIR, &nsDirectoryService::sPrograms },
{ NS_WIN_CONTROLS_DIR, &nsDirectoryService::sControls },
@@ -1050,6 +1052,10 @@ nsDirectoryService::GetFile(const char *prop, PRBool *persistent, nsIFile **_ret
{
rv = GetSpecialSystemDirectory(Win_WindowsDirectory, getter_AddRefs(localFile));
}
else if (inAtom == nsDirectoryService::sWindowsProgramFiles)
{
rv = GetSpecialSystemDirectory(Win_ProgramFiles, getter_AddRefs(localFile));
}
else if (inAtom == nsDirectoryService::sOS_HomeDirectory)
{
rv = GetSpecialSystemDirectory(Win_HomeDirectory, getter_AddRefs(localFile));