Author: ashaposhnikov
Date: Sat Sep 9 20:38:06 2017
New Revision: 75815
URL:
http://svn.reactos.org/svn/reactos?rev=75815&view=rev
Log:
[RAPPS] License header unification and minor style changes
- Unified & reformatted license headers according to
https://www.reactos.org/wiki/Coding_Style
- Minor style changes
Modified:
branches/GSoC_2017/rapps/reactos/base/applications/rapps/aboutdlg.cpp
branches/GSoC_2017/rapps/reactos/base/applications/rapps/available.cpp
branches/GSoC_2017/rapps/reactos/base/applications/rapps/gui.cpp
branches/GSoC_2017/rapps/reactos/base/applications/rapps/include/available.h
branches/GSoC_2017/rapps/reactos/base/applications/rapps/include/dialogs.h
branches/GSoC_2017/rapps/reactos/base/applications/rapps/include/installed.h
branches/GSoC_2017/rapps/reactos/base/applications/rapps/include/rosui.h
branches/GSoC_2017/rapps/reactos/base/applications/rapps/include/winmain.h
branches/GSoC_2017/rapps/reactos/base/applications/rapps/installed.cpp
branches/GSoC_2017/rapps/reactos/base/applications/rapps/integrity.cpp
branches/GSoC_2017/rapps/reactos/base/applications/rapps/loaddlg.cpp
branches/GSoC_2017/rapps/reactos/base/applications/rapps/misc.cpp
branches/GSoC_2017/rapps/reactos/base/applications/rapps/settingsdlg.cpp
branches/GSoC_2017/rapps/reactos/base/applications/rapps/unattended.cpp
branches/GSoC_2017/rapps/reactos/base/applications/rapps/winmain.cpp
Modified: branches/GSoC_2017/rapps/reactos/base/applications/rapps/aboutdlg.cpp
URL:
http://svn.reactos.org/svn/reactos/branches/GSoC_2017/rapps/reactos/base/ap…
==============================================================================
--- branches/GSoC_2017/rapps/reactos/base/applications/rapps/aboutdlg.cpp [iso-8859-1]
(original)
+++ branches/GSoC_2017/rapps/reactos/base/applications/rapps/aboutdlg.cpp [iso-8859-1] Sat
Sep 9 20:38:06 2017
@@ -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(a)reactos.org)
- * Alexander Shaposhikov (chaez.san(a)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(a)reactos.org)
+ * Copyright 2017 Alexander Shaposhikov (chaez.san(a)gmail.com)
*/
#include "defines.h"
Modified: branches/GSoC_2017/rapps/reactos/base/applications/rapps/available.cpp
URL:
http://svn.reactos.org/svn/reactos/branches/GSoC_2017/rapps/reactos/base/ap…
==============================================================================
--- branches/GSoC_2017/rapps/reactos/base/applications/rapps/available.cpp [iso-8859-1]
(original)
+++ branches/GSoC_2017/rapps/reactos/base/applications/rapps/available.cpp [iso-8859-1]
Sat Sep 9 20:38:06 2017
@@ -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(a)reactos.org)
- * Ismael Ferreras Morezuelas (swyterzone+ros(a)gmail.com)
- * Alexander Shaposhnikov (chaez.san(a)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(a)reactos.org)
+ * Copyright 2015 Ismael Ferreras Morezuelas (swyterzone+ros(a)gmail.com)
+ * Copyright 2017 Alexander Shaposhnikov (chaez.san(a)gmail.com)
*/
#include "defines.h"
Modified: branches/GSoC_2017/rapps/reactos/base/applications/rapps/gui.cpp
URL:
http://svn.reactos.org/svn/reactos/branches/GSoC_2017/rapps/reactos/base/ap…
==============================================================================
--- branches/GSoC_2017/rapps/reactos/base/applications/rapps/gui.cpp [iso-8859-1]
(original)
+++ branches/GSoC_2017/rapps/reactos/base/applications/rapps/gui.cpp [iso-8859-1] Sat Sep
9 20:38:06 2017
@@ -1,7 +1,10 @@
-/* PROJECT: ReactOS CE Applications Manager
- * LICENSE: GPL - See COPYING in the top level directory
- * AUTHORS: David Quintana <gigaherz(a)gmail.com>
- * Alexander Shaposhnikov <chaez.san(a)gmail.com>
+/*
+ * 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(a)gmail.com)
+ * Copyright 2017 Alexander Shaposhnikov (chaez.san(a)gmail.com)
*/
#include "defines.h"
@@ -633,18 +636,18 @@
class CMainWindow :
public CWindowImpl<CMainWindow, CWindow, CFrameWinTraits>
{
- CUiPanel * m_ClientPanel;
- CUiSplitPanel * m_VSplitter;
- CUiSplitPanel * m_HSplitter;
-
- CMainToolbar * m_Toolbar;
- CAppsListView * m_ListView;
-
- CSideTreeView * m_TreeView;
- CUiWindow<CStatusBar> * m_StatusBar;
- CUiWindow<CRichEdit> * m_RichEdit;
-
- CUiWindow<CSearchBar> * m_SearchBar;
+ CUiPanel* m_ClientPanel;
+ CUiSplitPanel* m_VSplitter;
+ CUiSplitPanel* m_HSplitter;
+
+ CMainToolbar* m_Toolbar;
+ CAppsListView* m_ListView;
+
+ CSideTreeView* m_TreeView;
+ CUiWindow<CStatusBar>* m_StatusBar;
+ CUiWindow<CRichEdit>* m_RichEdit;
+
+ CUiWindow<CSearchBar>* m_SearchBar;
CAvailableApps m_AvailableApps;
LPWSTR pLink;
@@ -1636,8 +1639,7 @@
}
};
-// File interface
-
+// global interface
CMainWindow * g_MainWindow;
HWND CreateMainWindow()
@@ -1675,7 +1677,12 @@
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 @@
{
InsertRichEditText(szText.GetString(), flags);
}
-
-CAvailableApps* GetAvailableApps()
-{
- return g_MainWindow->GetAvailableApps();
-}
Modified: branches/GSoC_2017/rapps/reactos/base/applications/rapps/include/available.h
URL:
http://svn.reactos.org/svn/reactos/branches/GSoC_2017/rapps/reactos/base/ap…
==============================================================================
---
branches/GSoC_2017/rapps/reactos/base/applications/rapps/include/available.h [iso-8859-1]
(original)
+++
branches/GSoC_2017/rapps/reactos/base/applications/rapps/include/available.h [iso-8859-1]
Sat Sep 9 20:38:06 2017
@@ -80,13 +80,14 @@
class CAvailableApps
{
- ATL::CAtlList<CAvailableApplicationInfo*> 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<CAvailableApplicationInfo*> m_InfoList;
public:
CAvailableApps();
Modified: branches/GSoC_2017/rapps/reactos/base/applications/rapps/include/dialogs.h
URL:
http://svn.reactos.org/svn/reactos/branches/GSoC_2017/rapps/reactos/base/ap…
==============================================================================
---
branches/GSoC_2017/rapps/reactos/base/applications/rapps/include/dialogs.h [iso-8859-1]
(original)
+++
branches/GSoC_2017/rapps/reactos/base/applications/rapps/include/dialogs.h [iso-8859-1]
Sat Sep 9 20:38:06 2017
@@ -16,6 +16,7 @@
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,
Modified: branches/GSoC_2017/rapps/reactos/base/applications/rapps/include/installed.h
URL:
http://svn.reactos.org/svn/reactos/branches/GSoC_2017/rapps/reactos/base/ap…
==============================================================================
---
branches/GSoC_2017/rapps/reactos/base/applications/rapps/include/installed.h [iso-8859-1]
(original)
+++
branches/GSoC_2017/rapps/reactos/base/applications/rapps/include/installed.h [iso-8859-1]
Sat Sep 9 20:38:06 2017
@@ -9,6 +9,7 @@
HKEY hSubKey;
ATL::CStringW szKeyName;
};
+
typedef INSTALLED_INFO *PINSTALLED_INFO;
typedef BOOL(CALLBACK *APPENUMPROC)(INT ItemIndex, ATL::CStringW &Name,
PINSTALLED_INFO Info);
Modified: branches/GSoC_2017/rapps/reactos/base/applications/rapps/include/rosui.h
URL:
http://svn.reactos.org/svn/reactos/branches/GSoC_2017/rapps/reactos/base/ap…
==============================================================================
--- branches/GSoC_2017/rapps/reactos/base/applications/rapps/include/rosui.h [iso-8859-1]
(original)
+++ branches/GSoC_2017/rapps/reactos/base/applications/rapps/include/rosui.h [iso-8859-1]
Sat Sep 9 20:38:06 2017
@@ -1,6 +1,10 @@
-/* PROJECT: ReactOS UI Layout Engine
- * LICENSE: GPL - See COPYING in the top level directory
- * AUTHORS: David Quintana <gigaherz(a)gmail.com>
+/*
+ * 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(a)gmail.com)
+ * Copyright 2017 Alexander Shaposhnikov (chaez.san(a)gmail.com)
*/
#pragma once
Modified: branches/GSoC_2017/rapps/reactos/base/applications/rapps/include/winmain.h
URL:
http://svn.reactos.org/svn/reactos/branches/GSoC_2017/rapps/reactos/base/ap…
==============================================================================
---
branches/GSoC_2017/rapps/reactos/base/applications/rapps/include/winmain.h [iso-8859-1]
(original)
+++
branches/GSoC_2017/rapps/reactos/base/applications/rapps/include/winmain.h [iso-8859-1]
Sat Sep 9 20:38:06 2017
@@ -1,7 +1,7 @@
#pragma once
#include <windef.h>
+
//TODO: Separate main and settings related definitions
-
struct SETTINGS_INFO
{
BOOL bSaveWndPos;
Modified: branches/GSoC_2017/rapps/reactos/base/applications/rapps/installed.cpp
URL:
http://svn.reactos.org/svn/reactos/branches/GSoC_2017/rapps/reactos/base/ap…
==============================================================================
--- branches/GSoC_2017/rapps/reactos/base/applications/rapps/installed.cpp [iso-8859-1]
(original)
+++ branches/GSoC_2017/rapps/reactos/base/applications/rapps/installed.cpp [iso-8859-1]
Sat Sep 9 20:38:06 2017
@@ -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(a)reactos.org)
- * Alexander Shaposhnikov (chaez.san(a)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(a)reactos.org)
+ * Copyright 2017 Alexander Shaposhnikov (chaez.san(a)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 @@
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 @@
return StartProcess(szPath, TRUE);
}
-BOOL
-ShowInstalledAppInfo(INT Index)
+BOOL ShowInstalledAppInfo(INT Index)
{
ATL::CStringW szText;
ATL::CStringW szInfo;
@@ -138,8 +133,7 @@
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 @@
}
}
-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;
Modified: branches/GSoC_2017/rapps/reactos/base/applications/rapps/integrity.cpp
URL:
http://svn.reactos.org/svn/reactos/branches/GSoC_2017/rapps/reactos/base/ap…
==============================================================================
--- branches/GSoC_2017/rapps/reactos/base/applications/rapps/integrity.cpp [iso-8859-1]
(original)
+++ branches/GSoC_2017/rapps/reactos/base/applications/rapps/integrity.cpp [iso-8859-1]
Sat Sep 9 20:38:06 2017
@@ -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(a)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(a)gmail.com)
+ * Copyright Mark Jansen
*/
#include "defines.h"
Modified: branches/GSoC_2017/rapps/reactos/base/applications/rapps/loaddlg.cpp
URL:
http://svn.reactos.org/svn/reactos/branches/GSoC_2017/rapps/reactos/base/ap…
==============================================================================
--- branches/GSoC_2017/rapps/reactos/base/applications/rapps/loaddlg.cpp [iso-8859-1]
(original)
+++ branches/GSoC_2017/rapps/reactos/base/applications/rapps/loaddlg.cpp [iso-8859-1] Sat
Sep 9 20:38:06 2017
@@ -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)
Modified: branches/GSoC_2017/rapps/reactos/base/applications/rapps/misc.cpp
URL:
http://svn.reactos.org/svn/reactos/branches/GSoC_2017/rapps/reactos/base/ap…
==============================================================================
--- branches/GSoC_2017/rapps/reactos/base/applications/rapps/misc.cpp [iso-8859-1]
(original)
+++ branches/GSoC_2017/rapps/reactos/base/applications/rapps/misc.cpp [iso-8859-1] Sat Sep
9 20:38:06 2017
@@ -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(a)reactos.org)
- * Ismael Ferreras Morezuelas (swyterzone+ros(a)gmail.com)
- * Alexander Shaposhnikov (chaez.san(a)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(a)reactos.org)
+ * Copyright 2015 Ismael Ferreras Morezuelas (swyterzone+ros(a)gmail.com)
+ * Copyright 2017 Alexander Shaposhnikov (chaez.san(a)gmail.com)
*/
#include "defines.h"
Modified: branches/GSoC_2017/rapps/reactos/base/applications/rapps/settingsdlg.cpp
URL:
http://svn.reactos.org/svn/reactos/branches/GSoC_2017/rapps/reactos/base/ap…
==============================================================================
--- branches/GSoC_2017/rapps/reactos/base/applications/rapps/settingsdlg.cpp [iso-8859-1]
(original)
+++ branches/GSoC_2017/rapps/reactos/base/applications/rapps/settingsdlg.cpp [iso-8859-1]
Sat Sep 9 20:38:06 2017
@@ -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(a)reactos.org)
- * Alexander Shaposhnikov (chaez.san(a)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(a)reactos.org)
+ * Copyright 2017 Alexander Shaposhnikov (chaez.san(a)gmail.com)
*/
#include "defines.h"
Modified: branches/GSoC_2017/rapps/reactos/base/applications/rapps/unattended.cpp
URL:
http://svn.reactos.org/svn/reactos/branches/GSoC_2017/rapps/reactos/base/ap…
==============================================================================
--- branches/GSoC_2017/rapps/reactos/base/applications/rapps/unattended.cpp [iso-8859-1]
(original)
+++ branches/GSoC_2017/rapps/reactos/base/applications/rapps/unattended.cpp [iso-8859-1]
Sat Sep 9 20:38:06 2017
@@ -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(a)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(a)gmail.com)
*/
-
#include "unattended.h"
#include "defines.h"
#include "available.h"
@@ -25,9 +24,7 @@
return FALSE;
}
- // Setup key - single app expected
// TODO: use DB filenames as names because they're shorter
-
ATL::CSimpleArray<ATL::CStringW> arrNames;
if (!StrCmpW(argv[0], CMD_KEY_INSTALL))
{
Modified: branches/GSoC_2017/rapps/reactos/base/applications/rapps/winmain.cpp
URL:
http://svn.reactos.org/svn/reactos/branches/GSoC_2017/rapps/reactos/base/ap…
==============================================================================
--- branches/GSoC_2017/rapps/reactos/base/applications/rapps/winmain.cpp [iso-8859-1]
(original)
+++ branches/GSoC_2017/rapps/reactos/base/applications/rapps/winmain.cpp [iso-8859-1] Sat
Sep 9 20:38:06 2017
@@ -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(a)reactos.org)
- * Ismael Ferreras Morezuelas (swyterzone+ros(a)gmail.com)
- * Alexander Shaposhnikov (chaez.san(a)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(a)reactos.org)
+ * Copyright 2015 Ismael Ferreras Morezuelas (swyterzone+ros(a)gmail.com)
+ * Copyright 2017 Alexander Shaposhnikov (chaez.san(a)gmail.com)
*/
#include "defines.h"
#include "rapps.h"