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

fix to mal-formed contract id introduced in mega-check-in:x

This commit is contained in:
rayw%netscape.com 2000-09-14 04:18:07 +00:00
Родитель d26db63cdc
Коммит 52476868db
5 изменённых файлов: 11 добавлений и 7 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

2
directory/xpcom/datasource/nsLDAPDataSource.js
Просмотреть файл

@ -66,7 +66,7 @@ ArrayEnumerator.prototype = {
// the datasource object itself // the datasource object itself
// //
const NS_LDAPDATASOURCE_CONTRACTID = const NS_LDAPDATASOURCE_CONTRACTID =
'@mozilla.org/rdf/datasource;1?name=?name=ldap'; '@mozilla.org/rdf/datasource;1?name=ldap';
const NS_LDAPDATASOURCE_CID = const NS_LDAPDATASOURCE_CID =
Components.ID('{8da18684-6486-4a7e-b261-35331f3e7163}'); Components.ID('{8da18684-6486-4a7e-b261-35331f3e7163}');

8
js/src/xpconnect/tests/js/old/xpctest_enum_create.js
Просмотреть файл

@ -140,7 +140,7 @@ var contractIDsTo_NOT_Create = [
// fixed "@mozilla.org/addressbook/directoryproperty;1", // fails to init refcount // fixed "@mozilla.org/addressbook/directoryproperty;1", // fails to init refcount
// fixed "@mozilla.org/rdf/datasource;1?name=local-store", //NS_NewLocalStore calls stuff that asserts // fixed "@mozilla.org/rdf/datasource;1?name=local-store", //NS_NewLocalStore calls stuff that asserts
// fixed "@mozilla.org/rdf/datasource;1?name=?name=xpinstall-update-notifier", //RDFXMLDataSourceImpl::Refresh does CreateInstance of parser but fails to check the result (I think I've seen this elsewhere) // fixed "@mozilla.org/rdf/datasource;1?name=xpinstall-update-notifier", //RDFXMLDataSourceImpl::Refresh does CreateInstance of parser but fails to check the result (I think I've seen this elsewhere)
// fixed "@mozilla.org/rdf/xul-template-builder;1", //RDFXMLDataSourceImpl::Refresh does CreateInstance of parser but fails to check the result (I think I've seen this elsewhere) // fixed "@mozilla.org/rdf/xul-template-builder;1", //RDFXMLDataSourceImpl::Refresh does CreateInstance of parser but fails to check the result (I think I've seen this elsewhere)
// fixed "@mozilla.org/rdf/xul-content-sink;1", // nsXULContentSink.cpp, XULContentSinkImpl::XULContentSinkImpl needs to init mNameSpaceManager // fixed "@mozilla.org/rdf/xul-content-sink;1", // nsXULContentSink.cpp, XULContentSinkImpl::XULContentSinkImpl needs to init mNameSpaceManager
@ -164,15 +164,15 @@ var contractIDsTo_NOT_Create = [
/* BUG 11512 */ "@mozilla.org/rdf/datasource;1?name=files", // FileSystemDataSource::~FileSystemDataSource calls gRDFService->UnregisterDataSource(this); even though it was not registered /* BUG 11512 */ "@mozilla.org/rdf/datasource;1?name=files", // FileSystemDataSource::~FileSystemDataSource calls gRDFService->UnregisterDataSource(this); even though it was not registered
/* BUG 11512 */ "@mozilla.org/rdf/datasource;1?name=?name=find", // FindDataSource::~FindDataSource calls gRDFService->UnregisterDataSource(this) even if it was not actaully registered. /* BUG 11512 */ "@mozilla.org/rdf/datasource;1?name=find", // FindDataSource::~FindDataSource calls gRDFService->UnregisterDataSource(this) even if it was not actaully registered.
/* BUG 11514 */ "@mozilla.org/rdf/datasource;1?name=?name=msgaccounts", // nsMsgAccountDataSource::QueryInterface is COMPLETELY <censor>screwed</censor> up /* BUG 11514 */ "@mozilla.org/rdf/datasource;1?name=msgaccounts", // nsMsgAccountDataSource::QueryInterface is COMPLETELY <censor>screwed</censor> up
/* BUG 11516 */ "@mozilla.org/rdf/xul-sort-service;1", // XULSortServiceImpl releases itself in its own destructor! /* BUG 11516 */ "@mozilla.org/rdf/xul-sort-service;1", // XULSortServiceImpl releases itself in its own destructor!
/* BUG 11570 */ "componment://netscape/intl/charsetconvertermanager", // another case where CreateInstance returned NS_OK, but the instance pointer was null! /* BUG 11570 */ "componment://netscape/intl/charsetconvertermanager", // another case where CreateInstance returned NS_OK, but the instance pointer was null!
/* BUG 11571 */ "@mozilla.org/rdf/datasource;1?name=?name=mail-messageview", // nsMessageViewDataSource::RemoveDataSource uses mDataSource without checking for validity /* BUG 11571 */ "@mozilla.org/rdf/datasource;1?name=mail-messageview", // nsMessageViewDataSource::RemoveDataSource uses mDataSource without checking for validity
/* BUG 11575 */ "@mozilla.org/rdf/resource-factory;1", // calling a property - trying to copy a null value in nsRDFResource::GetValue /* BUG 11575 */ "@mozilla.org/rdf/resource-factory;1", // calling a property - trying to copy a null value in nsRDFResource::GetValue

2
mailnews/base/resources/content/mailWindow.js
Просмотреть файл

@ -44,7 +44,7 @@ var mailSession;
var Bundle; var Bundle;
var BrandBundle; var BrandBundle;
var datasourceContractIDPrefix = "@mozilla.org/rdf/datasource;1?name=?name="; var datasourceContractIDPrefix = "@mozilla.org/rdf/datasource;1?name=";
var accountManagerDSContractID = datasourceContractIDPrefix + "msgaccountmanager"; var accountManagerDSContractID = datasourceContractIDPrefix + "msgaccountmanager";
var folderDSContractID = datasourceContractIDPrefix + "mailnewsfolders"; var folderDSContractID = datasourceContractIDPrefix + "mailnewsfolders";
var messageDSContractID = datasourceContractIDPrefix + "mailnewsmessages"; var messageDSContractID = datasourceContractIDPrefix + "mailnewsmessages";

2
mailnews/base/search/resources/content/SearchDialog.js
Просмотреть файл

@ -18,7 +18,7 @@
* Rights Reserved. * Rights Reserved.
*/ */
var rdfDatasourcePrefix = "@mozilla.org/rdf/datasource;1?name=?name="; var rdfDatasourcePrefix = "@mozilla.org/rdf/datasource;1?name=";
var rdfServiceContractID = "@mozilla.org/rdf/rdf-service;1"; var rdfServiceContractID = "@mozilla.org/rdf/rdf-service;1";
var searchSessionContractID = "@mozilla.org/messenger/searchSession;1"; var searchSessionContractID = "@mozilla.org/messenger/searchSession;1";
var folderDSContractID = rdfDatasourcePrefix + "mailnewsfolders"; var folderDSContractID = rdfDatasourcePrefix + "mailnewsfolders";

4
xpcom/components/nsComponentManager.cpp
Просмотреть файл

@ -1119,6 +1119,10 @@ nsComponentManagerImpl::ContractIDToClassID(const char *aContractID, nsCID *aCla
} }
#endif /* USE_REGISTRY */ #endif /* USE_REGISTRY */
if (PL_strcmp(aContractID, "@mozilla.org/rdf/datasource") == 0)
{
PR_ASSERT(false);
}
if (PR_LOG_TEST(nsComponentManagerLog, PR_LOG_ALWAYS)) { if (PR_LOG_TEST(nsComponentManagerLog, PR_LOG_ALWAYS)) {
char *buf = 0; char *buf = 0;
if (NS_SUCCEEDED(res)) if (NS_SUCCEEDED(res))