зеркало из https://github.com/mozilla/pjs.git
Change unsigned char* param to ConstStr255Param to make mach-o happier
r=sdagley/sr=blake. bug 118197.
This commit is contained in:
pinkerton%netscape.com
Родитель
38ed6718d3
Коммит
2c61b48f4b
|
|
@ -121,7 +121,7 @@ nsInternetConfig::~nsInternetConfig()
|
|||
}
|
||||
|
||||
|
||||
nsresult nsInternetConfig::GetString( unsigned char* inKey, char** outString )
|
||||
nsresult nsInternetConfig::GetString( ConstStr255Param inKey, char** outString )
|
||||
{
|
||||
nsresult result = NS_ERROR_FAILURE;
|
||||
ICInstance instance = nsInternetConfig::GetInstance();
|
||||
|
|
|
|||
|
|
@ -47,7 +47,7 @@ class nsInternetConfig
|
|||
public:
|
||||
nsInternetConfig();
|
||||
~nsInternetConfig();
|
||||
nsresult GetString( unsigned char* inKey, char** outString );
|
||||
nsresult GetString( ConstStr255Param inKey, char** outString );
|
||||
|
||||
static ICInstance GetInstance();
|
||||
static PRBool HasSeedChanged();
|
||||
|
|
|
|||
|
|
@ -1,149 +0,0 @@
|
|||
/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
|
||||
/* ***** BEGIN LICENSE BLOCK *****
|
||||
* Version: NPL 1.1/GPL 2.0/LGPL 2.1
|
||||
*
|
||||
* 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.
|
||||
*
|
||||
* The Initial Developer of the Original Code is
|
||||
* Netscape Communications Corporation.
|
||||
* Portions created by the Initial Developer are Copyright (C) 1998
|
||||
* the Initial Developer. All Rights Reserved.
|
||||
*
|
||||
* Contributor(s):
|
||||
*
|
||||
* 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
|
||||
* the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
|
||||
* in which case the provisions of the GPL or the LGPL are applicable instead
|
||||
* of those above. If you wish to allow use of your version of this file only
|
||||
* under the terms of either the GPL or the LGPL, and not to allow others to
|
||||
* use your version of this file under the terms of the NPL, indicate your
|
||||
* decision by deleting the provisions above and replace them with the notice
|
||||
* and other provisions required by the GPL or the LGPL. If you do not delete
|
||||
* the provisions above, a recipient may use your version of this file under
|
||||
* the terms of any one of the NPL, the GPL or the LGPL.
|
||||
*
|
||||
* ***** END LICENSE BLOCK ***** */
|
||||
|
||||
#include "nsInternetConfig.h"
|
||||
#include "nsString.h"
|
||||
#include "nsReadableUtils.h"
|
||||
#include "nsDebug.h"
|
||||
|
||||
#include <CodeFragments.h>
|
||||
#include <Processes.h>
|
||||
ICInstance nsInternetConfig::sInstance = NULL;
|
||||
long nsInternetConfig::sSeed = 0;
|
||||
PRInt32 nsInternetConfig::sRefCount = 0;
|
||||
|
||||
|
||||
|
||||
static OSType GetAppCreatorCode()
|
||||
{
|
||||
ProcessSerialNumber psn = { 0, kCurrentProcess } ;
|
||||
ProcessInfoRec procInfo;
|
||||
|
||||
procInfo.processInfoLength = sizeof(ProcessInfoRec);
|
||||
procInfo.processName = nsnull;
|
||||
procInfo.processAppSpec = nsnull;
|
||||
|
||||
GetProcessInformation(&psn, &procInfo);
|
||||
return procInfo.processSignature;
|
||||
}
|
||||
|
||||
|
||||
|
||||
ICInstance nsInternetConfig::GetInstance()
|
||||
{
|
||||
if ( !sInstance )
|
||||
{
|
||||
OSStatus err;
|
||||
if ((long)ICStart == kUnresolvedCFragSymbolAddress )
|
||||
return sInstance;
|
||||
|
||||
|
||||
OSType creator = GetAppCreatorCode();
|
||||
err = ::ICStart( &sInstance, creator );
|
||||
if ( err != noErr )
|
||||
{
|
||||
::ICStop( sInstance );
|
||||
}
|
||||
else
|
||||
{
|
||||
#if !TARGET_CARBON
|
||||
::ICFindConfigFile( sInstance, 0 , nil );
|
||||
#endif
|
||||
::ICGetSeed( sInstance, &sSeed );
|
||||
}
|
||||
}
|
||||
return sInstance;
|
||||
}
|
||||
|
||||
PRBool nsInternetConfig::HasSeedChanged()
|
||||
{
|
||||
ICInstance instance = nsInternetConfig::GetInstance();
|
||||
if ( instance )
|
||||
{
|
||||
long newSeed = 0;
|
||||
::ICGetSeed( sInstance, &newSeed );
|
||||
if ( newSeed != sSeed )
|
||||
{
|
||||
sSeed = newSeed;
|
||||
return PR_TRUE;
|
||||
}
|
||||
}
|
||||
return PR_FALSE;
|
||||
}
|
||||
|
||||
nsInternetConfig::nsInternetConfig()
|
||||
{
|
||||
sRefCount++;
|
||||
}
|
||||
|
||||
nsInternetConfig::~nsInternetConfig()
|
||||
{
|
||||
sRefCount--;
|
||||
if ( sRefCount == 0 && sInstance)
|
||||
{
|
||||
::ICStop( sInstance );
|
||||
sInstance = NULL;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
nsresult nsInternetConfig::GetString( unsigned char* 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;
|
||||
}
|
||||
|
|
@ -1,60 +0,0 @@
|
|||
/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
|
||||
/* ***** BEGIN LICENSE BLOCK *****
|
||||
* Version: NPL 1.1/GPL 2.0/LGPL 2.1
|
||||
*
|
||||
* 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.
|
||||
*
|
||||
* The Initial Developer of the Original Code is
|
||||
* Netscape Communications Corporation.
|
||||
* Portions created by the Initial Developer are Copyright (C) 1998
|
||||
* the Initial Developer. All Rights Reserved.
|
||||
*
|
||||
* Contributor(s):
|
||||
*
|
||||
* 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
|
||||
* the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
|
||||
* in which case the provisions of the GPL or the LGPL are applicable instead
|
||||
* of those above. If you wish to allow use of your version of this file only
|
||||
* under the terms of either the GPL or the LGPL, and not to allow others to
|
||||
* use your version of this file under the terms of the NPL, indicate your
|
||||
* decision by deleting the provisions above and replace them with the notice
|
||||
* and other provisions required by the GPL or the LGPL. If you do not delete
|
||||
* the provisions above, a recipient may use your version of this file under
|
||||
* the terms of any one of the NPL, the GPL or the LGPL.
|
||||
*
|
||||
* ***** END LICENSE BLOCK ***** */
|
||||
|
||||
#ifndef __NS_INTERNETCONFIG_H__
|
||||
#define __NS_INTERNETCONFIG_H__
|
||||
|
||||
#include <InternetConfig.h>
|
||||
#include "PRTypes.h"
|
||||
#include "nsError.h"
|
||||
|
||||
class nsInternetConfig
|
||||
{
|
||||
public:
|
||||
nsInternetConfig();
|
||||
~nsInternetConfig();
|
||||
nsresult GetString( unsigned char* inKey, char** outString );
|
||||
|
||||
static ICInstance GetInstance();
|
||||
static PRBool HasSeedChanged();
|
||||
private:
|
||||
static ICInstance sInstance;
|
||||
static long sSeed;
|
||||
static PRInt32 sRefCount;
|
||||
};
|
||||
|
||||
#endif /* __NS_INTERNETCONFIG_H__ */
|
||||
Загрузка…
Ссылка в новой задаче