#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
#error You need wxUSE_DYNLIB_CLASS to be 1 to compile dialup.cpp.
#endif
#include "wx/dialup.h"
-// Doesn't yet compile under BC++, mingw, Watcom C++: no wininet.h
-#if !defined(__BORLANDC__) && !defined(__GNUWIN32_OLD__) && !defined(__GNUWIN32__) && !defined(__WATCOMC__)
+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 <wininet.h>
-#include "wx/msw/private.h"
+// Not in VC++ 5
+#ifndef INTERNET_CONNECTION_LAN
+#define INTERNET_CONNECTION_LAN 2
+#endif
+#ifndef INTERNET_CONNECTION_PROXY
+#define INTERNET_CONNECTION_PROXY 4
+#endif
// ----------------------------------------------------------------------------
// constants
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 );
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
-struct wxRasThreadData
+struct WXDLLEXPORT wxRasThreadData
{
wxRasThreadData()
{
void CleanUpThreadData();
// timer used for polling RAS status
- class RasTimer : public wxTimer
+ class WXDLLEXPORT RasTimer : public wxTimer
{
public:
RasTimer(wxDialUpManagerMSW *dialUpManager)
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
{
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;
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);
{
// an error occured
wxLogError(_("Cannot find active dialup connection: %s"),
- GetErrorString(dwRet));
+ GetErrorString(dwRet).c_str());
return 0;
}
}
// 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:
{
if ( !SetEvent(m_data.hEventQuit) )
{
- wxLogLastError("SetEvent(RasThreadQuit)");
+ wxLogLastError(_T("SetEvent(RasThreadQuit)"));
}
CloseHandle(m_hThread);
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 )
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);
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
);
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 )
}
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
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"),
- 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 )
if ( dwRet != 0 )
{
wxLogError(_("Failed to terminate the dialup connection: %s"),
- GetErrorString(dwRet));
+ GetErrorString(dwRet).c_str());
}
ms_isConnected = FALSE;
// 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
{
dwSuspendCount = ResumeThread(m_hThread);
if ( dwSuspendCount == (DWORD)-1 )
{
- wxLogLastError("ResumeThread(RasThread)");
+ wxLogLastError(wxT("ResumeThread(RasThread)"));
ok = FALSE;
}
);
if ( !m_data.hEventRas )
{
- wxLogLastError("CreateEvent(RasStatus)");
+ wxLogLastError(wxT("CreateEvent(RasStatus)"));
ok = FALSE;
}
m_data.hEventQuit = CreateEvent(NULL, FALSE, FALSE, NULL);
if ( !m_data.hEventQuit )
{
- wxLogLastError("CreateEvent(RasThreadQuit)");
+ wxLogLastError(wxT("CreateEvent(RasThreadQuit)"));
CleanUpThreadData();
(HMENU)NULL, wxGetInstance(), 0);
if ( !ms_hwndRas )
{
- wxLogLastError("CreateWindow(RasHiddenWindow)");
+ wxLogLastError(wxT("CreateWindow(RasHiddenWindow)"));
CleanUpThreadData();
if ( !m_hThread )
{
- wxLogLastError("CreateThread(RasStatusThread)");
+ wxLogLastError(wxT("CreateThread(RasStatusThread)"));
CleanUpThreadData();
}
if ( dwRet != 0 )
{
wxLogDebug(wxT("RasConnectionNotification() failed: %s"),
- GetErrorString(dwRet));
+ GetErrorString(dwRet).c_str());
CleanUpThreadData();
}
// 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
break;
case WAIT_FAILED:
- wxLogLastError("WaitForMultipleObjects(RasMonitor)");
+ wxLogLastError(wxT("WaitForMultipleObjects(RasMonitor)"));
break;
}
}
projects / wxWidgets.git / blobdiff