Fix memory leak

Author: extremecode716

ConsoleScreenCapture/ConsoleScreenCapture/MessageLoop.h

@@ -24,7 +24,7 @@ bool bPressTermTime = false;
 bool bMecroPressed1 = false;
 bool bMecroPressed2 = false;
 HHOOK hHook;
-
+// 키 처리도 클래스로 전체적으로 관리해야하는데 귀찮으니~pass
 DWORD pressMacroKey[2] = { MACRO_MAGIC_NUM1, MACRO_MAGIC_NUM2 }; //magic num
 void resetPressMacroKey() {
 	pressMacroKey[0] = MACRO_MAGIC_NUM1;
@@ -154,7 +154,21 @@ void UnHook() {
 	UnhookWindowsHookEx( hHook );
 }
 
+BOOL ConsoleCtrlHandler( DWORD fdwCtrlType )
+{
+	switch ( fdwCtrlType )
+	{
+	case CTRL_CLOSE_EVENT:
+	case CTRL_SHUTDOWN_EVENT:
+	default:
+		CMonitor::GetInst()->DeleteMonitorData();
+		UnHook();
+		return FALSE;
+	}
+}
+
 int mainMessageLoop() {
+	SetConsoleCtrlHandler( (PHANDLER_ROUTINE)ConsoleCtrlHandler, TRUE );
 	SetHook();
 	MSG msg;
 	CDeltaTime::GetInst()->Init();
@@ -184,8 +198,7 @@ int mainMessageLoop() {
 					fPressTermAccTime = 0.f;
 				}
 			}
-
-			Sleep( 10 );
+			Sleep( 20 );
 		}
 	}
 	UnHook();

ConsoleScreenCapture/ConsoleScreenCapture/Monitor.cpp

@@ -13,24 +13,24 @@ int CMonitor::GetMonitorCount()
 
 void CMonitor::DeleteMonitorData()
 {
-	if ( m_MonitorData.pInfo != nullptr )
-	{
-		free( m_MonitorData.pInfo );
-		m_MonitorData.pInfo = nullptr;
-	}
 	if ( m_MonitorData.pDpiAndScale != nullptr )
 	{
-		free( m_MonitorData.pDpiAndScale );
+		delete m_MonitorData.pDpiAndScale;
 		m_MonitorData.pDpiAndScale = nullptr;
 	}
+	if ( m_MonitorData.pInfo != nullptr )
+	{
+		delete m_MonitorData.pInfo;
+		m_MonitorData.pInfo = nullptr;
+	}
 	if ( m_MonitorData.pDSF != nullptr )
 	{
-		free( m_MonitorData.pDSF );
+		delete m_MonitorData.pDSF;
 		m_MonitorData.pDSF = nullptr;
 	}
 	if ( m_MonitorData.pHMonitor != nullptr )
 	{
-		free( m_MonitorData.pHMonitor );
+		delete m_MonitorData.pHMonitor;
 		m_MonitorData.pHMonitor = nullptr;
 	}
 }
@@ -95,11 +95,11 @@ bool CMonitor::Setting()
 {
 	m_iMonitors = GetSystemMetrics( SM_CMONITORS );
 	m_MonitorData.iCurrent = 0;
-	m_MonitorData.pInfo = (MONITORINFOEXW*)calloc( m_iMonitors, sizeof( MONITORINFOEXW ) );
-	m_MonitorData.pDpiAndScale = (DpiAndScale*)calloc( m_iMonitors, sizeof( DpiAndScale ) );
-	m_MonitorData.pDSF = (DEVICE_SCALE_FACTOR*)calloc( m_iMonitors, sizeof( DEVICE_SCALE_FACTOR ) );
-	m_MonitorData.pHMonitor = (HMONITOR*)calloc( m_iMonitors, sizeof( HMONITOR ) );
-	
+	m_MonitorData.pInfo = new MONITORINFOEXW[m_iMonitors];
+	m_MonitorData.pDpiAndScale = new DpiAndScale[m_iMonitors];
+	m_MonitorData.pDSF = new DEVICE_SCALE_FACTOR[m_iMonitors];
+	m_MonitorData.pHMonitor = new HMONITOR[m_iMonitors];
+
 	if ( !GetAllMonitorInfo( &m_MonitorData ) ) return false;
 
 #ifdef TMP_SCALE_FACTOR

ConsoleScreenCapture/ConsoleScreenCapture/main.cpp

@@ -8,7 +8,7 @@ using namespace std;
 
 int main() {
 	std::wcout.imbue( std::locale( "korean" ) );
-	wcout << L"작성자: 김동일" << endl;
+	wcout << L"작성자: ExtremeCode" << endl;
 	wcout << L"이메일: extremecode716@gmail.com" << endl;
 	wcout << L"촬영 단축키(기본): LCTRL + 1 / LCTRL + 2" << endl;
 	wcout << L"환경 설정 파일: ExtremeScreenCapture_env.txt " << endl;