diff --git a/reactos/base/applications/rapps/aboutdlg.cpp b/reactos/base/applications/rapps/aboutdlg.cpp index 02634bd528a..c2275ce191f 100644 --- a/reactos/base/applications/rapps/aboutdlg.cpp +++ b/reactos/base/applications/rapps/aboutdlg.cpp @@ -1,10 +1,10 @@ /* - * PROJECT: ReactOS Applications Manager - * LICENSE: GPL - See COPYING in the top level directory - * FILE: base/applications/rapps/aboutdlg.cpp - * PURPOSE: About Dialog - * PROGRAMMERS: Dmitry Chapyshev (dmitry@reactos.org) - * Alexander Shaposhikov (chaez.san@gmail.com) + * PROJECT: ReactOS Applications Manager + * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) + * FILE: base/applications/rapps/aboutdlg.cpp + * PURPOSE: About Dialog + * COPYRIGHT: Copyright 2009 Dmitry Chapyshev (dmitry@reactos.org) + * Copyright 2017 Alexander Shaposhikov (chaez.san@gmail.com) */ #include "defines.h" diff --git a/reactos/base/applications/rapps/available.cpp b/reactos/base/applications/rapps/available.cpp index 962a9f9f6bc..8473fff930f 100644 --- a/reactos/base/applications/rapps/available.cpp +++ b/reactos/base/applications/rapps/available.cpp @@ -1,11 +1,11 @@ /* - * PROJECT: ReactOS Applications Manager - * LICENSE: GPL - See COPYING in the top level directory - * FILE: base/applications/rapps/available.cpp - * 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) + * PROJECT: ReactOS Applications Manager + * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) + * FILE: base/applications/rapps/available.cpp + * PURPOSE: Classes for working with available applications + * COPYRIGHT: Copyright 2009 Dmitry Chapyshev (dmitry@reactos.org) + * Copyright 2015 Ismael Ferreras Morezuelas (swyterzone+ros@gmail.com) + * Copyright 2017 Alexander Shaposhnikov (chaez.san@gmail.com) */ #include "defines.h" diff --git a/reactos/base/applications/rapps/gui.cpp b/reactos/base/applications/rapps/gui.cpp index 61fb7d1b054..7320ebedd2d 100644 --- a/reactos/base/applications/rapps/gui.cpp +++ b/reactos/base/applications/rapps/gui.cpp @@ -1,7 +1,10 @@ -/* PROJECT: ReactOS CE Applications Manager - * LICENSE: GPL - See COPYING in the top level directory - * AUTHORS: David Quintana - * Alexander Shaposhnikov +/* + * PROJECT: ReactOS Applications Manager + * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) + * FILE: base/applications/rapps/gui.cpp + * PURPOSE: GUI classes for RAPPS + * COPYRIGHT: Copyright 2015 David Quintana (gigaherz@gmail.com) + * Copyright 2017 Alexander Shaposhnikov (chaez.san@gmail.com) */ #include "defines.h" @@ -633,18 +636,18 @@ public: class CMainWindow : public CWindowImpl { - CUiPanel * m_ClientPanel; - CUiSplitPanel * m_VSplitter; - CUiSplitPanel * m_HSplitter; + CUiPanel* m_ClientPanel; + CUiSplitPanel* m_VSplitter; + CUiSplitPanel* m_HSplitter; - CMainToolbar * m_Toolbar; - CAppsListView * m_ListView; + CMainToolbar* m_Toolbar; + CAppsListView* m_ListView; - CSideTreeView * m_TreeView; - CUiWindow * m_StatusBar; - CUiWindow * m_RichEdit; + CSideTreeView* m_TreeView; + CUiWindow* m_StatusBar; + CUiWindow* m_RichEdit; - CUiWindow * m_SearchBar; + CUiWindow* m_SearchBar; CAvailableApps m_AvailableApps; LPWSTR pLink; @@ -1636,8 +1639,7 @@ public: } }; -// File interface - +// global interface CMainWindow * g_MainWindow; HWND CreateMainWindow() @@ -1675,7 +1677,12 @@ VOID InsertRichEditText(LPCWSTR szText, DWORD flags) g_MainWindow->GetRichEdit()->InsertText(szText, flags); } -/* ATL version of functions */ +CAvailableApps* GetAvailableApps() +{ + return g_MainWindow->GetAvailableApps(); +} + +// ATL version of functions above VOID SetStatusBarText(const ATL::CStringW& szText) { SetStatusBarText(szText.GetString()); @@ -1695,8 +1702,3 @@ VOID InsertRichEditText(const ATL::CStringW& szText, DWORD flags) { InsertRichEditText(szText.GetString(), flags); } - -CAvailableApps* GetAvailableApps() -{ - return g_MainWindow->GetAvailableApps(); -} diff --git a/reactos/base/applications/rapps/include/available.h b/reactos/base/applications/rapps/include/available.h index 59c1546f3b3..0c1b61df715 100644 --- a/reactos/base/applications/rapps/include/available.h +++ b/reactos/base/applications/rapps/include/available.h @@ -80,13 +80,14 @@ typedef BOOL(CALLBACK *AVAILENUMPROC)(CAvailableApplicationInfo *Info, LPCWSTR s class CAvailableApps { - ATL::CAtlList m_InfoList; static ATL::CStringW m_szPath; static ATL::CStringW m_szCabPath; static ATL::CStringW m_szAppsPath; static ATL::CStringW m_szSearchPath; static BOOL InitializeStaticStrings(); + + ATL::CAtlList m_InfoList; public: CAvailableApps(); diff --git a/reactos/base/applications/rapps/include/dialogs.h b/reactos/base/applications/rapps/include/dialogs.h index 76e56946e0e..9a2480623ba 100644 --- a/reactos/base/applications/rapps/include/dialogs.h +++ b/reactos/base/applications/rapps/include/dialogs.h @@ -16,6 +16,7 @@ class CDownloadManager static INT iCurrentApp; static VOID Download(const DownloadInfo& DLInfo, BOOL bIsModal = FALSE); + public: static INT_PTR CALLBACK DownloadDlgProc(HWND Dlg, UINT uMsg, WPARAM wParam, LPARAM lParam); static LRESULT CALLBACK DownloadProgressProc(HWND hWnd, diff --git a/reactos/base/applications/rapps/include/installed.h b/reactos/base/applications/rapps/include/installed.h index 882ebce5824..bd916d806f8 100644 --- a/reactos/base/applications/rapps/include/installed.h +++ b/reactos/base/applications/rapps/include/installed.h @@ -9,6 +9,7 @@ struct INSTALLED_INFO HKEY hSubKey; ATL::CStringW szKeyName; }; + typedef INSTALLED_INFO *PINSTALLED_INFO; typedef BOOL(CALLBACK *APPENUMPROC)(INT ItemIndex, ATL::CStringW &Name, PINSTALLED_INFO Info); diff --git a/reactos/base/applications/rapps/include/rosui.h b/reactos/base/applications/rapps/include/rosui.h index be59b3d82b7..fbd62e65492 100644 --- a/reactos/base/applications/rapps/include/rosui.h +++ b/reactos/base/applications/rapps/include/rosui.h @@ -1,6 +1,10 @@ -/* PROJECT: ReactOS UI Layout Engine - * LICENSE: GPL - See COPYING in the top level directory - * AUTHORS: David Quintana +/* + * PROJECT: ReactOS UI Layout Engine + * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) + * FILE: base/applications/rapps/include/rosui.h + * PURPOSE: ATL Layout engine for RAPPS + * COPYRIGHT: Copyright 2015 David Quintana (gigaherz@gmail.com) + * Copyright 2017 Alexander Shaposhnikov (chaez.san@gmail.com) */ #pragma once diff --git a/reactos/base/applications/rapps/include/winmain.h b/reactos/base/applications/rapps/include/winmain.h index c130a9db5ee..50a12e84137 100644 --- a/reactos/base/applications/rapps/include/winmain.h +++ b/reactos/base/applications/rapps/include/winmain.h @@ -1,7 +1,7 @@ #pragma once #include -//TODO: Separate main and settings related definitions +//TODO: Separate main and settings related definitions struct SETTINGS_INFO { BOOL bSaveWndPos; diff --git a/reactos/base/applications/rapps/installed.cpp b/reactos/base/applications/rapps/installed.cpp index e69a368affd..4841a988adb 100644 --- a/reactos/base/applications/rapps/installed.cpp +++ b/reactos/base/applications/rapps/installed.cpp @@ -1,12 +1,11 @@ /* - * PROJECT: ReactOS Applications Manager - * LICENSE: GPL - See COPYING in the top level directory - * FILE: base/applications/rapps/installed.cpp - * PURPOSE: Functions for working with installed applications - * PROGRAMMERS: Dmitry Chapyshev (dmitry@reactos.org) - * Alexander Shaposhnikov (chaez.san@gmail.com) + * PROJECT: ReactOS Applications Manager + * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) + * FILE: base/applications/rapps/installed.cpp + * PURPOSE: Functions for working with installed applications + * COPYRIGHT: Copyright 2009 Dmitry Chapyshev (dmitry@reactos.org) + * Copyright 2017 Alexander Shaposhnikov (chaez.san@gmail.com) */ - #include "defines.h" #include "installed.h" @@ -14,16 +13,14 @@ #include "gui.h" #include "misc.h" -BOOL -GetApplicationString(HKEY hKey, LPCWSTR lpKeyName, ATL::CStringW& String) +BOOL GetApplicationString(HKEY hKey, LPCWSTR lpKeyName, ATL::CStringW& String) { BOOL result = GetApplicationString(hKey, lpKeyName, String.GetBuffer(MAX_PATH)); String.ReleaseBuffer(); return result; } -BOOL -GetApplicationString(HKEY hKey, LPCWSTR lpKeyName, LPWSTR szString) +BOOL GetApplicationString(HKEY hKey, LPCWSTR lpKeyName, LPWSTR szString) { DWORD dwSize = MAX_PATH * sizeof(WCHAR); @@ -41,8 +38,7 @@ GetApplicationString(HKEY hKey, LPCWSTR lpKeyName, LPWSTR szString) return FALSE; } -BOOL -UninstallApplication(INT Index, BOOL bModify) +BOOL UninstallApplication(INT Index, BOOL bModify) { LPCWSTR szModify = L"ModifyPath"; LPCWSTR szUninstall = L"UninstallString"; @@ -96,8 +92,7 @@ UninstallApplication(INT Index, BOOL bModify) return StartProcess(szPath, TRUE); } -BOOL -ShowInstalledAppInfo(INT Index) +BOOL ShowInstalledAppInfo(INT Index) { ATL::CStringW szText; ATL::CStringW szInfo; @@ -138,8 +133,7 @@ ShowInstalledAppInfo(INT Index) return TRUE; } -VOID -RemoveAppFromRegistry(INT Index) +VOID RemoveAppFromRegistry(INT Index) { PINSTALLED_INFO Info; WCHAR szFullName[MAX_PATH] = L"Software\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\"; @@ -176,8 +170,7 @@ RemoveAppFromRegistry(INT Index) } } -BOOL -EnumInstalledApplications(INT EnumType, BOOL IsUserKey, APPENUMPROC lpEnumProc) +BOOL EnumInstalledApplications(INT EnumType, BOOL IsUserKey, APPENUMPROC lpEnumProc) { DWORD dwSize = MAX_PATH, dwType, dwValue; BOOL bIsSystemComponent, bIsUpdate; diff --git a/reactos/base/applications/rapps/integrity.cpp b/reactos/base/applications/rapps/integrity.cpp index a6923cac0e7..81c1baf4a4d 100644 --- a/reactos/base/applications/rapps/integrity.cpp +++ b/reactos/base/applications/rapps/integrity.cpp @@ -1,10 +1,10 @@ /* - * PROJECT: ReactOS Applications Manager - * LICENSE: GPL - See COPYING in the top level directory - * FILE: base/applications/rapps/integrity.cpp - * PURPOSE: Various integrity check mechanisms - * PROGRAMMERS: Ismael Ferreras Morezuelas (swyterzone+ros@gmail.com) - * Mark Jansen + * PROJECT: ReactOS Applications Manager + * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) + * FILE: base/applications/rapps/integrity.cpp + * PURPOSE: Various integrity check mechanisms + * COPYRIGHT: Copyright Ismael Ferreras Morezuelas (swyterzone+ros@gmail.com) + * Copyright Mark Jansen */ #include "defines.h" diff --git a/reactos/base/applications/rapps/loaddlg.cpp b/reactos/base/applications/rapps/loaddlg.cpp index 01cdc63a642..da3c5d92ef5 100644 --- a/reactos/base/applications/rapps/loaddlg.cpp +++ b/reactos/base/applications/rapps/loaddlg.cpp @@ -1,5 +1,6 @@ -/* PROJECT: ReactOS Applications Manager - * LICENSE: GPL - See COPYING in the top level directory +/* + * PROJECT: ReactOS Applications Manager + * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) * FILE: base/applications/rapps/loaddlg.cpp * PURPOSE: Displaying a download dialog * COPYRIGHT: Copyright 2001 John R. Sheets (for CodeWeavers) diff --git a/reactos/base/applications/rapps/misc.cpp b/reactos/base/applications/rapps/misc.cpp index d6ec7696514..250d40c527f 100644 --- a/reactos/base/applications/rapps/misc.cpp +++ b/reactos/base/applications/rapps/misc.cpp @@ -1,11 +1,11 @@ /* - * PROJECT: ReactOS Applications Manager - * LICENSE: GPL - See COPYING in the top level directory - * FILE: base/applications/rapps/misc.cpp - * PURPOSE: Misc functions - * PROGRAMMERS: Dmitry Chapyshev (dmitry@reactos.org) - * Ismael Ferreras Morezuelas (swyterzone+ros@gmail.com) - * Alexander Shaposhnikov (chaez.san@gmail.com) + * PROJECT: ReactOS Applications Manager + * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) + * FILE: base/applications/rapps/misc.cpp + * PURPOSE: Misc functions + * COPYRIGHT: Copyright 2009 Dmitry Chapyshev (dmitry@reactos.org) + * Copyright 2015 Ismael Ferreras Morezuelas (swyterzone+ros@gmail.com) + * Copyright 2017 Alexander Shaposhnikov (chaez.san@gmail.com) */ #include "defines.h" diff --git a/reactos/base/applications/rapps/settingsdlg.cpp b/reactos/base/applications/rapps/settingsdlg.cpp index 760aec9e248..7df8081d9e6 100644 --- a/reactos/base/applications/rapps/settingsdlg.cpp +++ b/reactos/base/applications/rapps/settingsdlg.cpp @@ -1,10 +1,10 @@ /* - * PROJECT: ReactOS Applications Manager - * LICENSE: GPL - See COPYING in the top level directory - * FILE: base/applications/rapps/settingsdlg.cpp - * PURPOSE: Settings Dialog - * PROGRAMMERS: Dmitry Chapyshev (dmitry@reactos.org) - * Alexander Shaposhnikov (chaez.san@gmail.com) + * PROJECT: ReactOS Applications Manager + * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) + * FILE: base/applications/rapps/settingsdlg.cpp + * PURPOSE: Settings Dialog + * COPYRIGHT: Copyright 2009 Dmitry Chapyshev (dmitry@reactos.org) + * Copyright 2017 Alexander Shaposhnikov (chaez.san@gmail.com) */ #include "defines.h" diff --git a/reactos/base/applications/rapps/unattended.cpp b/reactos/base/applications/rapps/unattended.cpp index 974889832d2..4c5c68d44b0 100644 --- a/reactos/base/applications/rapps/unattended.cpp +++ b/reactos/base/applications/rapps/unattended.cpp @@ -1,11 +1,10 @@ /* -* PROJECT: ReactOS Applications Manager -* LICENSE: GPL - See COPYING in the top level directory -* FILE: base/applications/rapps/unattended.cpp -* PURPOSE: Functions to parse command-line flags and process them -* PROGRAMMERS: Alexander Shaposhnikov (chaez.san@gmail.com) +* PROJECT: ReactOS Applications Manager +* LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) +* FILE: base/applications/rapps/unattended.cpp +* PURPOSE: Functions to parse command-line flags and process them +* COPYRIGHT: Copyright 2017 Alexander Shaposhnikov (chaez.san@gmail.com) */ - #include "unattended.h" #include "defines.h" #include "available.h" @@ -25,9 +24,7 @@ BOOL UseCmdParameters(LPWSTR lpCmdLine) return FALSE; } - // Setup key - single app expected // TODO: use DB filenames as names because they're shorter - ATL::CSimpleArray arrNames; if (!StrCmpW(argv[0], CMD_KEY_INSTALL)) { diff --git a/reactos/base/applications/rapps/winmain.cpp b/reactos/base/applications/rapps/winmain.cpp index 4296ef35ff8..e25b966bc48 100644 --- a/reactos/base/applications/rapps/winmain.cpp +++ b/reactos/base/applications/rapps/winmain.cpp @@ -1,11 +1,11 @@ /* - * PROJECT: ReactOS Applications Manager - * LICENSE: GPL - See COPYING in the top level directory - * FILE: base/applications/rapps/winmain.cpp - * PURPOSE: Main program - * PROGRAMMERS: Dmitry Chapyshev (dmitry@reactos.org) - * Ismael Ferreras Morezuelas (swyterzone+ros@gmail.com) - * Alexander Shaposhnikov (chaez.san@gmail.com) + * PROJECT: ReactOS Applications Manager + * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) + * FILE: base/applications/rapps/winmain.cpp + * PURPOSE: Main program + * COPYRIGHT: Copyright 2009 Dmitry Chapyshev (dmitry@reactos.org) + * Copyright 2015 Ismael Ferreras Morezuelas (swyterzone+ros@gmail.com) + * Copyright 2017 Alexander Shaposhnikov (chaez.san@gmail.com) */ #include "defines.h" #include "rapps.h"