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

latest testembed update

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@103630 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
depstein%netscape.com
2001-09-24 19:40:00 +00:00
parent ba76f4b35a
commit debe294f3b
19 changed files with 125 additions and 1391 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
mozilla/embedding/qa/testembed/winEmbedFileLocProvider.cpp
View File

@@ -167,14 +167,9 @@ NS_METHOD winEmbedFileLocProvider::CloneMozBinDirectory(nsILocalFile **aLocalFil
// This will be set if a directory was passed to NS_InitXPCOM
// 2. If that doesn't work, set it to be the current process directory
<<<<<<< winEmbedFileLocProvider.cpp
// NS_WITH_SERVICE(nsIProperties, directoryService, NS_DIRECTORY_SERVICE_CONTRACTID, &rv);
nsCOMPtr<nsIProperties> directoryService(do_GetService(NS_DIRECTORY_SERVICE_CONTRACTID,&rv));
=======
nsCOMPtr<nsIProperties> directoryService =
do_GetService(NS_DIRECTORY_SERVICE_CONTRACTID, &rv);
>>>>>>> 1.4
if (NS_FAILED(rv))
return rv;
@@ -213,14 +208,9 @@ NS_METHOD winEmbedFileLocProvider::GetProductDirectory(nsILocalFile **aLocalFile
PRBool exists;
nsCOMPtr<nsILocalFile> localDir;
<<<<<<< winEmbedFileLocProvider.cpp
//NS_WITH_SERVICE(nsIProperties, directoryService, NS_DIRECTORY_SERVICE_CONTRACTID, &rv);
nsCOMPtr<nsIProperties> directoryService(do_GetService(NS_DIRECTORY_SERVICE_CONTRACTID,&rv));
=======
nsCOMPtr<nsIProperties> directoryService =
do_GetService(NS_DIRECTORY_SERVICE_CONTRACTID, &rv);
>>>>>>> 1.4
if (NS_FAILED(rv)) return rv;
rv = directoryService->Get(NS_WIN_APPDATA_DIR, NS_GET_IID(nsILocalFile), getter_AddRefs(localDir));
if (NS_SUCCEEDED(rv))