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

convert to CreateInstanceFromProgID

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@46050 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
shaver%netscape.com 1999-09-05 06:42:13 +00:00
parent a80b5e4304
commit b425a58416
1 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
mozilla/netwerk/streamconv/src/nsStreamConverterService.cpp
View File

@ -485,8 +485,9 @@ nsStreamConverterService::Convert(nsIInputStream *aFromStream,
if (NS_FAILED(rv)) return rv;
nsISupports *converter = nsnull;
rv = comMgr->CreateInstance(cProgID, nsnull,
NS_GET_IID(nsIStreamConverter), (void**)&converter);
rv = comMgr->CreateInstanceByProgID(cProgID, nsnull,
NS_GET_IID(nsIStreamConverter),
(void**)&converter);
if (NS_FAILED(rv)) {
// couldn't go direct, let's try walking the graph of converters.
rv = BuildGraph();
@ -515,8 +516,9 @@ nsStreamConverterService::Convert(nsIInputStream *aFromStream,
nsCString *progIDStr = (nsCString*)converterChain->ElementAt(i);
const char *lProgID = progIDStr->GetBuffer();
rv = comMgr->CreateInstance(lProgID, nsnull,
NS_GET_IID(nsIStreamConverter), (void**)&converter);
rv = comMgr->CreateInstanceByProgID(lProgID, nsnull,
NS_GET_IID(nsIStreamConverter),
(void**)&converter);
if (NS_FAILED(rv)) {
// clean up the array.
@ -596,8 +598,9 @@ nsStreamConverterService::AsyncConvertData(const PRUnichar *aFromType,
if (NS_FAILED(rv)) return rv;
nsISupports *converter = nsnull;
rv = comMgr->CreateInstance(cProgID, nsnull,
NS_GET_IID(nsIStreamConverter), (void**)&converter);
rv = comMgr->CreateInstanceByProgID(cProgID, nsnull,
NS_GET_IID(nsIStreamConverter),
(void**)&converter);
if (NS_FAILED(rv)) {
// couldn't go direct, let's try walking the graph of converters.
rv = BuildGraph();
@ -626,8 +629,9 @@ nsStreamConverterService::AsyncConvertData(const PRUnichar *aFromType,
nsCString *progIDStr = (nsCString*)converterChain->ElementAt(i);
const char *lProgID = progIDStr->GetBuffer();
rv = comMgr->CreateInstance(lProgID, nsnull,
NS_GET_IID(nsIStreamConverter), (void**)&converter);
rv = comMgr->CreateInstanceByProgID(lProgID, nsnull,
NS_GET_IID(nsIStreamConverter),
(void**)&converter);
NS_ASSERTION(NS_SUCCEEDED(rv), "graph construction problem, built a progid that wasn't registered");
nsCString fromStr, toStr;