astyle formatting cleanup to make the sourcecode more accessible

switch used: astyle --style=ansi --min-conditional-indent=0 --pad=oper --unpad=paren
http://astyle.sourceforge.net/

git-svn-id: https://mpc-hc.svn.sourceforge.net/svnroot/mpc-hc/trunk@1783 10f7b99b-c216-0410-bff0-8a66a9350fd8

1 files changed, 224 insertions, 224 deletions

diff --git a/src/apps/mplayerc/PPageFullscreen.cpp b/src/apps/mplayerc/PPageFullscreen.cpp
index 7e8c60238..e8fe5b92d 100644
--- a/src/apps/mplayerc/PPageFullscreen.cpp
+++ b/src/apps/mplayerc/PPageFullscreen.cpp
@@ -30,293 +30,293 @@
 #include "MultiMonitor.h"

 

 // CPPagePlayer dialog

-	

+

 IMPLEMENT_DYNAMIC(CPPageFullscreen, CPPageBase)

 CPPageFullscreen::CPPageFullscreen()

-		: CPPageBase(CPPageFullscreen::IDD, CPPageFullscreen::IDD)

-		, m_launchfullscreen(FALSE)

-		, m_fSetFullscreenRes(FALSE)

-		, m_fSetDefault(FALSE)

-		, m_iShowBarsWhenFullScreen(FALSE)

-		, m_nShowBarsWhenFullScreenTimeOut(0)

-		, m_fExitFullScreenAtTheEnd(FALSE)

-		, m_fRestoreResAfterExit(TRUE)

+    : CPPageBase(CPPageFullscreen::IDD, CPPageFullscreen::IDD)

+    , m_launchfullscreen(FALSE)

+    , m_fSetFullscreenRes(FALSE)

+    , m_fSetDefault(FALSE)

+    , m_iShowBarsWhenFullScreen(FALSE)

+    , m_nShowBarsWhenFullScreenTimeOut(0)

+    , m_fExitFullScreenAtTheEnd(FALSE)

+    , m_fRestoreResAfterExit(TRUE)

 {

 }

-	

+

 CPPageFullscreen::~CPPageFullscreen()

 {

 }

 

 void CPPageFullscreen::DoDataExchange(CDataExchange* pDX)

 {

-		__super::DoDataExchange(pDX);

-		DDX_Check(pDX, IDC_CHECK1, m_launchfullscreen);

-		DDX_Check(pDX, IDC_CHECK2, m_fSetFullscreenRes);

-		DDX_Check(pDX, IDC_CHECK3, m_fSetDefault);

-		DDX_CBIndex(pDX, IDC_COMBO1, m_iMonitorType);

-		DDX_Control(pDX, IDC_COMBO1, m_iMonitorTypeCtrl);

-		DDX_Control(pDX, IDC_COMBO2, m_dispmode24combo);

-		DDX_Control(pDX, IDC_COMBO3, m_dispmode25combo);

-		DDX_Control(pDX, IDC_COMBO4, m_dispmode30combo);

-		DDX_Control(pDX, IDC_COMBO5, m_dispmodeOthercombo);

-		DDX_Control(pDX, IDC_COMBO6, m_dispmode23d976combo);

-		DDX_Control(pDX, IDC_COMBO7, m_dispmode29d97combo);

-		DDX_Check(pDX, IDC_CHECK4, m_iShowBarsWhenFullScreen);

-		DDX_Text(pDX, IDC_EDIT1, m_nShowBarsWhenFullScreenTimeOut);

-		DDX_Check(pDX, IDC_CHECK5, m_fExitFullScreenAtTheEnd);

-		DDX_Control(pDX, IDC_SPIN1, m_nTimeOutCtrl);

-		DDX_Check(pDX, IDC_RESTORERESCHECK, m_fRestoreResAfterExit);

+    __super::DoDataExchange(pDX);

+    DDX_Check(pDX, IDC_CHECK1, m_launchfullscreen);

+    DDX_Check(pDX, IDC_CHECK2, m_fSetFullscreenRes);

+    DDX_Check(pDX, IDC_CHECK3, m_fSetDefault);

+    DDX_CBIndex(pDX, IDC_COMBO1, m_iMonitorType);

+    DDX_Control(pDX, IDC_COMBO1, m_iMonitorTypeCtrl);

+    DDX_Control(pDX, IDC_COMBO2, m_dispmode24combo);

+    DDX_Control(pDX, IDC_COMBO3, m_dispmode25combo);

+    DDX_Control(pDX, IDC_COMBO4, m_dispmode30combo);

+    DDX_Control(pDX, IDC_COMBO5, m_dispmodeOthercombo);

+    DDX_Control(pDX, IDC_COMBO6, m_dispmode23d976combo);

+    DDX_Control(pDX, IDC_COMBO7, m_dispmode29d97combo);

+    DDX_Check(pDX, IDC_CHECK4, m_iShowBarsWhenFullScreen);

+    DDX_Text(pDX, IDC_EDIT1, m_nShowBarsWhenFullScreenTimeOut);

+    DDX_Check(pDX, IDC_CHECK5, m_fExitFullScreenAtTheEnd);

+    DDX_Control(pDX, IDC_SPIN1, m_nTimeOutCtrl);

+    DDX_Check(pDX, IDC_RESTORERESCHECK, m_fRestoreResAfterExit);

 }

 

 BEGIN_MESSAGE_MAP(CPPageFullscreen, CPPageBase)

-		ON_CBN_SELCHANGE(IDC_COMBO1, OnUpdateFullScrCombo)

-		ON_UPDATE_COMMAND_UI(IDC_COMBO2, OnUpdateDispMode24Combo)

-		ON_UPDATE_COMMAND_UI(IDC_COMBO3, OnUpdateDispMode25Combo)

-		ON_UPDATE_COMMAND_UI(IDC_COMBO4, OnUpdateDispMode30Combo)

-		ON_UPDATE_COMMAND_UI(IDC_COMBO5, OnUpdateDispModeOtherCombo)

-		ON_UPDATE_COMMAND_UI(IDC_COMBO6, OnUpdateDispMode23d976Combo)

-		ON_UPDATE_COMMAND_UI(IDC_COMBO7, OnUpdateDispMode29d97Combo)

-		ON_UPDATE_COMMAND_UI(IDC_CHECK3 ,OnUpdateApplyDefault)

-		ON_UPDATE_COMMAND_UI(IDC_SPIN1, OnUpdateTimeout)

-		ON_UPDATE_COMMAND_UI(IDC_EDIT1, OnUpdateTimeout)

-		ON_UPDATE_COMMAND_UI(IDC_RESTORERESCHECK, OnUpdateRestoreRes)

+    ON_CBN_SELCHANGE(IDC_COMBO1, OnUpdateFullScrCombo)

+    ON_UPDATE_COMMAND_UI(IDC_COMBO2, OnUpdateDispMode24Combo)

+    ON_UPDATE_COMMAND_UI(IDC_COMBO3, OnUpdateDispMode25Combo)

+    ON_UPDATE_COMMAND_UI(IDC_COMBO4, OnUpdateDispMode30Combo)

+    ON_UPDATE_COMMAND_UI(IDC_COMBO5, OnUpdateDispModeOtherCombo)

+    ON_UPDATE_COMMAND_UI(IDC_COMBO6, OnUpdateDispMode23d976Combo)

+    ON_UPDATE_COMMAND_UI(IDC_COMBO7, OnUpdateDispMode29d97Combo)

+    ON_UPDATE_COMMAND_UI(IDC_CHECK3 , OnUpdateApplyDefault)

+    ON_UPDATE_COMMAND_UI(IDC_SPIN1, OnUpdateTimeout)

+    ON_UPDATE_COMMAND_UI(IDC_EDIT1, OnUpdateTimeout)

+    ON_UPDATE_COMMAND_UI(IDC_RESTORERESCHECK, OnUpdateRestoreRes)

 END_MESSAGE_MAP()

-	

