* PROJECT: ReactOS Applications Manager
* LICENSE: GPL - See COPYING in the top level directory
* FILE: base/applications/rapps/available.cpp
- * PURPOSE: Functions for working with available applications
+ * PURPOSE: Classes for working with available applications
* PROGRAMMERS: Dmitry Chapyshev (dmitry@reactos.org)
* Ismael Ferreras Morezuelas (swyterzone+ros@gmail.com)
* Alexander Shaposhnikov (chaez.san@gmail.com)
#include "rapps.h"
-ATL::CAtlList<PAPPLICATION_INFO> InfoList;
+ // CAvailableApplicationInfo
-inline VOID
-InsertTextAfterLoaded_RichEdit(UINT uStringID, const ATL::CStringW& szText, DWORD StringFlags, DWORD TextFlags)
+CAvailableApplicationInfo::CAvailableApplicationInfo(const ATL::CStringW& sFileNameParam)
{
- ATL::CStringW szLoadedText;
- if (!szText.IsEmpty() && szLoadedText.LoadStringW(hInst, uStringID))
- {
- InsertRichEditText(szLoadedText, StringFlags);
- InsertRichEditText(szText, TextFlags);
- }
+ LicenseType = LICENSE_TYPE::None;
+ sFileName = sFileNameParam;
+ RetrieveCategory();
}
-inline VOID
-InsertLoadedTextNewl_RichEdit(UINT uStringID, DWORD StringFlags)
+VOID CAvailableApplicationInfo::RefreshAppInfo()
{
- ATL::CStringW szLoadedText;
- if (szLoadedText.LoadStringW(hInst, uStringID))
+ if (RetrieveGeneralInfo())
{
- InsertRichEditText(L"\n", 0);
- InsertRichEditText(szLoadedText, StringFlags);
- InsertRichEditText(L"\n", 0);
+ RetrieveLicenseType();
+ RetrieveLanguages();
+ RetrieveInstalledStatus();
+ if (m_IsInstalled)
+ {
+ RetrieveInstalledVersion();
+ }
}
}
-inline BOOL
-GetString(LPCWSTR lpKeyName, ATL::CStringW& ReturnedString, const ATL::CStringW& cFileName)
+BOOL CAvailableApplicationInfo::RetrieveGeneralInfo()
{
- if (!ParserGetString(lpKeyName, cFileName, ReturnedString))
+ if (szUrlDownload.IsEmpty())
{
- ReturnedString.Empty();
- return FALSE;
- }
- return TRUE;
-}
+ if (!GetString(L"Name", szName)
+ || !GetString(L"URLDownload", szUrlDownload))
+ {
+ return FALSE;
+ }
-//Check both registry keys in 64bit system
-//TODO: check system type beforehand to avoid double checks?
-inline BOOL
-GetInstalledVersionEx(PAPPLICATION_INFO Info, ATL::CStringW* szVersion, REGSAM key)
-{
- return (!Info->szRegName.IsEmpty()
- && (GetInstalledVersion_WowUser(szVersion, Info->szRegName, TRUE, key)
- || GetInstalledVersion_WowUser(szVersion, Info->szRegName, FALSE, key)))
- || (!Info->szName.IsEmpty()
- && (GetInstalledVersion_WowUser(szVersion, Info->szName, TRUE, key)
- || GetInstalledVersion_WowUser(szVersion, Info->szName, FALSE, key)));
+ GetString(L"RegName", szRegName);
+ GetString(L"Version", szVersion);
+ GetString(L"License", szLicense);
+ GetString(L"Description", szDesc);
+ GetString(L"Size", szSize);
+ GetString(L"URLSite", szUrlSite);
+ GetString(L"CDPath", szCDPath);
+ GetString(L"Language", szRegName);
+ GetString(L"SHA1", szSHA1);
+ return TRUE;
+ }
+ return FALSE;
}
-inline BOOL
-GetInstalledVersion(PAPPLICATION_INFO Info, ATL::CStringW* szVersion)
+VOID CAvailableApplicationInfo::RetrieveInstalledStatus()
{
- return GetInstalledVersionEx(Info, szVersion, KEY_WOW64_32KEY)
- || GetInstalledVersionEx(Info, szVersion, KEY_WOW64_64KEY);
+ m_IsInstalled = ::GetInstalledVersion(NULL, szRegName)
+ || ::GetInstalledVersion(NULL, szName);
}
-inline BOOL
-IsAppInstalled(PAPPLICATION_INFO Info)
+VOID CAvailableApplicationInfo::RetrieveInstalledVersion()
{
- return GetInstalledVersion(Info, NULL);
+ m_HasInstalledVersion = ::GetInstalledVersion(&szInstalledVersion, szRegName)
+ || ::GetInstalledVersion(&szInstalledVersion, szName);
}
-ATL::CSimpleArray<ATL::CStringW>
-ParserGetAppLanguages(const ATL::CStringW& szFileName)
+BOOL CAvailableApplicationInfo::RetrieveLanguages()
{
const WCHAR cDelimiter = L'|';
ATL::CStringW szBuffer;
- if (!ParserGetString(L"Languages", szFileName, szBuffer))
- return CSimpleArray<ATL::CStringW>();
+ // TODO: Get multiline parameter
+ if (!ParserGetString(L"Languages", sFileName, szBuffer))
+ return FALSE;
+ // Parse parameter string
ATL::CStringW szLocale;
- ATL::CSimpleArray<ATL::CStringW> arrLocalesResult;
for (INT i = 0; szBuffer[i] != UNICODE_NULL; ++i)
{
if (szBuffer[i] != cDelimiter)
{
szLocale += szBuffer[i];
- } else {
- arrLocalesResult.Add(szLocale);
+ }
+ else
+ {
+ Languages.Add(szLocale);
szLocale.Empty();
}
}
+
// For the text after delimiter
if (!szLocale.IsEmpty())
{
- arrLocalesResult.Add(szLocale);
+ Languages.Add(szLocale);
}
- return arrLocalesResult;
+
+ return TRUE;
}
-BOOL
-HasNativeLanguage(PAPPLICATION_INFO Info)
+VOID CAvailableApplicationInfo::RetrieveLicenseType()
{
- if (!Info)
+ INT IntBuffer = ParserGetInt(L"LicenseType", sFileName);
+
+ if (IntBuffer < 0 || IntBuffer > LICENSE_TYPE::Max)
{
- return FALSE;
+ LicenseType = LICENSE_TYPE::None;
+ }
+ else
+ {
+ LicenseType = (LICENSE_TYPE) IntBuffer;
}
- //TODO: make the actual check
- return TRUE;
}
-BOOL
-HasEnglishLanguage(PAPPLICATION_INFO Info)
+
+VOID CAvailableApplicationInfo::RetrieveCategory()
{
- if (!Info)
+ Category = ParserGetInt(L"Category", sFileName);
+}
+
+BOOL CAvailableApplicationInfo::HasLanguageInfo() const
+{
+ return m_HasLanguageInfo;
+}
+
+BOOL CAvailableApplicationInfo::HasNativeLanguage() const
+{
+ if (!m_HasLanguageInfo)
{
return FALSE;
}
+
//TODO: make the actual check
return TRUE;
}
-LICENSE_TYPE
-ParserGetLicenseType(const ATL::CStringW& szFileName)
+BOOL CAvailableApplicationInfo::HasEnglishLanguage() const
{
- INT IntBuffer = ParserGetInt(L"LicenseType", szFileName);
- if (IntBuffer < 0 || IntBuffer > LICENSE_TYPE::Max)
+ if (!m_HasLanguageInfo)
{
- return LICENSE_TYPE::None;
+ return FALSE;
}
- return (LICENSE_TYPE) IntBuffer;
-}
-LIST_ENTRY CachedEntriesHead = {&CachedEntriesHead, &CachedEntriesHead};
-PLIST_ENTRY pCachedEntry = &CachedEntriesHead;
+ //TODO: make the actual check
+ return TRUE;
+}
-VOID
-InsertVersionInfo_RichEdit(PAPPLICATION_INFO Info)
+BOOL CAvailableApplicationInfo::IsInstalled() const
{
- ATL::CStringW szVersion;
- BOOL bIsInstalled = IsAppInstalled(Info),
- bHasVersion = GetInstalledVersion(Info, &szVersion);
-
- if (bIsInstalled)
- {
- if (bHasVersion)
- {
- if (Info->szVersion.Compare(szVersion) > 0)
- InsertLoadedTextNewl_RichEdit(IDS_STATUS_UPDATE_AVAILABLE, CFE_ITALIC);
- else
- InsertLoadedTextNewl_RichEdit(IDS_STATUS_INSTALLED, CFE_ITALIC);
-
- InsertTextAfterLoaded_RichEdit(IDS_AINFO_VERSION, szVersion, CFE_BOLD, 0);
- }
- else
- {
- InsertLoadedTextNewl_RichEdit(IDS_STATUS_INSTALLED, CFE_ITALIC);
- }
- }
- else
- {
- InsertLoadedTextNewl_RichEdit(IDS_STATUS_NOTINSTALLED, CFE_ITALIC);
- }
-
- InsertTextAfterLoaded_RichEdit(IDS_AINFO_AVAILABLEVERSION, Info->szVersion, CFE_BOLD, 0);
+ return m_IsInstalled;
}
-VOID
-InsertLicenseInfo_RichEdit(PAPPLICATION_INFO Info)
+BOOL CAvailableApplicationInfo::HasInstalledVersion() const
{
- ATL::CStringW szLicense;
- switch (Info->LicenseType)
- {
- case LICENSE_TYPE::OpenSource:
- szLicense.LoadStringW(hInst, IDS_LICENSE_OPENSOURCE);
- break;
- case LICENSE_TYPE::Freeware:
- szLicense.LoadStringW(hInst, IDS_LICENSE_FREEWARE);
- break;
- case LICENSE_TYPE::Trial:
- szLicense.LoadStringW(hInst, IDS_LICENSE_TRIAL);
- break;
- default:
- break;
- }
-
- if (szLicense.IsEmpty())
- {
- InsertTextAfterLoaded_RichEdit(IDS_AINFO_LICENSE, Info->szLicense, CFE_BOLD, 0);
- }
- else
- {
- szLicense.Format(L"(%ls)", Info->szLicense);
- InsertTextAfterLoaded_RichEdit(IDS_AINFO_LICENSE, szLicense, CFE_BOLD, 0);
- }
+ return m_HasInstalledVersion;
+}
+BOOL CAvailableApplicationInfo::HasUpdate() const
+{
+ return (szInstalledVersion.Compare(szVersion) < 0) ? TRUE : FALSE;
}
-VOID
-InsertLanguageInfo_RichEdit(PAPPLICATION_INFO Info)
+VOID CAvailableApplicationInfo::SetLastWriteTime(FILETIME* ftTime)
{
- const INT nTranslations = Info->Languages.GetSize();
- ATL::CStringW szLangInfo;
- ATL::CStringW szLoadedTextAvailability;
- ATL::CStringW szLoadedAInfoText;
- szLoadedAInfoText.LoadStringW(IDS_AINFO_LANGUAGES);
+ RtlCopyMemory(&ftCacheStamp, ftTime, sizeof(FILETIME));
+}
- if(HasNativeLanguage(Info))
- {
- szLoadedTextAvailability.LoadStringW(IDS_LANGUAGE_AVAILABLE_TRANSLATION);
- }
- else if (HasEnglishLanguage(Info))
- {
- szLoadedTextAvailability.LoadStringW(IDS_LANGUAGE_ENGLISH_TRANSLATION);
- }
- else
+inline BOOL CAvailableApplicationInfo::GetString(LPCWSTR lpKeyName, ATL::CStringW& ReturnedString)
+{
+ if (!ParserGetString(lpKeyName, sFileName, ReturnedString))
{
- szLoadedTextAvailability.LoadStringW(IDS_LANGUAGE_NO_TRANSLATION);
+ ReturnedString.Empty();
+ return FALSE;
}
+ return TRUE;
+}
- if (nTranslations > 1)
+// CAvailableApps
+CAvailableApps::CAvailableApps()
+{
+ //set all paths
+ if (GetStorageDirectory(m_szPath))
{
- szLangInfo.Format(L" (+%d more)", nTranslations - 1);
+ m_szAppsPath = m_szPath + L"\\rapps\\";
+ m_szCabPath = m_szPath + L"\\rappmgr.cab";
+ m_szSearchPath = m_szAppsPath + L"*.txt";
}
-
- InsertRichEditText(szLoadedAInfoText, CFE_BOLD);
- InsertRichEditText(szLoadedTextAvailability, NULL);
- InsertRichEditText(szLangInfo, CFE_ITALIC);
}
-BOOL
-ShowAvailableAppInfo(INT Index)
+VOID CAvailableApps::FreeCachedEntries()
{
- PAPPLICATION_INFO Info = (PAPPLICATION_INFO) ListViewGetlParam(Index);
- if (!Info) return FALSE;
-
- NewRichEditText(Info->szName, CFE_BOLD);
- InsertVersionInfo_RichEdit(Info);
- InsertLicenseInfo_RichEdit(Info);
- InsertLanguageInfo_RichEdit(Info);
+ POSITION InfoListPosition = m_InfoList.GetHeadPosition();
- InsertTextAfterLoaded_RichEdit(IDS_AINFO_SIZE, Info->szSize, CFE_BOLD, 0);
- InsertTextAfterLoaded_RichEdit(IDS_AINFO_URLSITE, Info->szUrlSite, CFE_BOLD, CFE_LINK);
- InsertTextAfterLoaded_RichEdit(IDS_AINFO_DESCRIPTION, Info->szDesc, CFE_BOLD, 0);
- InsertTextAfterLoaded_RichEdit(IDS_AINFO_URLDOWNLOAD, Info->szUrlDownload, CFE_BOLD, CFE_LINK);
+ /* loop and deallocate all the cached app infos in the list */
+ while (InfoListPosition)
+ {
+ CAvailableApplicationInfo* Info = m_InfoList.GetAt(InfoListPosition);
+ m_InfoList.RemoveHead();
+ delete Info;
- return TRUE;
+ InfoListPosition = m_InfoList.GetHeadPosition();
+ }
}
-static BOOL
-DeleteCurrentAppsDB(VOID)
+BOOL CAvailableApps::DeleteCurrentAppsDB()
{
HANDLE hFind = INVALID_HANDLE_VALUE;
WIN32_FIND_DATAW FindFileData;
- ATL::CStringW szCabPath;
- ATL::CStringW szSearchPath;
- ATL::CStringW szPath;
BOOL result = TRUE;
- if (!GetStorageDirectory(szPath))
+ if (m_szPath.IsEmpty())
return FALSE;
- szCabPath = szPath + L"\\rappmgr.cab";
- result = result && DeleteFileW(szCabPath.GetString());
-
- szPath += L"\\rapps\\";
- szSearchPath = szPath + L"*.txt";
-
- hFind = FindFirstFileW(szSearchPath.GetString(), &FindFileData);
+ result = result && DeleteFileW(m_szCabPath.GetString());
+ hFind = FindFirstFileW(m_szSearchPath.GetString(), &FindFileData);
if (hFind == INVALID_HANDLE_VALUE)
return result;
ATL::CStringW szTmp;
do
{
- szTmp = szPath + FindFileData.cFileName;
+ szTmp = m_szPath + FindFileData.cFileName;
result = result && DeleteFileW(szTmp.GetString());
} while (FindNextFileW(hFind, &FindFileData) != 0);
return result;
}
-BOOL
-UpdateAppsDB(VOID)
+BOOL CAvailableApps::UpdateAppsDB()
{
- ATL::CStringW szPath;
- ATL::CStringW szAppsPath;
- ATL::CStringW szCabPath;
-
if (!DeleteCurrentAppsDB())
return FALSE;
DownloadApplicationsDB(APPLICATION_DATABASE_URL);
- if (!GetStorageDirectory(szPath))
+ if (m_szPath.IsEmpty())
return FALSE;
- szCabPath = szPath + L"\\rappmgr.cab";
- szAppsPath = szPath + L"\\rapps\\";
-
- if (!ExtractFilesFromCab(szCabPath, szAppsPath))
+ if (!ExtractFilesFromCab(m_szCabPath, m_szAppsPath))
{
return FALSE;
}
return TRUE;
}
-
-BOOL
-EnumAvailableApplications(INT EnumType, AVAILENUMPROC lpEnumProc)
+BOOL CAvailableApps::EnumAvailableApplications(INT EnumType, AVAILENUMPROC lpEnumProc)
{
HANDLE hFind = INVALID_HANDLE_VALUE;
WIN32_FIND_DATAW FindFileData;
- ATL::CStringW szPath;
- ATL::CStringW szAppsPath;
- ATL::CStringW szCabPath;
- PAPPLICATION_INFO Info;
- if (!GetStorageDirectory(szPath))
- return FALSE;
-
- szCabPath = szPath + L"\\rappmgr.cab";
- szPath += L"\\rapps\\";
- szAppsPath = szPath;
-
- if (!CreateDirectoryW(szPath.GetString(), NULL) &&
+ if (!CreateDirectoryW(m_szPath.GetString(), NULL) &&
GetLastError() != ERROR_ALREADY_EXISTS)
{
return FALSE;
}
- szPath += L"*.txt";
- hFind = FindFirstFileW(szPath.GetString(), &FindFileData);
+ hFind = FindFirstFileW(m_szSearchPath.GetString(), &FindFileData);
if (hFind == INVALID_HANDLE_VALUE)
{
- if (GetFileAttributesW(szCabPath) == INVALID_FILE_ATTRIBUTES)
+ if (GetFileAttributesW(m_szCabPath) == INVALID_FILE_ATTRIBUTES)
DownloadApplicationsDB(APPLICATION_DATABASE_URL);
- ExtractFilesFromCab(szCabPath, szAppsPath);
- hFind = FindFirstFileW(szPath, &FindFileData);
+ ExtractFilesFromCab(m_szCabPath, m_szAppsPath);
+ hFind = FindFirstFileW(m_szSearchPath.GetString(), &FindFileData);
if (hFind == INVALID_HANDLE_VALUE)
return FALSE;
do
{
/* loop for all the cached entries */
- POSITION CurrentListPosition = InfoList.GetHeadPosition();
+ POSITION CurrentListPosition = m_InfoList.GetHeadPosition();
+ CAvailableApplicationInfo* Info = NULL;
while (CurrentListPosition != NULL)
{
POSITION LastListPosition = CurrentListPosition;
- Info = InfoList.GetNext(CurrentListPosition);
+ Info = m_InfoList.GetNext(CurrentListPosition);
/* do we already have this entry in cache? */
- if (!Info->cFileName.Compare(FindFileData.cFileName))
+ if (Info->sFileName == FindFileData.cFileName)
{
/* is it current enough, or the file has been modified since our last time here? */
if (CompareFileTime(&FindFileData.ftLastWriteTime, &Info->ftCacheStamp) == 1)
{
/* recreate our cache, this is the slow path */
- InfoList.RemoveAt(LastListPosition);
+ m_InfoList.RemoveAt(LastListPosition);
+
delete Info;
+ Info = nullptr;
break;
}
else
}
/* create a new entry */
- Info = new APPLICATION_INFO();
+ Info = new CAvailableApplicationInfo(FindFileData.cFileName);
- if (!Info)
- break;
-
- Info->Category = ParserGetInt(L"Category", FindFileData.cFileName);
- Info->LicenseType = ParserGetLicenseType(FindFileData.cFileName);
- Info->Languages = ParserGetAppLanguages(FindFileData.cFileName);
-
- /* copy the cache-related fields for the next time */
- Info->cFileName = FindFileData.cFileName;
- RtlCopyMemory(&Info->ftCacheStamp, &FindFileData.ftLastWriteTime, sizeof(FILETIME));
-
- /* add our cached entry to the cached list */
- InfoList.AddTail(Info);
+ /* set a timestamp for the next time */
+ Info->SetLastWriteTime(&FindFileData.ftLastWriteTime);
+ m_InfoList.AddTail(Info);
skip_if_cached:
if (Info->Category == FALSE)
if (EnumType != Info->Category && EnumType != ENUM_ALL_AVAILABLE)
continue;
- /* if our cache hit was only partial, we need to parse
- and lazily fill the rest of fields only when needed */
-
- if (Info->szUrlDownload.IsEmpty())
- {
- if (!GetString(L"Name", Info->szName, FindFileData.cFileName)
- || !GetString(L"URLDownload", Info->szUrlDownload, FindFileData.cFileName))
- {
- continue;
- }
-
- GetString(L"RegName", Info->szRegName, FindFileData.cFileName);
- GetString(L"Version", Info->szVersion, FindFileData.cFileName);
- GetString(L"License", Info->szLicense, FindFileData.cFileName);
- GetString(L"Description", Info->szDesc, FindFileData.cFileName);
- GetString(L"Size", Info->szSize, FindFileData.cFileName);
- GetString(L"URLSite", Info->szUrlSite, FindFileData.cFileName);
- GetString(L"CDPath", Info->szCDPath, FindFileData.cFileName);
- GetString(L"Language", Info->szRegName, FindFileData.cFileName);
- GetString(L"SHA1", Info->szSHA1, FindFileData.cFileName);
- }
+ Info->RefreshAppInfo();
- if (!lpEnumProc(Info))
+ if (!lpEnumProc(static_cast<PAPPLICATION_INFO>(Info), m_szAppsPath.GetString()))
break;
} while (FindNextFileW(hFind, &FindFileData) != 0);
FindClose(hFind);
-
return TRUE;
}
-VOID FreeCachedAvailableEntries(VOID)
+const ATL::CStringW & CAvailableApps::GetFolderPath()
{
- PAPPLICATION_INFO Info;
- POSITION InfoListPosition = InfoList.GetHeadPosition();
+ return m_szPath;
+}
- /* loop and deallocate all the cached app infos in the list */
- while (InfoListPosition)
- {
- Info = InfoList.GetAt(InfoListPosition);
- InfoList.RemoveHead();
- InfoListPosition = InfoList.GetHeadPosition();
-
- delete Info;
- }
-}
\ No newline at end of file
+const ATL::CStringW & CAvailableApps::GetAppPath()
+{
+ return m_szAppsPath;
+}
+
+const ATL::CStringW & CAvailableApps::GetCabPath()
+{
+ return m_szCabPath;
+}
+
+const LPCWSTR CAvailableApps::GetFolderPathString()
+{
+ return m_szPath.GetString();
+}
+
+const LPCWSTR CAvailableApps::GetAppPathString()
+{
+ return m_szPath.GetString();
+}
+
+const LPCWSTR CAvailableApps::GetCabPathString()
+{
+ return m_szPath.GetString();
+}
HWND hListView = NULL;
+class CAvailableAppView
+{
+ static inline VOID InsertTextAfterLoaded_RichEdit(UINT uStringID,
+ const ATL::CStringW& szText,
+ DWORD StringFlags,
+ DWORD TextFlags)
+ {
+ ATL::CStringW szLoadedText;
+ if (!szText.IsEmpty() && szLoadedText.LoadStringW(hInst, uStringID))
+ {
+ InsertRichEditText(szLoadedText, StringFlags);
+ InsertRichEditText(szText, TextFlags);
+ }
+ }
+
+ static inline VOID InsertLoadedTextNewl_RichEdit(UINT uStringID,
+ DWORD StringFlags)
+ {
+ ATL::CStringW szLoadedText;
+ if (szLoadedText.LoadStringW(hInst, uStringID))
+ {
+ InsertRichEditText(L"\n", 0);
+ InsertRichEditText(szLoadedText, StringFlags);
+ InsertRichEditText(L"\n", 0);
+ }
+ }
+
+ static VOID InsertVersionInfo_RichEdit(CAvailableApplicationInfo* Info)
+ {
+ if (Info->IsInstalled())
+ {
+ if (Info->HasInstalledVersion())
+ {
+ if (Info->HasUpdate())
+ InsertLoadedTextNewl_RichEdit(IDS_STATUS_UPDATE_AVAILABLE, CFE_ITALIC);
+ else
+ InsertLoadedTextNewl_RichEdit(IDS_STATUS_INSTALLED, CFE_ITALIC);
+
+ InsertTextAfterLoaded_RichEdit(IDS_AINFO_VERSION, Info->szInstalledVersion, CFE_BOLD, 0);
+ }
+ else
+ {
+ InsertLoadedTextNewl_RichEdit(IDS_STATUS_INSTALLED, CFE_ITALIC);
+ }
+ }
+ else
+ {
+ InsertLoadedTextNewl_RichEdit(IDS_STATUS_NOTINSTALLED, CFE_ITALIC);
+ }
+
+ InsertTextAfterLoaded_RichEdit(IDS_AINFO_AVAILABLEVERSION, Info->szVersion, CFE_BOLD, 0);
+ }
+
+ static VOID InsertLicenseInfo_RichEdit(CAvailableApplicationInfo* Info)
+ {
+ ATL::CStringW szLicense;
+ switch (Info->LicenseType)
+ {
+ case LICENSE_TYPE::OpenSource:
+ szLicense.LoadStringW(hInst, IDS_LICENSE_OPENSOURCE);
+ break;
+ case LICENSE_TYPE::Freeware:
+ szLicense.LoadStringW(hInst, IDS_LICENSE_FREEWARE);
+ break;
+ case LICENSE_TYPE::Trial:
+ szLicense.LoadStringW(hInst, IDS_LICENSE_TRIAL);
+ break;
+ default:
+ InsertTextAfterLoaded_RichEdit(IDS_AINFO_LICENSE, Info->szLicense, CFE_BOLD, 0);
+ return;
+ }
+
+ szLicense += L" (" + Info->szLicense + L")";
+ InsertTextAfterLoaded_RichEdit(IDS_AINFO_LICENSE, szLicense, CFE_BOLD, 0);
+ }
+
+ static VOID InsertLanguageInfo_RichEdit(CAvailableApplicationInfo* Info)
+ {
+ const INT nTranslations = Info->Languages.GetSize();
+ ATL::CStringW szLangInfo;
+ ATL::CStringW szLoadedTextAvailability;
+ ATL::CStringW szLoadedAInfoText;
+ szLoadedAInfoText.LoadStringW(IDS_AINFO_LANGUAGES);
+
+ if (Info->HasNativeLanguage())
+ {
+ szLoadedTextAvailability.LoadStringW(IDS_LANGUAGE_AVAILABLE_TRANSLATION);
+ }
+ else if (Info->HasEnglishLanguage())
+ {
+ szLoadedTextAvailability.LoadStringW(IDS_LANGUAGE_ENGLISH_TRANSLATION);
+ }
+ else
+ {
+ szLoadedTextAvailability.LoadStringW(IDS_LANGUAGE_NO_TRANSLATION);
+ }
+
+ if (nTranslations > 1)
+ {
+ szLangInfo.Format(L" (+%d more)", nTranslations - 1);
+ }
+ else
+ {
+ szLangInfo.LoadStringW(IDS_LANGUAGE_SINGLE);
+ szLangInfo = L" (" + szLangInfo + L")";
+ }
+
+ InsertRichEditText(szLoadedAInfoText, CFE_BOLD);
+ InsertRichEditText(szLoadedTextAvailability, NULL);
+ InsertRichEditText(szLangInfo, CFE_ITALIC);
+ }
+
+public:
+ static BOOL ShowAvailableAppInfo(INT Index)
+ {
+ CAvailableApplicationInfo* Info = (CAvailableApplicationInfo*) ListViewGetlParam(Index);
+ if (!Info) return FALSE;
+
+ NewRichEditText(Info->szName, CFE_BOLD);
+ InsertVersionInfo_RichEdit(Info);
+ InsertLicenseInfo_RichEdit(Info);
+ InsertLanguageInfo_RichEdit(Info);
+
+ InsertTextAfterLoaded_RichEdit(IDS_AINFO_SIZE, Info->szSize, CFE_BOLD, 0);
+ InsertTextAfterLoaded_RichEdit(IDS_AINFO_URLSITE, Info->szUrlSite, CFE_BOLD, CFE_LINK);
+ InsertTextAfterLoaded_RichEdit(IDS_AINFO_DESCRIPTION, Info->szDesc, CFE_BOLD, 0);
+ InsertTextAfterLoaded_RichEdit(IDS_AINFO_URLDOWNLOAD, Info->szUrlDownload, CFE_BOLD, CFE_LINK);
+
+ return TRUE;
+ }
+};
+
class CMainToolbar :
public CUiWindow< CToolbar<> >
{
BOOL AddColumn(INT Index, ATL::CStringW& Text, INT Width, INT Format)
{
- BOOL result = AddColumn(Index, Text.GetBuffer(), Width, Format);
-
- return result;
+ return AddColumn(Index, const_cast<LPWSTR>(Text.GetString()), Width, Format);
}
BOOL AddColumn(INT Index, LPWSTR lpText, INT Width, INT Format)
public:
HTREEITEM AddItem(HTREEITEM hParent, ATL::CStringW &Text, INT Image, INT SelectedImage, LPARAM lParam)
{
- HTREEITEM result = CUiWindow<CTreeView>::AddItem(hParent, Text.GetBuffer(), Image, SelectedImage, lParam);
- Text.ReleaseBuffer();
- return result;
+ return CUiWindow<CTreeView>::AddItem(hParent, const_cast<LPWSTR>(Text.GetString()), Image, SelectedImage, lParam);
}
HTREEITEM AddCategory(HTREEITEM hRootItem, UINT TextIndex, UINT IconIndex)
BOOL SearchEnabled;
+ CAvailableApps m_AvailableApps;
+
public:
CMainWindow() :
m_ClientPanel(NULL),
SearchEnabled(TRUE)
{
}
-
private:
VOID InitApplicationsList(VOID)
m_HSplitter->m_Horizontal = TRUE;
m_HSplitter->m_Pos = 32768;
m_HSplitter->m_MinFirst = 300;
- m_HSplitter->m_MinSecond = 80;
+ m_HSplitter->m_MinSecond = 150;
m_VSplitter->Second().Append(m_HSplitter);
return m_HSplitter->Create(m_hWnd) != NULL;
FreeLogs();
- FreeCachedAvailableEntries();
-
if (IS_INSTALLED_ENUM(SelectedEnumType))
FreeInstalledAppList();
if (IS_INSTALLED_ENUM(SelectedEnumType))
ShowInstalledAppInfo(ItemIndex);
if (IS_AVAILABLE_ENUM(SelectedEnumType))
- ShowAvailableAppInfo(ItemIndex);
+ CAvailableAppView::ShowAvailableAppInfo(ItemIndex);
}
}
}
if (IS_INSTALLED_ENUM(SelectedEnumType))
ShowInstalledAppInfo(-1);
if (IS_AVAILABLE_ENUM(SelectedEnumType))
- ShowAvailableAppInfo(-1);
+ CAvailableAppView::ShowAvailableAppInfo(-1);
}
}
break;
break;
case ID_RESETDB:
- UpdateAppsDB();
+ m_AvailableApps.UpdateAppsDB();
UpdateApplicationsList(-1);
break;
/* Get version info */
GetApplicationString(ItemInfo->hSubKey, L"DisplayVersion", szText);
- ListView_SetItemText(hListView, Index, 1, szText.GetBuffer());
- szText.ReleaseBuffer();
+ ListView_SetItemText(hListView, Index, 1, const_cast<LPWSTR>(szText.GetString()));
/* Get comments */
GetApplicationString(ItemInfo->hSubKey, L"Comments", szText);
- ListView_SetItemText(hListView, Index, 2, szText.GetBuffer());
- szText.ReleaseBuffer();
+ ListView_SetItemText(hListView, Index, 2, const_cast<LPWSTR>(szText.GetString()));
+
return TRUE;
}
- static BOOL CALLBACK s_EnumAvailableAppProc(PAPPLICATION_INFO Info)
+ static BOOL CALLBACK s_EnumAvailableAppProc(PAPPLICATION_INFO Info, LPCWSTR szFolderPath)
{
INT Index;
HICON hIcon = NULL;
- ATL::CStringW szIconPath;
+
HIMAGELIST hImageListView = ListView_GetImageList(hListView, LVSIL_SMALL);
if (!SearchPatternMatch(Info->szName, szSearchPattern) &&
return TRUE;
}
- if (GetStorageDirectory(szIconPath))
- {
- /* Load icon from file */
- szIconPath += L"\\rapps\\icons\\" + Info->szName + L".ico";
- hIcon = (HICON) LoadImageW(NULL,
- szIconPath.GetString(),
- IMAGE_ICON,
- LISTVIEW_ICON_SIZE,
- LISTVIEW_ICON_SIZE,
- LR_LOADFROMFILE);
- }
-
- if (!hIcon)
+ /* Load icon from file */
+ ATL::CStringW szIconPath;
+ szIconPath.Format(L"%lsicons\\%ls.ico", szFolderPath, Info->szName);
+ hIcon = (HICON) LoadImageW(NULL,
+ szIconPath.GetString(),
+ IMAGE_ICON,
+ LISTVIEW_ICON_SIZE,
+ LISTVIEW_ICON_SIZE,
+ LR_LOADFROMFILE);
+
+ if (!hIcon || GetLastError() != ERROR_SUCCESS)
{
/* Load default icon */
hIcon = (HICON) LoadIconW(hInst, MAKEINTRESOURCEW(IDI_MAIN));
}
+
Index = ImageList_AddIcon(hImageListView, hIcon);
DestroyIcon(hIcon);
Index = ListViewAddItem(Info->Category, Index, Info->szName, (LPARAM) Info);
- hImageListView = ListView_SetImageList(hListView, hImageListView, LVSIL_SMALL);
+ ListView_SetImageList(hListView, hImageListView, LVSIL_SMALL);
- ListView_SetItemText(hListView, Index, 1, Info->szVersion.GetBuffer());
- Info->szVersion.ReleaseBuffer();
+ ListView_SetItemText(hListView, Index, 1, const_cast<LPWSTR>(Info->szVersion.GetString()));
+ ListView_SetItemText(hListView, Index, 2, const_cast<LPWSTR>(Info->szDesc.GetString()));
- ListView_SetItemText(hListView, Index, 2, Info->szDesc.GetBuffer());
- Info->szDesc.ReleaseBuffer();
return TRUE;
}
VOID UpdateApplicationsList(INT EnumType)
{
ATL::CStringW szBuffer1, szBuffer2;
- HIMAGELIST hImageListView = NULL;
+ HIMAGELIST hImageListView;
m_ListView->SendMessageW(WM_SETREDRAW, FALSE, 0);
FreeInstalledAppList();
(VOID) ListView_DeleteAllItems(hListView);
+
/* Create new ImageList */
hImageListView = ImageList_Create(LISTVIEW_ICON_SIZE,
LISTVIEW_ICON_SIZE,
GetSystemColorDepth() | ILC_MASK,
0, 1);
- hImageListView = ListView_SetImageList(hListView, hImageListView, LVSIL_SMALL);
+ HIMAGELIST hImageListBuf = ListView_SetImageList(hListView, hImageListView, LVSIL_SMALL);
+ if (hImageListBuf)
+ {
+ ImageList_Destroy(hImageListBuf);
+ }
- if (hImageListView)
- ImageList_Destroy(hImageListView);
if (IS_AVAILABLE_ENUM(EnumType))
{
/* Enum available applications */
- EnumAvailableApplications(EnumType, s_EnumAvailableAppProc);
+ m_AvailableApps.EnumAvailableApplications(EnumType, s_EnumAvailableAppProc);
}
SelectedEnumType = EnumType;
DWORD csStyle = CS_VREDRAW | CS_HREDRAW;
static ATL::CWndClassInfo wc =
{
- {
- sizeof(WNDCLASSEX),
- csStyle,
+ {
+ sizeof(WNDCLASSEX),
+ csStyle,
StartWindowProc,
- 0,
- 0,
+ 0,
+ 0,
NULL,
LoadIconW(_AtlBaseModule.GetModuleInstance(), MAKEINTRESOURCEW(IDI_MAIN)),
LoadCursorW(NULL, IDC_ARROW),
- (HBRUSH) (COLOR_BTNFACE + 1),
+ (HBRUSH) (COLOR_BTNFACE + 1),
MAKEINTRESOURCEW(IDR_MAINMENU),
- L"RAppsWnd",
+ L"RAppsWnd",
NULL
},
NULL, NULL, IDC_ARROW, TRUE, 0, _T("")
{
return m_RichEdit;
}
+
+ CAvailableApps * GetAvailableApps()
+ {
+ return &m_AvailableApps;
+ }
};
+// File interface
+
CMainWindow * g_MainWindow;
HWND CreateMainWindow()
INT ListViewAddItem(INT ItemIndex, INT IconIndex, ATL::CStringW & Name, LPARAM lParam)
{
- INT result = ListViewAddItem(ItemIndex, IconIndex, Name.GetBuffer(), lParam);
- Name.ReleaseBuffer();
- return result;
+ return ListViewAddItem(ItemIndex, IconIndex, const_cast<LPWSTR>(Name.GetString()), lParam);
}
VOID NewRichEditText(const ATL::CStringW& szText, DWORD flags)
InsertRichEditText(szText.GetString(), flags);
}
+CAvailableApps* GetAvailableApps()
+{
+ return g_MainWindow->GetAvailableApps();
+}
projects / reactos.git / commitdiff