mirror of
https://github.com/mozilla/gecko-dev.git
synced 2025-02-13 11:38:16 +00:00
No bug
r=mkaply, sr=blizzard, a=asa OS/2 only - add -nodde flag to attempt to diagnose some startup problems
This commit is contained in:
parent
d3b0f97480
commit
e7d9a96221
@ -1095,14 +1095,23 @@ nsNativeAppSupportOS2::Start( PRBool *aResult ) {
|
|||||||
NS_ENSURE_ARG( aResult );
|
NS_ENSURE_ARG( aResult );
|
||||||
NS_ENSURE_TRUE( mInstance == 0, NS_ERROR_NOT_INITIALIZED );
|
NS_ENSURE_TRUE( mInstance == 0, NS_ERROR_NOT_INITIALIZED );
|
||||||
|
|
||||||
|
PRBool useDDE = PR_TRUE;
|
||||||
|
|
||||||
nsresult rv = NS_ERROR_FAILURE;
|
nsresult rv = NS_ERROR_FAILURE;
|
||||||
*aResult = PR_FALSE;
|
*aResult = PR_FALSE;
|
||||||
|
|
||||||
|
for ( int i = 1; i < __argc; i++ ) {
|
||||||
|
if ( strcmp( "-nodde", __argv[i] ) == 0 ||
|
||||||
|
strcmp( "/nodde", __argv[i] ) == 0 ) {
|
||||||
|
useDDE = PR_FALSE;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
// Grab mutex first.
|
// Grab mutex first.
|
||||||
int retval;
|
int retval;
|
||||||
UINT id = ID_DDE_APPLICATION_NAME;
|
UINT id = ID_DDE_APPLICATION_NAME;
|
||||||
char nameBuf[ 128 ];
|
char nameBuf[ 128 ];
|
||||||
retval = WinLoadString( NULLHANDLE, NULLHANDLE, id, sizeof(nameBuffer), nameBuffer );
|
retval = WinLoadString( NULLHANDLE, NULLHANDLE, id, sizeof(nameBuffer), nameBuffer );
|
||||||
if ( retval == 0 ) {
|
if ( retval == 0 ) {
|
||||||
// No app name; just keep running.
|
// No app name; just keep running.
|
||||||
*aResult = PR_TRUE;
|
*aResult = PR_TRUE;
|
||||||
@ -1144,8 +1153,10 @@ nsNativeAppSupportOS2::Start( PRBool *aResult ) {
|
|||||||
// We will be server.
|
// We will be server.
|
||||||
rv = msgWindow.Create();
|
rv = msgWindow.Create();
|
||||||
if ( NS_SUCCEEDED( rv ) ) {
|
if ( NS_SUCCEEDED( rv ) ) {
|
||||||
// Start up DDE server.
|
if (useDDE) {
|
||||||
this->StartDDE();
|
// Start up DDE server.
|
||||||
|
this->StartDDE();
|
||||||
|
}
|
||||||
// Tell caller to spin message loop.
|
// Tell caller to spin message loop.
|
||||||
*aResult = PR_TRUE;
|
*aResult = PR_TRUE;
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user