Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-09 11:25:00 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

making string conversions explicit

Browse Source
This commit is contained in:
scc%netscape.com 2000-04-02 20:34:28 +00:00
parent afb0749506
commit 1b477e16f7
3 changed files with 281 additions and 154 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
profile/pref-migrator/src/nsPrefMigration.cpp
View File

@ -1276,7 +1276,7 @@ nsPrefMigration::GetSizes(nsFileSpec inputPath, PRBool readSubdirs, PRUint32 *si
{
nsFileSpec fileOrDirName = (nsFileSpec&)dir;
folderName = fileOrDirName.GetLeafName();
fileOrDirNameStr = folderName;
fileOrDirNameStr.AssignWithConversion(folderName);
if (nsStringEndsWith(fileOrDirNameStr, MAIL_SUMMARY_SUFFIX_IN_4x) || nsStringEndsWith(fileOrDirNameStr, NEWS_SUMMARY_SUFFIX_IN_4x) || nsStringEndsWith(fileOrDirNameStr, SUMMARY_SUFFIX_IN_5x)) /* Don't copy the summary files */
continue;
else
@ -1467,7 +1467,7 @@ nsPrefMigration::DoTheCopyAndRename(nsIFileSpec * oldPathSpec, nsIFileSpec *newP
{
nsFileSpec fileOrDirName = (nsFileSpec&)dir; //set first file or dir to a nsFileSpec
folderName = fileOrDirName.GetLeafName(); //get the filename without the full path
fileOrDirNameStr = folderName;
fileOrDirNameStr.AssignWithConversion(folderName);
if (nsStringEndsWith(fileOrDirNameStr, MAIL_SUMMARY_SUFFIX_IN_4x) || nsStringEndsWith(fileOrDirNameStr, NEWS_SUMMARY_SUFFIX_IN_4x) || nsStringEndsWith(fileOrDirNameStr, SUMMARY_SUFFIX_IN_5x)) /* Don't copy the summary files */
continue;
@ -1495,7 +1495,7 @@ nsPrefMigration::DoTheCopyAndRename(nsIFileSpec * oldPathSpec, nsIFileSpec *newP
if (needToRenameFiles) {
// rename the file, if it matches
if (fileOrDirNameStr.Equals(oldName)) {
if (fileOrDirNameStr.EqualsWithConversion(oldName)) {
nsFileSpec newFile = newPath;
newFile += fileOrDirNameStr;
newFile.Rename(newName);
@ -1635,9 +1635,9 @@ Fix4xCookies(nsIFileSpec * profilePath) {
/* generate the output buffer and write it to file */
outBuffer = prefix;
outBuffer.Append('\t');
outBuffer.Append(dateString);
outBuffer.Append('\t');
outBuffer.AppendWithConversion('\t');
outBuffer.AppendWithConversion(dateString);
outBuffer.AppendWithConversion('\t');
outBuffer.Append(suffix);
PutCookieLine(outStream, outBuffer);
}
@ -2168,7 +2168,7 @@ nsPrefConverter::GetPlatformCharset(nsAutoString& aCharset)
rv = platformCharset->GetCharset(kPlatformCharsetSel_FileName, aCharset);
}
if (NS_FAILED(rv)) {
aCharset.Assign("ISO-8859-1"); // use ISO-8859-1 in case of any error
aCharset.AssignWithConversion("ISO-8859-1"); // use ISO-8859-1 in case of any error
}
return rv;

93
profile/src/nsProfile.cpp
View File

@ -450,7 +450,7 @@ nsProfile::ProcessArgs(nsICmdLineService *cmdLineArgs,
if (NS_SUCCEEDED(rv))
{
if (cmdResult) {
nsAutoString currProfileName(cmdResult);
nsAutoString currProfileName; currProfileName.AssignWithConversion(cmdResult);
#ifdef DEBUG_profile
printf("ProfileName : %s\n", cmdResult);
@ -505,8 +505,8 @@ nsProfile::ProcessArgs(nsICmdLineService *cmdLineArgs,
if (NS_SUCCEEDED(rv))
{
if (cmdResult) {
nsAutoString currProfileName(strtok(cmdResult, " "));
nsAutoString currProfileDirString(strtok(NULL, " "));
nsAutoString currProfileName; currProfileName.AssignWithConversion(strtok(cmdResult, " "));
nsAutoString currProfileDirString; currProfileDirString.AssignWithConversion(strtok(NULL, " "));
if (!currProfileDirString.IsEmpty()) {
currProfileDirSpec = currProfileDirString;
@ -533,7 +533,7 @@ nsProfile::ProcessArgs(nsICmdLineService *cmdLineArgs,
printf("profileName & profileDir are: %s\n", cmdResult);
#endif /* DEBUG_profile */
nsAutoString currProfileDir(currProfileDirSpec.GetNativePathCString());
nsAutoString currProfileDir; currProfileDir.AssignWithConversion(currProfileDirSpec.GetNativePathCString());
rv = CreateNewProfile(currProfileName.GetUnicode(), currProfileDir.GetUnicode());
if (NS_SUCCEEDED(rv)) {
*profileDirSet = PR_TRUE;
@ -678,7 +678,7 @@ NS_IMETHODIMP nsProfile::GetProfileDir(const PRUnichar *profileName, nsFileSpec*
if (NS_FAILED(rv)) return rv;
// Set this to be a current profile only if it is a 5.0 profile
if (aProfile->isMigrated == REGISTRY_YES_STRING)
if (aProfile->isMigrated.EqualsWithConversion(REGISTRY_YES_STRING))
{
gProfileDataAccess->SetCurrentProfile(profileName);
@ -821,12 +821,12 @@ NS_IMETHODIMP nsProfile::SetProfileDir(const PRUnichar *profileName, nsFileSpec&
// Do I need to check for NS_ERROR_OUT_OF_MEMORY when I do a new on a class?
ProfileStruct* aProfile = new ProfileStruct();
nsAutoString profileLocation(profileDirString);
nsAutoString profileLocation; profileLocation.AssignWithConversion(profileDirString);
aProfile->profileName = profileName;
aProfile->profileLocation = profileLocation;
aProfile->isMigrated = REGISTRY_YES_STRING;
aProfile->isMigrated.AssignWithConversion(REGISTRY_YES_STRING);
rv = CreateUserDirectories(tmpDir);
@ -854,9 +854,15 @@ nsProfile::CreateNewProfile(const PRUnichar* profileName, const PRUnichar* nativ
nsresult rv = NS_OK;
#if defined(DEBUG_profile)
printf("ProfileManager : CreateNewProfile\n");
printf("Profile Name: %s\n", (const char*)nsCAutoString(profileName));
printf("Profile Dir: %s\n", (const char*)nsCAutoString(nativeProfileDir));
{
printf("ProfileManager : CreateNewProfile\n");
nsCAutoString temp1; temp1.AssignWithConversion(profileName);
printf("Profile Name: %s\n", NS_STATIC_CAST(const char*, temp1));
nsCAutoString temp2; temp2.AssignWithConversion(nativeProfileDir);
printf("Profile Dir: %s\n", NS_STATIC_CAST(const char*, temp2));
}
#endif
NS_WITH_SERVICE(nsIFileLocator, locator, kFileLocatorCID, &rv);
@ -1007,9 +1013,15 @@ nsProfile::RenameProfile(const PRUnichar* oldName, const PRUnichar* newName)
nsresult rv = NS_OK;
#if defined(DEBUG_profile)
printf("ProfileManager : Renaming profile\n");
printf("Old name: %s\n", (const char*)nsCAutoString(oldName));
printf("New name: %s\n", (const char*)nsCAutoString(newName));
{
printf("ProfileManager : Renaming profile\n");
nsCAutoString temp1; temp1.AssignWithConversion(oldName);
printf("Old name: %s\n", NS_STATIC_CAST(const char*, temp1));
nsCAutoString temp2; temp2.AssignWithConversion(newName);
printf("New name: %s\n", NS_STATIC_CAST(const char*, temp2));
}
#endif
PRBool exists;
@ -1147,8 +1159,12 @@ NS_IMETHODIMP nsProfile::StartApprunner(const PRUnichar* profileName)
nsresult rv = NS_OK;
#if defined(DEBUG_profile)
printf("ProfileManager : StartApprunner\n");
printf("profileName passed in: %s", (const char*)nsCAutoString(profileName));
{
printf("ProfileManager : StartApprunner\n");
nsCAutoString temp; temp.AssignWithConversion(profileName);
printf("profileName passed in: %s", NS_STATIC_CAST(const char*, temp));
}
#endif
gProfileDataAccess->SetCurrentProfile(profileName);
@ -1412,9 +1428,9 @@ NS_IMETHODIMP nsProfile::ProcessPREGInfo(const char* data)
return NS_ERROR_FAILURE;
}
nsAutoString pName(profileName);
nsAutoString emailAddress(userEmail);
nsAutoString serviceState(service_denial);
nsAutoString pName; pName.AssignWithConversion(profileName);
nsAutoString emailAddress; emailAddress.AssignWithConversion(userEmail);
nsAutoString serviceState; serviceState.AssignWithConversion(service_denial);
PRInt32 profileNameIndex, serviceIndex, delimIndex;
@ -1463,7 +1479,7 @@ NS_IMETHODIMP nsProfile::ProcessPREGInfo(const char* data)
// If user denies registration, ignore the information entered.
if (userServiceDenial.mLength > 0)
userProfileName.SetString("");
userProfileName.SetLength(0);
nsXPIDLString curProfile;
rv = GetCurrentProfile(getter_Copies(curProfile));
@ -1484,7 +1500,7 @@ NS_IMETHODIMP nsProfile::ProcessPREGInfo(const char* data)
nsAutoString netcenterProfileName(userProfileName);
// XXX Setting the name to curProfile. Not renaming for BETA1.
userProfileName = curProfile;
userProfileName.Assign( NS_STATIC_CAST(const PRUnichar*, curProfile) );
ProfileStruct* aProfile;
@ -1576,7 +1592,7 @@ NS_IMETHODIMP nsProfile::ProcessPREGInfo(const char* data)
if (NS_FAILED(rv)) return rv;
}
}
aProfile->NCHavePregInfo = REGISTRY_YES_STRING;
aProfile->NCHavePregInfo.AssignWithConversion(REGISTRY_YES_STRING);
gProfileDataAccess->SetValue(aProfile);
gProfileDataAccess->SetCurrentProfile(userProfileName.GetUnicode());
@ -1591,7 +1607,7 @@ NS_IMETHODIMP nsProfile::ProcessPREGInfo(const char* data)
if (NS_FAILED(rv)) return rv;
aProfile->NCDeniedService = userServiceDenial;
aProfile->NCHavePregInfo = REGISTRY_YES_STRING;
aProfile->NCHavePregInfo.AssignWithConversion(REGISTRY_YES_STRING);
gProfileDataAccess->SetValue(aProfile);
@ -1738,9 +1754,13 @@ NS_IMETHODIMP nsProfile::CloneProfile(const PRUnichar* newProfile)
#if defined(DEBUG_profile)
if (NS_SUCCEEDED(rv))
printf("ProfileManager : Cloned CurrentProfile\n");
printf("The new profile is ->%s<-\n", (const char*)nsCAutoString(newProfile));
{
if (NS_SUCCEEDED(rv))
printf("ProfileManager : Cloned CurrentProfile\n");
nsCAutoString temp; temp.AssignWithConversion(newProfile);
printf("The new profile is ->%s<-\n", NS_STATIC_CAST(const char*, temp));
}
#endif
gProfileDataAccess->mNumProfiles++;
@ -1890,9 +1910,10 @@ nsProfile::CreateDefaultProfile(void)
rv = locator->ForgetProfileDir();
nsAutoString dirSpecStr(profileDirSpec.GetNativePathCString());
nsAutoString dirSpecStr; dirSpecStr.AssignWithConversion(profileDirSpec.GetNativePathCString());
rv = CreateNewProfile(nsAutoString(DEFAULT_PROFILE_NAME).GetUnicode(), dirSpecStr.GetUnicode());
nsAutoString defaultProfileName; defaultProfileName.AssignWithConversion(DEFAULT_PROFILE_NAME);
rv = CreateNewProfile(defaultProfileName.GetUnicode(), dirSpecStr.GetUnicode());
return rv;
}
@ -2032,7 +2053,7 @@ NS_IMETHODIMP nsProfile::RemoveCookie(const char *cookie)
NS_ENSURE_ARG_POINTER(cookie);
nsresult rv = NS_OK;
nsAutoString inputCookie(PL_strstr(cookie, NS_ACTIVATION_COOOKIE));
nsAutoString inputCookie; inputCookie.AssignWithConversion(PL_strstr(cookie, NS_ACTIVATION_COOOKIE));
nsAutoString actvCookie;
inputCookie.Mid(actvCookie, 0, inputCookie.Find(SEMICOLON_DELIMITER, 0));
@ -2052,23 +2073,23 @@ NS_IMETHODIMP nsProfile::RemoveCookie(const char *cookie)
nsXPIDLCString path;
pregURI->GetHost(getter_Copies(host));
nsAutoString domain(PL_strchr(host, '.'));
nsAutoString domain; domain.AssignWithConversion(PL_strchr(host, '.'));
pregURI->GetPath(getter_Copies(path));
// Add domain
actvCookie += SEMICOLON_DELIMITER;
actvCookie += DOMAIN_STR;
actvCookie.AppendWithConversion(SEMICOLON_DELIMITER);
actvCookie.AppendWithConversion(DOMAIN_STR);
actvCookie += domain;
// Add path
actvCookie += SEMICOLON_DELIMITER;
actvCookie += PATH_STR;
actvCookie += path;
actvCookie.AppendWithConversion(SEMICOLON_DELIMITER);
actvCookie.AppendWithConversion(PATH_STR);
actvCookie.AppendWithConversion(path);
// Add expires string
actvCookie += SEMICOLON_DELIMITER;
actvCookie += ACTIVATION_COOKIE_EXPIRE_STR;
actvCookie.AppendWithConversion(SEMICOLON_DELIMITER);
actvCookie.AppendWithConversion(ACTIVATION_COOKIE_EXPIRE_STR);
NS_WITH_SERVICE(nsICookieService, service, kCookieServiceCID, &rv);
if ((NS_OK == rv) && (nsnull != service) && (nsnull != pregURI)) {

328
profile/src/nsProfileAccess.cpp
View File

@ -256,13 +256,17 @@ nsProfileAccess::FillProfileInfo()
nsCOMPtr<nsIEnumerator> enumKeys;
nsRegistryKey profilesTreeKey;
nsAutoString registryProfileSubtreeString;
registryProfileSubtreeString.AssignWithConversion(REGISTRY_PROFILE_SUBTREE_STRING);
rv = m_registry->GetKey(nsIRegistry::Common,
nsAutoString(REGISTRY_PROFILE_SUBTREE_STRING).GetUnicode(),
registryProfileSubtreeString.GetUnicode(),
&profilesTreeKey);
if (NS_FAILED(rv))
{
rv = m_registry->AddKey(nsIRegistry::Common,
nsAutoString(REGISTRY_PROFILE_SUBTREE_STRING).GetUnicode(),
registryProfileSubtreeString.GetUnicode(),
&profilesTreeKey);
if (NS_FAILED(rv)) return rv;
}
@ -281,8 +285,10 @@ nsProfileAccess::FillProfileInfo()
// for invalid rv values.
// Get the current profile
nsAutoString registryCurrentProfileString;
registryCurrentProfileString.AssignWithConversion(REGISTRY_CURRENT_PROFILE_STRING);
rv = m_registry->GetString(profilesTreeKey,
nsAutoString(REGISTRY_CURRENT_PROFILE_STRING).GetUnicode(),
registryCurrentProfileString.GetUnicode(),
getter_Copies(tmpCurrentProfile));
if (tmpCurrentProfile)
@ -294,30 +300,38 @@ nsProfileAccess::FillProfileInfo()
// the first profile if profiles exist but no current profile is set
// an empty string if no profiles exist.
mCurrentProfile = tmpCurrentProfile;
mCurrentProfile = NS_STATIC_CAST(const PRUnichar*, tmpCurrentProfile);
}
// Get the profile version
rv = m_registry->GetString(profilesTreeKey,
nsAutoString(REGISTRY_VERSION_STRING).GetUnicode(),
getter_Copies(tmpVersion));
{
nsAutoString registryVersionString;
registryVersionString.AssignWithConversion(REGISTRY_VERSION_STRING);
rv = m_registry->GetString(profilesTreeKey,
registryVersionString.GetUnicode(),
getter_Copies(tmpVersion));
}
if (tmpVersion == nsnull)
{
mFixRegEntries = PR_TRUE;
mVersion = REGISTRY_VERSION_1_0;
mVersion.AssignWithConversion(REGISTRY_VERSION_1_0);
mProfileDataChanged = PR_TRUE;
}
// Get the preg info
rv = m_registry->GetString(profilesTreeKey,
nsAutoString(REGISTRY_HAVE_PREG_INFO_STRING).GetUnicode(),
getter_Copies(tmpPREGInfo));
{
nsAutoString registryHavePRegInfoString;
registryHavePRegInfoString.AssignWithConversion(REGISTRY_HAVE_PREG_INFO_STRING);
rv = m_registry->GetString(profilesTreeKey,
registryHavePRegInfoString.GetUnicode(),
getter_Copies(tmpPREGInfo));
}
if (tmpPREGInfo == nsnull)
{
mHavePREGInfo = REGISTRY_NO_STRING;
mHavePREGInfo.AssignWithConversion(REGISTRY_NO_STRING);
mProfileDataChanged = PR_TRUE;
}
@ -362,38 +376,62 @@ nsProfileAccess::FillProfileInfo()
rv = node->GetKey(&profKey);
if (NS_FAILED(rv)) return rv;
rv = m_registry->GetString(profKey,
nsAutoString(REGISTRY_DIRECTORY_STRING).GetUnicode(),
getter_Copies(directory));
if (NS_FAILED(rv)) return rv;
{
nsAutoString registryDirectoryString;
registryDirectoryString.AssignWithConversion(REGISTRY_DIRECTORY_STRING);
rv = m_registry->GetString(profKey,
registryDirectoryString.GetUnicode(),
getter_Copies(directory));
if (NS_FAILED(rv)) return rv;
}
if (mFixRegEntries)
FixRegEntry(getter_Copies(directory));
rv = m_registry->GetString(profKey,
nsAutoString(REGISTRY_MIGRATED_STRING).GetUnicode(),
getter_Copies(isMigrated));
if (NS_FAILED(rv)) return rv;
{
nsAutoString registryMigratedString;
registryMigratedString.AssignWithConversion(REGISTRY_MIGRATED_STRING);
rv = m_registry->GetString(profKey,
registryMigratedString.GetUnicode(),
getter_Copies(isMigrated));
if (NS_FAILED(rv)) return rv;
}
// Not checking the return values of these variables as they
// are for activation, they are optional and their values
// do not call for a return
rv = m_registry->GetString(profKey,
nsAutoString(REGISTRY_NC_PROFILE_NAME_STRING).GetUnicode(),
getter_Copies(NCProfileName));
{
nsAutoString registryNCProfileNameString;
registryNCProfileNameString.AssignWithConversion(REGISTRY_NC_PROFILE_NAME_STRING);
m_registry->GetString(profKey,
registryNCProfileNameString.GetUnicode(),
getter_Copies(NCProfileName));
}
rv = m_registry->GetString(profKey,
nsAutoString(REGISTRY_NC_SERVICE_DENIAL_STRING).GetUnicode(),
getter_Copies(NCDeniedService));
{
nsAutoString registryNCServiceDenialString;
registryNCServiceDenialString.AssignWithConversion(REGISTRY_NC_SERVICE_DENIAL_STRING);
m_registry->GetString(profKey,
registryNCServiceDenialString.GetUnicode(),
getter_Copies(NCDeniedService));
}
rv = m_registry->GetString(profKey,
nsAutoString(REGISTRY_NC_USER_EMAIL_STRING).GetUnicode(),
getter_Copies(NCEmailAddress));
{
nsAutoString registryNCUserEmailString;
registryNCUserEmailString.AssignWithConversion(REGISTRY_NC_USER_EMAIL_STRING);
m_registry->GetString(profKey,
registryNCUserEmailString.GetUnicode(),
getter_Copies(NCEmailAddress));
}
rv = m_registry->GetString(profKey,
nsAutoString(REGISTRY_NC_HAVE_PREG_INFO_STRING).GetUnicode(),
getter_Copies(NCHavePregInfo));
{
nsAutoString registryNCHavePRegInfoString;
registryNCHavePRegInfoString.AssignWithConversion(REGISTRY_NC_HAVE_PREG_INFO_STRING);
m_registry->GetString(profKey,
registryNCHavePRegInfoString.GetUnicode(),
getter_Copies(NCHavePregInfo));
}
ProfileStruct* profileItem = new ProfileStruct();
@ -402,26 +440,30 @@ nsProfileAccess::FillProfileInfo()
profileItem->updateProfileEntry = PR_TRUE;
profileItem->profileName = profile;
profileItem->profileLocation = directory;
profileItem->isMigrated = isMigrated;
profileItem->profileName = NS_STATIC_CAST(const PRUnichar*, profile);
profileItem->profileLocation = NS_STATIC_CAST(const PRUnichar*, directory);
profileItem->isMigrated = NS_STATIC_CAST(const PRUnichar*, isMigrated);
if (NCProfileName)
profileItem->NCProfileName = NCProfileName;
profileItem->NCProfileName = NS_STATIC_CAST(const PRUnichar*, NCProfileName);
if (NCDeniedService)
profileItem->NCDeniedService = NCDeniedService;
profileItem->NCDeniedService = NS_STATIC_CAST(const PRUnichar*, NCDeniedService);
if (NCEmailAddress)
profileItem->NCEmailAddress = NCEmailAddress;
profileItem->NCEmailAddress = NS_STATIC_CAST(const PRUnichar*, NCEmailAddress);
if (NCHavePregInfo)
profileItem->NCHavePregInfo = NCHavePregInfo;
profileItem->NCHavePregInfo = NS_STATIC_CAST(const PRUnichar*, NCHavePregInfo);
if (nsAutoString(REGISTRY_YES_STRING).Equals(isMigrated))
mNumProfiles++;
else if (nsAutoString(REGISTRY_NO_STRING).Equals(isMigrated))
mNumOldProfiles++;
{
nsAutoString isMigratedAutoString(isMigrated);
if (isMigratedAutoString.EqualsWithConversion(REGISTRY_YES_STRING))
mNumProfiles++;
else if (isMigratedAutoString.EqualsWithConversion(REGISTRY_NO_STRING))
mNumOldProfiles++;
}
if (!mProfiles) {
mProfiles = new nsVoidArray();
@ -469,7 +511,7 @@ nsProfileAccess::GetNum4xProfiles(PRInt32 *numProfiles)
{
ProfileStruct* profileItem = (ProfileStruct *) (mProfiles->ElementAt(index));
if (profileItem->isMigrated == REGISTRY_NO_STRING)
if (profileItem->isMigrated.EqualsWithConversion(REGISTRY_NO_STRING))
{
(*numProfiles)++;
}
@ -510,7 +552,7 @@ nsProfileAccess::GetFirstProfile(PRUnichar **firstProfile)
{
ProfileStruct* profileItem = (ProfileStruct *) (mProfiles->ElementAt(index));
if (profileItem->isMigrated == REGISTRY_YES_STRING)
if (profileItem->isMigrated.EqualsWithConversion(REGISTRY_YES_STRING))
{
*firstProfile = profileItem->profileName.ToNewUnicode();
break;
@ -572,7 +614,7 @@ nsProfileAccess::RemoveSubTree(const PRUnichar* profileName)
{
ProfileStruct* profileItem = (ProfileStruct *) (mProfiles->ElementAt(index));
if (profileItem->isMigrated == REGISTRY_NO_STRING)
if (profileItem->isMigrated.EqualsWithConversion(REGISTRY_NO_STRING))
isOldProfile = PR_TRUE;
mProfiles->RemoveElementAt(index);
@ -586,7 +628,7 @@ nsProfileAccess::RemoveSubTree(const PRUnichar* profileName)
if (mCurrentProfile.Equals(profileName))
{
mCurrentProfile = "";
mCurrentProfile.SetLength(0);
}
}
}
@ -648,7 +690,9 @@ nsProfileAccess::FixRegEntry(PRUnichar** dirName)
descriptor.SetData(bigBuffer, bytesRead);
descriptor.GetData(decodedDirName);
*dirName = nsAutoString(decodedDirName).ToNewUnicode();
nsAutoString dirNameString;
dirNameString.AssignWithConversion(decodedDirName);
*dirName = dirNameString.ToNewUnicode();
}
}
@ -693,31 +737,45 @@ nsProfileAccess::UpdateRegistry()
nsRegistryKey profilesTreeKey;
// Get the major subtree
rv = m_registry->GetKey(nsIRegistry::Common,
nsAutoString(REGISTRY_PROFILE_SUBTREE_STRING).GetUnicode(),
&profilesTreeKey);
if (NS_FAILED(rv)) return rv;
{
nsAutoString registryProfileSubtreeString;
registryProfileSubtreeString.AssignWithConversion(REGISTRY_PROFILE_SUBTREE_STRING);
rv = m_registry->GetKey(nsIRegistry::Common,
registryProfileSubtreeString.GetUnicode(),
&profilesTreeKey);
if (NS_FAILED(rv)) return rv;
}
// Set the current profile
if (!mCurrentProfile.IsEmpty()) {
nsAutoString registry_current_profile_string;
registry_current_profile_string.AssignWithConversion(REGISTRY_CURRENT_PROFILE_STRING);
rv = m_registry->SetString(profilesTreeKey,
nsAutoString(REGISTRY_CURRENT_PROFILE_STRING).GetUnicode(),
registry_current_profile_string.GetUnicode(),
mCurrentProfile.GetUnicode());
if (NS_FAILED(rv)) return rv;
}
// Set the registry version
rv = m_registry->SetString(profilesTreeKey,
nsAutoString(REGISTRY_VERSION_STRING).GetUnicode(),
mVersion.GetUnicode());
if (NS_FAILED(rv)) return rv;
{
nsAutoString registry_version_string;
registry_version_string.AssignWithConversion(REGISTRY_VERSION_STRING);
rv = m_registry->SetString(profilesTreeKey,
registry_version_string.GetUnicode(),
mVersion.GetUnicode());
if (NS_FAILED(rv)) return rv;
}
// Set preg info
rv = m_registry->SetString(profilesTreeKey,
nsAutoString(REGISTRY_HAVE_PREG_INFO_STRING).GetUnicode(),
mHavePREGInfo.GetUnicode());
if (NS_FAILED(rv)) return rv;
{
nsAutoString registry_have_preg_info_string;
registry_have_preg_info_string.AssignWithConversion(REGISTRY_HAVE_PREG_INFO_STRING);
rv = m_registry->SetString(profilesTreeKey,
registry_have_preg_info_string.GetUnicode(),
mHavePREGInfo.GetUnicode());
if (NS_FAILED(rv)) return rv;
}
rv = m_registry->EnumerateSubtrees(profilesTreeKey, getter_AddRefs(enumKeys));
if (NS_FAILED(rv)) return rv;
@ -766,31 +824,55 @@ nsProfileAccess::UpdateRegistry()
rv = node->GetKey(&profKey);
if (NS_FAILED(rv)) return rv;
rv = m_registry->SetString(profKey,
nsAutoString(REGISTRY_DIRECTORY_STRING).GetUnicode(),
profileItem->profileLocation.GetUnicode());
if (NS_FAILED(rv)) return rv;
{
nsAutoString registry_directory_string;
registry_directory_string.AssignWithConversion(REGISTRY_DIRECTORY_STRING);
rv = m_registry->SetString(profKey,
registry_directory_string.GetUnicode(),
profileItem->profileLocation.GetUnicode());
if (NS_FAILED(rv)) return rv;
}
rv = m_registry->SetString(profKey,
nsAutoString(REGISTRY_MIGRATED_STRING).GetUnicode(),
profileItem->isMigrated.GetUnicode());
if (NS_FAILED(rv)) return rv;
{
nsAutoString registry_migrated_string;
registry_migrated_string.AssignWithConversion(REGISTRY_MIGRATED_STRING);
rv = m_registry->SetString(profKey,
registry_migrated_string.GetUnicode(),
profileItem->isMigrated.GetUnicode());
if (NS_FAILED(rv)) return rv;
}
rv = m_registry->SetString(profKey,
nsAutoString(REGISTRY_NC_PROFILE_NAME_STRING).GetUnicode(),
{
nsAutoString registry_nc_profile_name_string;
registry_nc_profile_name_string.AssignWithConversion(REGISTRY_NC_PROFILE_NAME_STRING);
m_registry->SetString(profKey,
registry_nc_profile_name_string.GetUnicode(),
profileItem->NCProfileName.GetUnicode());
}
rv = m_registry->SetString(profKey,
nsAutoString(REGISTRY_NC_SERVICE_DENIAL_STRING).GetUnicode(),
profileItem->NCDeniedService.GetUnicode());
{
nsAutoString registry_nc_service_denial_string;
registry_nc_service_denial_string.AssignWithConversion(REGISTRY_NC_SERVICE_DENIAL_STRING);
m_registry->SetString(profKey,
registry_nc_service_denial_string.GetUnicode(),
profileItem->NCDeniedService.GetUnicode());
}
rv = m_registry->SetString(profKey,
nsAutoString(REGISTRY_NC_USER_EMAIL_STRING).GetUnicode(),
profileItem->NCEmailAddress.GetUnicode());
{
nsAutoString registry_nc_user_email_string;
registry_nc_user_email_string.AssignWithConversion(REGISTRY_NC_USER_EMAIL_STRING);
m_registry->SetString(profKey,
registry_nc_user_email_string.GetUnicode(),
profileItem->NCEmailAddress.GetUnicode());
}
rv = m_registry->SetString(profKey,
nsAutoString(REGISTRY_NC_HAVE_PREG_INFO_STRING).GetUnicode(),
profileItem->NCHavePregInfo.GetUnicode());
{
nsAutoString registry_nc_have_preg_info_string;
registry_nc_have_preg_info_string.AssignWithConversion(REGISTRY_NC_HAVE_PREG_INFO_STRING);
m_registry->SetString(profKey,
registry_nc_have_preg_info_string.GetUnicode(),
profileItem->NCHavePregInfo.GetUnicode());
}
profileItem->updateProfileEntry = PR_FALSE;
}
@ -811,31 +893,55 @@ nsProfileAccess::UpdateRegistry()
&profKey);
if (NS_FAILED(rv)) return rv;
rv = m_registry->SetString(profKey,
nsAutoString(REGISTRY_DIRECTORY_STRING).GetUnicode(),
profileItem->profileLocation.GetUnicode());
if (NS_FAILED(rv)) return rv;
{
nsAutoString registry_directory_string;
registry_directory_string.AssignWithConversion(REGISTRY_DIRECTORY_STRING);
m_registry->SetString(profKey,
registry_directory_string.GetUnicode(),
profileItem->profileLocation.GetUnicode());
if (NS_FAILED(rv)) return rv;
}
rv = m_registry->SetString(profKey,
nsAutoString(REGISTRY_MIGRATED_STRING).GetUnicode(),
profileItem->isMigrated.GetUnicode());
if (NS_FAILED(rv)) return rv;
{
nsAutoString registry_migrated_string;
registry_migrated_string.AssignWithConversion(REGISTRY_MIGRATED_STRING);
rv = m_registry->SetString(profKey,
registry_migrated_string.GetUnicode(),
profileItem->isMigrated.GetUnicode());
if (NS_FAILED(rv)) return rv;
}
rv = m_registry->SetString(profKey,
nsAutoString(REGISTRY_NC_PROFILE_NAME_STRING).GetUnicode(),
profileItem->NCProfileName.GetUnicode());
{
nsAutoString registry_nc_profile_name_string;
registry_nc_profile_name_string.AssignWithConversion(REGISTRY_NC_PROFILE_NAME_STRING);
m_registry->SetString(profKey,
registry_nc_profile_name_string.GetUnicode(),
profileItem->NCProfileName.GetUnicode());
}
rv = m_registry->SetString(profKey,
nsAutoString(REGISTRY_NC_SERVICE_DENIAL_STRING).GetUnicode(),
profileItem->NCDeniedService.GetUnicode());
{
nsAutoString registry_nc_service_denial_string;
registry_nc_service_denial_string.AssignWithConversion(REGISTRY_NC_SERVICE_DENIAL_STRING);
m_registry->SetString(profKey,
registry_nc_service_denial_string.GetUnicode(),
profileItem->NCDeniedService.GetUnicode());
}
rv = m_registry->SetString(profKey,
nsAutoString(REGISTRY_NC_USER_EMAIL_STRING).GetUnicode(),
profileItem->NCEmailAddress.GetUnicode());
{
nsAutoString registry_nc_user_email_string;
registry_nc_user_email_string.AssignWithConversion(REGISTRY_NC_USER_EMAIL_STRING);
m_registry->SetString(profKey,
registry_nc_user_email_string.GetUnicode(),
profileItem->NCEmailAddress.GetUnicode());
}
rv = m_registry->SetString(profKey,
nsAutoString(REGISTRY_NC_HAVE_PREG_INFO_STRING).GetUnicode(),
profileItem->NCHavePregInfo.GetUnicode());
{
nsAutoString registry_nc_have_preg_info_string;
registry_nc_have_preg_info_string.AssignWithConversion(REGISTRY_NC_HAVE_PREG_INFO_STRING);
m_registry->SetString(profKey,
registry_nc_have_preg_info_string.GetUnicode(),
profileItem->NCHavePregInfo.GetUnicode());
}
profileItem->updateProfileEntry = PR_FALSE;
}
@ -855,7 +961,7 @@ nsProfileAccess::GetProfileList(PRUnichar **profileListStr)
{
NS_ASSERTION(profileListStr, "Invalid profileListStr pointer");
nsAutoString profileList("");
nsAutoString profileList;
for (PRInt32 index=0; index < mCount; index++)
{
@ -863,12 +969,12 @@ nsProfileAccess::GetProfileList(PRUnichar **profileListStr)
if (index != 0)
{
profileList += ",";
profileList.AppendWithConversion(",");
}
profileList += profileItem->profileName;
if (profileItem->isMigrated == REGISTRY_NO_STRING)
profileList += " - migrate";
if (profileItem->isMigrated.EqualsWithConversion(REGISTRY_NO_STRING))
profileList.AppendWithConversion(" - migrate");
}
*profileListStr = profileList.ToNewUnicode();
@ -975,14 +1081,14 @@ nsProfileAccess::Get4xProfileInfo(const char *registryName)
// For example something like %20 would probably be interpreted as a space
// There is some problem I guess in sending a space as itself
nsAutoString unescpPrfName(nsUnescape
(NS_CONST_CAST
(char*, nsCAutoString(profile).GetBuffer())));
nsCAutoString temp; temp.AssignWithConversion(profile);
nsAutoString unescpPrfName;
unescpPrfName.AssignWithConversion(nsUnescape( NS_CONST_CAST(char*, temp.GetBuffer()) ));
profileItem->profileName = unescpPrfName;
profileItem->profileLocation = nsAutoString(profLoc);
profileItem->isMigrated = REGISTRY_NO_STRING;
profileItem->profileLocation.AssignWithConversion(profLoc);
profileItem->isMigrated.AssignWithConversion(REGISTRY_NO_STRING);
if (!m4xProfiles)
m4xProfiles = new nsVoidArray();
@ -1105,7 +1211,7 @@ nsProfileAccess::UpdateProfileArray()
if (NS_SUCCEEDED(rv) && profileDirString)
{
profileItem->profileLocation = profileDirString;
profileItem->profileLocation.AssignWithConversion(profileDirString);
SetValue(profileItem);
}
}
@ -1120,7 +1226,7 @@ nsProfileAccess::SetPREGInfo(const char* pregInfo)
NS_ASSERTION(pregInfo, "Invalid pregInfo");
// This is always going to be just a yes/no string
mHavePREGInfo = pregInfo;
mHavePREGInfo.AssignWithConversion(pregInfo);
}
//Get the for PREG info.