corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 295247 - Allow extensions to ship plugin DLLs, part 1 - r=darin a=shaver

Browse Source
This commit is contained in:
bsmedberg@covad.net
2005-06-02 13:29:04 +00:00
parent 4f058f471c
commit abdabfdc87
3 changed files with 26 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
xpcom/io/nsDirectoryService.cpp
View File

@@ -43,6 +43,7 @@
#include "nsLocalFile.h"
#include "nsDebug.h"
#include "nsStaticAtom.h"
#include "nsEnumeratorUtils.h"
#if defined(XP_MAC)
#include <Folders.h>
@@ -582,10 +583,25 @@ static PRBool FindProviderFile(nsISupports* aElement, void *aData)
nsCOMPtr<nsIDirectoryServiceProvider2> prov2 = do_QueryInterface(aElement);
if (prov2)
{
rv = prov2->GetFiles(fileData->property, (nsISimpleEnumerator **)&fileData->data);
if (NS_SUCCEEDED(rv) && fileData->data) {
fileData->persistent = PR_FALSE; // Enumerators can never be peristent
return PR_FALSE;
nsCOMPtr<nsISimpleEnumerator> newFiles;
rv = prov2->GetFiles(fileData->property, getter_AddRefs(newFiles));
if (NS_SUCCEEDED(rv) && newFiles) {
if (fileData->data) {
nsCOMPtr<nsISimpleEnumerator> unionFiles;
NS_NewUnionEnumerator(getter_AddRefs(unionFiles),
(nsISimpleEnumerator*) fileData->data, newFiles);
if (unionFiles)
unionFiles.swap(* (nsISimpleEnumerator**) &fileData->data);
}
else
{
NS_ADDREF(fileData->data = newFiles);
}
fileData->persistent = PR_FALSE; // Enumerators can never be persistent
return rv == NS_SUCCESS_AGGREGATE_RESULT;
}
}
}