Author: ashaposhnikov Date: Tue Aug 15 22:35:45 2017 New Revision: 75560
URL: http://svn.reactos.org/svn/reactos?rev=75560&view=rev Log: [RAPPS] - Style changes, typo fixes etc.
Modified: 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/crichedit.h branches/GSoC_2017/rapps/reactos/base/applications/rapps/include/defines.h branches/GSoC_2017/rapps/reactos/base/applications/rapps/include/dialogs.h branches/GSoC_2017/rapps/reactos/base/applications/rapps/include/gui.h branches/GSoC_2017/rapps/reactos/base/applications/rapps/include/misc.h branches/GSoC_2017/rapps/reactos/base/applications/rapps/include/rosui.h branches/GSoC_2017/rapps/reactos/base/applications/rapps/include/unattended.h branches/GSoC_2017/rapps/reactos/base/applications/rapps/include/winmain.h branches/GSoC_2017/rapps/reactos/base/applications/rapps/installdlg.cpp 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/unattended.cpp branches/GSoC_2017/rapps/reactos/base/applications/rapps/winmain.cpp
Modified: branches/GSoC_2017/rapps/reactos/base/applications/rapps/available.cpp URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2017/rapps/reactos/base/app... ============================================================================== --- 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] Tue Aug 15 22:35:45 2017 @@ -91,7 +91,7 @@
// Parse parameter string ATL::CStringW m_szLocale; - int iLCID; + INT iLCID; for (INT i = 0; szBuffer[i] != UNICODE_NULL; ++i) { if (szBuffer[i] != cDelimiter && szBuffer[i] != L'\n') @@ -382,7 +382,7 @@ ATL::CSimpleArray<PAPPLICATION_INFO> CAvailableApps::FindInfoList(const ATL::CSimpleArrayATL::CStringW &arrAppsNames) { ATL::CSimpleArray<PAPPLICATION_INFO> result; - for (int i = 0; i < arrAppsNames.GetSize(); ++i) + for (INT i = 0; i < arrAppsNames.GetSize(); ++i) { PAPPLICATION_INFO Info = FindInfo(arrAppsNames[i]); if (Info) @@ -393,17 +393,17 @@ return result; }
-const ATL::CStringW & CAvailableApps::GetFolderPath() +const ATL::CStringW& CAvailableApps::GetFolderPath() { return m_szPath; }
-const ATL::CStringW & CAvailableApps::GetAppPath() +const ATL::CStringW& CAvailableApps::GetAppPath() { return m_szAppsPath; }
-const ATL::CStringW & CAvailableApps::GetCabPath() +const ATL::CStringW& CAvailableApps::GetCabPath() { return m_szCabPath; }
Modified: branches/GSoC_2017/rapps/reactos/base/applications/rapps/gui.cpp URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2017/rapps/reactos/base/app... ============================================================================== --- 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] Tue Aug 15 22:35:45 2017 @@ -26,7 +26,7 @@ HWND hListView = NULL;
INT -GetSystemColorDepth(VOID) +GetSystemColorDepth() { DEVMODEW pDevMode; INT ColorDepth; @@ -236,8 +236,7 @@ hImageList = ImageList_Create(TOOLBAR_HEIGHT,//GetSystemMetrics(SM_CXSMICON), TOOLBAR_HEIGHT,//GetSystemMetrics(SM_CYSMICON), ILC_MASK | GetSystemColorDepth(), - 1, - 1); + 1, 1); if (!hImageList) { /* TODO: Error message */ @@ -354,7 +353,7 @@ struct SortContext { CAppsListView * lvw; - int iSubItem; + INT iSubItem; };
BOOL bHasAllChecked; @@ -845,7 +844,7 @@
RECT r = {0, 0, LOWORD(lParam), HIWORD(lParam)}; HDWP hdwp = NULL; - int count = m_ClientPanel->CountSizableChildren(); + INT count = m_ClientPanel->CountSizableChildren();
hdwp = BeginDeferWindowPos(count); if (hdwp)
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/app... ============================================================================== --- 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] Tue Aug 15 22:35:45 2017 @@ -126,4 +126,4 @@ const LPCWSTR GetFolderPathString(); const LPCWSTR GetAppPathString(); const LPCWSTR GetCabPathString(); -}; +};
Modified: branches/GSoC_2017/rapps/reactos/base/applications/rapps/include/crichedit.h URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2017/rapps/reactos/base/app... ============================================================================== --- branches/GSoC_2017/rapps/reactos/base/applications/rapps/include/crichedit.h [iso-8859-1] (original) +++ branches/GSoC_2017/rapps/reactos/base/applications/rapps/include/crichedit.h [iso-8859-1] Tue Aug 15 22:35:45 2017 @@ -41,7 +41,7 @@ SendMessageW(EM_SETSEL, End, End + 1); }
- LONG GetTextLen(VOID) + LONG GetTextLen() { GETTEXTLENGTHEX TxtLenStruct;
@@ -87,15 +87,15 @@ LoadedLibrary = LoadLibraryW(L"riched20.dll");
m_hWnd = CreateWindowExW(0, - L"RichEdit20W", - NULL, - WS_CHILD | WS_VISIBLE | ES_MULTILINE | - ES_LEFT | ES_READONLY, - 205, 28, 465, 100, - hwndParent, - NULL, - _AtlBaseModule.GetModuleInstance(), - NULL); + L"RichEdit20W", + NULL, + WS_CHILD | WS_VISIBLE | ES_MULTILINE | + ES_LEFT | ES_READONLY, + 205, 28, 465, 100, + hwndParent, + NULL, + _AtlBaseModule.GetModuleInstance(), + NULL);
if (m_hWnd) {
Modified: branches/GSoC_2017/rapps/reactos/base/applications/rapps/include/defines.h URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2017/rapps/reactos/base/app... ============================================================================== --- branches/GSoC_2017/rapps/reactos/base/applications/rapps/include/defines.h [iso-8859-1] (original) +++ branches/GSoC_2017/rapps/reactos/base/applications/rapps/include/defines.h [iso-8859-1] Tue Aug 15 22:35:45 2017 @@ -31,4 +31,4 @@
#define APPLICATION_DATABASE_URL L"https://svn.reactos.org/packages/rappmgr.cab" #define MAX_STR_LEN 256 -#define ENUM_ALL_COMPONENTS 30 +#define ENUM_ALL_COMPONENTS 30
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/app... ============================================================================== --- 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] Tue Aug 15 22:35:45 2017 @@ -17,15 +17,15 @@
public: static INT_PTR CALLBACK DownloadDlgProc(HWND Dlg, UINT uMsg, WPARAM wParam, LPARAM lParam); - static LRESULT CALLBACK DownloadProgressProc(HWND hWnd, - UINT uMsg, - WPARAM wParam, - LPARAM lParam, - UINT_PTR uIdSubclass, + static LRESULT CALLBACK DownloadProgressProc(HWND hWnd, + UINT uMsg, + WPARAM wParam, + LPARAM lParam, + UINT_PTR uIdSubclass, DWORD_PTR dwRefData);
static DWORD WINAPI ThreadFunc(LPVOID Context); - static BOOL DownloadListOfApplications(const ATL::CSimpleArray<PAPPLICATION_INFO>& AppsList, BOOL modal = FALSE); + static BOOL DownloadListOfApplications(const ATL::CSimpleArray<PAPPLICATION_INFO>& AppsList, BOOL bIsModal = FALSE); static BOOL DownloadApplication(PAPPLICATION_INFO pAppInfo, BOOL modal = FALSE); static VOID DownloadApplicationsDB(LPCWSTR lpUrl); static VOID LaunchDownloadDialog(BOOL); @@ -35,7 +35,7 @@ VOID CreateSettingsDlg(HWND hwnd);
// About dialog (aboutdlg.cpp) -VOID ShowAboutDialog(VOID); +VOID ShowAboutDialog();
// Installation dialog (installdlg.cpp) -//BOOL InstallApplication(INT Index); +//BOOL InstallApplication(INT Index);
Modified: branches/GSoC_2017/rapps/reactos/base/applications/rapps/include/gui.h URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2017/rapps/reactos/base/app... ============================================================================== --- branches/GSoC_2017/rapps/reactos/base/applications/rapps/include/gui.h [iso-8859-1] (original) +++ branches/GSoC_2017/rapps/reactos/base/applications/rapps/include/gui.h [iso-8859-1] Tue Aug 15 22:35:45 2017 @@ -17,4 +17,4 @@ VOID InsertRichEditText(const ATL::CStringW& szText, DWORD flags); CAvailableApps * GetAvailableApps(); extern HWND hListView; -extern ATL::CStringW szSearchPattern; +extern ATL::CStringW szSearchPattern;
Modified: branches/GSoC_2017/rapps/reactos/base/applications/rapps/include/misc.h URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2017/rapps/reactos/base/app... ============================================================================== --- branches/GSoC_2017/rapps/reactos/base/applications/rapps/include/misc.h [iso-8859-1] (original) +++ branches/GSoC_2017/rapps/reactos/base/applications/rapps/include/misc.h [iso-8859-1] Tue Aug 15 22:35:45 2017 @@ -9,14 +9,14 @@ INT GetClientWindowHeight(HWND hwnd);
VOID CopyTextToClipboard(LPCWSTR lpszText); -VOID SetWelcomeText(VOID); +VOID SetWelcomeText(); VOID ShowPopupMenu(HWND hwnd, UINT MenuID, UINT DefaultItem); BOOL StartProcess(ATL::CStringW &Path, BOOL Wait); BOOL StartProcess(LPWSTR lpPath, BOOL Wait); BOOL GetStorageDirectory(ATL::CStringW &lpDirectory); BOOL ExtractFilesFromCab(LPCWSTR lpCabName, LPCWSTR lpOutputPath); -VOID InitLogs(VOID); -VOID FreeLogs(VOID); +VOID InitLogs(); +VOID FreeLogs(); BOOL WriteLogMessage(WORD wType, DWORD dwEventID, LPCWSTR lpMsg); BOOL GetInstalledVersion(ATL::CStringW *pszVersion, const ATL::CStringW &szRegName);
@@ -42,4 +42,4 @@
UINT GetString(const ATL::CStringW& KeyName, ATL::CStringW& ResultString); UINT GetInt(const ATL::CStringW& KeyName); -}; +};
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/app... ============================================================================== --- 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] Tue Aug 15 22:35:45 2017 @@ -6,7 +6,7 @@
#include <atlwin.h>
-template<class T, int GrowthRate = 10> +template<class T, INT GrowthRate = 10> class CPointerArray { protected: @@ -24,13 +24,13 @@ }
private: - static int CALLBACK s_OnRemoveItem(void * ptr, void * context) + static INT CALLBACK s_OnRemoveItem(PVOID ptr, PVOID context) { CPointerArray * self = (CPointerArray*) context; - return (int) self->OnRemoveItem(reinterpret_cast<T*>(ptr)); - } - - static int CALLBACK s_OnCompareItems(void *p1, void *p2, LPARAM lParam) + return (INT) self->OnRemoveItem(reinterpret_cast<T*>(ptr)); + } + + static INT CALLBACK s_OnCompareItems(PVOID p1, PVOID p2, LPARAM lParam) { CPointerArray * self = (CPointerArray*) lParam; return self->OnCompareItems(reinterpret_cast<T*>(p1), reinterpret_cast<T*>(p2)); @@ -42,9 +42,9 @@ return TRUE; }
- virtual int OnCompareItems(T * p1, T * p2) - { - int t = (reinterpret_cast<int>(p2) -reinterpret_cast<int>(p1)); + virtual INT OnCompareItems(T * p1, T * p2) + { + INT t = (reinterpret_cast<INT>(p2) - reinterpret_cast<INT>(p1)); if (t > 0) return 1; if (t < 0) @@ -53,45 +53,45 @@ }
public: - int GetCount() const + INT GetCount() const { return DPA_GetPtrCount(m_hDpa); }
- T* Get(int i) const + T* Get(INT i) const { return (T*) DPA_GetPtr(m_hDpa, i); }
- BOOL Set(int i, T* ptr) + BOOL Set(INT i, T* ptr) { return DPA_SetPtr(m_hDpa, i, ptr); }
- int Insert(int at, T* ptr) + INT Insert(INT at, T* ptr) { return DPA_InsertPtr(m_hDpa, at, ptr); }
- int Append(T* ptr) + INT Append(T* ptr) { return DPA_InsertPtr(m_hDpa, DA_LAST, ptr); }
- int IndexOf(T* ptr) const + INT IndexOf(T* ptr) const { return DPA_GetPtrIndex(m_hDpa, ptr); }
BOOL Remove(T* ptr) { - int i = IndexOf(ptr); + INT i = IndexOf(ptr); if (i < 0) return FALSE; return RemoveAt(i); }
- BOOL RemoveAt(int i) + BOOL RemoveAt(INT i) { T* ptr = (T*) DPA_GetPtr(m_hDpa, i); OnRemoveItem(ptr); @@ -109,7 +109,7 @@ return DPA_Sort(m_hDpa, s_OnCompareItems, (LPARAM)this); }
- int Search(T* item, int iStart, UINT uFlags) + INT Search(T* item, INT iStart, UINT uFlags) { return DPA_Search(m_hDpa, s_OnCompareItems, (LPARAM)this); } @@ -124,7 +124,7 @@ left = right = top = bottom = 0; }
- CUiRect(int l, int t, int r, int b) + CUiRect(INT l, INT t, INT r, INT b) { left = l; right = r; @@ -141,12 +141,12 @@ { }
- CUiMargin(int all) + CUiMargin(INT all) : CUiRect(all, all, all, all) { }
- CUiMargin(int horz, int vert) + CUiMargin(INT horz, INT vert) : CUiRect(horz, vert, horz, vert) { } @@ -165,7 +165,7 @@
private: MeasureType m_Type; - int m_Value; + INT m_Value;
public: CUiMeasure() @@ -174,13 +174,13 @@ m_Value = 0; }
- CUiMeasure(MeasureType type, int value) + CUiMeasure(MeasureType type, INT value) { m_Type = type; m_Value = value; }
- int ComputeMeasure(int parent, int content) + INT ComputeMeasure(INT parent, INT content) { switch (m_Type) { @@ -208,12 +208,12 @@ return CUiMeasure(Type_FitParent, 0); }
- static CUiMeasure Fixed(int pixels) + static CUiMeasure Fixed(INT pixels) { return CUiMeasure(Type_Fixed, pixels); }
- static CUiMeasure Percent(int percent) + static CUiMeasure Percent(INT percent) { return CUiMeasure(Type_Percent, percent); } @@ -242,7 +242,7 @@ m_VerticalAlignment = UiAlign_LeftTop; }
- virtual void ComputeRect(RECT parentRect, RECT currentRect, RECT* newRect) + virtual VOID ComputeRect(RECT parentRect, RECT currentRect, RECT* newRect) { parentRect.left += m_Margin.left; parentRect.right -= m_Margin.right; @@ -255,8 +255,8 @@ if (parentRect.bottom < parentRect.top) parentRect.bottom = parentRect.top;
- SIZE szParent = { parentRect.right - parentRect.left, parentRect.bottom - parentRect.top }; - SIZE szCurrent = { currentRect.right - currentRect.left, currentRect.bottom - currentRect.top }; + SIZE szParent = {parentRect.right - parentRect.left, parentRect.bottom - parentRect.top}; + SIZE szCurrent = {currentRect.right - currentRect.left, currentRect.bottom - currentRect.top};
currentRect = parentRect;
@@ -297,14 +297,14 @@
public: - virtual void ComputeMinimalSize(SIZE* size) + virtual VOID ComputeMinimalSize(SIZE* size) { // Override in subclass size->cx = max(size->cx, 0); size->cy = min(size->cy, 0); };
- virtual void ComputeContentBounds(RECT* rect) + virtual VOID ComputeContentBounds(RECT* rect) { // Override in subclass }; @@ -373,9 +373,9 @@
virtual CUiBox * AsBox() { return this; }
- virtual void ComputeMinimalSize(SIZE* size) - { - for (int i = 0; i < m_Children.GetCount(); i++) + virtual VOID ComputeMinimalSize(SIZE* size) + { + for (INT i = 0; i < m_Children.GetCount(); i++) { CUiBox * box = m_Children.Get(i)->AsBox(); if (box) @@ -385,9 +385,9 @@ } };
- virtual void ComputeContentBounds(RECT* rect) - { - for (int i = 0; i < m_Children.GetCount(); i++) + virtual VOID ComputeContentBounds(RECT* rect) + { + for (INT i = 0; i < m_Children.GetCount(); i++) { CUiBox * box = m_Children.Get(i)->AsBox(); if (box) @@ -399,8 +399,8 @@
virtual DWORD_PTR CountSizableChildren() { - int count = 0; - for (int i = 0; i < m_Children.GetCount(); i++) + INT count = 0; + for (INT i = 0; i < m_Children.GetCount(); i++) { CUiBox * box = m_Children.Get(i)->AsBox(); if (box) @@ -413,20 +413,20 @@
virtual HDWP OnParentSize(RECT parentRect, HDWP hDwp) { - RECT rect = { 0 }; - - SIZE content = { 0 }; + RECT rect = {0}; + + SIZE content = {0}; ComputeMinimalSize(&content);
- int preferredWidth = m_Width.ComputeMeasure(parentRect.right - parentRect.left, content.cx); - int preferredHeight = m_Height.ComputeMeasure(parentRect.bottom - parentRect.top, content.cy); + INT preferredWidth = m_Width.ComputeMeasure(parentRect.right - parentRect.left, content.cx); + INT preferredHeight = m_Height.ComputeMeasure(parentRect.bottom - parentRect.top, content.cy);
rect.right = preferredWidth; rect.bottom = preferredHeight;
ComputeRect(parentRect, rect, &rect);
- for (int i = 0; i < m_Children.GetCount(); i++) + for (INT i = 0; i < m_Children.GetCount(); i++) { CUiBox * box = m_Children.Get(i)->AsBox(); if (box) @@ -450,13 +450,13 @@
HWND GetWindow() { return T::m_hWnd; }
- virtual void ComputeMinimalSize(SIZE* size) + virtual VOID ComputeMinimalSize(SIZE* size) { // TODO: Maybe use WM_GETMINMAXINFO? return CUiBox::ComputeMinimalSize(size); };
- virtual void ComputeContentBounds(RECT* rect) + virtual VOID ComputeContentBounds(RECT* rect) { RECT r; ::GetWindowRect(T::m_hWnd, &r); @@ -495,7 +495,7 @@ T::DestroyWindow(); }
- void GetWindowTextW(ATL::CStringW& szText) + VOID GetWindowTextW(ATL::CStringW& szText) { INT length = CWindow::GetWindowTextLengthW() + 1; CWindow::GetWindowTextW(szText.GetBuffer(length), length); @@ -508,7 +508,7 @@ public CUiBox, public CWindowImpl<CUiSplitPanel> { - static const int THICKNESS = 4; + static const INT THICKNESS = 4;
protected:
@@ -522,11 +522,11 @@ BOOL m_HasOldRect;
public: - int m_Pos; + INT m_Pos; BOOL m_Horizontal; BOOL m_DynamicFirst; - int m_MinFirst; - int m_MinSecond; + INT m_MinFirst; + INT m_MinSecond;
CUiMeasure m_Width; CUiMeasure m_Height; @@ -551,7 +551,7 @@ CUiCollection& First() { return m_First.Children(); } CUiCollection& Second() { return m_Second.Children(); }
- virtual void ComputeMinimalSize(SIZE* size) + virtual VOID ComputeMinimalSize(SIZE* size) { if (m_Horizontal) size->cx = max(size->cx, THICKNESS); @@ -561,7 +561,7 @@ m_Second.ComputeMinimalSize(size); };
- virtual void ComputeContentBounds(RECT* rect) + virtual VOID ComputeContentBounds(RECT* rect) { RECT r;
@@ -578,7 +578,7 @@
virtual DWORD_PTR CountSizableChildren() { - int count = 1; + INT count = 1; count += m_First.CountSizableChildren(); count += m_Second.CountSizableChildren(); return count; @@ -586,20 +586,20 @@
virtual HDWP OnParentSize(RECT parentRect, HDWP hDwp) { - RECT rect = { 0 }; - - SIZE content = { 0 }; + RECT rect = {0}; + + SIZE content = {0}; ComputeMinimalSize(&content);
- int preferredWidth = m_Width.ComputeMeasure(parentRect.right - parentRect.left, content.cx); - int preferredHeight = m_Width.ComputeMeasure(parentRect.bottom - parentRect.top, content.cy); + INT preferredWidth = m_Width.ComputeMeasure(parentRect.right - parentRect.left, content.cx); + INT preferredHeight = m_Width.ComputeMeasure(parentRect.bottom - parentRect.top, content.cy);
rect.right = preferredWidth; rect.bottom = preferredHeight;
ComputeRect(parentRect, rect, &rect);
- SIZE growth = { 0 }; + SIZE growth = {0}; if (m_HasOldRect) { RECT oldRect = m_LastRect; @@ -620,7 +620,7 @@ { if (growth.cy > 0) { - m_Pos += min(growth.cy, rect.bottom - (m_Pos+THICKNESS)); + m_Pos += min(growth.cy, rect.bottom - (m_Pos + THICKNESS)); } else if (growth.cy < 0) { @@ -669,25 +669,25 @@
m_LastRect = parentRect; m_HasOldRect = TRUE; - + hDwp = m_First.OnParentSize(first, hDwp); hDwp = m_Second.OnParentSize(second, hDwp);
if (hDwp) { return DeferWindowPos(hDwp, NULL, - splitter.left, splitter.top, - splitter.right - splitter.left, - splitter.bottom - splitter.top, - SWP_NOACTIVATE | SWP_NOZORDER); + splitter.left, splitter.top, + splitter.right - splitter.left, + splitter.bottom - splitter.top, + SWP_NOACTIVATE | SWP_NOZORDER); } else { SetWindowPos(NULL, - splitter.left, splitter.top, - splitter.right - splitter.left, - splitter.bottom - splitter.top, - SWP_NOACTIVATE | SWP_NOZORDER); + splitter.left, splitter.top, + splitter.right - splitter.left, + splitter.bottom - splitter.top, + SWP_NOACTIVATE | SWP_NOZORDER); return NULL; } }; @@ -736,12 +736,12 @@ }
public: - int GetPos(VOID) + INT GetPos() { return m_Pos; }
- void SetPos(int NewPos) + VOID SetPos(INT NewPos) { RECT rcParent;
@@ -772,7 +772,7 @@ m_Pos = rcParent.right; }
- int count = CountSizableChildren(); + INT count = CountSizableChildren();
HDWP hdwp = NULL; hdwp = BeginDeferWindowPos(count); @@ -794,7 +794,7 @@ DWORD style = WS_CHILD | WS_VISIBLE; DWORD exStyle = WS_EX_TRANSPARENT;
- RECT size = { 205, 180, 465, THICKNESS }; + RECT size = {205, 180, 465, THICKNESS}; size.right += size.left; size.bottom += size.top;
Modified: branches/GSoC_2017/rapps/reactos/base/applications/rapps/include/unattended.h URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2017/rapps/reactos/base/app... ============================================================================== --- branches/GSoC_2017/rapps/reactos/base/applications/rapps/include/unattended.h [iso-8859-1] (original) +++ branches/GSoC_2017/rapps/reactos/base/applications/rapps/include/unattended.h [iso-8859-1] Tue Aug 15 22:35:45 2017 @@ -5,4 +5,4 @@ #define CMD_KEY_SETUP L"/SETUP"
// return TRUE if the SETUP key was valid -BOOL CmdParser(LPWSTR lpCmdLine); +BOOL CmdParser(LPWSTR lpCmdLine);
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/app... ============================================================================== --- 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] Tue Aug 15 22:35:45 2017 @@ -32,4 +32,4 @@ VOID FillDefaultSettings(PSETTINGS_INFO pSettingsInfo);
// integrity.cpp -BOOL VerifyInteg(LPCWSTR lpSHA1Hash, LPCWSTR lpFileName); +BOOL VerifyInteg(LPCWSTR lpSHA1Hash, LPCWSTR lpFileName);
Modified: branches/GSoC_2017/rapps/reactos/base/applications/rapps/installdlg.cpp URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2017/rapps/reactos/base/app... ============================================================================== --- branches/GSoC_2017/rapps/reactos/base/applications/rapps/installdlg.cpp [iso-8859-1] (original) +++ branches/GSoC_2017/rapps/reactos/base/applications/rapps/installdlg.cpp [iso-8859-1] Tue Aug 15 22:35:45 2017 @@ -18,22 +18,22 @@ { switch (Msg) { - case WM_INITDIALOG: + case WM_INITDIALOG: + { + } + break; + + case WM_COMMAND: + { + switch (LOWORD(wParam)) { + case IDOK: + case IDCANCEL: + EndDialog(hDlg, LOWORD(wParam)); + break; } - break; - - case WM_COMMAND: - { - switch (LOWORD(wParam)) - { - case IDOK: - case IDCANCEL: - EndDialog(hDlg, LOWORD(wParam)); - break; - } - } - break; + } + break; }
return FALSE; @@ -49,9 +49,9 @@ if (!AppInfo) return FALSE;
DialogBoxW(hInst, - MAKEINTRESOURCEW(IDD_INSTALL_DIALOG), - hMainWnd, - InstallDlgProc); + MAKEINTRESOURCEW(IDD_INSTALL_DIALOG), + hMainWnd, + InstallDlgProc);
return TRUE; }
Modified: branches/GSoC_2017/rapps/reactos/base/applications/rapps/installed.cpp URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2017/rapps/reactos/base/app... ============================================================================== --- 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] Tue Aug 15 22:35:45 2017 @@ -158,9 +158,9 @@
if (MessageBoxW(hMainWnd, szMsgText, szMsgTitle, MB_YESNO | MB_ICONQUESTION) == IDYES) { - ATL::CStringW::CopyChars(szFullName, - MAX_PATH, - Info->szKeyName.GetString(), + ATL::CStringW::CopyChars(szFullName, + MAX_PATH, + Info->szKeyName.GetString(), MAX_PATH - wcslen(szFullName));
if (RegDeleteKeyW(Info->hRootKey, szFullName) == ERROR_SUCCESS)
Modified: branches/GSoC_2017/rapps/reactos/base/applications/rapps/integrity.cpp URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2017/rapps/reactos/base/app... ============================================================================== --- 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] Tue Aug 15 22:35:45 2017 @@ -53,7 +53,7 @@
WCHAR buf[(sizeof(sha) * 2) + 1]; for (UINT i = 0; i < sizeof(sha); i++) - swprintf(buf + 2 * i, L"%02x", ((unsigned char *)sha)[i]); + swprintf(buf + 2 * i, L"%02x", ((unsigned char *) sha)[i]); /* does the resulting SHA1 match with the provided one? */ if (!_wcsicmp(buf, lpSHA1Hash)) ret = TRUE;
Modified: branches/GSoC_2017/rapps/reactos/base/applications/rapps/loaddlg.cpp URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2017/rapps/reactos/base/app... ============================================================================== --- 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] Tue Aug 15 22:35:45 2017 @@ -46,8 +46,8 @@ #include "misc.h"
#ifdef USE_CERT_PINNING - #define CERT_ISSUER_INFO "BE\r\nGlobalSign nv-sa\r\nGlobalSign Domain Validation CA - SHA256 - G2" - #define CERT_SUBJECT_INFO "Domain Control Validated\r\n*.reactos.org" +#define CERT_ISSUER_INFO "BE\r\nGlobalSign nv-sa\r\nGlobalSign Domain Validation CA - SHA256 - G2" +#define CERT_SUBJECT_INFO "Domain Control Validated\r\n*.reactos.org" #endif
typedef enum @@ -768,7 +768,7 @@ DownloadsListView.SetDownloadStatus(iAppId, DOWNLOAD_STATUS::DLInstalling); //TODO: issue an install operation separately so that the apps could be downloaded in the background WaitForSingleObject(shExInfo.hProcess, INFINITE); - CloseHandle(shExInfo.hProcess); + CloseHandle(shExInfo.hProcess); } else {
Modified: branches/GSoC_2017/rapps/reactos/base/applications/rapps/misc.cpp URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2017/rapps/reactos/base/app... ============================================================================== --- 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] Tue Aug 15 22:35:45 2017 @@ -20,8 +20,8 @@
struct ERF { - int erfOper; - int erfType; + INT erfOper; + INT erfType; BOOL fError; };
@@ -160,7 +160,7 @@ }
BOOL StartProcess(ATL::CStringW &Path, BOOL Wait) -{ +{ return StartProcess(const_cast<LPWSTR>(Path.GetString()), Wait);; }
@@ -498,7 +498,7 @@ return FALSE;
// convert it to an actual integer - int result = StrToIntW(Buffer.GetString()); + INT result = StrToIntW(Buffer.GetString());
return (UINT) (result <= 0) ? 0 : result; }
Modified: branches/GSoC_2017/rapps/reactos/base/applications/rapps/unattended.cpp URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2017/rapps/reactos/base/app... ============================================================================== --- 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] Tue Aug 15 22:35:45 2017 @@ -17,14 +17,12 @@ }
// Setup key - single app expected - // TODO: add multiple apps // TODO: use DB filenames as names because they're shorter
- // app setup ATL::CSimpleArrayATL::CStringW arrNames; if (!StrCmpW(argv[0], CMD_KEY_INSTALL)) { - for (int i = 1; i < argc; ++i) + for (INT i = 1; i < argc; ++i) { arrNames.Add(argv[i]); } @@ -32,7 +30,6 @@ else if (!StrCmpW(argv[0], CMD_KEY_SETUP)) { - //TODO: inf file loading HINF InfHandle = SetupOpenInfFileW(argv[1], NULL, INF_STYLE_WIN4, NULL); if (InfHandle == INVALID_HANDLE_VALUE) { @@ -40,24 +37,23 @@ }
INFCONTEXT Context; - if (!SetupFindFirstLineW(InfHandle, L"RAPPS", L"Install", &Context)) + if (SetupFindFirstLineW(InfHandle, L"RAPPS", L"Install", &Context)) { - return FALSE; + WCHAR szName[MAX_PATH]; + do + { + if (SetupGetStringFieldW(&Context, 1, szName, MAX_PATH, NULL)) + { + arrNames.Add(szName); + } + } while (SetupFindNextLine(&Context, &Context)); } - - WCHAR szName[MAX_PATH]; - do - { - if (SetupGetStringFieldW(&Context, 1, szName, MAX_PATH, NULL)) - { - arrNames.Add(szName); - } - } - while (SetupFindNextLine(&Context, &Context)); SetupCloseInfFile(InfHandle); } else + { return FALSE; + }
CAvailableApps apps; apps.EnumAvailableApplications(ENUM_ALL_AVAILABLE, NULL); @@ -70,4 +66,3 @@
return FALSE; } -
Modified: branches/GSoC_2017/rapps/reactos/base/applications/rapps/winmain.cpp URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2017/rapps/reactos/base/app... ============================================================================== --- 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] Tue Aug 15 22:35:45 2017 @@ -31,11 +31,6 @@ CRAppsModule gModule; CAtlWinModule gWinModule;
-//void *operator new (size_t, void *buf) -//{ -// return buf; -//} - static VOID InitializeAtlModule(HINSTANCE hInstance, BOOL bInitialize) { if (bInitialize) @@ -51,6 +46,7 @@ VOID FillDefaultSettings(PSETTINGS_INFO pSettingsInfo) { ATL::CStringW szDownloadDir; + ZeroMemory(pSettingsInfo, sizeof(SETTINGS_INFO));
pSettingsInfo->bSaveWndPos = TRUE; pSettingsInfo->bUpdateAtStart = FALSE; @@ -81,10 +77,6 @@ pSettingsInfo->Top = CW_USEDEFAULT; pSettingsInfo->Width = 680; pSettingsInfo->Height = 450; - pSettingsInfo->Proxy = 0; - - pSettingsInfo->szProxyServer[0] = UNICODE_NULL; - pSettingsInfo->szNoProxyFor[0] = UNICODE_NULL; }
static BOOL LoadSettings() @@ -130,7 +122,7 @@ } }
-INT WINAPI wWinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPWSTR lpCmdLine, int nShowCmd) +INT WINAPI wWinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPWSTR lpCmdLine, INT nShowCmd) { LPCWSTR szWindowClass = L"ROSAPPMGR"; HANDLE hMutex;
-
ashaposhnikov＠svn.reactos.org