mozilla
/
pjs
зеркало из https://github.com/mozilla/pjs.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

BUG329102 : Modified code to allow overwrite of existing connectoids without complaining about RNA entry

This commit is contained in:
racham%netscape.com 1998-10-15 03:45:42 +00:00
Родитель 2cc7fbf241
Коммит e93dc1afb1
1 изменённых файлов: 22 добавлений и 49 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

71
cmd/dialup/win/aswplugn/src/dialer.cpp
Просмотреть файл

@ -205,12 +205,10 @@ statusDlgcallback(HWND hWnd,
dwRet = RasHangUp(hRasConn);
if (dwRet == ERROR_INVALID_HANDLE) {
trace("dialer.cpp : statusDlgcallback - Can't hangup. Invalid Connection Handle. (r)");
return FALSE;
trace("dialer.cpp : statusDlgcallback - Can't hangup. Invalid Connection Handle.");
}
else if (dwRet && dwRet != ERROR_INVALID_HANDLE) {
trace("dialer.cpp : statusDlgcallback - Can't hangup. Error %d. (r)", dwRet);
return FALSE;
else if (dwRet) {
trace("dialer.cpp : statusDlgcallback - Can't hangup. Error %d.", dwRet);
}
Sleep(3000);
@ -403,7 +401,7 @@ void ProcessRasDialEvent(RASCONNSTATE rasconnstate, DWORD dwError)
if (dwRet == ERROR_INVALID_HANDLE) {
trace("dialer.cpp : ProcessRasDialEvent (stateConnected) - Can't hangup. Invalid Connection Handle.");
}
else if (dwRet && dwRet != ERROR_INVALID_HANDLE) {
else if (dwRet) {
trace("dialer.cpp : ProcessRasDialEvent (stateConnected) - Can't hangup. Error %d", dwRet);
}
@ -424,7 +422,7 @@ void ProcessRasDialEvent(RASCONNSTATE rasconnstate, DWORD dwError)
{
trace("dialer.cpp : ProcessRasDialEvent (stateConnecting) - Can't hangup. Invalid Connection Handle.");
}
else if (dwRet && dwRet != ERROR_INVALID_HANDLE)
else if (dwRet)
{
trace("dialer.cpp : ProcessRasDialEvent (stateConnecting) - Can't hangup. Error %d", dwRet);
}
@ -592,7 +590,7 @@ static BOOL IsDialerConnected()
if (ret == ERROR_INVALID_NAME) {
trace("dialer.cpp : isDialerConnected - Can't delete regi phonebook entry. Invalid phonebook entry name");
}
else if (ret && ret != ERROR_INVALID_NAME) {
else if (ret) {
trace("dialer.cpp : isDialerConnected - Can't delete regi phone book entry. Error = %d", ret);
}
@ -650,7 +648,7 @@ native_netscape_npasw_SetupPlugin_SECURE_0005fDialerConnect(JRIEnv* env,
if (dwError == ERROR_NOT_ENOUGH_MEMORY){
trace("dialer.cpp : [native] DialerConnect - Not enough memory for dialing activity. Dialing failed.");
}
else if (dwError && dwError != ERROR_NOT_ENOUGH_MEMORY){
else if (dwError){
trace("dialer.cpp : [native] DialerConnect - Dialing failed. Error code = %d",dwError);
}
}
@ -765,7 +763,7 @@ native_netscape_npasw_SetupPlugin_SECURE_0005fDialerConnect(JRIEnv* env,
if (dwRet == ERROR_INVALID_HANDLE) {
trace("dialer.cpp : [native] DialerConnect - Can't hangup. Invalid Connection Handle.");
}
else if (dwRet && dwRet != ERROR_INVALID_HANDLE) {
else if (dwRet) {
trace("dialer.cpp : [native] DialerConnect - Can't hangup. Error %d", dwRet);
}
@ -790,7 +788,7 @@ native_netscape_npasw_SetupPlugin_SECURE_0005fDialerConnect(JRIEnv* env,
if (ret == ERROR_INVALID_NAME) {
trace("dialer.cpp : [native] DialerConnect - Can't delete regi phonebook entry. Invalid phonebook entry name");
}
else if (ret && ret != ERROR_INVALID_NAME) {
else if (ret) {
trace("dialer.cpp : [native] DialerConnect - Can't delete regi phone book entry. Error %d", ret);
}
#else
@ -907,7 +905,7 @@ void DialerHangup()
if (dwRet == ERROR_INVALID_HANDLE) {
trace("dialer.cpp : DialerHangup - Can't hangup. Invalid Connection Handle.");
}
else if (dwRet && dwRet != ERROR_INVALID_HANDLE) {
else if (dwRet) {
trace("dialer.cpp : DialerHangup - Can't hangup. Error %d.", dwRet);
}
@ -935,7 +933,7 @@ void DialerHangup()
if (ret == ERROR_INVALID_NAME) {
trace("dialer.cpp : DialerHangup - Can't delete regi phonebook entry. Invalid phonebook entry name");
}
else if (ret && ret != ERROR_INVALID_NAME) {
else if (ret) {
trace("dialer.cpp : DialerHangup - Can't delete regi phone book entry. Error code %d", ret);
}
@ -1692,39 +1690,32 @@ void EnableDialOnDemandNT(LPSTR lpProfileName)
rtn = (*m_lpfnRasSetAutodialParam)(RASADP_DisableConnectionQuery, &val, sizeof(int));
if (rtn == ERROR_INVALID_PARAMETER) {
trace("dialer.cpp : EnableDialOnDemandNT - Invalid Parameter. Can't set Autodial Parameters. (r)");
return;
trace("dialer.cpp : EnableDialOnDemandNT - Invalid Parameter. Can't set Autodial Parameters.");
}
else if (rtn == ERROR_INVALID_SIZE) {
trace("dialer.cpp : EnableDialOnDemandNT - Invalid size. Can't set Autodial Parameters. (r)");
return;
trace("dialer.cpp : EnableDialOnDemandNT - Invalid size. Can't set Autodial Parameters.");
}
else if (rtn) {
trace("dialer.cpp : EnableDialOnDemandNT - Can't set Autodial Parameters. Error %d. (r)", rtn);
return;
trace("dialer.cpp : EnableDialOnDemandNT - Can't set Autodial Parameters. Error %d.", rtn);
}
rtn = (*m_lpfnRasSetAutodialAddress)("www.netscape.com", 0, &rasAutodialEntry,
sizeof(RASAUTODIALENTRY), 1);
if (rtn == ERROR_INVALID_PARAMETER) {
trace("dialer.cpp : EnableDialOnDemandNT - Invalid Parameter. Can't set Autodial Address. (r)");
return;
trace("dialer.cpp : EnableDialOnDemandNT - Invalid Parameter. Can't set Autodial Address.");
}
else if (rtn == ERROR_INVALID_SIZE) {
trace("dialer.cpp : EnableDialOnDemandNT - Invalid size. Can't set Autodial Address. (r)");
return;
trace("dialer.cpp : EnableDialOnDemandNT - Invalid size. Can't set Autodial Address.");
}
else if (rtn) {
trace("dialer.cpp : EnableDialOnDemandNT - Can't set Autodial Address. Error %d. (r)", rtn);
return;
trace("dialer.cpp : EnableDialOnDemandNT - Can't set Autodial Address. Error %d.", rtn);
}
rtn = (*m_lpfnRasSetAutodialEnable)(rasAutodialEntry.dwDialingLocation, TRUE);
if (rtn) {
trace("dialer.cpp : EnableDialOnDemandNT - Can't set Autodial Enable. Error %d. (r)", rtn);
return;
trace("dialer.cpp : EnableDialOnDemandNT - Can't set Autodial Enable. Error %d.", rtn);
}
}
@ -2097,28 +2088,10 @@ static BOOL CreateRNAEntry( ACCOUNTPARAMS account, const LOCATIONPARAMS& locatio
EnableDialOnDemand( (LPSTR)(LPCSTR)account.ISPName );
#endif //WIN32
dwRet = (*m_lpfnRasValidateEntryName)( NULL, (LPSTR)(LPCSTR)account.ISPName );
//assert( dwRet == 0 );
if (dwRet == ERROR_INVALID_NAME) {
trace ("dialer.cpp : CreateRNAEntry (RasValidateEntryName) - Invalid Name. Can't set RasEntry properties. (r)");
return FALSE;
}
else if (dwRet == ERROR_ALREADY_EXISTS) {
trace ("dialer.cpp : CreateRNAEntry (RasValidateEntryName) - This name already exists. (r)");
return FALSE;
}
else if (dwRet) {
trace ("dialer.cpp : CreateRNAEntry (RasValidateEntryName) - Can't Validate account name. Error %d. (r)", dwRet);
return FALSE;
}
dwRet = (*m_lpfnRasSetEntryProperties)( NULL, (LPSTR)(LPCSTR)account.ISPName,
(LPBYTE)&rasEntry, stRASENTRY, NULL, 0 );
assert( dwRet == 0 );
//if ( dwRet )
//return -1; // ??? this is going to return TRUE
if (dwRet == ERROR_BUFFER_INVALID) {
trace ("dialer.cpp : CreateRNAEntry (RasSetEntryProperties) - Invalid Buffer. Can't set RasEntry properties. (r)");
return FALSE;
@ -2190,7 +2163,7 @@ static BOOL CreateRNAEntry( ACCOUNTPARAMS account, const LOCATIONPARAMS& locatio
strcat( pbPath, "\\ras\\rasphone.pbk" );
strcat( pbPath, "\0" );
ret = ( RasSetEntryDialParams( pbPath, &dialParams, FALSE ) == 0 );
dwRet = RasSetEntryDialParams( pbPath, &dialParams, FALSE );
if (dwRet == ERROR_BUFFER_INVALID) {
trace ("dialer.cpp : CreateRNAEntry (RasSetEntryDialParams) - Invalid Buffer. Can't set RasEntry Dial properties. (r)");
@ -2209,6 +2182,8 @@ static BOOL CreateRNAEntry( ACCOUNTPARAMS account, const LOCATIONPARAMS& locatio
return FALSE;
}
ret = (dwRet == 0);
// sets up user login info for new phonebook entry
memset( &credentials, 0, sizeof( RASCREDENTIALS ) );
credentials.dwSize = sizeof( RASCREDENTIALS );
@ -2253,14 +2228,12 @@ static BOOL CreateRNAEntry( ACCOUNTPARAMS account, const LOCATIONPARAMS& locatio
{
free( sysDir );
// Err: not enough memory for pbPath!
//return -2; // ???
return FALSE;
}
}
else
{
// Err: not enough memory for sysDir;
//return -3; // ???
return FALSE;
} // if (sysDir)
} // else if (platformOS == VER_PLATFORM_WIN32_NT