fixing bugsgape #2279 - shrimp uninstall fails. r=sgehani. affects windows platforms only

This commit is contained in:
ssu%netscape.com 2000-09-14 23:05:57 +00:00
parent 3a0e695fc3
commit 3b88620c17
2 changed files with 8 additions and 8 deletions

View File

@ -5081,15 +5081,15 @@ HRESULT DecryptVariable(LPSTR szVariable, DWORD dwVariableSize)
wsprintf(szVariable, "Software\\Netscape\\Netscape 6\\%s", szBuf);
}
else if(lstrcmpi(szVariable, "Netscape Instant Messenger CurrentVersion") == 0)
else if(lstrcmpi(szVariable, "Netscape Netbusiness Messenger CurrentVersion") == 0)
{
/* parse for the current Netscape WinReg key */
GetWinReg(HKEY_LOCAL_MACHINE, "Software\\Netscape\\Netscape Instant Messenger", "CurrentVersion", szBuf, sizeof(szBuf));
GetWinReg(HKEY_LOCAL_MACHINE, "Software\\Netscape\\Netscape Netbusiness Messenger", "CurrentVersion", szBuf, sizeof(szBuf));
if(*szBuf == '\0')
return(FALSE);
wsprintf(szVariable, "Software\\Netscape\\Netscape Instant Messenger\\%s", szBuf);
wsprintf(szVariable, "Software\\Netscape\\Netscape Netbusiness Messenger\\%s", szBuf);
}
else if(lstrcmpi(szVariable, "Mozilla Seamonkey CurrentVersion") == 0)
{

View File

@ -1501,19 +1501,19 @@ HRESULT DecryptVariable(LPSTR szVariable, DWORD dwVariableSize)
wsprintf(szVariable, "Software\\Netscape\\Netscape 6\\%s", szBuf);
}
else if(lstrcmpi(szVariable, "WinRegKey Netscape Instant Messenger") == 0)
else if(lstrcmpi(szVariable, "WinRegKey Netscape Netbusiness Messenger") == 0)
{
lstrcpy(szVariable, "Software\\Netscape\\Netscape Instant Messenger");
lstrcpy(szVariable, "Software\\Netscape\\Netscape Netbusiness Messenger");
}
else if(lstrcmpi(szVariable, "Netscape Instant Messenger CurrentVersion") == 0)
else if(lstrcmpi(szVariable, "Netscape Netbusiness Messenger CurrentVersion") == 0)
{
/* parse for the current Netscape WinReg key */
GetWinReg(HKEY_LOCAL_MACHINE, "Software\\Netscape\\Netscape Instant Messenger", "CurrentVersion", szBuf, sizeof(szBuf));
GetWinReg(HKEY_LOCAL_MACHINE, "Software\\Netscape\\Netscape Netbusiness Messenger", "CurrentVersion", szBuf, sizeof(szBuf));
if(*szBuf == '\0')
return(FALSE);
wsprintf(szVariable, "Software\\Netscape\\Netscape Instant Messenger\\%s", szBuf);
wsprintf(szVariable, "Software\\Netscape\\Netscape Netbusiness Messenger\\%s", szBuf);
}
else if(lstrcmpi(szVariable, "WinRegKey Mozilla Seamonkey") == 0)
{