From 2d505553931a26ef4ead3e43c1ca70bff10b9a4b Mon Sep 17 00:00:00 2001
From: "serge%netscape.com"
 <serge%netscape.com@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Wed, 12 Dec 2001 03:55:57 +0000
Subject: [PATCH] checking in for rdayal Removing the MAPI related code from
 mozilla/xpfe .. patch (id=56117) in bug # 106137. r=mscott, sr=alecf. This
 patch also fixes bug # 111199.

git-svn-id: svn://10.0.0.236/trunk@110349 18797224-902f-48f8-a5cc-f745e15eee43
---
 .../appshell/public/nsINativeAppSupport.idl   |  4 --
 mozilla/xpfe/bootstrap/nsAppRunner.cpp        |  5 --
 .../xpfe/bootstrap/nsNativeAppSupportBase.cpp | 12 -----
 .../xpfe/bootstrap/nsNativeAppSupportWin.cpp  | 52 -------------------
 .../startup/public/nsINativeAppSupport.idl    |  4 --
 5 files changed, 77 deletions(-)

diff --git a/mozilla/xpfe/appshell/public/nsINativeAppSupport.idl b/mozilla/xpfe/appshell/public/nsINativeAppSupport.idl
index 00f8fc5a622..75db280e05b 100644
--- a/mozilla/xpfe/appshell/public/nsINativeAppSupport.idl
+++ b/mozilla/xpfe/appshell/public/nsINativeAppSupport.idl
@@ -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.
diff --git a/mozilla/xpfe/bootstrap/nsAppRunner.cpp b/mozilla/xpfe/bootstrap/nsAppRunner.cpp
index 101f556d0c1..c567071d75d 100644
--- a/mozilla/xpfe/bootstrap/nsAppRunner.cpp
+++ b/mozilla/xpfe/bootstrap/nsAppRunner.cpp
@@ -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.
diff --git a/mozilla/xpfe/bootstrap/nsNativeAppSupportBase.cpp b/mozilla/xpfe/bootstrap/nsNativeAppSupportBase.cpp
index d270fb92fbf..e5b35ca2347 100644
--- a/mozilla/xpfe/bootstrap/nsNativeAppSupportBase.cpp
+++ b/mozilla/xpfe/bootstrap/nsNativeAppSupportBase.cpp
@@ -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)
 {
diff --git a/mozilla/xpfe/bootstrap/nsNativeAppSupportWin.cpp b/mozilla/xpfe/bootstrap/nsNativeAppSupportWin.cpp
index e5bef2d981d..09c345fe52f 100644
--- a/mozilla/xpfe/bootstrap/nsNativeAppSupportWin.cpp
+++ b/mozilla/xpfe/bootstrap/nsNativeAppSupportWin.cpp
@@ -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;
-}
-
-/***************************************************************/
diff --git a/mozilla/xpfe/components/startup/public/nsINativeAppSupport.idl b/mozilla/xpfe/components/startup/public/nsINativeAppSupport.idl
index 00f8fc5a622..75db280e05b 100644
--- a/mozilla/xpfe/components/startup/public/nsINativeAppSupport.idl
+++ b/mozilla/xpfe/components/startup/public/nsINativeAppSupport.idl
@@ -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.