Remove old+unused MAPI stuff
This commit is contained in:
parent
eec52685c4
commit
a2f9fa4e06
|
@ -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
|
||||||
|
|
|
@ -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
|
||||||
|
|
||||||
///////////////////////////////////////////////////////////////////////////////
|
///////////////////////////////////////////////////////////////////////////////
|
||||||
|
|
|
@ -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
|
||||||
|
|
|
@ -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
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue