https://git.reactos.org/?p=reactos.git;a=commitdiff;h=3b777fd133808ef4488f61b085be34ef4f89e448
commit 3b777fd133808ef4488f61b085be34ef4f89e448 Author: Hermès Bélusca-Maïto <[email protected]> AuthorDate: Sat Feb 3 23:42:46 2018 +0100 Commit: Hermès Bélusca-Maïto <[email protected]> CommitDate: Sat Feb 3 23:43:56 2018 +0100 [RAPPS] Remove trailing spaces. --- base/applications/rapps/CMakeLists.txt | 2 +- base/applications/rapps/available.cpp | 6 +++--- base/applications/rapps/gui.cpp | 4 ++-- base/applications/rapps/include/available.h | 2 +- base/applications/rapps/include/crichedit.h | 2 +- base/applications/rapps/include/defines.h | 2 +- base/applications/rapps/include/resource.h | 2 +- base/applications/rapps/include/winmain.h | 2 +- base/applications/rapps/lang/en-US.rc | 2 +- base/applications/rapps/lang/ro-RO.rc | 2 +- base/applications/rapps/loaddlg.cpp | 4 ++-- base/applications/rapps/misc.cpp | 2 +- base/applications/rapps/unattended.cpp | 8 ++++---- 13 files changed, 20 insertions(+), 20 deletions(-) diff --git a/base/applications/rapps/CMakeLists.txt b/base/applications/rapps/CMakeLists.txt index 82ade46cc7..cdbb6f97dc 100644 --- a/base/applications/rapps/CMakeLists.txt +++ b/base/applications/rapps/CMakeLists.txt @@ -35,7 +35,7 @@ list(APPEND SOURCE add_definitions( -DUSE_CERT_PINNING -D_ATL_NO_EXCEPTIONS) - + file(GLOB_RECURSE rapps_rc_deps res/*.*) add_rc_deps(rapps.rc ${rapps_rc_deps}) add_executable(rapps ${SOURCE} rapps.rc) diff --git a/base/applications/rapps/available.cpp b/base/applications/rapps/available.cpp index 19101cef14..04e5005e5a 100644 --- a/base/applications/rapps/available.cpp +++ b/base/applications/rapps/available.cpp @@ -204,7 +204,7 @@ inline BOOL CAvailableApplicationInfo::GetString(LPCWSTR lpKeyName, ATL::CString } return TRUE; } -// CAvailableApplicationInfo +// CAvailableApplicationInfo // AvailableStrings AvailableStrings::AvailableStrings() @@ -352,8 +352,8 @@ BOOL CAvailableApps::Enum(INT EnumType, AVAILENUMPROC lpEnumProc) m_InfoList.AddTail(Info); skip_if_cached: - if (EnumType == Info->m_Category - || EnumType == ENUM_ALL_AVAILABLE + if (EnumType == Info->m_Category + || EnumType == ENUM_ALL_AVAILABLE || (EnumType == ENUM_CAT_SELECTED && Info->m_IsSelected)) { Info->RefreshAppInfo(); diff --git a/base/applications/rapps/gui.cpp b/base/applications/rapps/gui.cpp index cae703f9a9..4a3e2794b3 100644 --- a/base/applications/rapps/gui.cpp +++ b/base/applications/rapps/gui.cpp @@ -668,7 +668,7 @@ public: const INT m_Width; const INT m_Height; - CSearchBar() : m_Width(200), m_Height(22) + CSearchBar() : m_Width(200), m_Height(22) { } @@ -1613,7 +1613,7 @@ private: m_ListView->DeleteAllItems(); - // Create new ImageList + // Create new ImageList hImageListView = ImageList_Create(LISTVIEW_ICON_SIZE, LISTVIEW_ICON_SIZE, GetSystemColorDepth() | ILC_MASK, diff --git a/base/applications/rapps/include/available.h b/base/applications/rapps/include/available.h index adf4c73aec..782f960be8 100644 --- a/base/applications/rapps/include/available.h +++ b/base/applications/rapps/include/available.h @@ -1,7 +1,7 @@ #pragma once #include <windef.h> -#include <atlstr.h> +#include <atlstr.h> #include <atlsimpcoll.h> #include <atlcoll.h> diff --git a/base/applications/rapps/include/crichedit.h b/base/applications/rapps/include/crichedit.h index ca6eaee255..3b34fde3f4 100644 --- a/base/applications/rapps/include/crichedit.h +++ b/base/applications/rapps/include/crichedit.h @@ -22,7 +22,7 @@ class CRichEdit : if ((dwEffects == CFM_LINK) && !PathIsURLW(lpszText)) { // if text is not an URL, no styling is used - SetRangeFormatting(Len, Len + InsertedTextLen, 0); + SetRangeFormatting(Len, Len + InsertedTextLen, 0); } else { diff --git a/base/applications/rapps/include/defines.h b/base/applications/rapps/include/defines.h index 159bcdc504..31feb26828 100644 --- a/base/applications/rapps/include/defines.h +++ b/base/applications/rapps/include/defines.h @@ -23,7 +23,7 @@ #include <ndk/rtlfuncs.h> #include <atlcoll.h> #include <atlsimpcoll.h> -#include <atlstr.h> +#include <atlstr.h> #include <rappsmsg.h> #include "resource.h" diff --git a/base/applications/rapps/include/resource.h b/base/applications/rapps/include/resource.h index b035f02807..6e768227fa 100644 --- a/base/applications/rapps/include/resource.h +++ b/base/applications/rapps/include/resource.h @@ -173,7 +173,7 @@ #define IDS_CAT_VIDEO 714 /* App installation status */ -#define IDS_STATUS_INSTALLED 800 +#define IDS_STATUS_INSTALLED 800 #define IDS_STATUS_NOTINSTALLED 801 #define IDS_STATUS_DOWNLOADED 802 #define IDS_STATUS_UPDATE_AVAILABLE 803 diff --git a/base/applications/rapps/include/winmain.h b/base/applications/rapps/include/winmain.h index 50a12e8413..bee3b96492 100644 --- a/base/applications/rapps/include/winmain.h +++ b/base/applications/rapps/include/winmain.h @@ -31,5 +31,5 @@ extern SETTINGS_INFO SettingsInfo; VOID SaveSettings(HWND hwnd); VOID FillDefaultSettings(PSETTINGS_INFO pSettingsInfo); -// integrity.cpp +// integrity.cpp BOOL VerifyInteg(LPCWSTR lpSHA1Hash, LPCWSTR lpFileName); diff --git a/base/applications/rapps/lang/en-US.rc b/base/applications/rapps/lang/en-US.rc index af79001c77..3ecbc2c081 100644 --- a/base/applications/rapps/lang/en-US.rc +++ b/base/applications/rapps/lang/en-US.rc @@ -91,7 +91,7 @@ BEGIN END IDD_DOWNLOAD_DIALOG DIALOGEX 0, 0, 220, 220 -STYLE DS_SHELLFONT | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION | WS_VISIBLE +STYLE DS_SHELLFONT | DS_CENTER | WS_POPUPWINDOW | WS_CAPTION | WS_VISIBLE CAPTION "Downloading %ls…" FONT 8, "MS Shell Dlg" BEGIN diff --git a/base/applications/rapps/lang/ro-RO.rc b/base/applications/rapps/lang/ro-RO.rc index 30129d1c71..8d2d4f55e1 100644 --- a/base/applications/rapps/lang/ro-RO.rc +++ b/base/applications/rapps/lang/ro-RO.rc @@ -212,7 +212,7 @@ BEGIN IDS_UNABLE_TO_DOWNLOAD2 "Pachetul nu poate fi descărcat! Verificați conexiunea de Internet!" IDS_UNABLE_TO_REMOVE "Datele de registru pentru acest program nu au putut fi eliminate!" IDS_UNABLE_TO_INSTALL "Programul de instalare nu poate fi executat!" - IDS_CERT_DOES_NOT_MATCH "Verificarea certificatului SSL a eșuat." + IDS_CERT_DOES_NOT_MATCH "Verificarea certificatului SSL a eșuat." IDS_INTEG_CHECK_TITLE "Integritatea pachetului în verificare…" IDS_INTEG_CHECK_FAIL "Pachetul nu a trecut de verificarea de integritate. Utilizarea programului nu este recomandată." IDS_INTERRUPTED_DOWNLOAD "Descărcarea a fost întreruptă. Verificați conexiunea la Internet." diff --git a/base/applications/rapps/loaddlg.cpp b/base/applications/rapps/loaddlg.cpp index ba3e714012..d9d5aec84a 100644 --- a/base/applications/rapps/loaddlg.cpp +++ b/base/applications/rapps/loaddlg.cpp @@ -428,7 +428,7 @@ INT_PTR CALLBACK CDownloadManager::DownloadDlgProc(HWND Dlg, UINT uMsg, WPARAM w if (Item) { // initialize the default values for our nifty progress bar - // and subclass it so that it learns to print a status text + // and subclass it so that it learns to print a status text SendMessageW(Item, PBM_SETRANGE, 0, MAKELPARAM(0, 100)); SendMessageW(Item, PBM_SETPOS, 0, 0); @@ -705,7 +705,7 @@ DWORD WINAPI CDownloadManager::ThreadFunc(LPVOID param) case 0: // preconfig hOpen = InternetOpenW(lpszAgent, INTERNET_OPEN_TYPE_PRECONFIG, NULL, NULL, 0); break; - case 1: // direct (no proxy) + case 1: // direct (no proxy) hOpen = InternetOpenW(lpszAgent, INTERNET_OPEN_TYPE_DIRECT, NULL, NULL, 0); break; case 2: // use proxy diff --git a/base/applications/rapps/misc.cpp b/base/applications/rapps/misc.cpp index afd134899c..1a527317af 100644 --- a/base/applications/rapps/misc.cpp +++ b/base/applications/rapps/misc.cpp @@ -215,7 +215,7 @@ BOOL ExtractFilesFromCab(LPCWSTR lpCabName, LPCWSTR lpOutputPath) SESSION Dest; HRESULT Result; fnExtract pfnExtract; - + hCabinetDll = LoadLibraryW(L"cabinet.dll"); if (hCabinetDll) { diff --git a/base/applications/rapps/unattended.cpp b/base/applications/rapps/unattended.cpp index 08587bb4e2..06f8537999 100644 --- a/base/applications/rapps/unattended.cpp +++ b/base/applications/rapps/unattended.cpp @@ -30,9 +30,9 @@ BOOL UseCmdParameters(LPWSTR lpCmdLine) for (INT i = 1; i < argc; ++i) { arrNames.Add(argv[i]); - } - } - else + } + } + else if (!StrCmpW(argv[0], CMD_KEY_SETUP)) { HINF InfHandle = SetupOpenInfFileW(argv[1], NULL, INF_STYLE_WIN4, NULL); @@ -70,6 +70,6 @@ BOOL UseCmdParameters(LPWSTR lpCmdLine) CDownloadManager::DownloadListOfApplications(arrAppInfo, TRUE); return TRUE; } - + return FALSE; }
