added carbonaccessors.o

[wxWidgets.git] / src / msw / dialup.cpp

diff --git a/src/msw/dialup.cpp b/src/msw/dialup.cpp
index bd42877ed32e907bf487ea0623cf67c0448b3a57..e7a00a506b984db8399bbd74be19962806cad3ae 100644 (file)
--- a/src/msw/dialup.cpp
+++ b/src/msw/dialup.cpp
@@ -38,6 +38,10 @@
     #include "wx/event.h"
 #endif
 
     #include "wx/event.h"
 #endif
 

+#include "wx/timer.h"
+#include "wx/app.h"
+#include "wx/generic/choicdgg.h"
+

 #include "wx/msw/private.h"  // must be before #include "dynlib.h"
 
 #if !wxUSE_DYNLIB_CLASS
 #include "wx/msw/private.h"  // must be before #include "dynlib.h"
 
 #if !wxUSE_DYNLIB_CLASS


@@ -48,8 +52,15 @@
 
 #include "wx/dialup.h"
 
 
 #include "wx/dialup.h"
 

-// Doesn't yet compile under VC++ 4, BC++, mingw, Watcom C++: no wininet.h
-#if !defined(__BORLANDC__) && !defined(__GNUWIN32_OLD__) && !defined(__GNUWIN32__) && !defined(__WATCOMC__) && ! (defined(__VISUALC__) && (__VISUALC__ < 1020))
+DEFINE_EVENT_TYPE(wxEVT_DIALUP_CONNECTED)
+DEFINE_EVENT_TYPE(wxEVT_DIALUP_DISCONNECTED)
+
+// Doesn't yet compile under VC++ 4, BC++, Watcom C++: no wininet.h
+#if !defined(__BORLANDC__) && \
+    (!defined(__GNUWIN32__) || wxCHECK_W32API_VERSION(0, 5)) && \
+    !defined(__GNUWIN32_OLD__) && \
+    !defined(__WATCOMC__) && \
+    (!defined(__VISUALC__) || (__VISUALC__ >= 1020))

 
 #include <ras.h>
 #include <raserror.h>
 
 #include <ras.h>
 #include <raserror.h>


@@ -102,7 +113,7 @@
     typedef DWORD (APIENTRY * RASVALIDATEENTRYNAME)( LPCSTR, LPCSTR );
     typedef DWORD (APIENTRY * RASCONNECTIONNOTIFICATION)( HRASCONN, HANDLE, DWORD );
 
     typedef DWORD (APIENTRY * RASVALIDATEENTRYNAME)( LPCSTR, LPCSTR );
     typedef DWORD (APIENTRY * RASCONNECTIONNOTIFICATION)( HRASCONN, HANDLE, DWORD );
 

-    static const char gs_funcSuffix = 'A';
+    static const wxChar gs_funcSuffix = _T('A');

 #else // Unicode
     typedef DWORD (APIENTRY * RASDIAL)( LPRASDIALEXTENSIONS, LPCWSTR, LPRASDIALPARAMSW, DWORD, LPVOID, LPHRASCONN );
     typedef DWORD (APIENTRY * RASENUMCONNECTIONS)( LPRASCONNW, LPDWORD, LPDWORD );
 #else // Unicode
     typedef DWORD (APIENTRY * RASDIAL)( LPRASDIALEXTENSIONS, LPCWSTR, LPRASDIALPARAMSW, DWORD, LPVOID, LPHRASCONN );
     typedef DWORD (APIENTRY * RASENUMCONNECTIONS)( LPRASCONNW, LPDWORD, LPDWORD );


@@ -124,7 +135,7 @@
     typedef DWORD (APIENTRY * RASVALIDATEENTRYNAME)( LPCWSTR, LPCWSTR );
     typedef DWORD (APIENTRY * RASCONNECTIONNOTIFICATION)( HRASCONN, HANDLE, DWORD );
 
     typedef DWORD (APIENTRY * RASVALIDATEENTRYNAME)( LPCWSTR, LPCWSTR );
     typedef DWORD (APIENTRY * RASCONNECTIONNOTIFICATION)( HRASCONN, HANDLE, DWORD );
 

-    static const char gs_funcSuffix = 'W';
+    static const wxChar gs_funcSuffix = _T('W');

 #endif // ASCII/Unicode
 
 // structure passed to the secondary thread
 #endif // ASCII/Unicode
 
 // structure passed to the secondary thread


