Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-12 12:55:46 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

checking in for rdayal

Browse Source 
Removing the MAPI related code from mozilla/xpfe .. patch (id=56117) in bug # 106137.
r=mscott, sr=alecf. This patch also fixes bug # 111199.
This commit is contained in:
serge%netscape.com 2001-12-12 03:55:57 +00:00
parent ea2361a61d
commit 195bad9340
5 changed files with 0 additions and 77 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
xpfe/appshell/public/nsINativeAppSupport.idl
View File

@ -176,10 +176,6 @@ interface nsINativeAppSupport : nsISupports {
boolean stop();
void quit();
// Startup/Shutdown for features like MAPI
[noscript] void startAddonFeatures();
[noscript] void stopAddonFeatures();
[noscript] void ensureProfile(in nsICmdLineService aCmdService);
// Splash screen functions.

5
xpfe/bootstrap/nsAppRunner.cpp
View File

@ -1250,11 +1250,6 @@ static nsresult main1(int argc, char* argv[], nsISupports *nativeApp )
// From this point on, should be true
appShell->SetQuitOnLastWindowClosing(PR_TRUE);
nsCOMPtr<nsINativeAppSupport> nativeAppSupport;
rv = appShell->GetNativeAppSupport(getter_AddRefs( nativeAppSupport ));
if (NS_SUCCEEDED(rv))
nativeAppSupport->StartAddonFeatures();
#ifdef MOZ_ENABLE_XREMOTE
// if we have X remote support and we have our one window up and
// running start listening for requests on the proxy window.

12
xpfe/bootstrap/nsNativeAppSupportBase.cpp
View File

@ -179,18 +179,6 @@ nsNativeAppSupportBase::QueryInterface( const nsIID &iid, void**p ) {
return rv;
}
NS_IMETHODIMP
nsNativeAppSupportBase::StartAddonFeatures()
{
return NS_OK;
}
NS_IMETHODIMP
nsNativeAppSupportBase::StopAddonFeatures()
{
return NS_OK;
}
NS_IMETHODIMP
nsNativeAppSupportBase::EnsureProfile(nsICmdLineService* args)
{

52
xpfe/bootstrap/nsNativeAppSupportWin.cpp
View File

@ -88,25 +88,8 @@
#define TURBO_DISABLE 5
#define TURBO_EXIT 6
/*************************************************************/
/* MAPI SUPPORT */
/*************************************************************/
#define MAPI_DLL "msgMapi.dll"
#define MAPI_INIT_METHOD "Init"
#define MAPI_STARTUP_ARG "/MAPIStartUp"
typedef void (PASCAL InitMethod)();
HINSTANCE mapiInstance = nsnull;
void CheckMapiSupport()
{
mapiInstance = LoadLibrary(MAPI_DLL);
}
/*************************************************************/
static HWND hwndForDOMWindow( nsISupports * );
static
@ -361,8 +344,6 @@ public:
NS_IMETHOD StartServerMode();
NS_IMETHOD OnLastWindowClosing( nsIXULWindow *aWindow );
NS_IMETHOD SetIsServerMode( PRBool isServerMode );
NS_IMETHOD StartAddonFeatures();
NS_IMETHOD StopAddonFeatures();
NS_IMETHOD EnsureProfile(nsICmdLineService* args);
// The "old" Start method (renamed).
@ -979,7 +960,6 @@ nsNativeAppSupportWin::Start( PRBool *aResult ) {
this->StartDDE();
// Tell caller to spin message loop.
*aResult = PR_TRUE;
CheckMapiSupport();
}
}
@ -1052,8 +1032,6 @@ nsNativeAppSupportWin::Stop( PRBool *aResult ) {
nsresult rv = NS_OK;
*aResult = PR_TRUE;
StopAddonFeatures();
Mutex ddeLock( MOZ_STARTUP_MUTEX_NAME );
if ( ddeLock.Lock( MOZ_DDE_STOP_TIMEOUT ) ) {
@ -2109,34 +2087,4 @@ nsNativeAppSupportWin::GetStartupURL(nsICmdLineService *args, nsCString& taskURL
return NS_OK;
}
/***************************************************************/
/* MAPI SUPPORT */
/***************************************************************/
NS_IMETHODIMP
nsNativeAppSupportWin::StartAddonFeatures()
{
InitMethod *InitFunction = nsnull;
if (mapiInstance != nsnull)
{
InitFunction = (InitMethod *)GetProcAddress(mapiInstance, MAPI_INIT_METHOD);
if (InitFunction != nsnull)
InitFunction();
}
return NS_OK;
}
NS_IMETHODIMP
nsNativeAppSupportWin::StopAddonFeatures()
{
if (mapiInstance != nsnull)
{
FreeLibrary(mapiInstance);
mapiInstance = nsnull;
}
return NS_OK;
}
/***************************************************************/

4
xpfe/components/startup/public/nsINativeAppSupport.idl
View File

@ -176,10 +176,6 @@ interface nsINativeAppSupport : nsISupports {
boolean stop();
void quit();
// Startup/Shutdown for features like MAPI
[noscript] void startAddonFeatures();
[noscript] void stopAddonFeatures();
[noscript] void ensureProfile(in nsICmdLineService aCmdService);
// Splash screen functions.