From 8e0d3dde71f5ebfe0fb6e7f73dcc0018f997219d Mon Sep 17 00:00:00 2001 From: Rom Walton Date: Thu, 16 Feb 2006 19:59:23 +0000 Subject: [PATCH] *** empty log message *** svn path=/trunk/boinc/; revision=9490 --- checkin_notes | 4 ++++ clientgui/WelcomePage.cpp | 2 +- clientlib/win/BOINCSENSSink.cpp | 6 ------ clientlib/win/NetworkTracker.cpp | 12 ------------ 4 files changed, 5 insertions(+), 19 deletions(-) diff --git a/checkin_notes b/checkin_notes index 9ae8253ab1..66c64076d7 100755 --- a/checkin_notes +++ b/checkin_notes @@ -1937,6 +1937,7 @@ Rom 16 Feb 2006 defect from an account manager - Remove CompletionUpdatePage.cpp and CompletionRemovePage.cpp - Remove AccountManagerStatusPage.cpp + - Remove trace messages from boinc dll. clientgui/ AccountManagerProcessingPage.cpp @@ -1951,3 +1952,6 @@ Rom 16 Feb 2006 clientgui/res/ stats.xpm (Added) usage.xpm + clientlib/win/ + BOINCSENSSink.cpp + NetworkTracker.cpp diff --git a/clientgui/WelcomePage.cpp b/clientgui/WelcomePage.cpp index 9b50d7c181..366ee925c7 100644 --- a/clientgui/WelcomePage.cpp +++ b/clientgui/WelcomePage.cpp @@ -318,7 +318,7 @@ void CWelcomePage::OnPageChanged( wxWizardExEvent& event ) { ); strBuffer.Printf( _("We'll now remove this computer from %s. You will\n" - "be responisible for managing the BOINC client software from\n" + "be responsible for managing the BOINC client software from\n" "now on."), pWAM->m_strProjectName.c_str() ); diff --git a/clientlib/win/BOINCSENSSink.cpp b/clientlib/win/BOINCSENSSink.cpp index f2f8351b68..357c893e25 100755 --- a/clientlib/win/BOINCSENSSink.cpp +++ b/clientlib/win/BOINCSENSSink.cpp @@ -43,9 +43,6 @@ void CBOINCSENSSink::FinalRelease() HRESULT CBOINCSENSSink::ConnectionMade(BSTR bstrConnection, unsigned long ulType, SENS_QOCINFO * lpQOCInfo) { USES_CONVERSION; - ATLTRACE(TEXT("ConnectionMade: Connection: '%s' Type '%d'\n"), COLE2T(bstrConnection), ulType); - ATLTRACE(TEXT("ConnectionMade: dwSize '%d' dwFlags: '%d' dwOutSpeed '%d' dwInSpeed '%d'\n"), - lpQOCInfo->dwSize, lpQOCInfo->dwFlags, lpQOCInfo->dwOutSpeed, lpQOCInfo->dwInSpeed); std::vector::iterator iter; BOOL bCachedConnectionFound = FALSE; @@ -62,7 +59,6 @@ HRESULT CBOINCSENSSink::ConnectionMade(BSTR bstrConnection, unsigned long ulType } if (!bCachedConnectionFound) { - ATLTRACE(TEXT("ConnectionMade: Creating new record.\n")); PNETWORK_CONNECTION pNetworkConnection = new NETWORK_CONNECTION; pNetworkConnection->bstrConnection = bstrConnection; pNetworkConnection->ulType = ulType; @@ -76,7 +72,6 @@ HRESULT CBOINCSENSSink::ConnectionMade(BSTR bstrConnection, unsigned long ulType HRESULT CBOINCSENSSink::ConnectionMadeNoQOCInfo(BSTR bstrConnection, unsigned long ulType) { USES_CONVERSION; - ATLTRACE(TEXT("ConnectionMadeNoQOCInfo: Connection: '%s' Type '%d'\n"), COLE2T(bstrConnection), ulType); std::vector::iterator iter; BOOL bCachedConnectionFound = FALSE; @@ -105,7 +100,6 @@ HRESULT CBOINCSENSSink::ConnectionMadeNoQOCInfo(BSTR bstrConnection, unsigned lo HRESULT CBOINCSENSSink::ConnectionLost(BSTR bstrConnection, unsigned long ulType) { USES_CONVERSION; - ATLTRACE(TEXT("ConnectionLost: Connection: '%s' Type '%d'\n"), COLE2T(bstrConnection), ulType); std::vector::iterator iter; for (iter = gpNetworkConnections.begin(); iter != gpNetworkConnections.end(); iter++) { if ((*iter)->bstrConnection == bstrConnection) { diff --git a/clientlib/win/NetworkTracker.cpp b/clientlib/win/NetworkTracker.cpp index 88639f082a..5c4d36e604 100755 --- a/clientlib/win/NetworkTracker.cpp +++ b/clientlib/win/NetworkTracker.cpp @@ -42,16 +42,12 @@ EXTERN_C __declspec(dllexport) BOOL BOINCIsNetworkAlive( LPDWORD lpdwFlags ) BOOL bCachePopulated = FALSE; PNETWORK_CONNECTION pNetworkConnection = NULL; - ATLTRACE(TEXT("BOINCIsNetworkAlive - Function Begin\n")); - // Check cached connection state if (!gpNetworkConnections.empty()) { - ATLTRACE(TEXT("BOINCIsNetworkAlive - Using cached connection list\n")); bCachePopulated = TRUE; for (i=0; iulType & *lpdwFlags) { - ATLTRACE(TEXT("BOINCIsNetworkAlive - Cached connection type found\n")); bReturnValue = TRUE; } } @@ -60,7 +56,6 @@ EXTERN_C __declspec(dllexport) BOOL BOINCIsNetworkAlive( LPDWORD lpdwFlags ) // If we do not have any cached information, then fall back to other // methods if (!bCachePopulated) { - ATLTRACE(TEXT("BOINCIsNetworkAlive - Calling SENS IsNetworkAlive()\n")); bReturnValue = IsNetworkAlive( lpdwFlags ); if (!bReturnValue) { DWORD current_flags = NULL; @@ -77,7 +72,6 @@ EXTERN_C __declspec(dllexport) BOOL BOINCIsNetworkAlive( LPDWORD lpdwFlags ) if (NETWORK_ALIVE_AOL & *lpdwFlags) desired_flags |= INTERNET_CONNECTION_LAN | INTERNET_CONNECTION_MODEM; - ATLTRACE(TEXT("BOINCIsNetworkAlive - Calling InternetGetConnectedState()\n")); BOOL retval = InternetGetConnectedState(¤t_flags, 0); if (retval && (current_flags & desired_flags)) { bReturnValue = TRUE; @@ -87,8 +81,6 @@ EXTERN_C __declspec(dllexport) BOOL BOINCIsNetworkAlive( LPDWORD lpdwFlags ) } } - ATLTRACE(TEXT("BOINCIsNetworkAlive - Returning '%d'\n"), bReturnValue); - ATLTRACE(TEXT("BOINCIsNetworkAlive - Function End\n")); return bReturnValue; } @@ -98,12 +90,8 @@ EXTERN_C __declspec(dllexport) BOOL BOINCIsNetworkAlwaysOnline() BOOL bReturnValue = FALSE; DWORD dwFlags = NETWORK_ALIVE_LAN; - ATLTRACE(TEXT("BOINCIsNetworkAlwaysOnline - Function Begin\n")); - bReturnValue = BOINCIsNetworkAlive(&dwFlags); - ATLTRACE(TEXT("BOINCIsNetworkAlwaysOnline - Returning '%d'\n"), bReturnValue); - ATLTRACE(TEXT("BOINCIsNetworkAlwaysOnline - Function End\n")); return bReturnValue; }