https://git.reactos.org/?p=reactos.git;a=commitdiff;h=35efa2b9c7275df4074a61...
commit 35efa2b9c7275df4074a615341bac4980c0a610c Author: Hermès Bélusca-Maïto hermes.belusca-maito@reactos.org AuthorDate: Wed Dec 29 01:16:42 2021 +0100 Commit: Hermès Bélusca-Maïto hermes.belusca-maito@reactos.org CommitDate: Wed Dec 29 01:28:53 2021 +0100
[RAPPS] Minor formatting. --- base/applications/rapps/appview.cpp | 16 ++++++++-------- base/applications/rapps/available.cpp | 10 +++++----- base/applications/rapps/misc.cpp | 6 ++---- 3 files changed, 15 insertions(+), 17 deletions(-)
diff --git a/base/applications/rapps/appview.cpp b/base/applications/rapps/appview.cpp index d548504c1cb..09bbb178a9a 100644 --- a/base/applications/rapps/appview.cpp +++ b/base/applications/rapps/appview.cpp @@ -1414,7 +1414,7 @@ BOOL CAppsListView::AddInstalledApplication(CInstalledApplicationInfo *InstAppIn
if (!hIcon) { - /* Load default icon */ + /* Load the default icon */ hIcon = LoadIconW(hInst, MAKEINTRESOURCEW(IDI_MAIN)); }
@@ -1442,17 +1442,17 @@ BOOL CAppsListView::AddAvailableApplication(CAvailableApplicationInfo *AvlbAppIn if (AvlbAppInfo->RetrieveIcon(szIconPath)) { hIcon = (HICON)LoadImageW(NULL, - szIconPath.GetString(), - IMAGE_ICON, - LISTVIEW_ICON_SIZE, - LISTVIEW_ICON_SIZE, - LR_LOADFROMFILE); + 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)); + /* Load the default icon */ + hIcon = LoadIconW(hInst, MAKEINTRESOURCEW(IDI_MAIN)); }
int IconIndex = ImageList_AddIcon(m_hImageListView, hIcon); diff --git a/base/applications/rapps/available.cpp b/base/applications/rapps/available.cpp index e148a2df4ba..3f8e30243df 100644 --- a/base/applications/rapps/available.cpp +++ b/base/applications/rapps/available.cpp @@ -15,7 +15,7 @@ #include "dialogs.h"
- // CAvailableApplicationInfo +// CAvailableApplicationInfo CAvailableApplicationInfo::CAvailableApplicationInfo(const ATL::CStringW& sFileNameParam, AvailableStrings& AvlbStrings) : m_LicenseType(LICENSE_NONE), m_SizeBytes(0), m_sFileName(sFileNameParam), m_IsInstalled(FALSE), m_HasLanguageInfo(FALSE), m_HasInstalledVersion(FALSE) @@ -38,7 +38,8 @@ VOID CAvailableApplicationInfo::RetrieveGeneralInfo(AvailableStrings& AvlbString
// TODO: I temporarily use the file name (without suffix) as package name. // It should be better to put this in a field of ini file. - // consider write a converter to do this and write a github action for rapps-db to ensure package_name is unique. + // Consider writing a converter to do this and write a github action for + // rapps-db to ensure package_name is unique. m_szPkgName = m_sFileName; PathRemoveExtensionW(m_szPkgName.GetBuffer(MAX_PATH)); m_szPkgName.ReleaseBuffer(); @@ -72,7 +73,6 @@ VOID CAvailableApplicationInfo::RetrieveGeneralInfo(AvailableStrings& AvlbString break; }
- if (PathIsURLW(ScrnshotLocation.GetString())) { m_szScrnshotLocation.Add(ScrnshotLocation); @@ -416,7 +416,7 @@ BOOL CAvailableApps::UpdateAppsDB() return FALSE; }
- //if there are some files in the db folder - we're good + // If there are some files in the db folder, we're good hFind = FindFirstFileW(m_Strings.szSearchPath, &FindFileData); if (hFind != INVALID_HANDLE_VALUE) { @@ -425,7 +425,7 @@ BOOL CAvailableApps::UpdateAppsDB() }
DownloadApplicationsDB(SettingsInfo.bUseSource ? SettingsInfo.szSourceURL : APPLICATION_DATABASE_URL, - !SettingsInfo.bUseSource); + !SettingsInfo.bUseSource);
if (!ExtractFilesFromCab(m_Strings.szCabName, m_Strings.szCabDir, diff --git a/base/applications/rapps/misc.cpp b/base/applications/rapps/misc.cpp index b5d142828ff..80bd875008a 100644 --- a/base/applications/rapps/misc.cpp +++ b/base/applications/rapps/misc.cpp @@ -6,8 +6,8 @@ * Copyright 2015 Ismael Ferreras Morezuelas (swyterzone+ros@gmail.com) * Copyright 2017 Alexander Shaposhnikov (sanchaez@reactos.org) */ -#include "rapps.h"
+#include "rapps.h" #include "misc.h"
static HANDLE hLog = NULL; @@ -197,7 +197,7 @@ VOID InitLogs() }
dwData = EVENTLOG_ERROR_TYPE | EVENTLOG_WARNING_TYPE | - EVENTLOG_INFORMATION_TYPE; + EVENTLOG_INFORMATION_TYPE;
if ((key.SetStringValue(L"EventMessageFile", szPath, @@ -215,7 +215,6 @@ VOID InitLogs() } }
- VOID FreeLogs() { if (hLog) @@ -224,7 +223,6 @@ VOID FreeLogs() } }
- BOOL WriteLogMessage(WORD wType, DWORD dwEventID, LPCWSTR lpMsg) { if (!SettingsInfo.bLogEnabled)