mozilla
/
pjs
зеркало из https://github.com/mozilla/pjs.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

fixing code that relied on implicit string construction

This commit is contained in:
scc%mozilla.org 2000-08-19 21:44:26 +00:00
Родитель 6a657f7eaa
Коммит 8b37e3ee88
2 изменённых файлов: 10 добавлений и 10 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

10
modules/plugin/base/src/nsPluginHostImpl.cpp
Просмотреть файл

@ -1579,7 +1579,7 @@ NS_IMETHODIMP nsPluginHostImpl::RegisterPlugin(REFNSIID aCID,
rv = registry->OpenWellKnownRegistry(nsIRegistry::ApplicationComponentRegistry); rv = registry->OpenWellKnownRegistry(nsIRegistry::ApplicationComponentRegistry);
if (NS_FAILED(rv)) return rv; if (NS_FAILED(rv)) return rv;
nsCAutoString path = "software/plugins/"; nsCAutoString path("software/plugins/");
char* cid = aCID.ToString(); char* cid = aCID.ToString();
if (! cid) if (! cid)
return NS_ERROR_OUT_OF_MEMORY; return NS_ERROR_OUT_OF_MEMORY;
@ -1619,7 +1619,7 @@ NS_IMETHODIMP nsPluginHostImpl::UnregisterPlugin(REFNSIID aCID)
rv = registry->OpenWellKnownRegistry(nsIRegistry::ApplicationComponentRegistry); rv = registry->OpenWellKnownRegistry(nsIRegistry::ApplicationComponentRegistry);
if (NS_FAILED(rv)) return rv; if (NS_FAILED(rv)) return rv;
nsCAutoString path = "software/plugins/"; nsCAutoString path("software/plugins/");
char* cid = aCID.ToString(); char* cid = aCID.ToString();
if (! cid) if (! cid)
return NS_ERROR_OUT_OF_MEMORY; return NS_ERROR_OUT_OF_MEMORY;
@ -2138,7 +2138,7 @@ nsresult nsPluginHostImpl::RegisterPluginMimeTypesWithLayout(nsPluginTag * plugi
{ {
static NS_DEFINE_CID(kPluginDocLoaderFactoryCID, NS_PLUGINDOCLOADERFACTORY_CID); static NS_DEFINE_CID(kPluginDocLoaderFactoryCID, NS_PLUGINDOCLOADERFACTORY_CID);
nsCAutoString progid = NS_DOCUMENT_LOADER_FACTORY_PROGID_PREFIX "view/"; nsCAutoString progid(NS_DOCUMENT_LOADER_FACTORY_PROGID_PREFIX "view/");
progid += pluginTag->mMimeTypeArray[i]; progid += pluginTag->mMimeTypeArray[i];
rv = compManager->RegisterComponentSpec(kPluginDocLoaderFactoryCID, rv = compManager->RegisterComponentSpec(kPluginDocLoaderFactoryCID,
@ -2952,8 +2952,8 @@ LoadXPCOMPlugin(nsIComponentManager* aComponentManager,
// To figure out the filename of the plugin, we'll need to get the // To figure out the filename of the plugin, we'll need to get the
// plugin's CID, and then navigate through the XPCOM registry to // plugin's CID, and then navigate through the XPCOM registry to
// pull out the DLL name to which the CID is registered. // pull out the DLL name to which the CID is registered.
nsAutoString path = NS_LITERAL_STRING("software/mozilla/XPCOM/classID/"); nsAutoString path;
path += NS_ConvertASCIItoUCS2(aCID); path = NS_LITERAL_STRING("software/mozilla/XPCOM/classID/") + NS_ConvertASCIItoUCS2(aCID);
nsRegistryKey cidKey; nsRegistryKey cidKey;
rv = aRegistry->GetKey(nsIRegistry::Common, path.GetUnicode(), &cidKey); rv = aRegistry->GetKey(nsIRegistry::Common, path.GetUnicode(), &cidKey);

10
modules/plugin/nglsrc/nsPluginHostImpl.cpp
Просмотреть файл

@ -1579,7 +1579,7 @@ NS_IMETHODIMP nsPluginHostImpl::RegisterPlugin(REFNSIID aCID,
rv = registry->OpenWellKnownRegistry(nsIRegistry::ApplicationComponentRegistry); rv = registry->OpenWellKnownRegistry(nsIRegistry::ApplicationComponentRegistry);
if (NS_FAILED(rv)) return rv; if (NS_FAILED(rv)) return rv;
nsCAutoString path = "software/plugins/"; nsCAutoString path("software/plugins/");
char* cid = aCID.ToString(); char* cid = aCID.ToString();
if (! cid) if (! cid)
return NS_ERROR_OUT_OF_MEMORY; return NS_ERROR_OUT_OF_MEMORY;
@ -1619,7 +1619,7 @@ NS_IMETHODIMP nsPluginHostImpl::UnregisterPlugin(REFNSIID aCID)
rv = registry->OpenWellKnownRegistry(nsIRegistry::ApplicationComponentRegistry); rv = registry->OpenWellKnownRegistry(nsIRegistry::ApplicationComponentRegistry);
if (NS_FAILED(rv)) return rv; if (NS_FAILED(rv)) return rv;
nsCAutoString path = "software/plugins/"; nsCAutoString path("software/plugins/");
char* cid = aCID.ToString(); char* cid = aCID.ToString();
if (! cid) if (! cid)
return NS_ERROR_OUT_OF_MEMORY; return NS_ERROR_OUT_OF_MEMORY;
@ -2138,7 +2138,7 @@ nsresult nsPluginHostImpl::RegisterPluginMimeTypesWithLayout(nsPluginTag * plugi
{ {
static NS_DEFINE_CID(kPluginDocLoaderFactoryCID, NS_PLUGINDOCLOADERFACTORY_CID); static NS_DEFINE_CID(kPluginDocLoaderFactoryCID, NS_PLUGINDOCLOADERFACTORY_CID);
nsCAutoString progid = NS_DOCUMENT_LOADER_FACTORY_PROGID_PREFIX "view/"; nsCAutoString progid(NS_DOCUMENT_LOADER_FACTORY_PROGID_PREFIX "view/");
progid += pluginTag->mMimeTypeArray[i]; progid += pluginTag->mMimeTypeArray[i];
rv = compManager->RegisterComponentSpec(kPluginDocLoaderFactoryCID, rv = compManager->RegisterComponentSpec(kPluginDocLoaderFactoryCID,
@ -2952,8 +2952,8 @@ LoadXPCOMPlugin(nsIComponentManager* aComponentManager,
// To figure out the filename of the plugin, we'll need to get the // To figure out the filename of the plugin, we'll need to get the
// plugin's CID, and then navigate through the XPCOM registry to // plugin's CID, and then navigate through the XPCOM registry to
// pull out the DLL name to which the CID is registered. // pull out the DLL name to which the CID is registered.
nsAutoString path = NS_LITERAL_STRING("software/mozilla/XPCOM/classID/"); nsAutoString path;
path += NS_ConvertASCIItoUCS2(aCID); path = NS_LITERAL_STRING("software/mozilla/XPCOM/classID/") + NS_ConvertASCIItoUCS2(aCID);
nsRegistryKey cidKey; nsRegistryKey cidKey;
rv = aRegistry->GetKey(nsIRegistry::Common, path.GetUnicode(), &cidKey); rv = aRegistry->GetKey(nsIRegistry::Common, path.GetUnicode(), &cidKey);