ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

uninstaller: Fail more gracefully when the registry key is missing.

This commit is contained in:
Alexandre Julliard 2006-07-25 17:50:27 +02:00
parent 8cec3cf120
commit 084458bc2e
1 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
programs/uninstaller/main.c
View File

@ -76,8 +76,7 @@ static void ListUninstallPrograms(void)
char *descr; char *descr;
char *key; char *key;
if (! FetchUninstallInformation()) FetchUninstallInformation();
return;
for (i=0; i < numentries; i++) for (i=0; i < numentries; i++)
{ {
@ -100,8 +99,7 @@ static void RemoveSpecificProgram(WCHAR *nameW)
int lenName; int lenName;
char *name; char *name;
if (! FetchUninstallInformation()) FetchUninstallInformation();
return;
for (i=0; i < numentries; i++) for (i=0; i < numentries; i++)
{ {
@ -196,10 +194,7 @@ static int FetchUninstallInformation(void)
numentries = 0; numentries = 0;
oldsel = -1; oldsel = -1;
if (RegOpenKeyExW(HKEY_LOCAL_MACHINE, PathUninstallW, 0, KEY_READ, &hkeyUninst) != ERROR_SUCCESS) if (RegOpenKeyExW(HKEY_LOCAL_MACHINE, PathUninstallW, 0, KEY_READ, &hkeyUninst) != ERROR_SUCCESS)
{
MessageBoxW(0, sRegistryKeyNotAvailable, sAppName, MB_OK);
return 0; return 0;
}
if (!entries) if (!entries)
entries = HeapAlloc(GetProcessHeap(), 0, sizeof(uninst_entry)); entries = HeapAlloc(GetProcessHeap(), 0, sizeof(uninst_entry));
@ -363,6 +358,7 @@ static void UpdateList(HWND hList)
prevsel = SendMessageW(hList, LB_GETCURSEL, 0, 0); prevsel = SendMessageW(hList, LB_GETCURSEL, 0, 0);
if (!(FetchUninstallInformation())) if (!(FetchUninstallInformation()))
{ {
MessageBoxW(0, sRegistryKeyNotAvailable, sAppName, MB_OK);
PostQuitMessage(0); PostQuitMessage(0);
return; return;
} }