Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixing code that relied on implicit string construction

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@76724 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
scc%mozilla.org
2000-08-19 21:44:26 +00:00
parent b25c1e798c
commit 3dc16d7d10
2 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
mozilla/modules/plugin/base/src/nsPluginHostImpl.cpp
View File

@@ -1579,7 +1579,7 @@ NS_IMETHODIMP nsPluginHostImpl::RegisterPlugin(REFNSIID aCID,
rv = registry->OpenWellKnownRegistry(nsIRegistry::ApplicationComponentRegistry);
if (NS_FAILED(rv)) return rv;
nsCAutoString path = "software/plugins/";
nsCAutoString path("software/plugins/");
char* cid = aCID.ToString();
if (! cid)
return NS_ERROR_OUT_OF_MEMORY;
@@ -1619,7 +1619,7 @@ NS_IMETHODIMP nsPluginHostImpl::UnregisterPlugin(REFNSIID aCID)
rv = registry->OpenWellKnownRegistry(nsIRegistry::ApplicationComponentRegistry);
if (NS_FAILED(rv)) return rv;
nsCAutoString path = "software/plugins/";
nsCAutoString path("software/plugins/");
char* cid = aCID.ToString();
if (! cid)
return NS_ERROR_OUT_OF_MEMORY;
@@ -2138,7 +2138,7 @@ nsresult nsPluginHostImpl::RegisterPluginMimeTypesWithLayout(nsPluginTag * plugi
{
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];
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
// plugin's CID, and then navigate through the XPCOM registry to
// pull out the DLL name to which the CID is registered.
nsAutoString path = NS_LITERAL_STRING("software/mozilla/XPCOM/classID/");
path += NS_ConvertASCIItoUCS2(aCID);
nsAutoString path;
path = NS_LITERAL_STRING("software/mozilla/XPCOM/classID/") + NS_ConvertASCIItoUCS2(aCID);
nsRegistryKey cidKey;
rv = aRegistry->GetKey(nsIRegistry::Common, path.GetUnicode(), &cidKey);

10
mozilla/modules/plugin/nglsrc/nsPluginHostImpl.cpp
View File

@@ -1579,7 +1579,7 @@ NS_IMETHODIMP nsPluginHostImpl::RegisterPlugin(REFNSIID aCID,
rv = registry->OpenWellKnownRegistry(nsIRegistry::ApplicationComponentRegistry);
if (NS_FAILED(rv)) return rv;
nsCAutoString path = "software/plugins/";
nsCAutoString path("software/plugins/");
char* cid = aCID.ToString();
if (! cid)
return NS_ERROR_OUT_OF_MEMORY;
@@ -1619,7 +1619,7 @@ NS_IMETHODIMP nsPluginHostImpl::UnregisterPlugin(REFNSIID aCID)
rv = registry->OpenWellKnownRegistry(nsIRegistry::ApplicationComponentRegistry);
if (NS_FAILED(rv)) return rv;
nsCAutoString path = "software/plugins/";
nsCAutoString path("software/plugins/");
char* cid = aCID.ToString();
if (! cid)
return NS_ERROR_OUT_OF_MEMORY;
@@ -2138,7 +2138,7 @@ nsresult nsPluginHostImpl::RegisterPluginMimeTypesWithLayout(nsPluginTag * plugi
{
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];
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
// plugin's CID, and then navigate through the XPCOM registry to
// pull out the DLL name to which the CID is registered.
nsAutoString path = NS_LITERAL_STRING("software/mozilla/XPCOM/classID/");
path += NS_ConvertASCIItoUCS2(aCID);
nsAutoString path;
path = NS_LITERAL_STRING("software/mozilla/XPCOM/classID/") + NS_ConvertASCIItoUCS2(aCID);
nsRegistryKey cidKey;
rv = aRegistry->GetKey(nsIRegistry::Common, path.GetUnicode(), &cidKey);