X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/03baf031866c399a835fef3a00834e32857e0dde..e4a8a172020d5e3ee08660420142e702799c7878:/src/msw/dialup.cpp?ds=sidebyside diff --git a/src/msw/dialup.cpp b/src/msw/dialup.cpp index e8480bd8a3..3ccfba7a7f 100644 --- a/src/msw/dialup.cpp +++ b/src/msw/dialup.cpp @@ -48,11 +48,13 @@ 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__) && \ +// Doesn't yet compile under VC++ 4, BC++, Watcom C++, +// Wine: no wininet.h +#if (!defined(__BORLANDC__) || (__BORLANDC__>=0x550)) && \ (!defined(__GNUWIN32__) || wxCHECK_W32API_VERSION(0, 5)) && \ !defined(__GNUWIN32_OLD__) && \ !defined(__WATCOMC__) && \ + !defined(__WINE__) && \ (!defined(__VISUALC__) || (__VISUALC__ >= 1020)) #include @@ -213,6 +215,8 @@ private: private: wxDialUpManagerMSW *m_dialUpManager; + + DECLARE_NO_COPY_CLASS(RasTimer) } m_timerStatusPolling; // thread handle for the thread sitting on connection change event @@ -223,7 +227,7 @@ private: wxRasThreadData m_data; // the handle of rasapi32.dll when it's loaded - wxPluginManager m_dllRas; + wxDynamicLibrary m_dllRas; // the hidden window we use for passing messages between threads static HWND ms_hwndRas; @@ -231,12 +235,6 @@ private: // the handle of the connection we initiated or 0 if none static HRASCONN ms_hRasConnection; - // FIXME: There is probably no reason these really need to - // be static anymore since the dll refcounting is - // handled by wxPluginManager now. Whether or not - // we still _want_ them to be static is another - // issue entirely.. - // the pointers to RAS functions static RASDIAL ms_pfnRasDial; static RASENUMCONNECTIONS ms_pfnRasEnumConnections; @@ -266,12 +264,10 @@ private: // this flag tells us if we're online static int ms_isConnected; - // this flag is the result of the call to IsAlwaysOnline() (-1 if not - // called yet) - static int ms_isAlwaysOnline; - // this flag tells us whether a call to RasDial() is in progress static wxDialUpManagerMSW *ms_dialer; + + DECLARE_NO_COPY_CLASS(wxDialUpManagerMSW) }; // ---------------------------------------------------------------------------- @@ -321,7 +317,6 @@ RASCONNECTIONNOTIFICATION wxDialUpManagerMSW::ms_pfnRasConnectionNotification = int wxDialUpManagerMSW::ms_userSpecifiedOnlineStatus = -1; int wxDialUpManagerMSW::ms_isConnected = -1; -int wxDialUpManagerMSW::ms_isAlwaysOnline = -1; wxDialUpManagerMSW *wxDialUpManagerMSW::ms_dialer = NULL; // ---------------------------------------------------------------------------- @@ -340,8 +335,8 @@ wxDialUpManager *wxDialUpManager::Create() #endif // VC++ wxDialUpManagerMSW::wxDialUpManagerMSW() - : m_timerStatusPolling(this) - , m_dllRas(_T("RASAPI32")) + : m_timerStatusPolling(this), + m_dllRas(_T("RASAPI32")) { // initialize our data m_hThread = 0; @@ -350,7 +345,7 @@ wxDialUpManagerMSW::wxDialUpManagerMSW() { wxLogError(_("Dial up functions are unavailable because the remote access service (RAS) is not installed on this machine. Please install it.")); } - else if( ms_pfnRasDial == 0 ) + else if ( !ms_pfnRasDial ) { // resolve the functions we need @@ -830,12 +825,12 @@ bool wxDialUpManagerMSW::Dial(const wxString& nameOfISP, DWORD dwRet = ms_pfnRasDial ( - (LPRASDIALEXTENSIONS)NULL, // no extended features - NULL, // default phone book file (NT only) + NULL, // no extended features + NULL, // default phone book file (NT only) &rasDialParams, - 0, // use callback for notifications - async ? wxRasDialFunc // the callback - : 0, // no notifications - sync operation + 0, // use callback for notifications + async ? (void *)wxRasDialFunc // cast needed for gcc 3.1 + : 0, // no notifications, sync operation &ms_hRasConnection ); @@ -926,20 +921,16 @@ bool wxDialUpManagerMSW::HangUp() bool wxDialUpManagerMSW::IsAlwaysOnline() const { - // we cache the result (presumably this won't change while the program is - // running!) - if ( ms_isAlwaysOnline != -1 ) - { - return ms_isAlwaysOnline != 0; - } + // assume no permanent connection by default + bool isAlwaysOnline = FALSE; - // try to use WinInet function first + // try to use WinInet functions // NB: we could probably use wxDynamicLibrary here just as well, // but we allow multiple instances of wxDialUpManagerMSW so // we might as well use the ref counted version here too. - wxPluginManager hDll(_T("WININET")); + wxDynamicLibrary hDll(_T("WININET")); if ( hDll.IsLoaded() ) { typedef BOOL (WINAPI *INTERNETGETCONNECTEDSTATE)(LPDWORD, DWORD); @@ -956,45 +947,26 @@ bool wxDialUpManagerMSW::IsAlwaysOnline() const if ( pfnInternetGetConnectedState(&flags, 0 /* reserved */) ) { // there is some connection to the net, see of which type - ms_isAlwaysOnline = ((flags & INTERNET_CONNECTION_LAN) != 0) - || ((flags & INTERNET_CONNECTION_PROXY) != 0); - } - else - { - // no Internet connection at all - ms_isAlwaysOnline = FALSE; + isAlwaysOnline = (flags & (INTERNET_CONNECTION_LAN | + INTERNET_CONNECTION_PROXY)) != 0; } + //else: no Internet connection at all } } - // did we succeed with WinInet? if not, try something else - if ( ms_isAlwaysOnline == -1 ) - { - if ( !IsOnline() ) - { - // definitely no permanent connection because we are not connected - // now - ms_isAlwaysOnline = FALSE; - } - else - { - // of course, having a modem doesn't prevent us from having a - // permanent connection as well, but we have to guess somehow and - // it's probably more common that a system connected via a modem - // doesn't have any other net access, so: - ms_isAlwaysOnline = FALSE; - } - } - - wxASSERT_MSG( ms_isAlwaysOnline != -1, wxT("logic error") ); - - return ms_isAlwaysOnline != 0; + return isAlwaysOnline; } bool wxDialUpManagerMSW::IsOnline() const { wxCHECK_MSG( IsOk(), FALSE, wxT("using uninitialized wxDialUpManager") ); + if ( IsAlwaysOnline() ) + { + // always => now + return true; + } + if ( ms_userSpecifiedOnlineStatus != -1 ) { // user specified flag overrides our logic @@ -1250,22 +1222,31 @@ static DWORD wxRasMonitorThread(wxRasThreadData *data) static LRESULT APIENTRY wxRasStatusWindowProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam) { - if ( message == wxWM_RAS_STATUS_CHANGED ) - { - wxRasThreadData *data = (wxRasThreadData *)lParam; - data->dialUpManager->OnConnectStatusChange(); - } - else if ( message == wxWM_RAS_DIALING_PROGRESS ) + switch ( message ) { - wxDialUpManagerMSW *dialUpManager = wxDialUpManagerMSW::GetDialer(); + case wxWM_RAS_STATUS_CHANGED: + { + wxRasThreadData *data = (wxRasThreadData *)lParam; + data->dialUpManager->OnConnectStatusChange(); + } + break; - dialUpManager->OnDialProgress((RASCONNSTATE)wParam, lParam); + case wxWM_RAS_DIALING_PROGRESS: + { + wxDialUpManagerMSW *dialMan = wxDialUpManagerMSW::GetDialer(); + + dialMan->OnDialProgress((RASCONNSTATE)wParam, lParam); + } + break; + + default: + return ::DefWindowProc(hWnd, message, wParam, lParam); } return 0; } -static void WINAPI wxRasDialFunc(UINT unMsg, +static void WINAPI wxRasDialFunc(UINT WXUNUSED(unMsg), RASCONNSTATE rasconnstate, DWORD dwError) { @@ -1277,8 +1258,7 @@ static void WINAPI wxRasDialFunc(UINT unMsg, rasconnstate, dwError); } -#endif - // __BORLANDC__ +#endif // __BORLANDC__ + #endif // wxUSE_DIALUP_MANAGER -// vi:sts=4:sw=4:et