зеркало из https://github.com/mozilla/pjs.git
Bug 321167 viewer crashes at launch
r=roc sr=roc Stop calling InitXPCOM2 since there's now a call to InitXPCOM3 Changing nsViewerApp::SetupRegistry and nsViewerApp::Initialize to appropriately bail for failure cases, both will return SUCCESS and set mIsInitialized only if it leaves XPCOM initialized. Otherwise it will return failure, leave mIsInitialized false and leave XPCOM uninitialized or if it started it up, it will shutdown xpcom before returning. main will return -1 if nsNativeViewerApp isn't created and -2 if initialize fails.
This commit is contained in:
timeless%mozdev.org
Родитель
5fcbc2793e
Коммит
f01fc347a6
|
|
@ -212,59 +212,72 @@ nsViewerApp::SetupRegistry()
|
|||
nsCOMPtr<nsIServiceManager> servManager;
|
||||
rv = NS_InitXPCOM3(getter_AddRefs(servManager), nsnull, nsnull,
|
||||
kPStaticModules, kStaticModuleCount);
|
||||
if (NS_FAILED(rv))
|
||||
return rv;
|
||||
do {
|
||||
nsCOMPtr<nsIComponentRegistrar> registrar = do_QueryInterface(servManager);
|
||||
NS_ASSERTION(registrar, "No nsIComponentRegistrar from get service. see dougt");
|
||||
rv = registrar->AutoRegister(nsnull);
|
||||
|
||||
nsCOMPtr<nsIComponentRegistrar> registrar = do_QueryInterface(servManager);
|
||||
NS_ASSERTION(registrar, "No nsIComponentRegistrar from get service. see dougt");
|
||||
rv = registrar->AutoRegister(nsnull);
|
||||
|
||||
// Register our browser window factory
|
||||
nsIFactory* bwf;
|
||||
NS_NewXPBaseWindowFactory(&bwf);
|
||||
registrar->RegisterFactory(kXPBaseWindowCID, 0, 0, bwf);
|
||||
NS_RELEASE(bwf);
|
||||
|
||||
// register the cookie manager
|
||||
nsCOMPtr<nsICookieService> cookieService =
|
||||
do_GetService(kCookieServiceCID, &rv);
|
||||
if (NS_FAILED(rv) || (nsnull == cookieService)) {
|
||||
// register the cookie manager
|
||||
nsCOMPtr<nsICookieService> cookieService =
|
||||
do_GetService(kCookieServiceCID, &rv);
|
||||
if (NS_FAILED(rv) || (nsnull == cookieService)) {
|
||||
#ifdef DEBUG
|
||||
printf("Unable to instantiate Cookie Manager\n");
|
||||
printf("Unable to instantiate Cookie Manager\n");
|
||||
#endif
|
||||
}
|
||||
}
|
||||
|
||||
return NS_OK;
|
||||
// Register our browser window factory
|
||||
nsIFactory* bwf;
|
||||
rv = NS_NewXPBaseWindowFactory(&bwf);
|
||||
if (NS_FAILED(rv))
|
||||
break;
|
||||
registrar->RegisterFactory(kXPBaseWindowCID, 0, 0, bwf);
|
||||
NS_RELEASE(bwf);
|
||||
} while (0);
|
||||
if (NS_FAILED(rv))
|
||||
NS_ShutdownXPCOM(nsnull);
|
||||
|
||||
return rv;
|
||||
}
|
||||
|
||||
nsresult
|
||||
nsViewerApp::Initialize(int argc, char** argv)
|
||||
{
|
||||
nsresult rv;
|
||||
|
||||
rv = SetupRegistry();
|
||||
nsresult rv = SetupRegistry();
|
||||
if (NS_FAILED(rv)) {
|
||||
return rv;
|
||||
}
|
||||
|
||||
InitializeWindowCreator();
|
||||
do {
|
||||
rv = InitializeWindowCreator();
|
||||
|
||||
// Create widget application shell
|
||||
rv = CallCreateInstance(kAppShellCID, &mAppShell);
|
||||
if (NS_FAILED(rv)) {
|
||||
return rv;
|
||||
}
|
||||
mAppShell->Create(&argc, argv);
|
||||
// Create widget application shell
|
||||
rv = CallCreateInstance(kAppShellCID, &mAppShell);
|
||||
if (NS_FAILED(rv))
|
||||
break;
|
||||
|
||||
// Load preferences
|
||||
rv = CallGetService(NS_PREFSERVICE_CONTRACTID, &mPrefService);
|
||||
if (NS_FAILED(rv)) {
|
||||
return rv;
|
||||
}
|
||||
mPrefService->ReadUserPrefs(nsnull);
|
||||
rv = mAppShell->Create(&argc, argv);
|
||||
if (NS_FAILED(rv))
|
||||
break;
|
||||
|
||||
// Finally process our arguments
|
||||
rv = ProcessArguments(argc, argv);
|
||||
// Load preferences
|
||||
rv = CallGetService(NS_PREFSERVICE_CONTRACTID, &mPrefService);
|
||||
if (NS_FAILED(rv))
|
||||
break;
|
||||
mPrefService->ReadUserPrefs(nsnull);
|
||||
|
||||
// Finally process our arguments
|
||||
rv = ProcessArguments(argc, argv);
|
||||
if (NS_FAILED(rv))
|
||||
break;
|
||||
|
||||
mIsInitialized = PR_TRUE;
|
||||
} while (0);
|
||||
if (NS_FAILED(rv))
|
||||
NS_ShutdownXPCOM(nsnull);
|
||||
|
||||
mIsInitialized = PR_TRUE;
|
||||
return rv;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -1,173 +0,0 @@
|
|||
/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
|
||||
/* ***** BEGIN LICENSE BLOCK *****
|
||||
* Version: MPL 1.1/GPL 2.0/LGPL 2.1
|
||||
*
|
||||
* The contents of this file are subject to the Mozilla Public License Version
|
||||
* 1.1 (the "License"); you may not use this file except in compliance with
|
||||
* the License. You may obtain a copy of the License at
|
||||
* http://www.mozilla.org/MPL/
|
||||
*
|
||||
* Software distributed under the License is distributed on an "AS IS" basis,
|
||||
* WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
|
||||
* for the specific language governing rights and limitations under the
|
||||
* License.
|
||||
*
|
||||
* The Original Code is Mozilla Communicator client code.
|
||||
*
|
||||
* The Initial Developer of the Original Code is
|
||||
* Netscape Communications Corporation.
|
||||
* Portions created by the Initial Developer are Copyright (C) 1998
|
||||
* the Initial Developer. All Rights Reserved.
|
||||
*
|
||||
* Contributor(s):
|
||||
* Michael Lowe <michael.lowe@bigfoot.com>
|
||||
*
|
||||
* Alternatively, the contents of this file may be used under the terms of
|
||||
* either of the GNU General Public License Version 2 or later (the "GPL"),
|
||||
* or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
|
||||
* in which case the provisions of the GPL or the LGPL are applicable instead
|
||||
* of those above. If you wish to allow use of your version of this file only
|
||||
* under the terms of either the GPL or the LGPL, and not to allow others to
|
||||
* use your version of this file under the terms of the MPL, indicate your
|
||||
* decision by deleting the provisions above and replace them with the notice
|
||||
* and other provisions required by the GPL or the LGPL. If you do not delete
|
||||
* the provisions above, a recipient may use your version of this file under
|
||||
* the terms of any one of the MPL, the GPL or the LGPL.
|
||||
*
|
||||
* ***** END LICENSE BLOCK ***** */
|
||||
#include <windows.h>
|
||||
#include "nsViewerApp.h"
|
||||
#include "nsBrowserWindow.h"
|
||||
#include "nsITimer.h"
|
||||
#include "JSConsole.h"
|
||||
#include "plevent.h"
|
||||
#include "nsIServiceManager.h"
|
||||
#include "nsWidgetsCID.h"
|
||||
|
||||
JSConsole *gConsole;
|
||||
HINSTANCE gInstance, gPrevInstance;
|
||||
|
||||
nsNativeViewerApp::nsNativeViewerApp()
|
||||
{
|
||||
}
|
||||
|
||||
nsNativeViewerApp::~nsNativeViewerApp()
|
||||
{
|
||||
}
|
||||
|
||||
|
||||
int
|
||||
nsNativeViewerApp::Run()
|
||||
{
|
||||
if (mJustShutdown)
|
||||
return 0;
|
||||
|
||||
OpenWindow();
|
||||
|
||||
// Process messages
|
||||
MSG msg;
|
||||
int keepGoing = 1;
|
||||
|
||||
// Pump all messages
|
||||
do {
|
||||
// Give priority to system messages (in particular keyboard, mouse,
|
||||
// timer, and paint messages).
|
||||
// Note: on Win98 and NT 5.0 we can also use PM_QS_INPUT and PM_QS_PAINT flags.
|
||||
if (::PeekMessage(&msg, NULL, 0, WM_USER-1, PM_REMOVE) ||
|
||||
::PeekMessage(&msg, NULL, 0, 0, PM_REMOVE)) {
|
||||
|
||||
keepGoing = (msg.message != WM_QUIT);
|
||||
|
||||
// If we successfully retrieved a message then dispatch it
|
||||
if (keepGoing >= 0) {
|
||||
if (!JSConsole::sAccelTable || !gConsole || !gConsole->GetMainWindow() ||
|
||||
!TranslateAccelerator(gConsole->GetMainWindow(), JSConsole::sAccelTable, &msg)) {
|
||||
TranslateMessage(&msg);
|
||||
DispatchMessage(&msg);
|
||||
}
|
||||
}
|
||||
|
||||
} else {
|
||||
// Block and wait for any posted application message
|
||||
::WaitMessage();
|
||||
}
|
||||
} while (keepGoing != 0);
|
||||
|
||||
return msg.wParam;
|
||||
}
|
||||
|
||||
//----------------------------------------------------------------------
|
||||
|
||||
nsNativeBrowserWindow::nsNativeBrowserWindow()
|
||||
{
|
||||
}
|
||||
|
||||
nsNativeBrowserWindow::~nsNativeBrowserWindow()
|
||||
{
|
||||
}
|
||||
|
||||
nsresult
|
||||
nsNativeBrowserWindow::InitNativeWindow()
|
||||
{
|
||||
// override to do something special with platform native windows
|
||||
return NS_OK;
|
||||
}
|
||||
|
||||
nsresult
|
||||
nsNativeBrowserWindow::CreateMenuBar(PRInt32 aWidth)
|
||||
{
|
||||
HMENU menu = ::LoadMenu(gInstance, "Viewer");
|
||||
HWND hwnd = (HWND)mWindow->GetNativeData(NS_NATIVE_WIDGET);
|
||||
::SetMenu(hwnd, menu);
|
||||
|
||||
return NS_OK;
|
||||
}
|
||||
|
||||
nsresult
|
||||
nsNativeBrowserWindow::GetMenuBarHeight(PRInt32 * aHeightOut)
|
||||
{
|
||||
NS_ENSURE_ARG_POINTER(aHeightOut);
|
||||
|
||||
*aHeightOut = 0;
|
||||
|
||||
return NS_OK;
|
||||
}
|
||||
|
||||
nsEventStatus
|
||||
nsNativeBrowserWindow::DispatchMenuItem(PRInt32 aID)
|
||||
{
|
||||
// Dispatch windows-only menu code goes here
|
||||
|
||||
// Dispatch xp menu items
|
||||
return nsBrowserWindow::DispatchMenuItem(aID);
|
||||
}
|
||||
|
||||
//----------------------------------------------------------------------
|
||||
|
||||
int main(int argc, char **argv)
|
||||
{
|
||||
nsresult rv;
|
||||
rv = NS_InitXPCOM2(nsnull, nsnull, nsnull);
|
||||
NS_ASSERTION(NS_SUCCEEDED(rv), "NS_InitXPCOM failed");
|
||||
nsViewerApp* app = new nsNativeViewerApp();
|
||||
NS_ADDREF(app);
|
||||
app->Initialize(argc, argv);
|
||||
int result = app->Run();
|
||||
app->Exit(); // this exit is needed for the -x case where the close box is never clicked
|
||||
NS_RELEASE(app);
|
||||
rv = NS_ShutdownXPCOM(nsnull);
|
||||
NS_ASSERTION(NS_SUCCEEDED(rv), "NS_ShutdownXPCOM failed");
|
||||
return result;
|
||||
}
|
||||
|
||||
#ifndef __GNUC__
|
||||
int PASCAL
|
||||
WinMain(HINSTANCE instance, HINSTANCE prevInstance, LPSTR cmdParam,
|
||||
int nCmdShow)
|
||||
{
|
||||
gInstance = instance;
|
||||
gPrevInstance = prevInstance;
|
||||
return main(0, nsnull);
|
||||
}
|
||||
#endif
|
||||
|
||||
Загрузка…
Ссылка в новой задаче