Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-02-06 06:22:33 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

The remaining fix for international characters in component names.

Browse Source
This commit is contained in:
rayw%netscape.com 2000-05-15 17:26:18 +00:00
parent 4db0a36e74
commit 6e8adc1631
1 changed files with 53 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
js/src/xpconnect/loader/mozJSComponentLoader.cpp
View File

@ -412,13 +412,26 @@ nsresult
mozJSComponentLoader::SetRegistryInfo(const char *registryLocation,
nsIFile *component)
{
nsresult rv;
if (!mRegistry.get())
return NS_OK; // silent failure
nsresult rv;
PRUint32 length = strlen(registryLocation);
char* eRegistryLocation;
rv = mRegistry->EscapeKey((PRUint8*)registryLocation, 1, &length, (PRUint8**)&eRegistryLocation);
if (rv != NS_OK)
{
return rv;
}
if (eRegistryLocation == nsnull) // No escaping required
eRegistryLocation = (char*)registryLocation;
nsRegistryKey key;
rv = mRegistry->AddSubtreeRaw(mXPCOMKey, registryLocation, &key);
rv = mRegistry->AddSubtreeRaw(mXPCOMKey, eRegistryLocation, &key);
if (registryLocation != eRegistryLocation)
nsAllocator::Free(eRegistryLocation);
if (NS_FAILED(rv))
return rv;
@ -431,6 +444,8 @@ mozJSComponentLoader::SetRegistryInfo(const char *registryLocation,
PRInt64 fileSize;
if (NS_FAILED(rv = component->GetFileSize(&fileSize)) ||
NS_FAILED(rv = mRegistry->SetLongLong(key, fileSizeValueName, &fileSize)))
if (registryLocation != eRegistryLocation)
nsAllocator::Free(eRegistryLocation);
return rv;
#ifdef DEBUG_shaver_off
@ -447,20 +462,53 @@ mozJSComponentLoader::RemoveRegistryInfo(const char *registryLocation)
if (!mRegistry.get())
return NS_OK; // silent failure
return mRegistry->RemoveSubtree(mXPCOMKey, registryLocation);
nsresult rv;
if (!mRegistry.get())
return NS_OK; // silent failure
PRUint32 length = strlen(registryLocation);
char* eRegistryLocation;
rv = mRegistry->EscapeKey((PRUint8*)registryLocation, 1, &length, (PRUint8**)&eRegistryLocation);
if (rv != NS_OK)
{
return rv;
}
if (eRegistryLocation == nsnull) // No escaping required
eRegistryLocation = (char*)registryLocation;
rv = mRegistry->RemoveSubtree(mXPCOMKey, eRegistryLocation);
if (registryLocation != eRegistryLocation)
nsAllocator::Free(eRegistryLocation);
return rv;
}
PRBool
mozJSComponentLoader::HasChanged(const char *registryLocation,
nsIFile *component)
{
/* if we don't have a registry handle, force registration of component */
if (!mRegistry)
return PR_TRUE;
nsresult rv;
PRUint32 length = strlen(registryLocation);
char* eRegistryLocation;
rv = mRegistry->EscapeKey((PRUint8*)registryLocation, 1, &length, (PRUint8**)&eRegistryLocation);
if (rv != NS_OK)
{
return rv;
}
if (eRegistryLocation == nsnull) // No escaping required
eRegistryLocation = (char*)registryLocation;
nsRegistryKey key;
if (NS_FAILED(mRegistry->GetSubtreeRaw(mXPCOMKey, registryLocation, &key)))
int r = NS_FAILED(mRegistry->GetSubtreeRaw(mXPCOMKey, eRegistryLocation, &key));
if (registryLocation != eRegistryLocation)
nsAllocator::Free(eRegistryLocation);
if (r)
return PR_TRUE;
/* check modification date */