Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-06 06:12:59 +00:00
Code Issues Projects Releases Packages Wiki Activity

[RAPPS]

Browse source 
fix handle leaks

svn path=/trunk/; revision=67305
This commit is contained in:
Christoph von Wittich 2015-04-19 19:28:03 +00:00
parent ece1ba5016
commit 3804a6e321
3 changed files with 21 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

9
reactos/base/applications/rapps/available.c
View file

@ -26,7 +26,7 @@
b[0] = '\0'; b[0] = '\0';
LIST_ENTRY CachedEntriesHead = { &CachedEntriesHead, &CachedEntriesHead }; LIST_ENTRY CachedEntriesHead = { &CachedEntriesHead, &CachedEntriesHead };
PLIST_ENTRY pCachedEntry = NULL; PLIST_ENTRY pCachedEntry = &CachedEntriesHead;
BOOL BOOL
ShowAvailableAppInfo(INT Index) ShowAvailableAppInfo(INT Index)
@ -151,13 +151,6 @@ EnumAvailableApplications(INT EnumType, AVAILENUMPROC lpEnumProc)
PAPPLICATION_INFO Info; PAPPLICATION_INFO Info;
HRESULT hr; HRESULT hr;
/* initialize the cached list if hasn't been yet */
if (pCachedEntry == NULL)
{
InitializeListHead(&CachedEntriesHead);
pCachedEntry = &CachedEntriesHead;
}
if (!GetStorageDirectory(szPath, _countof(szPath))) if (!GetStorageDirectory(szPath, _countof(szPath)))
return FALSE; return FALSE;

12
reactos/base/applications/rapps/installed.c
View file

@ -282,8 +282,20 @@ EnumInstalledApplications(INT EnumType, BOOL IsUserKey, APPENUMPROC lpEnumProc)
if (!lpEnumProc(ItemIndex, pszDisplayName, &Info)) if (!lpEnumProc(ItemIndex, pszDisplayName, &Info))
break; break;
} }
else
{
RegCloseKey(Info.hSubKey);
} }
} }
else
{
RegCloseKey(Info.hSubKey);
}
}
else
{
RegCloseKey(Info.hSubKey);
}
} }
dwSize = MAX_PATH; dwSize = MAX_PATH;

9
reactos/base/applications/rapps/winmain.c
View file

@ -127,10 +127,17 @@ EnumInstalledAppProc(INT ItemIndex, LPWSTR lpName, PINSTALLED_INFO Info)
INT Index; INT Index;
if (!SearchPatternMatch(lpName, szSearchPattern)) if (!SearchPatternMatch(lpName, szSearchPattern))
{
RegCloseKey(Info->hSubKey);
return TRUE; return TRUE;
}
ItemInfo = HeapAlloc(GetProcessHeap(), 0, sizeof(INSTALLED_INFO)); ItemInfo = HeapAlloc(GetProcessHeap(), 0, sizeof(INSTALLED_INFO));
if (!ItemInfo) return FALSE; if (!ItemInfo)
{
RegCloseKey(Info->hSubKey);
return FALSE;
}
RtlCopyMemory(ItemInfo, Info, sizeof(INSTALLED_INFO)); RtlCopyMemory(ItemInfo, Info, sizeof(INSTALLED_INFO));