зеркало из https://github.com/mozilla/gecko-dev.git
we think the fix is in to support the original form, so back to the original form we go
This commit is contained in:
Родитель
61b03233b8
Коммит
daa61fe5b5
|
@ -2951,11 +2951,7 @@ 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;
|
nsAutoString path(NS_LITERAL_STRING("software/mozilla/XPCOM/classID/") + NS_ConvertUCS2toASCII(aCID));
|
||||||
path.AppendWithConversion("software/mozilla/XPCOM/classID/");
|
|
||||||
path.AppendWithConversion(aCID);
|
|
||||||
// this contortion to append is a hack until I can figure out why the right |operator+| is not found
|
|
||||||
// and/or why it doesn't know what a |nsPromiseConcatenation| is ... on some platforms
|
|
||||||
|
|
||||||
nsRegistryKey cidKey;
|
nsRegistryKey cidKey;
|
||||||
rv = aRegistry->GetKey(nsIRegistry::Common, path.GetUnicode(), &cidKey);
|
rv = aRegistry->GetKey(nsIRegistry::Common, path.GetUnicode(), &cidKey);
|
||||||
|
|
|
@ -2951,11 +2951,7 @@ 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;
|
nsAutoString path(NS_LITERAL_STRING("software/mozilla/XPCOM/classID/") + NS_ConvertUCS2toASCII(aCID));
|
||||||
path.AppendWithConversion("software/mozilla/XPCOM/classID/");
|
|
||||||
path.AppendWithConversion(aCID);
|
|
||||||
// this contortion to append is a hack until I can figure out why the right |operator+| is not found
|
|
||||||
// and/or why it doesn't know what a |nsPromiseConcatenation| is ... on some platforms
|
|
||||||
|
|
||||||
nsRegistryKey cidKey;
|
nsRegistryKey cidKey;
|
||||||
rv = aRegistry->GetKey(nsIRegistry::Common, path.GetUnicode(), &cidKey);
|
rv = aRegistry->GetKey(nsIRegistry::Common, path.GetUnicode(), &cidKey);
|
||||||
|
|
Загрузка…
Ссылка в новой задаче