BOOL
GetApplicationString(HKEY hKey, LPWSTR lpKeyName, LPWSTR lpString)
{
- DWORD dwSize = MAX_PATH;
+ DWORD dwSize = MAX_PATH * sizeof(WCHAR);
if (RegQueryValueExW(hKey,
lpKeyName,
if (RegOpenKeyW(hKey, szName, &hSubKey) == ERROR_SUCCESS)
{
dwType = REG_SZ;
- dwSize = MAX_PATH;
+ dwSize = sizeof(szDisplayName);
if (RegQueryValueExW(hSubKey,
L"DisplayName",
NULL,
ItemIndex = Index;
}
- ListView_GetItemText(hListView, ItemIndex, 0, szAppName, sizeof(szAppName) / sizeof(WCHAR));
+ ListView_GetItemText(hListView, ItemIndex, 0, szAppName, _countof(szAppName));
WriteLogMessage(EVENTLOG_SUCCESS, MSG_SUCCESS_REMOVE, szAppName);
- ZeroMemory(&Item, sizeof(LVITEM));
+ ZeroMemory(&Item, sizeof(Item));
Item.mask = LVIF_PARAM;
Item.iItem = ItemIndex;
hKey = ItemInfo->hSubKey;
dwType = REG_SZ;
- dwSize = MAX_PATH;
+ dwSize = sizeof(szPath);
if (RegQueryValueExW(hKey,
bModify ? szModify : szUninstall,
NULL,
#define GET_INFO(a, b, c, d) \
if (GetApplicationString(Info->hSubKey, a, szInfo)) \
{ \
- LoadStringW(hInst, b, szText, sizeof(szText) / sizeof(WCHAR)); \
+ LoadStringW(hInst, b, szText, _countof(szText)); \
InsertRichEditText(szText, c); \
InsertRichEditText(szInfo, d); \
} \
Info = ListViewGetlParam(Index);
if (!Info || !Info->hSubKey || (ItemIndex == -1)) return;
- if (!LoadStringW(hInst, IDS_APP_REG_REMOVE, szMsgText, sizeof(szMsgText) / sizeof(WCHAR)) ||
- !LoadStringW(hInst, IDS_INFORMATION, szMsgTitle, sizeof(szMsgTitle) / sizeof(WCHAR)))
+ if (!LoadStringW(hInst, IDS_APP_REG_REMOVE, szMsgText, _countof(szMsgText)) ||
+ !LoadStringW(hInst, IDS_INFORMATION, szMsgTitle, _countof(szMsgTitle)))
return;
if (MessageBoxW(hMainWnd, szMsgText, szMsgTitle, MB_YESNO | MB_ICONQUESTION) == IDYES)
return;
}
- if (!LoadStringW(hInst, IDS_UNABLE_TO_REMOVE, szMsgText, sizeof(szMsgText) / sizeof(WCHAR)))
+ if (!LoadStringW(hInst, IDS_UNABLE_TO_REMOVE, szMsgText, _countof(szMsgText)))
return;
MessageBoxW(hMainWnd, szMsgText, NULL, MB_OK | MB_ICONERROR);
}
dwType = REG_SZ;
- dwSize = MAX_PATH;
+ dwSize = sizeof(pszParentKeyName);
bIsUpdate = (RegQueryValueExW(Info.hSubKey,
L"ParentKeyName",
NULL,
(LPBYTE)pszParentKeyName,
&dwSize) == ERROR_SUCCESS);
- dwSize = MAX_PATH;
+ dwSize = sizeof(pszDisplayName);
if (RegQueryValueExW(Info.hSubKey,
L"DisplayName",
NULL,
if (!lpEnumProc(ItemIndex, pszDisplayName, &Info))
break;
}
+ else
+ {
+ RegCloseKey(Info.hSubKey);
+ }
+ }
+ else
+ {
+ RegCloseKey(Info.hSubKey);
}
}
+ else
+ {
+ RegCloseKey(Info.hSubKey);
+ }
}
dwSize = MAX_PATH;