colin
/
tripwire-open-source
mirror of https://github.com/Tripwire/tripwire-open-source.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Remove old+unused MAPI stuff

This commit is contained in:
Brian Cox 2016-06-19 15:37:44 -07:00
parent eec52685c4
commit a2f9fa4e06
4 changed files with 1 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/core/platform.h
View File

@ -185,7 +185,7 @@
// Miscellaneous // Miscellaneous
#define FSEEK_TAKES_INT32 IS_UNIX // True if fseek takes 32-bit offsets #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 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_16_BITS IS_WIN32
#define WCHAR_IS_32_BITS IS_UNIX #define WCHAR_IS_32_BITS IS_UNIX
#define WCHAR_REP_IS_UCS2 IS_WIN32 #define WCHAR_REP_IS_UCS2 IS_WIN32

31
src/tripwire/mailmessage.h
View File

@ -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 //#ifdef IS_UNIX
/////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////

2
src/tripwire/twcmdline.cpp
View File

@ -367,8 +367,6 @@ static void FillOutConfigInfo(cTWModeCommon* pModeInfo, const cConfigFile& cf)
{ {
if (_tcsicmp(str.c_str(), _T("SENDMAIL")) == 0) if (_tcsicmp(str.c_str(), _T("SENDMAIL")) == 0)
pModeInfo->mMailMethod = cMailMessage::MAIL_BY_PIPE; 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 ) else if( _tcsicmp( str.c_str(), _T("SMTP") ) == 0 )
pModeInfo->mMailMethod = cMailMessage::MAIL_BY_SMTP; pModeInfo->mMailMethod = cMailMessage::MAIL_BY_SMTP;
else else

10
src/tripwire/twcmdlineutil.cpp
View File

@ -555,13 +555,8 @@ static bool EmailReportTo(const TSTRING &toAddress, const cFCOReportHeader& head
reportMail = std::auto_ptr<cMailMessage>(new cPipedMailMessage(modeCommon->mMailProgram)); reportMail = std::auto_ptr<cMailMessage>(new cPipedMailMessage(modeCommon->mMailProgram));
break; break;
case cMailMessage::MAIL_BY_MAPI: case cMailMessage::MAIL_BY_MAPI:
#if SUPPORTS_MAPI
reportMail = std::auto_ptr<cMailMessage>(new cMAPIMailMessage);
break;
#else
ASSERT(false); ASSERT(false);
return false; return false;
#endif
} }
TSTRING strTempFilename; TSTRING strTempFilename;
@ -717,13 +712,8 @@ bool cTWCmdLineUtil::SendEmailTestMessage(const TSTRING &mAddress, const cTWMode
reportMail = std::auto_ptr<cMailMessage>(new cPipedMailMessage(modeCommon->mMailProgram)); reportMail = std::auto_ptr<cMailMessage>(new cPipedMailMessage(modeCommon->mMailProgram));
break; break;
case cMailMessage::MAIL_BY_MAPI: case cMailMessage::MAIL_BY_MAPI:
#if SUPPORTS_MAPI
reportMail = std::auto_ptr<cMailMessage>(new cMAPIMailMessage);
break;
#else
ASSERT(false); ASSERT(false);
return false; return false;
#endif
} }