зеркало из https://github.com/mozilla/pjs.git
adding windows cookie system directory specifier. bug 185689 r=ccarlen,jag
This commit is contained in:
danm%netscape.com
Родитель
d05bac393d
Коммит
b1264bb355
|
|
@ -399,6 +399,7 @@ nsIAtom* nsDirectoryService::sCommon_Startup = nsnull;
|
|||
nsIAtom* nsDirectoryService::sCommon_Desktopdirectory = nsnull;
|
||||
nsIAtom* nsDirectoryService::sAppdata = nsnull;
|
||||
nsIAtom* nsDirectoryService::sPrinthood = nsnull;
|
||||
nsIAtom* nsDirectoryService::sWinCookiesDirectory = nsnull;
|
||||
#elif defined (XP_UNIX)
|
||||
nsIAtom* nsDirectoryService::sLocalDirectory = nsnull;
|
||||
nsIAtom* nsDirectoryService::sLibDirectory = nsnull;
|
||||
|
|
@ -503,6 +504,7 @@ nsDirectoryService::Init()
|
|||
nsDirectoryService::sCommon_Desktopdirectory = NS_NewAtom(NS_WIN_COMMON_DESKTOP_DIRECTORY);
|
||||
nsDirectoryService::sAppdata = NS_NewAtom(NS_WIN_APPDATA_DIR);
|
||||
nsDirectoryService::sPrinthood = NS_NewAtom(NS_WIN_PRINTHOOD);
|
||||
nsDirectoryService::sWinCookiesDirectory = NS_NewAtom(NS_WIN_COOKIES_DIR);
|
||||
#elif defined (XP_UNIX)
|
||||
nsDirectoryService::sLocalDirectory = NS_NewAtom(NS_UNIX_LOCAL_DIR);
|
||||
nsDirectoryService::sLibDirectory = NS_NewAtom(NS_UNIX_LIB_DIR);
|
||||
|
|
@ -597,6 +599,7 @@ nsDirectoryService::~nsDirectoryService()
|
|||
NS_IF_RELEASE(nsDirectoryService::sCommon_Desktopdirectory);
|
||||
NS_IF_RELEASE(nsDirectoryService::sAppdata);
|
||||
NS_IF_RELEASE(nsDirectoryService::sPrinthood);
|
||||
NS_IF_RELEASE(nsDirectoryService::sWinCookiesDirectory);
|
||||
#elif defined (XP_UNIX)
|
||||
NS_IF_RELEASE(nsDirectoryService::sLocalDirectory);
|
||||
NS_IF_RELEASE(nsDirectoryService::sLibDirectory);
|
||||
|
|
@ -1130,6 +1133,11 @@ nsDirectoryService::GetFile(const char *prop, PRBool *persistent, nsIFile **_ret
|
|||
nsSpecialSystemDirectory fileSpec(nsSpecialSystemDirectory::Win_Printhood);
|
||||
rv = NS_FileSpecToIFile(&fileSpec, getter_AddRefs(localFile));
|
||||
}
|
||||
else if (inAtom == nsDirectoryService::sWinCookiesDirectory)
|
||||
{
|
||||
nsSpecialSystemDirectory fileSpec(nsSpecialSystemDirectory::Win_Cookies);
|
||||
rv = NS_FileSpecToIFile(&fileSpec, getter_AddRefs(localFile));
|
||||
}
|
||||
#elif defined (XP_UNIX)
|
||||
|
||||
else if (inAtom == nsDirectoryService::sLocalDirectory)
|
||||
|
|
|
|||
|
|
@ -137,6 +137,7 @@ private:
|
|||
static nsIAtom *sCommon_Desktopdirectory;
|
||||
static nsIAtom *sAppdata;
|
||||
static nsIAtom *sPrinthood;
|
||||
static nsIAtom *sWinCookiesDirectory;
|
||||
#elif defined (XP_UNIX)
|
||||
static nsIAtom *sLocalDirectory;
|
||||
static nsIAtom *sLibDirectory;
|
||||
|
|
|
|||
|
|
@ -115,6 +115,7 @@
|
|||
#define NS_WIN_COMMON_DESKTOP_DIRECTORY "CmDeskP"
|
||||
#define NS_WIN_APPDATA_DIR "AppData"
|
||||
#define NS_WIN_PRINTHOOD "PrntHd"
|
||||
#define NS_WIN_COOKIES_DIR "CookD"
|
||||
#elif defined (XP_UNIX)
|
||||
#define NS_UNIX_LOCAL_DIR "Locl"
|
||||
#define NS_UNIX_LIB_DIR "LibD"
|
||||
|
|
|
|||
Разница между файлами не показана из-за своего большого размера
Загрузить разницу
|
|
@ -1,151 +0,0 @@
|
|||
/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
|
||||
/*
|
||||
* The contents of this file are subject to the Netscape Public
|
||||
* License Version 1.1 (the "License"); you may not use this file
|
||||
* except in compliance with the License. You may obtain a copy of
|
||||
* the License at http://www.mozilla.org/NPL/
|
||||
*
|
||||
* Software distributed under the License is distributed on an "AS
|
||||
* IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
|
||||
* implied. See the License for the specific language governing
|
||||
* rights and limitations under the License.
|
||||
*
|
||||
* The Original Code is Mozilla Communicator client code,
|
||||
* released March 31, 1998.
|
||||
*
|
||||
* The Initial Developer of the Original Code is Netscape Communications
|
||||
* Corporation. Portions created by Netscape are
|
||||
* Copyright (C) 1998 Netscape Communications Corporation. All
|
||||
* Rights Reserved.
|
||||
*
|
||||
* Contributor(s):
|
||||
* Doug Turner <dougt@netscape.com>
|
||||
* IBM Corp.
|
||||
*/
|
||||
|
||||
#ifndef _NSSPECIALSYSTEMDIRECTORY_H_
|
||||
#define _NSSPECIALSYSTEMDIRECTORY_H_
|
||||
|
||||
#include "nscore.h"
|
||||
#include "nsFileSpec.h"
|
||||
|
||||
#if defined(XP_MAC) || defined(XP_MACOSX)
|
||||
#include <Types.h>
|
||||
#endif
|
||||
|
||||
|
||||
extern NS_COM void StartupSpecialSystemDirectory();
|
||||
extern NS_COM void ShutdownSpecialSystemDirectory();
|
||||
|
||||
|
||||
// SEE ALSO:
|
||||
// mozilla/xpfe/appshell/public/nsFileLocations.h
|
||||
|
||||
class NS_COM nsSpecialSystemDirectory : public nsFileSpec
|
||||
{
|
||||
|
||||
public:
|
||||
enum SystemDirectories
|
||||
{
|
||||
OS_DriveDirectory = 1
|
||||
, OS_TemporaryDirectory = 2
|
||||
, OS_CurrentProcessDirectory= 3
|
||||
, OS_CurrentWorkingDirectory= 4
|
||||
|
||||
, XPCOM_CurrentProcessComponentDirectory= 5
|
||||
, XPCOM_CurrentProcessComponentRegistry= 6
|
||||
|
||||
, Moz_BinDirectory = 10
|
||||
|
||||
, Mac_SystemDirectory = 101
|
||||
, Mac_DesktopDirectory = 102
|
||||
, Mac_TrashDirectory = 103
|
||||
, Mac_StartupDirectory = 104
|
||||
, Mac_ShutdownDirectory = 105
|
||||
, Mac_AppleMenuDirectory = 106
|
||||
, Mac_ControlPanelDirectory = 107
|
||||
, Mac_ExtensionDirectory = 108
|
||||
, Mac_FontsDirectory = 109
|
||||
, Mac_ClassicPreferencesDirectory = 110
|
||||
, Mac_DocumentsDirectory = 111
|
||||
, Mac_InternetSearchDirectory = 112
|
||||
, Mac_DefaultDownloadDirectory = 113
|
||||
, Mac_UserLibDirectory = 114
|
||||
, Mac_PreferencesDirectory = 115
|
||||
|
||||
, Win_SystemDirectory = 201
|
||||
, Win_WindowsDirectory = 202
|
||||
|
||||
, Win_HomeDirectory = 203
|
||||
, Win_Desktop = 204
|
||||
, Win_Programs = 205
|
||||
, Win_Controls = 206
|
||||
, Win_Printers = 207
|
||||
, Win_Personal = 208
|
||||
, Win_Favorites = 209
|
||||
, Win_Startup = 210
|
||||
, Win_Recent = 211
|
||||
, Win_Sendto = 212
|
||||
, Win_Bitbucket = 213
|
||||
, Win_Startmenu = 214
|
||||
, Win_Desktopdirectory = 215
|
||||
, Win_Drives = 216
|
||||
, Win_Network = 217
|
||||
, Win_Nethood = 218
|
||||
, Win_Fonts = 219
|
||||
, Win_Templates = 220
|
||||
, Win_Common_Startmenu = 221
|
||||
, Win_Common_Programs = 222
|
||||
, Win_Common_Startup = 223
|
||||
, Win_Common_Desktopdirectory = 224
|
||||
, Win_Appdata = 225
|
||||
, Win_Printhood = 226
|
||||
|
||||
, Unix_LocalDirectory = 301
|
||||
, Unix_LibDirectory = 302
|
||||
, Unix_HomeDirectory = 303
|
||||
|
||||
, BeOS_SettingsDirectory = 401
|
||||
, BeOS_HomeDirectory = 402
|
||||
, BeOS_DesktopDirectory = 403
|
||||
, BeOS_SystemDirectory = 404
|
||||
|
||||
, OS2_SystemDirectory = 501
|
||||
, OS2_OS2Directory = 502
|
||||
, OS2_DesktopDirectory = 503
|
||||
, OS2_HomeDirectory = 504
|
||||
};
|
||||
|
||||
//nsSpecialSystemDirectory();
|
||||
nsSpecialSystemDirectory(SystemDirectories aSystemSystemDirectory);
|
||||
|
||||
virtual ~nsSpecialSystemDirectory();
|
||||
|
||||
void operator = (SystemDirectories aSystemSystemDirectory);
|
||||
|
||||
#if defined(XP_MAC) || defined(XP_MACOSX)
|
||||
void operator = (OSType folderType);
|
||||
nsSpecialSystemDirectory(OSType folderType);
|
||||
enum {
|
||||
kDefaultDownloadFolderType = FOUR_CHAR_CODE('DfDÄ') /* Default Download Folder */
|
||||
};
|
||||
#endif
|
||||
|
||||
/**
|
||||
|
||||
* @param: dirToSet, the value to set for this safeLocation
|
||||
|
||||
* @param: dirSpec, the directory specified as a filespec
|
||||
|
||||
*/
|
||||
|
||||
static void Set(SystemDirectories dirToSet, nsFileSpec *dirSpec);
|
||||
|
||||
|
||||
private:
|
||||
void operator = (const char* inPath) { *(nsFileSpec*)this = inPath; }
|
||||
|
||||
}; // class NS_COM nsSpecialSystemDirectory
|
||||
|
||||
|
||||
#endif
|
||||
Загрузка…
Ссылка в новой задаче