added test for wxScopeGuard

[wxWidgets.git] / contrib / src / net / smapi.cpp

diff --git a/contrib/src/net/smapi.cpp b/contrib/src/net/smapi.cpp
index 43421b8ebd1157418ab7b4be596ab79dbf25b925..95b3287d62b1ee9ad2edc491ceef1396715924cf 100644 (file)
--- a/contrib/src/net/smapi.cpp
+++ b/contrib/src/net/smapi.cpp
@@ -20,6 +20,8 @@
 #pragma hdrstop
 #endif
 
 #pragma hdrstop
 #endif
 

+#ifdef __WXMSW__
+

 #ifndef WX_PRECOMP
 #include "wx/wx.h"
 #endif
 #ifndef WX_PRECOMP
 #include "wx/wx.h"
 #endif


@@ -27,11 +29,19 @@
 #include "wx/string.h"
 #include "wx/msw/private.h"
 
 #include "wx/string.h"
 #include "wx/msw/private.h"
 

+// mapi.h in Cygwin's include directory isn't a full implementation and is
+// not sufficient for this lib. However recent versions of Cygwin also
+// have another mapi.h in include/w32api which can be used.
+//
+#ifdef __CYGWIN__
+#include <w32api/mapi.h>
+#else

 #include <mapi.h>
 #include <mapi.h>

+#endif

 
 #include "wx/net/smapi.h"
 
 
 #include "wx/net/smapi.h"
 

-class wxMapiData
+class WXDLLIMPEXP_NETUTILS wxMapiData

 {
 public:
     wxMapiData()
 {
 public:
     wxMapiData()


@@ -141,15 +151,12 @@ bool wxMapiSession::Logon(const wxString& sProfileName, const wxString& sPasswor
     
     //Setup the ascii versions of the profile name and password
     int nProfileLength = sProfileName.Length();
     
     //Setup the ascii versions of the profile name and password
     int nProfileLength = sProfileName.Length();

-    int nPasswordLength = sPassword.Length();

     
     LPSTR pszProfileName = NULL;
     LPSTR pszPassword = NULL;
     wxCharBuffer cbProfile(1),cbPassword(1);
     if (nProfileLength)
     {
     
     LPSTR pszProfileName = NULL;
     LPSTR pszPassword = NULL;
     wxCharBuffer cbProfile(1),cbPassword(1);
     if (nProfileLength)
     {

-//        pszProfileName = T2A((LPTSTR) (LPCTSTR) sProfileName);
-//        pszPassword = T2A((LPTSTR) (LPCTSTR) sPassword);

 #ifndef UNICODE
         pszProfileName = (LPSTR) sProfileName.c_str();
         pszPassword = (LPSTR) sPassword.c_str();
 #ifndef UNICODE
         pszProfileName = (LPSTR) sProfileName.c_str();
         pszPassword = (LPSTR) sPassword.c_str();


@@ -197,7 +204,7 @@ bool wxMapiSession::Logon(const wxString& sProfileName, const wxString& sPasswor
         }
         else
         {
         }
         else
         {

-            wxLogDebug(_T("Failed to logon to MAPI using a shared session, Error:%d\n"), nError);
+            wxLogDebug(_T("Failed to logon to MAPI using a shared session, Error:%ld\n"), nError);

             m_data->m_nLastError = nError;
         }
     }
             m_data->m_nLastError = nError;
         }
     }


@@ -234,7 +241,7 @@ bool wxMapiSession::Logoff()
         ULONG nError = m_data->m_lpfnMAPILogoff(m_data->m_hSession, 0, 0, 0); 
         if (nError != SUCCESS_SUCCESS)
         {
         ULONG nError = m_data->m_lpfnMAPILogoff(m_data->m_hSession, 0, 0, 0); 
         if (nError != SUCCESS_SUCCESS)
         {

-            wxLogDebug(_T("Failed in call to MapiLogoff, Error:%d"), nError);
+            wxLogDebug(_T("Failed in call to MapiLogoff, Error:%ld"), nError);

             m_data->m_nLastError = nError;
             bSuccess = TRUE;
         }
             m_data->m_nLastError = nError;
             bSuccess = TRUE;
         }


@@ -259,7 +266,6 @@ bool wxMapiSession::Resolve(const wxString& sName, void* lppRecip1)
     wxASSERT(m_data->m_hSession); //MAPI session handle must be valid
     
     //Call the MAPIResolveName function
     wxASSERT(m_data->m_hSession); //MAPI session handle must be valid
     
     //Call the MAPIResolveName function

-//    LPSTR lpszAsciiName = T2A((LPTSTR) (LPCTSTR) sName);

 #ifndef UNICODE
     LPSTR lpszAsciiName = (LPSTR) sName.c_str();
 #else
 #ifndef UNICODE
     LPSTR lpszAsciiName = (LPSTR) sName.c_str();
 #else


@@ -270,7 +276,8 @@ bool wxMapiSession::Resolve(const wxString& sName, void* lppRecip1)
     ULONG nError = m_data->m_lpfnMAPIResolveName(m_data->m_hSession, 0, lpszAsciiName, 0, 0, lppRecip);
     if (nError != SUCCESS_SUCCESS)
     {
     ULONG nError = m_data->m_lpfnMAPIResolveName(m_data->m_hSession, 0, lpszAsciiName, 0, 0, lppRecip);
     if (nError != SUCCESS_SUCCESS)
     {

-        wxLogDebug(_T("Failed to resolve the name: %s, Error:%d\n"), sName, nError);
+        wxLogDebug(_T("Failed to resolve the name: %s, Error:%ld\n"),
+                   sName.c_str(), nError);

         m_data->m_nLastError = nError;
     }
     
         m_data->m_nLastError = nError;
     }
     


@@ -301,8 +308,6 @@ bool wxMapiSession::Send(wxMailMessage& message)
     mapiMessage.lpszSubject = cbSubject.data();
     mapiMessage.lpszNoteText = cbBody.data();
 #endif
     mapiMessage.lpszSubject = cbSubject.data();
     mapiMessage.lpszNoteText = cbBody.data();
 #endif

-//    mapiMessage.lpszSubject = T2A((LPTSTR) (LPCTSTR) message.m_subject);
-//    mapiMessage.lpszNoteText = T2A((LPTSTR) (LPCTSTR) message.m_body);

     mapiMessage.nRecipCount = message.m_to.GetCount() + message.m_cc.GetCount() + message.m_bcc.GetCount();
     wxASSERT(mapiMessage.nRecipCount); //Must have at least 1 recipient!
     
     mapiMessage.nRecipCount = message.m_to.GetCount() + message.m_cc.GetCount() + message.m_bcc.GetCount();
     wxASSERT(mapiMessage.nRecipCount); //Must have at least 1 recipient!
     


@@ -341,12 +346,11 @@ bool wxMapiSession::Send(wxMailMessage& message)
         if (Resolve(sName, (void*) &lpTempRecip))
         {
             //Resolve worked, put the resolved name back into the sName
         if (Resolve(sName, (void*) &lpTempRecip))
         {
             //Resolve worked, put the resolved name back into the sName

-            sName = wxString(lpTempRecip->lpszName,wxConvCurrent);
+            sName = wxString(lpTempRecip->lpszName,*wxConvCurrent);

             
             //Don't forget to free up the memory MAPI allocated for us
             m_data->m_lpfnMAPIFreeBuffer(lpTempRecip);
         }
             
             //Don't forget to free up the memory MAPI allocated for us
             m_data->m_lpfnMAPIFreeBuffer(lpTempRecip);
         }

-        //recip.lpszName = T2A((LPTSTR) (LPCTSTR) sName);

 #ifndef UNICODE
         recip.lpszName = (LPSTR) sName.c_str();
 #else
 #ifndef UNICODE
         recip.lpszName = (LPSTR) sName.c_str();
 #else


@@ -370,12 +374,11 @@ bool wxMapiSession::Send(wxMailMessage& message)
         if (Resolve(sName, (void*) &lpTempRecip))
         {
             //Resolve worked, put the resolved name back into the sName
         if (Resolve(sName, (void*) &lpTempRecip))
         {
             //Resolve worked, put the resolved name back into the sName

-            sName = wxString(lpTempRecip->lpszName,wxConvCurrent);
+            sName = wxString(lpTempRecip->lpszName,*wxConvCurrent);

             
             //Don't forget to free up the memory MAPI allocated for us
             m_data->m_lpfnMAPIFreeBuffer(lpTempRecip);
         }
             
             //Don't forget to free up the memory MAPI allocated for us
             m_data->m_lpfnMAPIFreeBuffer(lpTempRecip);
         }

-        //recip.lpszName = T2A((LPTSTR) (LPCTSTR) sName);

 #ifndef UNICODE
         recip.lpszName = (LPSTR) sName.c_str();
 #else
 #ifndef UNICODE
         recip.lpszName = (LPSTR) sName.c_str();
 #else


@@ -404,7 +407,6 @@ bool wxMapiSession::Send(wxMailMessage& message)
             //Don't forget to free up the memory MAPI allocated for us
             m_data->m_lpfnMAPIFreeBuffer(lpTempRecip);
         }
             //Don't forget to free up the memory MAPI allocated for us
             m_data->m_lpfnMAPIFreeBuffer(lpTempRecip);
         }