@@ -347,9 +358,7 @@ wxDialUpManagerMSW::wxDialUpManagerMSW()
         ms_dllRas = wxDllLoader::LoadLibrary("RASAPI32");
         if ( !ms_dllRas )
         {
         ms_dllRas = wxDllLoader::LoadLibrary("RASAPI32");
         if ( !ms_dllRas )
         {

-            wxLogError(_("Dial up functions are unavailable because the "
-                         "remote access service (RAS) is not installed "
-                         "on this machine. Please install it."));
+            wxLogError(_("Dial up functions are unavailable because the remote access service (RAS) is not installed on this machine. Please install it."));

         }
         else
         {
         }
         else
         {


@@ -409,10 +418,12 @@ wxDialUpManagerMSW::wxDialUpManagerMSW()
 exit:
             if ( funcName )
             {
 exit:
             if ( funcName )
             {

-                wxLogError(_("The version of remote access service (RAS) "
-                             "installed on this machine is too old, please "
-                             "upgrade (the following required function is "
-                             "missing: %s)."), funcName);
+                static const wxChar *msg = wxTRANSLATE(
+"The version of remote access service (RAS) installed on this machine is too\
+old, please upgrade (the following required function is missing: %s)."
+                                                       );
+
+                wxLogError(wxGetTranslation(msg), funcName);

 
                 wxDllLoader::UnloadLibrary(ms_dllRas);
                 ms_dllRas = 0;
 
                 wxDllLoader::UnloadLibrary(ms_dllRas);
                 ms_dllRas = 0;


@@ -455,8 +466,8 @@ wxString wxDialUpManagerMSW::GetErrorString(DWORD error)
 
         default:
             {
 
         default:
             {

-                wxLogSysError(dwRet, _("Failed to retrieve text of RAS "
-                                       "error message"));
+                wxLogSysError(dwRet,
+                      _("Failed to retrieve text of RAS error message"));

 
                 wxString msg;
                 msg.Printf(_("unknown error (error code %08x)."), error);
 
                 wxString msg;
                 msg.Printf(_("unknown error (error code %08x)."), error);


@@ -512,7 +523,7 @@ HRASCONN wxDialUpManagerMSW::FindActiveConnection()
         {
             // an error occured
             wxLogError(_("Cannot find active dialup connection: %s"),
         {
             // an error occured
             wxLogError(_("Cannot find active dialup connection: %s"),

-                       GetErrorString(dwRet));
+                       GetErrorString(dwRet).c_str());

             return 0;
         }
     }
             return 0;
         }
     }


@@ -532,8 +543,7 @@ HRASCONN wxDialUpManagerMSW::FindActiveConnection()
             // connection) - the warning is really needed because this function
             // is used, for example, to select the connection to hang up and so
             // we may hang up the wrong connection here...
             // connection) - the warning is really needed because this function
             // is used, for example, to select the connection to hang up and so
             // we may hang up the wrong connection here...

-            wxLogWarning(_("Several active dialup connections found, "
-                           "choosing one randomly."));
+            wxLogWarning(_("Several active dialup connections found, choosing one randomly."));

             // fall through
 
         case 1:
             // fall through
 
         case 1:


@@ -552,7 +562,7 @@ void wxDialUpManagerMSW::CleanUpThreadData()
     {
         if ( !SetEvent(m_data.hEventQuit) )
         {
     {
         if ( !SetEvent(m_data.hEventQuit) )
         {

-            wxLogLastError("SetEvent(RasThreadQuit)");
+            wxLogLastError(_T("SetEvent(RasThreadQuit)"));

         }
 
         CloseHandle(m_hThread);
         }
 
         CloseHandle(m_hThread);


@@ -634,7 +644,7 @@ void wxDialUpManagerMSW::OnDialProgress(RASCONNSTATE rasconnstate,
     if ( dwError )
     {
         wxLogError(_("Failed to establish dialup connection: %s"),
     if ( dwError )
     {
         wxLogError(_("Failed to establish dialup connection: %s"),

-                   GetErrorString(dwError));
+                   GetErrorString(dwError).c_str());

 
         // we should still call RasHangUp() if we got a non 0 connection
         if ( ms_hRasConnection )
 
         // we should still call RasHangUp() if we got a non 0 connection
         if ( ms_hRasConnection )


@@ -693,7 +703,8 @@ size_t wxDialUpManagerMSW::GetISPNames(wxArrayString& names) const
         else if ( dwRet != 0 )
         {
             // some other error - abort
         else if ( dwRet != 0 )
         {
             // some other error - abort

-            wxLogError(_("Failed to get ISP names: %s"), GetErrorString(dwRet));
+            wxLogError(_("Failed to get ISP names: %s"),
+                       GetErrorString(dwRet).c_str());

 
             free(rasEntries);
 
 
             free(rasEntries);
 


@@ -761,8 +772,7 @@ bool wxDialUpManagerMSW::Dial(const wxString& nameOfISP,
                     entryName = wxGetSingleChoice
                                 (
                                  _("Choose ISP to dial"),
                     entryName = wxGetSingleChoice
                                 (
                                  _("Choose ISP to dial"),

-                                 _("Please choose which ISP do you want to "
-                                   "connect to"),
+                                 _("Please choose which ISP do you want to connect to"),

                                  count,
                                  strings
                                 );
                                  count,
                                  strings
                                 );


@@ -780,7 +790,7 @@ bool wxDialUpManagerMSW::Dial(const wxString& nameOfISP,
 
     RASDIALPARAMS rasDialParams;
     rasDialParams.dwSize = sizeof(rasDialParams);
 
     RASDIALPARAMS rasDialParams;
     rasDialParams.dwSize = sizeof(rasDialParams);

-    strncpy(rasDialParams.szEntryName, entryName, RAS_MaxEntryName);
+    wxStrncpy(rasDialParams.szEntryName, entryName, RAS_MaxEntryName);

 
     // do we have the username and password?
     if ( !username || !password )
 
     // do we have the username and password?
     if ( !username || !password )


@@ -802,8 +812,8 @@ bool wxDialUpManagerMSW::Dial(const wxString& nameOfISP,
     }
        else
        {
     }
        else
        {

-               strncpy(rasDialParams.szUserName, username, UNLEN);
-               strncpy(rasDialParams.szPassword, password, PWLEN);
+               wxStrncpy(rasDialParams.szUserName, username, UNLEN);
+               wxStrncpy(rasDialParams.szPassword, password, PWLEN);

        }
 
        // default values for other fields
        }
 
        // default values for other fields


@@ -854,9 +864,17 @@ bool wxDialUpManagerMSW::Dial(const wxString& nameOfISP,
 
     if ( dwRet != 0 )
     {
 
     if ( dwRet != 0 )
     {

+#if wxUSE_UNICODE
+        // can't pass a wxWCharBuffer through ( ... )
+        wxLogError(_("Failed to %s dialup connection: %s").data(),
+                   async ? _("initiate").data() : _("establish").data(),
+                   GetErrorString(dwRet).c_str());
+#else
+        // can't pass a wxWCharBuffer through ( ... )

         wxLogError(_("Failed to %s dialup connection: %s"),
         wxLogError(_("Failed to %s dialup connection: %s"),

-                   async ? _("initiate") : _("establish"),
-                   GetErrorString(dwRet));
+                   wxString(async ? _("initiate") : _("establish")).c_str(),
+                   GetErrorString(dwRet).c_str());
+#endif

 
         // we should still call RasHangUp() if we got a non 0 connection
         if ( ms_hRasConnection )
 
         // we should still call RasHangUp() if we got a non 0 connection
         if ( ms_hRasConnection )


@@ -928,7 +946,7 @@ bool wxDialUpManagerMSW::HangUp()
     if ( dwRet != 0 )
     {
         wxLogError(_("Failed to terminate the dialup connection: %s"),
     if ( dwRet != 0 )
     {
         wxLogError(_("Failed to terminate the dialup connection: %s"),

-                   GetErrorString(dwRet));
+                   GetErrorString(dwRet).c_str());

     }
 
     ms_isConnected = FALSE;
     }
 
     ms_isConnected = FALSE;


@@ -966,9 +984,6 @@ bool wxDialUpManagerMSW::IsAlwaysOnline() const
                 // there is some connection to the net, see of which type
                 ms_isAlwaysOnline = (flags & INTERNET_CONNECTION_LAN != 0) ||
                                     (flags & INTERNET_CONNECTION_PROXY != 0);
                 // there is some connection to the net, see of which type
                 ms_isAlwaysOnline = (flags & INTERNET_CONNECTION_LAN != 0) ||
                                     (flags & INTERNET_CONNECTION_PROXY != 0);

-
-                wxLogMessage("InternetGetConnectedState() returned TRUE, "
-                             "flags = %08x", flags);

             }
             else
             {
             }
             else
             {


@@ -1047,7 +1062,7 @@ bool wxDialUpManagerMSW::EnableAutoCheckOnlineStatus(size_t nSeconds)
                 dwSuspendCount = ResumeThread(m_hThread);
                 if ( dwSuspendCount == (DWORD)-1 )
                 {
                 dwSuspendCount = ResumeThread(m_hThread);
                 if ( dwSuspendCount == (DWORD)-1 )
                 {

-                    wxLogLastError("ResumeThread(RasThread)");
+                    wxLogLastError(wxT("ResumeThread(RasThread)"));

 
                     ok = FALSE;
                 }
 
                     ok = FALSE;
                 }


@@ -1075,7 +1090,7 @@ bool wxDialUpManagerMSW::EnableAutoCheckOnlineStatus(size_t nSeconds)
                            );
         if ( !m_data.hEventRas )
         {
                            );
         if ( !m_data.hEventRas )
         {

-            wxLogLastError("CreateEvent(RasStatus)");
+            wxLogLastError(wxT("CreateEvent(RasStatus)"));

 
             ok = FALSE;
         }
 
             ok = FALSE;
         }


@@ -1087,7 +1102,7 @@ bool wxDialUpManagerMSW::EnableAutoCheckOnlineStatus(size_t nSeconds)
         m_data.hEventQuit = CreateEvent(NULL, FALSE, FALSE, NULL);
         if ( !m_data.hEventQuit )
         {
         m_data.hEventQuit = CreateEvent(NULL, FALSE, FALSE, NULL);
         if ( !m_data.hEventQuit )
         {

-            wxLogLastError("CreateEvent(RasThreadQuit)");
+            wxLogLastError(wxT("CreateEvent(RasThreadQuit)"));

 
             CleanUpThreadData();
 
 
             CleanUpThreadData();
 


@@ -1106,7 +1121,7 @@ bool wxDialUpManagerMSW::EnableAutoCheckOnlineStatus(size_t nSeconds)
                                     (HMENU)NULL, wxGetInstance(), 0);
         if ( !ms_hwndRas )
         {
                                     (HMENU)NULL, wxGetInstance(), 0);
         if ( !ms_hwndRas )
         {

-            wxLogLastError("CreateWindow(RasHiddenWindow)");
+            wxLogLastError(wxT("CreateWindow(RasHiddenWindow)"));

 
             CleanUpThreadData();
 
 
             CleanUpThreadData();
 


@@ -1143,7 +1158,7 @@ bool wxDialUpManagerMSW::EnableAutoCheckOnlineStatus(size_t nSeconds)
 
         if ( !m_hThread )
         {
 
         if ( !m_hThread )
         {

-            wxLogLastError("CreateThread(RasStatusThread)");
+            wxLogLastError(wxT("CreateThread(RasStatusThread)"));

 
             CleanUpThreadData();
         }
 
             CleanUpThreadData();
         }


@@ -1162,7 +1177,7 @@ bool wxDialUpManagerMSW::EnableAutoCheckOnlineStatus(size_t nSeconds)
         if ( dwRet != 0 )
         {
             wxLogDebug(wxT("RasConnectionNotification() failed: %s"),
         if ( dwRet != 0 )
         {
             wxLogDebug(wxT("RasConnectionNotification() failed: %s"),

-                       GetErrorString(dwRet));
+                       GetErrorString(dwRet).c_str());

 
             CleanUpThreadData();
         }
 
             CleanUpThreadData();
         }


@@ -1194,7 +1209,7 @@ void wxDialUpManagerMSW::DisableAutoCheckOnlineStatus()
         // we have running secondary thread, it's just enough to suspend it
         if ( SuspendThread(m_hThread) == (DWORD)-1 )
         {
         // we have running secondary thread, it's just enough to suspend it
         if ( SuspendThread(m_hThread) == (DWORD)-1 )
         {

-            wxLogLastError("SuspendThread(RasThread)");
+            wxLogLastError(wxT("SuspendThread(RasThread)"));

         }
     }
     else
         }
     }
     else


@@ -1252,7 +1267,7 @@ static DWORD wxRasMonitorThread(wxRasThreadData *data)
                 break;
 
             case WAIT_FAILED:
                 break;
 
             case WAIT_FAILED:

-                wxLogLastError("WaitForMultipleObjects(RasMonitor)");
+                wxLogLastError(wxT("WaitForMultipleObjects(RasMonitor)"));

                 break;
         }
     }
                 break;
         }
     }