Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-07-30 19:01:54 +00:00
Code Issues Projects Releases Packages Wiki Activity

[RAPPS] Re-add support for icons named after the ini file

Browse source
This commit is contained in:
Mark Jansen 2020-09-30 19:24:52 +02:00
parent 12caaece25
commit 7a2c1f7d0b
No known key found for this signature in database
GPG key ID: B39240EE84BEAE8B
1 changed files with 19 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

24
base/applications/rapps/available.cpp
View file

@ -92,18 +92,32 @@ VOID CAvailableApplicationInfo::RetrieveGeneralInfo(AvailableStrings& AvlbString
} }
} }
ATL::CStringW IconPath = AvlbStrings.szAppsPath;
PathAppendW(IconPath.GetBuffer(MAX_PATH), L"icons");
// TODO: are we going to support specify an URL for an icon ? // TODO: are we going to support specify an URL for an icon ?
ATL::CStringW IconLocation; ATL::CStringW IconLocation;
if (GetString(L"Icon", IconLocation)) if (GetString(L"Icon", IconLocation))
{ {
// TODO: Does the filename contain anything stuff like ":" "<" ">" ?
// these stuff may lead to security issues
ATL::CStringW IconPath = AvlbStrings.szAppsPath;
PathAppendW(IconPath.GetBuffer(MAX_PATH), L"icons");
BOOL bSuccess = PathAppendNoDirEscapeW(IconPath.GetBuffer(), IconLocation.GetString()); BOOL bSuccess = PathAppendNoDirEscapeW(IconPath.GetBuffer(), IconLocation.GetString());
IconPath.ReleaseBuffer(); IconPath.ReleaseBuffer();
if (bSuccess) if (!bSuccess)
{
IconPath.Empty();
}
}
else
{
// inifile.ico
PathAppendW(IconPath.GetBuffer(), m_szPkgName);
IconPath.ReleaseBuffer();
IconPath += L".ico";
}
if (!IconPath.IsEmpty())
{
if (PathFileExistsW(IconPath))
{ {
m_szIconLocation = IconPath; m_szIconLocation = IconPath;
} }