зеркало из https://github.com/mozilla/gecko-dev.git
Re-landing #169667 - use LaunchServices APIs instead of InternetConfig APIs when appropriate (fixed mach-o and Mac Classic build issues from 1st landing try). r=ccarlen,sr=sfraser
This commit is contained in:
sdagley%netscape.com
Родитель
9113ce1184
Коммит
a50ca5627d
|
|
@ -120,30 +120,3 @@ nsInternetConfig::~nsInternetConfig()
|
|||
}
|
||||
}
|
||||
|
||||
|
||||
nsresult nsInternetConfig::GetString( ConstStr255Param inKey, char** outString )
|
||||
{
|
||||
nsresult result = NS_ERROR_FAILURE;
|
||||
ICInstance instance = nsInternetConfig::GetInstance();
|
||||
if ( instance )
|
||||
{
|
||||
OSStatus err;
|
||||
char buffer[256];
|
||||
ICAttr junk;
|
||||
long size = 256;
|
||||
err = ::ICGetPref( instance, inKey, &junk, buffer, &size );
|
||||
if ( err == noErr )
|
||||
{
|
||||
if (size == 0) {
|
||||
*outString = nsnull;
|
||||
return NS_OK;
|
||||
}
|
||||
|
||||
// Buffer is a Pascal string
|
||||
nsCString temp( &buffer[1], buffer[0] );
|
||||
*outString = ToNewCString(temp);
|
||||
result = NS_OK;
|
||||
}
|
||||
}
|
||||
return result;
|
||||
}
|
||||
|
|
@ -47,7 +47,6 @@ class nsInternetConfig
|
|||
public:
|
||||
nsInternetConfig();
|
||||
~nsInternetConfig();
|
||||
nsresult GetString( ConstStr255Param inKey, char** outString );
|
||||
|
||||
static ICInstance GetInstance();
|
||||
static PRBool HasSeedChanged();
|
||||
|
|
|
|||
|
|
@ -20,6 +20,7 @@
|
|||
* the Initial Developer. All Rights Reserved.
|
||||
*
|
||||
* Contributor(s):
|
||||
* Steve Dagley <sdagley@netscape.com>
|
||||
*
|
||||
* Alternatively, the contents of this file may be used under the terms of
|
||||
* either the GNU General Public License Version 2 or later (the "GPL"), or
|
||||
|
|
@ -48,19 +49,25 @@
|
|||
#include "nsILocalFileMac.h"
|
||||
#include "nsMimeTypes.h"
|
||||
#include <TextUtils.h>
|
||||
#include <CodeFragments.h>
|
||||
#include <Processes.h>
|
||||
#include <Gestalt.h>
|
||||
#include <CFURL.h>
|
||||
#include <Finder.h>
|
||||
#include <LaunchServices.h>
|
||||
|
||||
|
||||
// helper converter function.....
|
||||
static void ConvertCharStringToStr255( const char* inString, Str255& outString )
|
||||
static void ConvertCharStringToStr255(const char* inString, Str255& outString)
|
||||
{
|
||||
if ( inString == NULL )
|
||||
if (inString == NULL)
|
||||
return;
|
||||
|
||||
PRInt32 len = strlen(inString);
|
||||
NS_ASSERTION( len<= 255 , " String is too big");
|
||||
if ( len> 255 )
|
||||
NS_ASSERTION(len <= 255 , " String is too big");
|
||||
if (len> 255)
|
||||
{
|
||||
len = 255;
|
||||
|
||||
}
|
||||
memcpy(&outString[1], inString, len);
|
||||
outString[0] = len;
|
||||
|
|
@ -72,6 +79,11 @@ static NS_DEFINE_CID(kICServiceCID, NS_INTERNETCONFIGSERVICE_CID);
|
|||
nsInternetConfigService::nsInternetConfigService()
|
||||
{
|
||||
NS_INIT_ISUPPORTS();
|
||||
|
||||
long version;
|
||||
OSErr err;
|
||||
mRunningOSX = ((err = ::Gestalt(gestaltSystemVersion, &version)) == noErr && version >= 0x00001000);
|
||||
mRunningJaguar = (err == noErr && version >= 0x00001200);
|
||||
}
|
||||
|
||||
nsInternetConfigService::~nsInternetConfigService()
|
||||
|
|
@ -82,35 +94,43 @@ nsInternetConfigService::~nsInternetConfigService()
|
|||
/*
|
||||
* Implement the nsISupports methods...
|
||||
*/
|
||||
NS_IMPL_THREADSAFE_ADDREF(nsInternetConfigService)
|
||||
NS_IMPL_THREADSAFE_RELEASE(nsInternetConfigService)
|
||||
|
||||
NS_INTERFACE_MAP_BEGIN(nsInternetConfigService)
|
||||
NS_INTERFACE_MAP_ENTRY(nsIInternetConfigService)
|
||||
NS_INTERFACE_MAP_ENTRY_AMBIGUOUS(nsISupports, nsIInternetConfigService)
|
||||
NS_INTERFACE_MAP_END_THREADSAFE
|
||||
NS_IMPL_ISUPPORTS1(nsInternetConfigService, nsIInternetConfigService)
|
||||
|
||||
// void LaunchURL (in string url);
|
||||
// given a url string, call ICLaunchURL using url
|
||||
// Given a url string, call ICLaunchURL using url
|
||||
// Under OS X use LaunchServices instead of IC
|
||||
NS_IMETHODIMP nsInternetConfigService::LaunchURL(const char *url)
|
||||
{
|
||||
nsresult result;
|
||||
nsresult rv = NS_ERROR_FAILURE;
|
||||
|
||||
#if TARGET_CARBON
|
||||
if (mRunningOSX && ((UInt32)LSOpenCFURLRef != (UInt32)kUnresolvedCFragSymbolAddress))
|
||||
{
|
||||
CFURLRef myURLRef = ::CFURLCreateWithBytes(
|
||||
kCFAllocatorDefault,
|
||||
(const UInt8*)url,
|
||||
strlen(url),
|
||||
kCFStringEncodingUTF8, NULL);
|
||||
if (myURLRef)
|
||||
{
|
||||
rv = ::LSOpenCFURLRef(myURLRef, NULL);
|
||||
::CFRelease(myURLRef);
|
||||
}
|
||||
}
|
||||
else
|
||||
#endif
|
||||
{
|
||||
size_t len = strlen(url);
|
||||
long selStart = 0, selEnd = len;
|
||||
ICInstance inst = nsInternetConfig::GetInstance();
|
||||
|
||||
if (inst)
|
||||
{
|
||||
result = ::ICLaunchURL(inst, "\p", (Ptr)url, (long)len, &selStart, &selEnd);
|
||||
if (result == noErr)
|
||||
return NS_OK;
|
||||
else
|
||||
return NS_ERROR_FAILURE;
|
||||
if (::ICLaunchURL(inst, "\p", (Ptr)url, (long)len, &selStart, &selEnd) == noErr)
|
||||
rv = NS_OK;
|
||||
}
|
||||
else
|
||||
{
|
||||
return NS_ERROR_FAILURE;
|
||||
}
|
||||
return rv;
|
||||
}
|
||||
|
||||
// boolean HasMappingForMIMEType (in string mimetype);
|
||||
|
|
@ -131,27 +151,78 @@ NS_IMETHODIMP nsInternetConfigService::HasMappingForMIMEType(const char *mimetyp
|
|||
// protocol handler for protocol
|
||||
NS_IMETHODIMP nsInternetConfigService::HasProtocolHandler(const char *protocol, PRBool *_retval)
|
||||
{
|
||||
*_retval = PR_FALSE;
|
||||
*_retval = PR_FALSE; // Presume failure
|
||||
nsresult rv = NS_ERROR_FAILURE; // Ditto
|
||||
|
||||
#if TARGET_CARBON
|
||||
// Use LaunchServices directly when we're running under OS X to avoid the problem of some protocols
|
||||
// apparently not being reflected into the IC mappings (webcal for one). Even better it seems
|
||||
// LaunchServices under 10.1.x will often fail to find an app when using LSGetApplicationForURL
|
||||
// so we only use it for 10.2 or later.
|
||||
|
||||
// Since protocol comes in with _just_ the protocol we have to add a ':' to the end of it or
|
||||
// LaunchServices will be very unhappy with the CFURLRef created from it (crashes trying to look
|
||||
// up a handler for it with LSGetApplicationForURL, at least under 10.2.1)
|
||||
if (mRunningJaguar)
|
||||
{
|
||||
nsCAutoString scheme(protocol);
|
||||
scheme += ":";
|
||||
CFURLRef myURLRef = ::CFURLCreateWithBytes(
|
||||
kCFAllocatorDefault,
|
||||
(const UInt8 *)scheme.get(),
|
||||
scheme.Length(),
|
||||
kCFStringEncodingUTF8, NULL);
|
||||
if (myURLRef)
|
||||
{
|
||||
FSRef appFSRef;
|
||||
|
||||
if (::LSGetApplicationForURL(myURLRef, kLSRolesAll, &appFSRef, NULL) == noErr)
|
||||
{ // Now see if the FSRef for the found app == the running app
|
||||
ProcessSerialNumber psn;
|
||||
if (::GetCurrentProcess(&psn) == noErr)
|
||||
{
|
||||
FSRef runningAppFSRef;
|
||||
if (::GetProcessBundleLocation(&psn, &runningAppFSRef) == noErr)
|
||||
{
|
||||
if (::FSCompareFSRefs(&appFSRef, &runningAppFSRef) == noErr)
|
||||
{ // Oops, the current app is the handler which would cause infinite recursion
|
||||
rv = NS_ERROR_NOT_AVAILABLE;
|
||||
}
|
||||
else
|
||||
{
|
||||
*_retval = PR_TRUE;
|
||||
rv = NS_OK;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
::CFRelease(myURLRef);
|
||||
}
|
||||
}
|
||||
else
|
||||
#endif
|
||||
{
|
||||
// look for IC pref "\pHelper¥<protocol>"
|
||||
Str255 pref = kICHelper;
|
||||
|
||||
if (strlen(protocol) > 248)
|
||||
return NS_ERROR_OUT_OF_MEMORY;
|
||||
|
||||
memcpy(pref + pref[0] + 1, protocol, strlen(protocol));
|
||||
pref[0] = pref[0] + strlen(protocol);
|
||||
if (nsCRT::strlen(protocol) > 248)
|
||||
rv = NS_ERROR_OUT_OF_MEMORY;
|
||||
else
|
||||
{
|
||||
memcpy(pref + pref[0] + 1, protocol, nsCRT::strlen(protocol));
|
||||
pref[0] = pref[0] + nsCRT::strlen(protocol);
|
||||
|
||||
ICInstance instance = nsInternetConfig::GetInstance();
|
||||
if ( !instance )
|
||||
return NS_ERROR_FAILURE;
|
||||
|
||||
if (instance)
|
||||
{
|
||||
OSStatus err;
|
||||
ICAttr junk;
|
||||
ICAppSpec spec;
|
||||
long ioSize = sizeof(ICAppSpec);
|
||||
err = ::ICGetPref( instance, pref, &junk, (void *)&spec, &ioSize );
|
||||
if ( err != noErr )
|
||||
return NS_ERROR_FAILURE;
|
||||
err = ::ICGetPref(instance, pref, &junk, (void *)&spec, &ioSize);
|
||||
|
||||
if (err == noErr)
|
||||
{
|
||||
// check if registered protocol helper is us
|
||||
// if so, return PR_FALSE because we'll go into infinite recursion
|
||||
// continually launching back into ourselves
|
||||
|
|
@ -167,17 +238,19 @@ NS_IMETHODIMP nsInternetConfigService::HasProtocolHandler(const char *protocol,
|
|||
if (err == noErr)
|
||||
{
|
||||
if (info.processSignature != spec.fCreator)
|
||||
{
|
||||
*_retval = PR_TRUE;
|
||||
else
|
||||
return NS_ERROR_NOT_AVAILABLE;
|
||||
rv = NS_OK;
|
||||
}
|
||||
else
|
||||
return NS_ERROR_FAILURE;
|
||||
rv = NS_ERROR_NOT_AVAILABLE;
|
||||
}
|
||||
else
|
||||
return NS_ERROR_FAILURE;
|
||||
|
||||
return NS_OK;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
return rv;
|
||||
}
|
||||
|
||||
// This method does the dirty work of traipsing through IC mappings database
|
||||
|
|
@ -188,7 +261,8 @@ nsresult nsInternetConfigService::GetMappingForMIMEType(const char *mimetype, co
|
|||
OSStatus err = noErr;
|
||||
ICAttr attr;
|
||||
Handle prefH;
|
||||
PRBool domimecheck = PR_TRUE, gotmatch = PR_FALSE;
|
||||
PRBool domimecheck = PR_TRUE;
|
||||
PRBool gotmatch = PR_FALSE;
|
||||
ICMapEntry ent;
|
||||
|
||||
// if mime type is "unknown" or "octet stream" *AND* we have a file extension,
|
||||
|
|
@ -215,7 +289,7 @@ nsresult nsInternetConfigService::GetMappingForMIMEType(const char *mimetype, co
|
|||
if (err == noErr)
|
||||
{
|
||||
long pos;
|
||||
for(long i = 1; i <= count; i++)
|
||||
for (long i = 1; i <= count; ++i)
|
||||
{
|
||||
err = ::ICGetIndMapEntry(inst, prefH, i, &pos, &ent);
|
||||
if (err == noErr)
|
||||
|
|
@ -274,6 +348,7 @@ nsresult nsInternetConfigService::GetMappingForMIMEType(const char *mimetype, co
|
|||
}
|
||||
}
|
||||
}
|
||||
|
||||
if (err != noErr)
|
||||
return NS_ERROR_FAILURE;
|
||||
else
|
||||
|
|
@ -366,15 +441,12 @@ NS_IMETHODIMP nsInternetConfigService::FillInMIMEInfo(const char *mimetype, cons
|
|||
{
|
||||
rv = GetMappingForMIMEType(mimetype, nsnull, &entry);
|
||||
}
|
||||
if (rv == NS_OK)
|
||||
{
|
||||
rv = FillMIMEInfoForICEntry(entry, mimeinfo);
|
||||
|
||||
}
|
||||
if (rv == NS_OK)
|
||||
rv = FillMIMEInfoForICEntry(entry, mimeinfo);
|
||||
else
|
||||
{
|
||||
rv = NS_ERROR_FAILURE;
|
||||
}
|
||||
|
||||
return rv;
|
||||
}
|
||||
|
||||
|
|
@ -382,40 +454,38 @@ NS_IMETHODIMP nsInternetConfigService::GetMIMEInfoFromExtension(const char *aFil
|
|||
{
|
||||
nsresult rv = NS_ERROR_FAILURE;
|
||||
ICInstance instance = nsInternetConfig::GetInstance();
|
||||
if ( instance )
|
||||
if (instance)
|
||||
{
|
||||
nsCAutoString filename("foobar.");
|
||||
filename+=aFileExt;
|
||||
filename += aFileExt;
|
||||
Str255 pFileName;
|
||||
ConvertCharStringToStr255( filename.get(), pFileName );
|
||||
ConvertCharStringToStr255(filename.get(), pFileName);
|
||||
ICMapEntry entry;
|
||||
OSStatus err = ::ICMapFilename( instance, pFileName, &entry );
|
||||
if( err == noErr )
|
||||
OSStatus err = ::ICMapFilename(instance, pFileName, &entry);
|
||||
if (err == noErr)
|
||||
{
|
||||
rv = FillMIMEInfoForICEntry(entry, _retval);
|
||||
}
|
||||
}
|
||||
|
||||
return rv;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
NS_IMETHODIMP nsInternetConfigService::GetMIMEInfoFromTypeCreator(PRUint32 aType, PRUint32 aCreator, const char *aFileExt, nsIMIMEInfo **_retval)
|
||||
{
|
||||
nsresult rv = NS_ERROR_FAILURE;
|
||||
ICInstance instance = nsInternetConfig::GetInstance();
|
||||
if ( instance )
|
||||
if (instance)
|
||||
{
|
||||
nsCAutoString filename("foobar.");
|
||||
filename+=aFileExt;
|
||||
filename += aFileExt;
|
||||
Str255 pFileName;
|
||||
ConvertCharStringToStr255( filename.get(), pFileName );
|
||||
ConvertCharStringToStr255(filename.get(), pFileName);
|
||||
ICMapEntry entry;
|
||||
OSStatus err = ::ICMapTypeCreator( instance, aType, aCreator, pFileName, &entry );
|
||||
if( err == noErr )
|
||||
OSStatus err = ::ICMapTypeCreator(instance, aType, aCreator, pFileName, &entry);
|
||||
if (err == noErr)
|
||||
rv = FillMIMEInfoForICEntry(entry,_retval);
|
||||
}
|
||||
|
||||
return rv;
|
||||
}
|
||||
|
||||
|
|
@ -429,19 +499,19 @@ NS_IMETHODIMP nsInternetConfigService::GetFileMappingFlags(FSSpec* fsspec, PRBoo
|
|||
*_retval = -1;
|
||||
|
||||
ICInstance instance = nsInternetConfig::GetInstance();
|
||||
if ( instance )
|
||||
if (instance)
|
||||
{
|
||||
ICMapEntry entry;
|
||||
|
||||
if (lookupByExtensionFirst)
|
||||
err = ::ICMapFilename( instance, fsspec->name, &entry );
|
||||
err = ::ICMapFilename(instance, fsspec->name, &entry);
|
||||
|
||||
if (!lookupByExtensionFirst || err != noErr)
|
||||
{
|
||||
FInfo info;
|
||||
err = FSpGetFInfo (fsspec, &info);
|
||||
err = FSpGetFInfo(fsspec, &info);
|
||||
if (err == noErr)
|
||||
err = ::ICMapTypeCreator( instance, info.fdType, info.fdCreator, fsspec->name, &entry );
|
||||
err = ::ICMapTypeCreator(instance, info.fdType, info.fdCreator, fsspec->name, &entry);
|
||||
}
|
||||
|
||||
if (err == noErr)
|
||||
|
|
@ -449,7 +519,6 @@ NS_IMETHODIMP nsInternetConfigService::GetFileMappingFlags(FSSpec* fsspec, PRBoo
|
|||
|
||||
rv = NS_OK;
|
||||
}
|
||||
|
||||
return rv;
|
||||
}
|
||||
|
||||
|
|
@ -509,7 +578,7 @@ NS_IMETHODIMP nsInternetConfigService::GetDownloadFolder(FSSpec *fsspec)
|
|||
|
||||
nsresult nsInternetConfigService::GetICKeyPascalString(PRUint32 inIndex, const unsigned char*& outICKey)
|
||||
{
|
||||
nsresult result = NS_OK;
|
||||
nsresult rv = NS_OK;
|
||||
|
||||
switch (inIndex)
|
||||
{
|
||||
|
|
@ -571,10 +640,9 @@ nsresult nsInternetConfigService::GetICKeyPascalString(PRUint32 inIndex, const u
|
|||
case eICText_Plan: outICKey = kICPlan; break;
|
||||
|
||||
default:
|
||||
result = NS_ERROR_INVALID_ARG;
|
||||
rv = NS_ERROR_INVALID_ARG;
|
||||
}
|
||||
|
||||
return result;
|
||||
return rv;
|
||||
}
|
||||
|
||||
|
||||
|
|
@ -582,41 +650,43 @@ nsresult nsInternetConfigService::GetICPreference(PRUint32 inKey,
|
|||
void *outData, long *ioSize)
|
||||
{
|
||||
const unsigned char *icKey;
|
||||
nsresult result = GetICKeyPascalString( inKey, icKey );
|
||||
if (NS_FAILED(result))
|
||||
return result;
|
||||
|
||||
nsresult rv = GetICKeyPascalString(inKey, icKey);
|
||||
if (rv == NS_OK)
|
||||
{
|
||||
ICInstance instance = nsInternetConfig::GetInstance();
|
||||
if ( !instance )
|
||||
return NS_ERROR_FAILURE;
|
||||
|
||||
if (instance)
|
||||
{
|
||||
OSStatus err;
|
||||
ICAttr junk;
|
||||
err = ::ICGetPref( instance, icKey, &junk, outData, ioSize );
|
||||
if ( err )
|
||||
return NS_ERROR_UNEXPECTED;
|
||||
|
||||
return NS_OK;
|
||||
err = ::ICGetPref(instance, icKey, &junk, outData, ioSize);
|
||||
if (err != noErr)
|
||||
rv = NS_ERROR_UNEXPECTED;
|
||||
}
|
||||
else
|
||||
rv = NS_ERROR_FAILURE;
|
||||
}
|
||||
return rv;
|
||||
}
|
||||
|
||||
|
||||
NS_IMETHODIMP nsInternetConfigService::GetString(PRUint32 inKey, char **value)
|
||||
NS_IMETHODIMP nsInternetConfigService::GetString(PRUint32 inKey, nsACString& value)
|
||||
{
|
||||
long size = 256;
|
||||
char buffer[256];
|
||||
nsresult result = GetICPreference( inKey, (void *)&buffer, &size );
|
||||
if ( result == NS_OK ) {
|
||||
if ( size == 0 ) {
|
||||
*value = nsnull;
|
||||
return NS_ERROR_UNEXPECTED;
|
||||
nsresult rv = GetICPreference(inKey, (void *)&buffer, &size);
|
||||
if (rv == NS_OK)
|
||||
{
|
||||
if (size == 0)
|
||||
{
|
||||
value = "";
|
||||
rv = NS_ERROR_UNEXPECTED;
|
||||
}
|
||||
|
||||
// Buffer is a Pascal string; convert it to a c-string
|
||||
nsCString temp( &buffer[1], buffer[0] );
|
||||
*value = ToNewCString(temp);
|
||||
else
|
||||
{ // Buffer is a Pascal string so adjust for length byte when assigning
|
||||
value.Assign(&buffer[1], (unsigned char)buffer[0]);
|
||||
}
|
||||
|
||||
return result;
|
||||
}
|
||||
return rv;
|
||||
}
|
||||
|
||||
|
||||
|
|
@ -631,18 +701,19 @@ NS_IMETHODIMP nsInternetConfigService::GetColor(PRUint32 inKey, PRUint32 *outCol
|
|||
|
||||
RGBColor buffer;
|
||||
long size = sizeof(RGBColor);
|
||||
nsresult result = GetICPreference( inKey, &buffer, &size );
|
||||
if ( result == NS_OK ) {
|
||||
if ( size != sizeof(RGBColor) ) {
|
||||
*outColor = MAKE_NS_RGB(0xff, 0xff, 0xff); // default to white if we didn't get the right size
|
||||
return NS_OK;
|
||||
nsresult rv = GetICPreference(inKey, &buffer, &size);
|
||||
if (rv == NS_OK)
|
||||
{
|
||||
if (size != sizeof(RGBColor))
|
||||
{ // default to white if we didn't get the right size
|
||||
*outColor = MAKE_NS_RGB(0xff, 0xff, 0xff);
|
||||
}
|
||||
|
||||
// convert to a web color
|
||||
*outColor = MAKE_NS_RGB( buffer.red>>8, buffer.green>>8, buffer.blue>>8 );
|
||||
else
|
||||
{ // convert to a web color
|
||||
*outColor = MAKE_NS_RGB(buffer.red >> 8, buffer.green >> 8, buffer.blue >> 8);
|
||||
}
|
||||
|
||||
return result;
|
||||
}
|
||||
return rv;
|
||||
}
|
||||
|
||||
|
||||
|
|
@ -650,22 +721,13 @@ NS_IMETHODIMP nsInternetConfigService::GetBoolean(PRUint32 inKey, PRBool *outFla
|
|||
{
|
||||
Boolean buffer;
|
||||
long size = sizeof(Boolean);
|
||||
nsresult result = GetICPreference( inKey, (void *)&buffer, &size );
|
||||
if ( result == NS_OK ) {
|
||||
if ( (size_t)size < sizeof(Boolean) ) {
|
||||
nsresult rv = GetICPreference(inKey, (void *)&buffer, &size);
|
||||
if (rv == NS_OK)
|
||||
{
|
||||
if ((size_t)size < sizeof(Boolean))
|
||||
*outFlag = PR_FALSE; // default to false if we didn't get the right amount of data
|
||||
return NS_OK;
|
||||
}
|
||||
|
||||
else
|
||||
*outFlag = buffer;
|
||||
result = NS_OK;
|
||||
}
|
||||
|
||||
return result;
|
||||
}
|
||||
|
||||
|
||||
NS_IMETHODIMP nsInternetConfigService::GetText(PRUint32 inKey, PRUint32 *ioLength, PRUnichar **outText)
|
||||
{
|
||||
return NS_ERROR_NOT_IMPLEMENTED;
|
||||
return rv;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -61,6 +61,9 @@ protected:
|
|||
|
||||
nsresult GetICKeyPascalString(PRUint32 inIndex, const unsigned char*& outICKey);
|
||||
nsresult GetICPreference(PRUint32 inKey, void *outData, long *ioSize);
|
||||
|
||||
PRBool mRunningOSX;
|
||||
PRBool mRunningJaguar;
|
||||
};
|
||||
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -123,11 +123,9 @@ interface nsIInternetConfigService : nsISupports
|
|||
|
||||
[noscript] void getDownloadFolder(out FSSpec fsspec);
|
||||
|
||||
string getString(in unsigned long keyenum);
|
||||
ACString getString(in unsigned long keyenum);
|
||||
|
||||
unsigned long getColor(in unsigned long keyenum);
|
||||
|
||||
boolean getBoolean(in unsigned long keyenum);
|
||||
|
||||
wstring getText(in unsigned long keyenum, out unsigned long length);
|
||||
};
|
||||
|
|
|
|||
|
|
@ -65,6 +65,8 @@
|
|||
|
||||
#include "nsSound.h"
|
||||
|
||||
#include "nsString.h"
|
||||
|
||||
//#define SOUND_DEBUG
|
||||
|
||||
#pragma mark nsSoundRequest
|
||||
|
|
@ -433,8 +435,8 @@ nsSound::GetSoundResourceName(const char* inSoundName, StringPtr outResourceName
|
|||
if (NS_FAILED(rv))
|
||||
return rv;
|
||||
|
||||
nsXPIDLCString newMailSound;
|
||||
rv = icService->GetString(nsIInternetConfigService::eICString_NewMailSoundName, getter_Copies(newMailSound));
|
||||
nsCAutoString newMailSound;
|
||||
rv = icService->GetString(nsIInternetConfigService::eICString_NewMailSoundName, newMailSound);
|
||||
if (NS_FAILED(rv))
|
||||
return rv;
|
||||
|
||||
|
|
|
|||
|
|
@ -60,14 +60,12 @@ nsUserInfo::GetFullname(PRUnichar **aFullname)
|
|||
nsCOMPtr<nsIInternetConfigService> icService (do_GetService(NS_INTERNETCONFIGSERVICE_CONTRACTID));
|
||||
if (icService)
|
||||
{
|
||||
char* cName;
|
||||
result = icService->GetString(nsIInternetConfigService::eICString_RealName, &cName);
|
||||
nsCAutoString cName;
|
||||
result = icService->GetString(nsIInternetConfigService::eICString_RealName, cName);
|
||||
if ( NS_SUCCEEDED ( result ) )
|
||||
{
|
||||
nsString fullName;
|
||||
fullName.AssignWithConversion( cName );
|
||||
nsMemory::Free( cName );
|
||||
*aFullname = ToNewUnicode(fullName);
|
||||
*aFullname = ToNewUnicode(cName);
|
||||
}
|
||||
}
|
||||
return result;
|
||||
|
|
@ -81,7 +79,11 @@ nsUserInfo::GetEmailAddress(char * *aEmailAddress)
|
|||
nsCOMPtr<nsIInternetConfigService> icService (do_GetService(NS_INTERNETCONFIGSERVICE_CONTRACTID));
|
||||
if (icService)
|
||||
{
|
||||
result = icService->GetString(nsIInternetConfigService::eICString_Email, aEmailAddress);
|
||||
nsCAutoString tempString;
|
||||
result = icService->GetString(nsIInternetConfigService::eICString_Email, tempString);
|
||||
if (NS_SUCCEEDED(result))
|
||||
*aEmailAddress = ToNewCString(tempString);
|
||||
|
||||
}
|
||||
return result;
|
||||
}
|
||||
|
|
@ -91,16 +93,14 @@ nsUserInfo::GetUsername(char * *aUsername)
|
|||
{
|
||||
*aUsername = nsnull;
|
||||
|
||||
char* cString;
|
||||
nsCAutoString tempString;
|
||||
nsresult rv = NS_ERROR_FAILURE;
|
||||
nsCOMPtr<nsIInternetConfigService> icService (do_GetService(NS_INTERNETCONFIGSERVICE_CONTRACTID));
|
||||
if (icService)
|
||||
rv = icService->GetString(nsIInternetConfigService::eICString_Email, &cString);
|
||||
rv = icService->GetString(nsIInternetConfigService::eICString_Email, tempString);
|
||||
|
||||
if ( NS_FAILED( rv ) ) return rv;
|
||||
|
||||
nsCAutoString tempString(cString);
|
||||
nsMemory::Free( cString );
|
||||
const char* atString = "@";
|
||||
PRInt32 atOffset = tempString.Find(atString);
|
||||
if (atOffset != kNotFound)
|
||||
|
|
@ -114,14 +114,12 @@ NS_IMETHODIMP
|
|||
nsUserInfo::GetDomain(char * *aDomain)
|
||||
{
|
||||
*aDomain = nsnull;
|
||||
char* cString;
|
||||
nsCAutoString tempString;
|
||||
nsresult rv = NS_ERROR_FAILURE;
|
||||
nsCOMPtr<nsIInternetConfigService> icService (do_GetService(NS_INTERNETCONFIGSERVICE_CONTRACTID));
|
||||
if (icService)
|
||||
rv = icService->GetString(nsIInternetConfigService::eICString_Email, &cString);
|
||||
rv = icService->GetString(nsIInternetConfigService::eICString_Email, tempString);
|
||||
if ( NS_FAILED( rv ) ) return rv;
|
||||
nsCAutoString tempString( cString);
|
||||
nsMemory::Free( cString );
|
||||
const char* atString = "@";
|
||||
PRInt32 atOffset = tempString.Find(atString);
|
||||
if (atOffset != kNotFound)
|
||||
|
|
|
|||
|
|
@ -60,14 +60,12 @@ nsUserInfo::GetFullname(PRUnichar **aFullname)
|
|||
nsCOMPtr<nsIInternetConfigService> icService (do_GetService(NS_INTERNETCONFIGSERVICE_CONTRACTID));
|
||||
if (icService)
|
||||
{
|
||||
char* cName;
|
||||
result = icService->GetString(nsIInternetConfigService::eICString_RealName, &cName);
|
||||
nsCAutoString cName;
|
||||
result = icService->GetString(nsIInternetConfigService::eICString_RealName, cName);
|
||||
if ( NS_SUCCEEDED ( result ) )
|
||||
{
|
||||
nsString fullName;
|
||||
fullName.AssignWithConversion( cName );
|
||||
nsMemory::Free( cName );
|
||||
*aFullname = ToNewUnicode(fullName);
|
||||
*aFullname = ToNewUnicode(cName);
|
||||
}
|
||||
}
|
||||
return result;
|
||||
|
|
@ -81,7 +79,11 @@ nsUserInfo::GetEmailAddress(char * *aEmailAddress)
|
|||
nsCOMPtr<nsIInternetConfigService> icService (do_GetService(NS_INTERNETCONFIGSERVICE_CONTRACTID));
|
||||
if (icService)
|
||||
{
|
||||
result = icService->GetString(nsIInternetConfigService::eICString_Email, aEmailAddress);
|
||||
nsCAutoString tempString;
|
||||
result = icService->GetString(nsIInternetConfigService::eICString_Email, tempString);
|
||||
if (NS_SUCCEEDED(result))
|
||||
*aEmailAddress = ToNewCString(tempString);
|
||||
|
||||
}
|
||||
return result;
|
||||
}
|
||||
|
|
@ -91,16 +93,14 @@ nsUserInfo::GetUsername(char * *aUsername)
|
|||
{
|
||||
*aUsername = nsnull;
|
||||
|
||||
char* cString;
|
||||
nsCAutoString tempString;
|
||||
nsresult rv = NS_ERROR_FAILURE;
|
||||
nsCOMPtr<nsIInternetConfigService> icService (do_GetService(NS_INTERNETCONFIGSERVICE_CONTRACTID));
|
||||
if (icService)
|
||||
rv = icService->GetString(nsIInternetConfigService::eICString_Email, &cString);
|
||||
rv = icService->GetString(nsIInternetConfigService::eICString_Email, tempString);
|
||||
|
||||
if ( NS_FAILED( rv ) ) return rv;
|
||||
|
||||
nsCAutoString tempString(cString);
|
||||
nsMemory::Free( cString );
|
||||
const char* atString = "@";
|
||||
PRInt32 atOffset = tempString.Find(atString);
|
||||
if (atOffset != kNotFound)
|
||||
|
|
@ -114,14 +114,12 @@ NS_IMETHODIMP
|
|||
nsUserInfo::GetDomain(char * *aDomain)
|
||||
{
|
||||
*aDomain = nsnull;
|
||||
char* cString;
|
||||
nsCAutoString tempString;
|
||||
nsresult rv = NS_ERROR_FAILURE;
|
||||
nsCOMPtr<nsIInternetConfigService> icService (do_GetService(NS_INTERNETCONFIGSERVICE_CONTRACTID));
|
||||
if (icService)
|
||||
rv = icService->GetString(nsIInternetConfigService::eICString_Email, &cString);
|
||||
rv = icService->GetString(nsIInternetConfigService::eICString_Email, tempString);
|
||||
if ( NS_FAILED( rv ) ) return rv;
|
||||
nsCAutoString tempString( cString);
|
||||
nsMemory::Free( cString );
|
||||
const char* atString = "@";
|
||||
PRInt32 atOffset = tempString.Find(atString);
|
||||
if (atOffset != kNotFound)
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче