Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-03 20:35:43 +00:00
Code Issues Projects Releases Packages Wiki Activity

[MSCONFIG_NEW] Add missing header guard. Rename Update_Btn_States() and iSortedColumn. #179

Browse source
This commit is contained in:
Amine Khaldi 2017-12-25 20:31:27 +01:00
parent 018ba0f72e
commit 9ce192a807
3 changed files with 12 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

14
base/applications/msconfig_new/srvpage.cpp
View file

@ -582,7 +582,7 @@ static BOOL ValidateItem(int index, BOOL bNewState, BOOL bDisplayErrors)
static void static void
Update_Btn_States(HWND hDlg) UpdateBtnStates(HWND hDlg)
{ {
// HWND hTree = GetDlgItem(hDlg, IDC_SYSTEM_TREE); // HWND hTree = GetDlgItem(hDlg, IDC_SYSTEM_TREE);
@ -714,7 +714,7 @@ ServicesPageWndProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam)
// //
GetServices(); GetServices();
ListView_Sort(hServicesListCtrl, 0); ListView_Sort(hServicesListCtrl, 0);
Update_Btn_States(hDlg); UpdateBtnStates(hDlg);
// Select the first item. // Select the first item.
ListView_SetItemState(hServicesListCtrl, 0, LVIS_SELECTED, LVIS_SELECTED); ListView_SetItemState(hServicesListCtrl, 0, LVIS_SELECTED, LVIS_SELECTED);
@ -745,7 +745,7 @@ ServicesPageWndProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam)
if (bAreThereMods) if (bAreThereMods)
{ {
Update_Btn_States(hDlg); UpdateBtnStates(hDlg);
PropSheet_Changed(GetParent(hServicesPage), hServicesPage); PropSheet_Changed(GetParent(hServicesPage), hServicesPage);
} }
@ -764,7 +764,7 @@ ServicesPageWndProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam)
if (bAreThereMods) if (bAreThereMods)
{ {
Update_Btn_States(hDlg); UpdateBtnStates(hDlg);
PropSheet_Changed(GetParent(hServicesPage), hServicesPage); PropSheet_Changed(GetParent(hServicesPage), hServicesPage);
} }
@ -775,7 +775,7 @@ ServicesPageWndProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam)
{ {
bMaskProprietarySvcs = !bMaskProprietarySvcs; bMaskProprietarySvcs = !bMaskProprietarySvcs;
GetServices(bMaskProprietarySvcs); GetServices(bMaskProprietarySvcs);
Update_Btn_States(hDlg); UpdateBtnStates(hDlg);
return TRUE; return TRUE;
} }
@ -792,7 +792,7 @@ ServicesPageWndProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam)
if (ValidateItem(/*reinterpret_cast<int>*/ int(lParam), bNewCheckState, !HideEssentialServiceWarning())) if (ValidateItem(/*reinterpret_cast<int>*/ int(lParam), bNewCheckState, !HideEssentialServiceWarning()))
{ {
Update_Btn_States(hDlg); UpdateBtnStates(hDlg);
PropSheet_Changed(GetParent(hServicesPage), hServicesPage); PropSheet_Changed(GetParent(hServicesPage), hServicesPage);
} }
@ -1058,7 +1058,7 @@ ServicesPageWndProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam)
} }
GetServices(bMaskProprietarySvcs); GetServices(bMaskProprietarySvcs);
Update_Btn_States(hDlg); UpdateBtnStates(hDlg);
return TRUE; return TRUE;
} }

6
base/applications/msconfig_new/toolspage.cpp
View file

@ -15,7 +15,7 @@
static HWND hToolsPage = NULL; static HWND hToolsPage = NULL;
static HWND hToolsListCtrl = NULL; static HWND hToolsListCtrl = NULL;
static int iSortedColumn = 0; static int iToolsPageSortedColumn = 0;
struct TOOL struct TOOL
{ {
@ -442,8 +442,8 @@ ToolsPageWndProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam)
{ {
int iSortingColumn = ((LPNMLISTVIEW)lParam)->iSubItem; int iSortingColumn = ((LPNMLISTVIEW)lParam)->iSubItem;
ListView_SortEx(hToolsListCtrl, iSortingColumn, iSortedColumn); ListView_SortEx(hToolsListCtrl, iSortingColumn, iToolsPageSortedColumn);
iSortedColumn = iSortingColumn; iToolsPageSortedColumn = iSortingColumn;
return TRUE; return TRUE;
} }

2
base/applications/msconfig_new/xmldomparser.hpp
View file

@ -6,6 +6,8 @@
* COPYRIGHT: Copyright 2011-2012 Hermes BELUSCA - MAITO <hermes.belusca@sfr.fr> * COPYRIGHT: Copyright 2011-2012 Hermes BELUSCA - MAITO <hermes.belusca@sfr.fr>
*/ */
#pragma once
/* /*
* *
* MSXML Version Header File Name Library File Name DLL File Name * MSXML Version Header File Name Library File Name DLL File Name