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

#279773

Browse Source 
r=mkaply
Patch from Peter Weilbacher - Firefox isn't coming up on OS/2


git-svn-id: svn://10.0.0.236/trunk@168441 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
mkaply%us.ibm.com
2005-01-28 16:03:20 +00:00
parent 34415cfe9c
commit 4e13e3adda
2 changed files with 33 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
mozilla/toolkit/components/commandlines/src/nsCommandLine.cpp
View File

@@ -64,6 +64,8 @@
#include <Directory.h>
#elif defined(XP_UNIX)
#include <unistd.h>
#elif defined(XP_OS2)
#include <os2.h>
#endif
#ifdef DEBUG_bsmedberg
@@ -345,7 +347,7 @@ nsCommandLine::ResolveFile(const nsAString& aArgument, nsIFile* *aResult)
NS_ADDREF(*aResult = lf);
return NS_OK;
#elif defined(XP_WIN32) || defined(XP_OS2)
#elif defined(XP_WIN32)
nsCOMPtr<nsILocalFile> lf (do_CreateInstance(NS_LOCAL_FILE_CONTRACTID));
NS_ENSURE_TRUE(lf, NS_ERROR_OUT_OF_MEMORY);
@@ -375,6 +377,32 @@ nsCommandLine::ResolveFile(const nsAString& aArgument, nsIFile* *aResult)
NS_ADDREF(*aResult = lf);
return NS_OK;
#elif defined(XP_OS2)
nsCOMPtr<nsILocalFile> lf (do_CreateInstance(NS_LOCAL_FILE_CONTRACTID));
NS_ENSURE_TRUE(lf, NS_ERROR_OUT_OF_MEMORY);
rv = lf->InitWithPath(aArgument);
if (NS_FAILED(rv)) {
nsCAutoString fullPath;
mWorkingDir->GetNativePath(fullPath);
nsCAutoString carg;
NS_CopyUnicodeToNative(aArgument, carg);
fullPath.Append('\\');
fullPath.Append(carg);
char pathBuf[CCHMAXPATH];
if (DosQueryPathInfo(fullPath.get(), FIL_QUERYFULLNAME, pathBuf, sizeof(pathBuf)))
return NS_ERROR_FAILURE;
rv = lf->InitWithNativePath(nsDependentCString(pathBuf));
if (NS_FAILED(rv)) return rv;
}
NS_ADDREF(*aResult = lf);
return NS_OK;
#else
#error Need platform-specific logic here.
#endif