+

 // CPPagePlayer message handlers

 

 BOOL CPPageFullscreen::OnInitDialog()

 {

-		__super::OnInitDialog();

-

-		SetHandCursor(m_hWnd, IDC_COMBO1);

-

-		AppSettings& s = AfxGetAppSettings();

-

-		m_launchfullscreen = s.launchfullscreen;

-		m_AutoChangeFullscrRes = s.AutoChangeFullscrRes;

-		m_fSetDefault = s.AutoChangeFullscrRes.bApplyDefault;

-		m_f_hmonitor = s.f_hmonitor;

-		m_iShowBarsWhenFullScreen = s.fShowBarsWhenFullScreen;

-		m_nShowBarsWhenFullScreenTimeOut = s.nShowBarsWhenFullScreenTimeOut;

-		m_nTimeOutCtrl.SetRange(-1, 10);

-		m_fExitFullScreenAtTheEnd = s.fExitFullScreenAtTheEnd;

-		m_fRestoreResAfterExit = s.fRestoreResAfterExit;

-			

-		CString str;

-		m_iMonitorType = 0;

-		CMonitor monitor;

-		CMonitors monitors;

-

-		m_iMonitorTypeCtrl.AddString(ResStr(IDS_FULLSCREENMONITOR_CURRENT));

-		m_MonitorDisplayNames.Add(_T("Current"));

-		if(m_f_hmonitor == _T("Current"))

-		{

-			m_iMonitorType = m_iMonitorTypeCtrl.GetCount()-1;

-		}

-

-		for ( int i = 0; i < monitors.GetCount(); i++ )

-		{

-			monitor = monitors.GetMonitor( i );

-			monitor.GetName(str);

-

-			if(monitor.IsMonitor())

-			{

-				DISPLAY_DEVICE displayDevice;

-				ZeroMemory(&displayDevice, sizeof(displayDevice));

-				displayDevice.cb = sizeof(displayDevice);

-				VERIFY(EnumDisplayDevices(str, 0,  &displayDevice, 0));

-

-				m_iMonitorTypeCtrl.AddString(str+_T(" - ")+displayDevice.DeviceString);

-				m_MonitorDisplayNames.Add(str);

-

-				if(m_f_hmonitor == str && m_iMonitorType == 0)

-				{

-					m_iMonitorType = m_iMonitorTypeCtrl.GetCount()-1;

-				}

-			}

-		}

-

-		if(m_iMonitorTypeCtrl.GetCount() > 2)

-		{

-			GetDlgItem(IDC_COMBO1)->EnableWindow(TRUE);

-		}

-		else

-		{ 

-			m_iMonitorType = 0;

-			GetDlgItem(IDC_COMBO1)->EnableWindow(FALSE);

-		}

-		ModesUpdate();

-		UpdateData(FALSE);

-

-		return TRUE;  // return TRUE unless you set the focus to a control

-		// EXCEPTION: OCX Property Pages should return FALSE

+    __super::OnInitDialog();

+

+    SetHandCursor(m_hWnd, IDC_COMBO1);

+

+    AppSettings& s = AfxGetAppSettings();

+

+    m_launchfullscreen = s.launchfullscreen;

+    m_AutoChangeFullscrRes = s.AutoChangeFullscrRes;

+    m_fSetDefault = s.AutoChangeFullscrRes.bApplyDefault;

+    m_f_hmonitor = s.f_hmonitor;

+    m_iShowBarsWhenFullScreen = s.fShowBarsWhenFullScreen;

+    m_nShowBarsWhenFullScreenTimeOut = s.nShowBarsWhenFullScreenTimeOut;

+    m_nTimeOutCtrl.SetRange(-1, 10);

+    m_fExitFullScreenAtTheEnd = s.fExitFullScreenAtTheEnd;

+    m_fRestoreResAfterExit = s.fRestoreResAfterExit;

+

+    CString str;

+    m_iMonitorType = 0;

+    CMonitor monitor;

+    CMonitors monitors;

+

+    m_iMonitorTypeCtrl.AddString(ResStr(IDS_FULLSCREENMONITOR_CURRENT));

+    m_MonitorDisplayNames.Add(_T("Current"));

+    if(m_f_hmonitor == _T("Current"))

+    {

+        m_iMonitorType = m_iMonitorTypeCtrl.GetCount() - 1;

+    }

+

+    for(int i = 0; i < monitors.GetCount(); i++)

+    {

+        monitor = monitors.GetMonitor(i);

+        monitor.GetName(str);

+

+        if(monitor.IsMonitor())

+        {

+            DISPLAY_DEVICE displayDevice;

+            ZeroMemory(&displayDevice, sizeof(displayDevice));

+            displayDevice.cb = sizeof(displayDevice);

+            VERIFY(EnumDisplayDevices(str, 0,  &displayDevice, 0));

+

+            m_iMonitorTypeCtrl.AddString(str + _T(" - ") + displayDevice.DeviceString);

+            m_MonitorDisplayNames.Add(str);

+

+            if(m_f_hmonitor == str && m_iMonitorType == 0)

+            {

+                m_iMonitorType = m_iMonitorTypeCtrl.GetCount() - 1;

+            }

+        }

+    }

+

+    if(m_iMonitorTypeCtrl.GetCount() > 2)

+    {

+        GetDlgItem(IDC_COMBO1)->EnableWindow(TRUE);

+    }

+    else

+    {

+        m_iMonitorType = 0;

+        GetDlgItem(IDC_COMBO1)->EnableWindow(FALSE);

+    }

+    ModesUpdate();

+    UpdateData(FALSE);

+

+    return TRUE;  // return TRUE unless you set the focus to a control

+    // EXCEPTION: OCX Property Pages should return FALSE

 }

 

 BOOL CPPageFullscreen::OnApply()

 {

-		UpdateData();

-

-		AppSettings& s = AfxGetAppSettings();

-		

-		int iSel_24   =  m_dispmode24combo.GetCurSel();

-		int iSel_25   =  m_dispmode25combo.GetCurSel();

-		int iSel_30   =  m_dispmode30combo.GetCurSel();

-		int iSel_Other = m_dispmodeOthercombo.GetCurSel();

-		int iSel_23   =  m_dispmode23d976combo.GetCurSel();

-		int iSel_29   =  m_dispmode29d97combo.GetCurSel();

-		

-		if (m_AutoChangeFullscrRes.bEnabled = !!m_fSetFullscreenRes)

-		{

-			if(iSel_24 >= 0 && iSel_24 < m_dms.GetCount())

-				m_AutoChangeFullscrRes.dmFullscreenRes24Hz = m_dms[m_dispmode24combo.GetCurSel()];

-			if(iSel_25 >= 0 && iSel_25 < m_dms.GetCount())

-				m_AutoChangeFullscrRes.dmFullscreenRes25Hz = m_dms[m_dispmode25combo.GetCurSel()];

-			if(iSel_30 >= 0 && iSel_30 < m_dms.GetCount())

-				m_AutoChangeFullscrRes.dmFullscreenRes30Hz = m_dms[m_dispmode30combo.GetCurSel()];

-			if(iSel_Other >= 0 && iSel_Other < m_dms.GetCount())

-				m_AutoChangeFullscrRes.dmFullscreenResOther = m_dms[m_dispmodeOthercombo.GetCurSel()];

-			if(iSel_23 >= 0 && iSel_23 < m_dms.GetCount())

-				m_AutoChangeFullscrRes.dmFullscreenRes23d976Hz = m_dms[m_dispmode23d976combo.GetCurSel()];

-			if(iSel_29 >= 0 && iSel_29 < m_dms.GetCount())

-				m_AutoChangeFullscrRes.dmFullscreenRes29d97Hz = m_dms[m_dispmode29d97combo.GetCurSel()];

-		}

-		m_AutoChangeFullscrRes.bApplyDefault = m_fSetDefault;

-		s.AutoChangeFullscrRes = m_AutoChangeFullscrRes;

-		s.launchfullscreen = !!m_launchfullscreen;

-		s.f_hmonitor =  m_f_hmonitor;

-		s.fShowBarsWhenFullScreen = !!m_iShowBarsWhenFullScreen;

-		s.nShowBarsWhenFullScreenTimeOut = m_nShowBarsWhenFullScreenTimeOut;

-		s.fExitFullScreenAtTheEnd = !!m_fExitFullScreenAtTheEnd;

-		s.fRestoreResAfterExit = !!m_fRestoreResAfterExit;

-

-

-		return __super::OnApply();

+    UpdateData();

+

+    AppSettings& s = AfxGetAppSettings();

+

+    int iSel_24   =  m_dispmode24combo.GetCurSel();

+    int iSel_25   =  m_dispmode25combo.GetCurSel();

+    int iSel_30   =  m_dispmode30combo.GetCurSel();

+    int iSel_Other = m_dispmodeOthercombo.GetCurSel();

+    int iSel_23   =  m_dispmode23d976combo.GetCurSel();

+    int iSel_29   =  m_dispmode29d97combo.GetCurSel();

+

+    if(m_AutoChangeFullscrRes.bEnabled = !!m_fSetFullscreenRes)

+    {

+        if(iSel_24 >= 0 && iSel_24 < m_dms.GetCount())

+            m_AutoChangeFullscrRes.dmFullscreenRes24Hz = m_dms[m_dispmode24combo.GetCurSel()];

+        if(iSel_25 >= 0 && iSel_25 < m_dms.GetCount())

+            m_AutoChangeFullscrRes.dmFullscreenRes25Hz = m_dms[m_dispmode25combo.GetCurSel()];

+        if(iSel_30 >= 0 && iSel_30 < m_dms.GetCount())

+            m_AutoChangeFullscrRes.dmFullscreenRes30Hz = m_dms[m_dispmode30combo.GetCurSel()];

+        if(iSel_Other >= 0 && iSel_Other < m_dms.GetCount())

+            m_AutoChangeFullscrRes.dmFullscreenResOther = m_dms[m_dispmodeOthercombo.GetCurSel()];

+        if(iSel_23 >= 0 && iSel_23 < m_dms.GetCount())

+            m_AutoChangeFullscrRes.dmFullscreenRes23d976Hz = m_dms[m_dispmode23d976combo.GetCurSel()];

+        if(iSel_29 >= 0 && iSel_29 < m_dms.GetCount())

+            m_AutoChangeFullscrRes.dmFullscreenRes29d97Hz = m_dms[m_dispmode29d97combo.GetCurSel()];

+    }

+    m_AutoChangeFullscrRes.bApplyDefault = m_fSetDefault;

+    s.AutoChangeFullscrRes = m_AutoChangeFullscrRes;

+    s.launchfullscreen = !!m_launchfullscreen;

+    s.f_hmonitor =  m_f_hmonitor;

+    s.fShowBarsWhenFullScreen = !!m_iShowBarsWhenFullScreen;

+    s.nShowBarsWhenFullScreenTimeOut = m_nShowBarsWhenFullScreenTimeOut;

+    s.fExitFullScreenAtTheEnd = !!m_fExitFullScreenAtTheEnd;

+    s.fRestoreResAfterExit = !!m_fRestoreResAfterExit;

+

+

+    return __super::OnApply();

 }

 

 void CPPageFullscreen::OnUpdateDispMode24Combo(CCmdUI* pCmdUI)

 {

-		pCmdUI->Enable(!!IsDlgButtonChecked(IDC_CHECK2));

+    pCmdUI->Enable(!!IsDlgButtonChecked(IDC_CHECK2));

 }

 

 void CPPageFullscreen::OnUpdateDispMode25Combo(CCmdUI* pCmdUI)

 {

-		pCmdUI->Enable(!!IsDlgButtonChecked(IDC_CHECK2));

+    pCmdUI->Enable(!!IsDlgButtonChecked(IDC_CHECK2));

 }

 

 void CPPageFullscreen::OnUpdateDispMode30Combo(CCmdUI* pCmdUI)

 {

-		pCmdUI->Enable(!!IsDlgButtonChecked(IDC_CHECK2));

+    pCmdUI->Enable(!!IsDlgButtonChecked(IDC_CHECK2));

 }

 

 void CPPageFullscreen::OnUpdateDispModeOtherCombo(CCmdUI* pCmdUI)

 {

-		pCmdUI->Enable(!!IsDlgButtonChecked(IDC_CHECK2));

+    pCmdUI->Enable(!!IsDlgButtonChecked(IDC_CHECK2));

 }

 

 void CPPageFullscreen::OnUpdateDispMode23d976Combo(CCmdUI* pCmdUI)

 {

-		pCmdUI->Enable(!!IsDlgButtonChecked(IDC_CHECK2) && CMPlayerCApp::IsVistaOrAbove());

+    pCmdUI->Enable(!!IsDlgButtonChecked(IDC_CHECK2) && CMPlayerCApp::IsVistaOrAbove());

 }

 

 void CPPageFullscreen::OnUpdateDispMode29d97Combo(CCmdUI* pCmdUI)

 {

-		pCmdUI->Enable(!!IsDlgButtonChecked(IDC_CHECK2) && CMPlayerCApp::IsVistaOrAbove());

+    pCmdUI->Enable(!!IsDlgButtonChecked(IDC_CHECK2) && CMPlayerCApp::IsVistaOrAbove());

 }

 

 void CPPageFullscreen::OnUpdateApplyDefault(CCmdUI* pCmdUI)

 {

-		pCmdUI->Enable(!!IsDlgButtonChecked(IDC_CHECK2));

+    pCmdUI->Enable(!!IsDlgButtonChecked(IDC_CHECK2));

 }

 

 void CPPageFullscreen::OnUpdateRestoreRes(CCmdUI* pCmdUI)

 {

-		pCmdUI->Enable(!!IsDlgButtonChecked(IDC_CHECK2));

+    pCmdUI->Enable(!!IsDlgButtonChecked(IDC_CHECK2));

 }

 

 void CPPageFullscreen::OnUpdateFullScrCombo()

 {

-		CMonitors monitors;

-		m_f_hmonitor = m_MonitorDisplayNames[m_iMonitorTypeCtrl.GetCurSel()];

-		if(AfxGetAppSettings().f_hmonitor !=  m_f_hmonitor) m_AutoChangeFullscrRes.bEnabled = false;

-		ModesUpdate();

-		SetModified();

+    CMonitors monitors;

+    m_f_hmonitor = m_MonitorDisplayNames[m_iMonitorTypeCtrl.GetCurSel()];

+    if(AfxGetAppSettings().f_hmonitor !=  m_f_hmonitor) m_AutoChangeFullscrRes.bEnabled = false;

+    ModesUpdate();

+    SetModified();

 }

 

 void CPPageFullscreen::OnUpdateTimeout(CCmdUI* pCmdUI)

 {

-		UpdateData();

-		pCmdUI->Enable(m_iShowBarsWhenFullScreen);

+    UpdateData();

+    pCmdUI->Enable(m_iShowBarsWhenFullScreen);

 }

 void CPPageFullscreen::ModesUpdate()

 {

-		CMonitors monitors;

-		m_fSetFullscreenRes = m_AutoChangeFullscrRes.bEnabled;

-		int iSel_24, iSel_25, iSel_30, iSel_Other, iSel_23, iSel_29;

-		iSel_24 = iSel_25 = iSel_30 = iSel_Other = iSel_23 = iSel_29 = -1;

-		dispmode dm, 

-		dmtoset24	 = m_AutoChangeFullscrRes.dmFullscreenRes24Hz,

-		dmtoset25	 = m_AutoChangeFullscrRes.dmFullscreenRes25Hz,

-		dmtoset30	 = m_AutoChangeFullscrRes.dmFullscreenRes30Hz,

-		dmtosetOther = m_AutoChangeFullscrRes.dmFullscreenResOther,

-		dmtoset23	 = m_AutoChangeFullscrRes.dmFullscreenRes23d976Hz,

-		dmtoset29	 = m_AutoChangeFullscrRes.dmFullscreenRes29d97Hz;

-

-		if(!m_AutoChangeFullscrRes.bEnabled) 

-		{	

-			GetCurDispMode(dmtoset24, m_f_hmonitor);

-			dmtoset29 = dmtoset23 = dmtosetOther = dmtoset30 = dmtoset25 = dmtoset24;

-		}

-		CString str;

-

-		ComboBox_ResetContent(m_dispmode24combo);

-		ComboBox_ResetContent(m_dispmode25combo);

-		ComboBox_ResetContent(m_dispmode30combo);

-		ComboBox_ResetContent(m_dispmodeOthercombo);

-		ComboBox_ResetContent(m_dispmode23d976combo);

-		ComboBox_ResetContent(m_dispmode29d97combo);

-		m_dms.RemoveAll();

-		

-		for(int i = 0, j = 0, ModeExist = true;  ; i++)

-		{

-			ModeExist = GetDispMode(i, dm, m_f_hmonitor);

-			if (!ModeExist) break;   

-			if(dm.bpp <= 8) continue;

-			//skip doubles (check previous only)

-			if (j>0 && (dm.bpp == m_dms[j-1].bpp && dm.dmDisplayFlags == m_dms[j-1].dmDisplayFlags

-				&& dm.freq == m_dms[j-1].freq && dm.fValid == m_dms[j-1].fValid

-				&& dm.size == m_dms[j-1].size)) continue; 

-			m_dms.Add(dm);

-			str.Format(_T("%dx%d %dbpp %d") + ResStr(IDS_HZ), dm.size.cx, dm.size.cy, dm.bpp, dm.freq);

-			if (dm.dmDisplayFlags == DM_INTERLACED) str+=_T(" ")+ ResStr(IDS_INTERLACED);

-			if (dm.freq == 23) str+=_T(" (23.976)");

-			if (dm.freq == 59) str+=_T(" (NTSC)");

-

-			m_dispmode24combo.AddString(str);

-			m_dispmode25combo.AddString(str);

-			m_dispmode30combo.AddString(str);

-			m_dispmodeOthercombo.AddString(str);

-			m_dispmode23d976combo.AddString(str);

-			m_dispmode29d97combo.AddString(str);

-

-			if(iSel_24 < 0 && dmtoset24.fValid && dm.size == dmtoset24.size

-				&& dm.bpp == dmtoset24.bpp && dm.freq == dmtoset24.freq) iSel_24 = j;

-			if(iSel_25 < 0 && dmtoset25.fValid && dm.size == dmtoset25.size

-				&& dm.bpp == dmtoset25.bpp && dm.freq == dmtoset25.freq) iSel_25 = j;

-			if(iSel_30 < 0 && dmtoset30.fValid && dm.size == dmtoset30.size

-				&& dm.bpp == dmtoset30.bpp && dm.freq == dmtoset30.freq) iSel_30 = j;

-			if(iSel_Other < 0 && dmtosetOther.fValid && dm.size == dmtosetOther.size

-				&& dm.bpp == dmtosetOther.bpp && dm.freq == dmtosetOther.freq) iSel_Other = j;

-			if(iSel_23 < 0 && dmtoset23.fValid && dm.size == dmtoset23.size

-				&& dm.bpp == dmtoset23.bpp && dm.freq == dmtoset23.freq) iSel_23 = j;

-			if(iSel_29 < 0 && dmtoset29.fValid && dm.size == dmtoset29.size

-				&& dm.bpp == dmtoset29.bpp && dm.freq == dmtoset29.freq) iSel_29 = j;

-			j++;

-		}

-		m_dispmode24combo.SetCurSel(iSel_24);

-		m_dispmode25combo.SetCurSel(iSel_25);

-		m_dispmode30combo.SetCurSel(iSel_30);

-		m_dispmodeOthercombo.SetCurSel(iSel_Other);

-		m_dispmode23d976combo.SetCurSel(iSel_23);

-		m_dispmode29d97combo.SetCurSel(iSel_29);

+    CMonitors monitors;

+    m_fSetFullscreenRes = m_AutoChangeFullscrRes.bEnabled;

+    int iSel_24, iSel_25, iSel_30, iSel_Other, iSel_23, iSel_29;

+    iSel_24 = iSel_25 = iSel_30 = iSel_Other = iSel_23 = iSel_29 = -1;

+    dispmode dm,

+             dmtoset24	 = m_AutoChangeFullscrRes.dmFullscreenRes24Hz,

+               dmtoset25	 = m_AutoChangeFullscrRes.dmFullscreenRes25Hz,

+                 dmtoset30	 = m_AutoChangeFullscrRes.dmFullscreenRes30Hz,

+                   dmtosetOther = m_AutoChangeFullscrRes.dmFullscreenResOther,

+                   dmtoset23	 = m_AutoChangeFullscrRes.dmFullscreenRes23d976Hz,

+                     dmtoset29	 = m_AutoChangeFullscrRes.dmFullscreenRes29d97Hz;

+

+    if(!m_AutoChangeFullscrRes.bEnabled)

+    {

+        GetCurDispMode(dmtoset24, m_f_hmonitor);

+        dmtoset29 = dmtoset23 = dmtosetOther = dmtoset30 = dmtoset25 = dmtoset24;

+    }

+    CString str;

+

+    ComboBox_ResetContent(m_dispmode24combo);

+    ComboBox_ResetContent(m_dispmode25combo);

+    ComboBox_ResetContent(m_dispmode30combo);

+    ComboBox_ResetContent(m_dispmodeOthercombo);

+    ComboBox_ResetContent(m_dispmode23d976combo);

+    ComboBox_ResetContent(m_dispmode29d97combo);

+    m_dms.RemoveAll();

+

+    for(int i = 0, j = 0, ModeExist = true;  ; i++)

+    {

+        ModeExist = GetDispMode(i, dm, m_f_hmonitor);

+        if(!ModeExist) break;

+        if(dm.bpp <= 8) continue;

+        //skip doubles (check previous only)

+        if(j > 0 && (dm.bpp == m_dms[j-1].bpp && dm.dmDisplayFlags == m_dms[j-1].dmDisplayFlags

+                     && dm.freq == m_dms[j-1].freq && dm.fValid == m_dms[j-1].fValid

+                     && dm.size == m_dms[j-1].size)) continue;

+        m_dms.Add(dm);

+        str.Format(_T("%dx%d %dbpp %d") + ResStr(IDS_HZ), dm.size.cx, dm.size.cy, dm.bpp, dm.freq);

+        if(dm.dmDisplayFlags == DM_INTERLACED) str += _T(" ") + ResStr(IDS_INTERLACED);

+        if(dm.freq == 23) str += _T(" (23.976)");

+        if(dm.freq == 59) str += _T(" (NTSC)");

+

+        m_dispmode24combo.AddString(str);

+        m_dispmode25combo.AddString(str);

+        m_dispmode30combo.AddString(str);

+        m_dispmodeOthercombo.AddString(str);

+        m_dispmode23d976combo.AddString(str);

+        m_dispmode29d97combo.AddString(str);

+

+        if(iSel_24 < 0 && dmtoset24.fValid && dm.size == dmtoset24.size

+           && dm.bpp == dmtoset24.bpp && dm.freq == dmtoset24.freq) iSel_24 = j;

+        if(iSel_25 < 0 && dmtoset25.fValid && dm.size == dmtoset25.size

+           && dm.bpp == dmtoset25.bpp && dm.freq == dmtoset25.freq) iSel_25 = j;

+        if(iSel_30 < 0 && dmtoset30.fValid && dm.size == dmtoset30.size

+           && dm.bpp == dmtoset30.bpp && dm.freq == dmtoset30.freq) iSel_30 = j;

+        if(iSel_Other < 0 && dmtosetOther.fValid && dm.size == dmtosetOther.size

+           && dm.bpp == dmtosetOther.bpp && dm.freq == dmtosetOther.freq) iSel_Other = j;

+        if(iSel_23 < 0 && dmtoset23.fValid && dm.size == dmtoset23.size

+           && dm.bpp == dmtoset23.bpp && dm.freq == dmtoset23.freq) iSel_23 = j;

+        if(iSel_29 < 0 && dmtoset29.fValid && dm.size == dmtoset29.size

+           && dm.bpp == dmtoset29.bpp && dm.freq == dmtoset29.freq) iSel_29 = j;

+        j++;

+    }

+    m_dispmode24combo.SetCurSel(iSel_24);

+    m_dispmode25combo.SetCurSel(iSel_25);

+    m_dispmode30combo.SetCurSel(iSel_30);

+    m_dispmodeOthercombo.SetCurSel(iSel_Other);

+    m_dispmode23d976combo.SetCurSel(iSel_23);

+    m_dispmode29d97combo.SetCurSel(iSel_29);

 }