Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-01-01 03:54:02 +00:00
Code Issues Projects Releases Packages Wiki Activity

[RAPPS] License header unification and minor style changes

Browse source 
- Unified & reformatted license headers according to https://www.reactos.org/wiki/Coding_Style
- Minor style changes

svn path=/branches/GSoC_2017/rapps/; revision=75815
This commit is contained in:
Alexander Shaposhnikov 2017-09-09 20:38:06 +00:00
parent 9cf1050fce
commit b49140dc40
15 changed files with 94 additions and 94 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
reactos/base/applications/rapps/aboutdlg.cpp
View file

@ -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"

14
reactos/base/applications/rapps/available.cpp
View file

@ -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"

44
reactos/base/applications/rapps/gui.cpp
View file

@ -1,7 +1,10 @@
/* PROJECT: ReactOS CE Applications Manager
* LICENSE: GPL - See COPYING in the top level directory
* AUTHORS: David Quintana <gigaherz@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/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<CMainWindow, CWindow, CFrameWinTraits>
{
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<CStatusBar> * m_StatusBar;
CUiWindow<CRichEdit> * m_RichEdit;
CSideTreeView* m_TreeView;
CUiWindow<CStatusBar>* m_StatusBar;
CUiWindow<CRichEdit>* m_RichEdit;
CUiWindow<CSearchBar> * m_SearchBar;
CUiWindow<CSearchBar>* 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();
}

3
reactos/base/applications/rapps/include/available.h
View file

@ -80,13 +80,14 @@ typedef BOOL(CALLBACK *AVAILENUMPROC)(CAvailableApplicationInfo *Info, LPCWSTR s
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();

1
reactos/base/applications/rapps/include/dialogs.h
View file

@ -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,

1
reactos/base/applications/rapps/include/installed.h
View file

@ -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);

10
reactos/base/applications/rapps/include/rosui.h
View file

@ -1,6 +1,10 @@
/* PROJECT: ReactOS UI Layout Engine
* LICENSE: GPL - See COPYING in the top level directory
* AUTHORS: David Quintana <gigaherz@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@gmail.com)
* Copyright 2017 Alexander Shaposhnikov (chaez.san@gmail.com)
*/
#pragma once

2
reactos/base/applications/rapps/include/winmain.h
View file

@ -1,7 +1,7 @@
#pragma once
#include <windef.h>
//TODO: Separate main and settings related definitions
//TODO: Separate main and settings related definitions
struct SETTINGS_INFO
{
BOOL bSaveWndPos;

31
reactos/base/applications/rapps/installed.cpp
View file

@ -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;

12
reactos/base/applications/rapps/integrity.cpp
View file

@ -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"

5
reactos/base/applications/rapps/loaddlg.cpp
View file

@ -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)

14
reactos/base/applications/rapps/misc.cpp
View file

@ -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"

12
reactos/base/applications/rapps/settingsdlg.cpp
View file

@ -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"

13
reactos/base/applications/rapps/unattended.cpp
View file

@ -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<ATL::CStringW> arrNames;
if (!StrCmpW(argv[0], CMD_KEY_INSTALL))
{

14
reactos/base/applications/rapps/winmain.cpp
View file

@ -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"