Use builtin memory-checks-on-exit, so we don't get memleak

notices for static/global objects.

Fallback to default refresh instead of max.
This commit is contained in:
Glenn Maynard
2002-08-29 23:05:54 +00:00
parent 0f7e9874cc
commit 99853f04cf
+9 -17
View File
@@ -144,7 +144,7 @@ int WINAPI WinMain( HINSTANCE hInstance, HINSTANCE, LPSTR, int nCmdShow )
g_hInstance = hInstance; g_hInstance = hInstance;
#ifdef _DEBUG #ifdef _DEBUG
_CrtSetDbgFlag(_CRTDBG_CHECK_ALWAYS_DF); _CrtSetDbgFlag(_CRTDBG_ALLOC_MEM_DF|_CRTDBG_LEAK_CHECK_DF);
#endif #endif
#ifndef _DEBUG #ifndef _DEBUG
@@ -347,12 +347,6 @@ int WINAPI WinMain( HINSTANCE hInstance, HINSTANCE, LPSTR, int nCmdShow )
CoUninitialize(); // Uninitialize COM CoUninitialize(); // Uninitialize COM
CloseHandle( g_hMutex ); CloseHandle( g_hMutex );
#ifdef _DEBUG
_CrtCheckMemory();
_CrtDumpMemoryLeaks();
#endif
return 0L; return 0L;
} }
@@ -860,16 +854,11 @@ void Render()
InvalidateObjects(); InvalidateObjects();
// Resize the device // Resize the device
if( SUCCEEDED( hr = DISPLAY->Reset() ) ) if( FAILED( hr = DISPLAY->Reset() ) )
{
// Initialize the app's device-dependent objects
RestoreObjects();
return;
}
else
{
throw RageException( hr, "Failed to DISPLAY->Reset()" ); throw RageException( hr, "Failed to DISPLAY->Reset()" );
}
// Initialize the app's device-dependent objects
RestoreObjects();
break; break;
case S_OK: case S_OK:
@@ -933,6 +922,9 @@ void ApplyGraphicOptions()
default: throw RageException( "Invalid TextureResolution '%d'", iTextureSize ); default: throw RageException( "Invalid TextureResolution '%d'", iTextureSize );
} }
/* XXX: ScreenGraphicOptions assumes this is always 16bpp. If this is
* ever changed, keep track of it, since the available refresh rates
* is dependent on the bit depth. */
int iTextureBPP = 16; int iTextureBPP = 16;
int &iRefreshRate = PREFSMAN->m_iRefreshRate; int &iRefreshRate = PREFSMAN->m_iRefreshRate;
@@ -953,7 +945,7 @@ void ApplyGraphicOptions()
goto success; goto success;
// We failed. Using default refresh rate. // We failed. Using default refresh rate.
iRefreshRate = 0; iRefreshRate = RageDisplay::REFRESH_DEFAULT;
if( DISPLAY->SwitchDisplayMode(bWindowed, iDisplayWidth, iDisplayHeight, iDisplayBPP, iRefreshRate) ) if( DISPLAY->SwitchDisplayMode(bWindowed, iDisplayWidth, iDisplayHeight, iDisplayBPP, iRefreshRate) )
goto success; goto success;