From a2f9fa4e06ab25f50219a789084cf69c5e66293e Mon Sep 17 00:00:00 2001
From: Brian Cox <BrianRCox@gmail.com>
Date: Sun, 19 Jun 2016 15:37:44 -0700
Subject: [PATCH] Remove old+unused MAPI stuff

---
 src/core/platform.h            |  2 +-
 src/tripwire/mailmessage.h     | 31 -------------------------------
 src/tripwire/twcmdline.cpp     |  2 --
 src/tripwire/twcmdlineutil.cpp | 10 ----------
 4 files changed, 1 insertion(+), 44 deletions(-)

diff --git a/src/core/platform.h b/src/core/platform.h
index 01abde9..263eb03 100644
--- a/src/core/platform.h
+++ b/src/core/platform.h
@@ -185,7 +185,7 @@
 // Miscellaneous
 #define FSEEK_TAKES_INT32       IS_UNIX     // True if fseek takes 32-bit offsets
 #define USE_OUTPUT_DEBUG_STRING IS_WIN32    // Use the Win32 OutputDebugString() for debug messages.
-#define SUPPORTS_MAPI           IS_WIN32
+#define SUPPORTS_MAPI           0
 #define WCHAR_IS_16_BITS        IS_WIN32
 #define WCHAR_IS_32_BITS        IS_UNIX
 #define WCHAR_REP_IS_UCS2       IS_WIN32
diff --git a/src/tripwire/mailmessage.h b/src/tripwire/mailmessage.h
index e138258..ac95c9f 100644
--- a/src/tripwire/mailmessage.h
+++ b/src/tripwire/mailmessage.h
@@ -309,37 +309,6 @@ private:
 };
 
 
-#if SUPPORTS_MAPI
-
-
-///////////////////////////////////////////////////////////////////////////////
-//
-// This class implements sending a message via MAPI under Win32
-//
-class cMAPIMailMessage : public cMailMessage
-{
-public:
-
-    cMAPIMailMessage();
-    virtual ~cMAPIMailMessage();
-
-    virtual bool Send(); //throw(eMailMessageError) 
-        //returns true upon success
-
-private:
-
-    bool InitMAPI();
-    bool FinitMAPI();
-
-    HINSTANCE hlibMAPI;
-
-    bool DoSendMessage();
-    void PrintMAPIErrorMessage(ULONG errorMessage);
-};
-
-#endif
-
-
 //#ifdef IS_UNIX
 
 ///////////////////////////////////////////////////////////////////////////////
diff --git a/src/tripwire/twcmdline.cpp b/src/tripwire/twcmdline.cpp
index 3913edf..fa92ba9 100644
--- a/src/tripwire/twcmdline.cpp
+++ b/src/tripwire/twcmdline.cpp
@@ -367,8 +367,6 @@ static void FillOutConfigInfo(cTWModeCommon* pModeInfo, const cConfigFile& cf)
     {
       if (_tcsicmp(str.c_str(), _T("SENDMAIL")) == 0)
         pModeInfo->mMailMethod = cMailMessage::MAIL_BY_PIPE;
-      else if (_tcsicmp(str.c_str(), _T("MAPI")) == 0)
-        pModeInfo->mMailMethod = cMailMessage::MAIL_BY_MAPI; // NT support only
       else if( _tcsicmp( str.c_str(), _T("SMTP") ) == 0 )
         pModeInfo->mMailMethod = cMailMessage::MAIL_BY_SMTP;
       else                
diff --git a/src/tripwire/twcmdlineutil.cpp b/src/tripwire/twcmdlineutil.cpp
index 421d80a..bab7a0f 100644
--- a/src/tripwire/twcmdlineutil.cpp
+++ b/src/tripwire/twcmdlineutil.cpp
@@ -555,13 +555,8 @@ static bool EmailReportTo(const TSTRING &toAddress, const cFCOReportHeader& head
       reportMail = std::auto_ptr<cMailMessage>(new cPipedMailMessage(modeCommon->mMailProgram));
       break;
     case cMailMessage::MAIL_BY_MAPI:
-#if SUPPORTS_MAPI
-      reportMail = std::auto_ptr<cMailMessage>(new cMAPIMailMessage);
-      break;
-#else
       ASSERT(false);
       return false;
-#endif
     }
 
   TSTRING strTempFilename;
@@ -717,13 +712,8 @@ bool cTWCmdLineUtil::SendEmailTestMessage(const TSTRING &mAddress, const cTWMode
       reportMail = std::auto_ptr<cMailMessage>(new cPipedMailMessage(modeCommon->mMailProgram));
       break;
    case cMailMessage::MAIL_BY_MAPI:
-#if SUPPORTS_MAPI
-      reportMail = std::auto_ptr<cMailMessage>(new cMAPIMailMessage);
-      break;
-#else
       ASSERT(false);
       return false;
-#endif
    }