bug 764127 - some return values in Windows runtime stub are wrong type or wrongly interpreted; r=felipe

This commit is contained in:
Myk Melez 2012-06-12 13:35:32 -07:00
parent 56a8945611
commit ad14387243

View File

@ -266,7 +266,7 @@ namespace {
// Get the path to the runtime.
char rtPath[MAXPATHLEN];
rv = joinPath(rtPath, greDir, kWEBAPPRT_PATH, MAXPATHLEN);
NS_ENSURE_SUCCESS(rv, rv);
NS_ENSURE_SUCCESS(rv, false);
// Get the path to the runtime's INI file.
char rtIniPath[MAXPATHLEN];
@ -285,7 +285,7 @@ namespace {
ScopedXREAppData webShellAppData;
rv = webShellAppData.create(rtINI);
NS_ENSURE_SUCCESS(rv, rv);
NS_ENSURE_SUCCESS(rv, false);
SetAllocatedString(webShellAppData->profile, profile);
SetAllocatedString(webShellAppData->name, profile);
@ -503,8 +503,7 @@ main(int argc, char* argv[])
// Second attempt at loading Firefox binaries:
// Get the location of Firefox from the registry
rv = GetFirefoxDirFromRegistry(firefoxDir);
if (NS_SUCCEEDED(rv)) {
if (GetFirefoxDirFromRegistry(firefoxDir)) {
if (AttemptLoadFromDir(firefoxDir)) {
// XXX: Write gre dir location to webapp.ini
return 0;