-        //recip.lpszName = T2A((LPTSTR) (LPCTSTR) sName);

 #ifndef UNICODE
         recip.lpszName = (LPSTR) sName.c_str();
 #else
 #ifndef UNICODE
         recip.lpszName = (LPSTR) sName.c_str();
 #else


@@ -432,7 +434,6 @@ bool wxMapiSession::Send(wxMailMessage& message)
             ZeroMemory(&file, sizeof(MapiFileDesc));
             file.nPosition = 0xFFFFFFFF;
             wxString& sFilename = message.m_attachments[i];
             ZeroMemory(&file, sizeof(MapiFileDesc));
             file.nPosition = 0xFFFFFFFF;
             wxString& sFilename = message.m_attachments[i];

-            //file.lpszPathName = T2A((LPTSTR) (LPCTSTR) sFilename);

 
 #ifndef UNICODE
             file.lpszPathName = (LPSTR) sFilename.c_str();
 
 #ifndef UNICODE
             file.lpszPathName = (LPSTR) sFilename.c_str();


@@ -445,7 +446,6 @@ bool wxMapiSession::Send(wxMailMessage& message)
             if (nTitleSize && !message.m_attachmentTitles[i].IsEmpty())
             {
                 wxString& sTitle = message.m_attachmentTitles[i];
             if (nTitleSize && !message.m_attachmentTitles[i].IsEmpty())
             {
                 wxString& sTitle = message.m_attachmentTitles[i];

-                //file.lpszFileName = T2A((LPTSTR) (LPCTSTR) sTitle);

 #ifndef UNICODE
                 file.lpszFileName = (LPSTR) sTitle.c_str();
 #else
 #ifndef UNICODE
                 file.lpszFileName = (LPSTR) sTitle.c_str();
 #else


@@ -464,7 +464,7 @@ bool wxMapiSession::Send(wxMailMessage& message)
     }
     else
     {
     }
     else
     {

-        wxLogDebug(_T("Failed to send mail message, Error:%d\n"), nError);
+        wxLogDebug(_T("Failed to send mail message, Error:%ld\n"), nError);

         m_data->m_nLastError = nError;
     }
     
         m_data->m_nLastError = nError;
     }
     


@@ -472,7 +472,7 @@ bool wxMapiSession::Send(wxMailMessage& message)
     if (nAttachmentSize)
     {
 #ifdef UNICODE
     if (nAttachmentSize)
     {
 #ifdef UNICODE

-        for (int i = 0;i < nAttachmentSize;i++)
+        for (i = 0;i < nAttachmentSize;i++)

         {
             free(mapiMessage.lpFiles[i].lpszPathName);
             free(mapiMessage.lpFiles[i].lpszFileName);
         {
             free(mapiMessage.lpFiles[i].lpszPathName);
             free(mapiMessage.lpFiles[i].lpszFileName);


@@ -483,7 +483,7 @@ bool wxMapiSession::Send(wxMailMessage& message)
     
     //Free up the Recipients and Originator memory
 #ifdef UNICODE
     
     //Free up the Recipients and Originator memory
 #ifdef UNICODE

-    for (int i = 0;i < nRecipIndex;i++)
+    for (i = 0;i < nRecipIndex;i++)

         free(mapiMessage.lpRecips[i].lpszName);
 #endif
     delete [] mapiMessage.lpRecips;
         free(mapiMessage.lpRecips[i].lpszName);
 #endif
     delete [] mapiMessage.lpRecips;


@@ -497,3 +497,5 @@ long wxMapiSession::GetLastError() const
 {
     return m_data->m_nLastError;
 }
 {
     return m_data->m_nLastError;
 }

+
+#endif // __WXMSW__