ShuriZma
/
project64
mirror of https://github.com/project64/project64.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[Project64] Code cleanup of MemTest.cpp

This commit is contained in:
zilmar 2015-12-23 13:10:04 +11:00
parent a05c3f5c00
commit 6395ea52f7
1 changed files with 233 additions and 224 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
Source/Common/MemTest.cpp
View File

@ -1,10 +1,11 @@
#include "stdafx.h"
#if defined(_MSC_VER) #if defined(_MSC_VER)
#include <crtdbg.h> #include <crtdbg.h>
#else #else
#define _ASSERTE(expr) ((void)0) #define _ASSERTE(expr) ((void)0)
#endif #endif
#include "stdafx.h"
#ifdef _DEBUG #ifdef _DEBUG
#pragma warning(disable:4786) //Disable std library warning #pragma warning(disable:4786) //Disable std library warning
@ -17,7 +18,6 @@
#include <shellapi.h> //Needed for ShellExecute #include <shellapi.h> //Needed for ShellExecute
#pragma comment(lib, "shell32.lib") //Needed for ShellExecute #pragma comment(lib, "shell32.lib") //Needed for ShellExecute
#include <tchar.h>
#undef new #undef new
#undef malloc #undef malloc
#undef realloc #undef realloc
@ -74,9 +74,9 @@ CMemList::~CMemList()
memset(LogFileName, 0, sizeof(LogFileName)); memset(LogFileName, 0, sizeof(LogFileName));
GetModuleFileName(m_hModule, path_buffer, sizeof(path_buffer)); GetModuleFileName(m_hModule, path_buffer, sizeof(path_buffer));
_tsplitpath( path_buffer, drive, dir, fname, ext ); _splitpath(path_buffer, drive, dir, fname, ext);
_tmakepath( LogFileName, drive, dir, fname, _T("leak.csv") ); _makepath(LogFileName, drive, dir, fname, "leak.csv");
HANDLE hLogFile = INVALID_HANDLE_VALUE; HANDLE hLogFile = INVALID_HANDLE_VALUE;
do do
@ -94,9 +94,9 @@ CMemList::~CMemList()
{ {
if (GetLastError() == ERROR_SHARING_VIOLATION) if (GetLastError() == ERROR_SHARING_VIOLATION)
{ {
TCHAR Msg[3000]; char Msg[3000];
_stprintf(Msg,TEXT("%s\nCan not be opened for writing please close app using this file\n\nTry Again ?"),LogFileName); sprintf(Msg, "%s\nCan not be opened for writing please close app using this file\n\nTry Again ?", LogFileName);
int Result = MessageBox(NULL,Msg,_T("Memory Leak"),MB_YESNO|MB_ICONQUESTION|MB_SETFOREGROUND | MB_SERVICE_NOTIFICATION); int Result = MessageBox(NULL, Msg, "Memory Leak", MB_YESNO | MB_ICONQUESTION | MB_SETFOREGROUND | MB_SERVICE_NOTIFICATION);
if (Result == IDNO) if (Result == IDNO)
{ {
break; break;
@ -125,12 +125,12 @@ CMemList::~CMemList()
} }
CloseHandle(hLogFile); CloseHandle(hLogFile);
} }
TCHAR Msg[3000]; char Msg[3000];
_stprintf(Msg,TEXT("%s%s\n\nMemory Leaks detected\n\nOpen the Log File ?"),fname,ext); sprintf(Msg, "%s%s\n\nMemory Leaks detected\n\nOpen the Log File ?", fname, ext);
int Result = MessageBox(NULL,Msg,_T("Memory Leak"),MB_YESNO|MB_ICONQUESTION|MB_SETFOREGROUND| MB_SERVICE_NOTIFICATION); int Result = MessageBox(NULL, Msg, "Memory Leak", MB_YESNO | MB_ICONQUESTION | MB_SETFOREGROUND | MB_SERVICE_NOTIFICATION);
if (Result == IDYES) if (Result == IDYES)
{ {
ShellExecute(NULL,_T("open"),LogFileName,NULL,NULL,SW_SHOW); ShellExecute(NULL, "open", LogFileName, NULL, NULL, SW_SHOW);
} }
} }
CloseHandle(hSemaphone); CloseHandle(hSemaphone);
@ -151,7 +151,8 @@ void * CMemList::AddItem ( size_t size, char * filename, int line)
void CMemList::RecordAddItem(void * ptr, size_t size, const char * filename, int line) void CMemList::RecordAddItem(void * ptr, size_t size, const char * filename, int line)
{ {
__try { __try
{
if (State == Initialized && hSemaphone != NULL) if (State == Initialized && hSemaphone != NULL)
{ {
DWORD CurrentThread = GetCurrentThreadId(); DWORD CurrentThread = GetCurrentThreadId();
@ -173,7 +174,9 @@ void CMemList::RecordAddItem ( void * ptr, size_t size, const char * filename, i
ReleaseSemaphore(hSemaphone, 1, &dwSemCount); ReleaseSemaphore(hSemaphone, 1, &dwSemCount);
} }
} }
} __except (EXCEPTION_EXECUTE_HANDLER) { }
__except (EXCEPTION_EXECUTE_HANDLER)
{
//_asm int 3 //_asm int 3
} }
} }
@ -192,7 +195,8 @@ void * CMemList::ReAllocItem ( void * ptr, size_t size, const char * filename, i
} }
if (ptr != res) if (ptr != res)
{ {
__try { __try
{
if (State == Initialized && hSemaphone != NULL) if (State == Initialized && hSemaphone != NULL)
{ {
DWORD CurrentThread = GetCurrentThreadId(); DWORD CurrentThread = GetCurrentThreadId();
@ -217,7 +221,9 @@ void * CMemList::ReAllocItem ( void * ptr, size_t size, const char * filename, i
ReleaseSemaphore(hSemaphone, 1, &dwSemCount); ReleaseSemaphore(hSemaphone, 1, &dwSemCount);
} }
} }
} __except (EXCEPTION_EXECUTE_HANDLER) { }
__except (EXCEPTION_EXECUTE_HANDLER)
{
//_asm int 3 //_asm int 3
} }
} }
@ -241,7 +247,8 @@ void CMemList::removeItem (void * ptr, bool bFree )
free(ptr); free(ptr);
} }
__try { __try
{
if (State == Initialized && hSemaphone != NULL) if (State == Initialized && hSemaphone != NULL)
{ {
DWORD CurrentThread = GetCurrentThreadId(); DWORD CurrentThread = GetCurrentThreadId();
@ -257,7 +264,9 @@ void CMemList::removeItem (void * ptr, bool bFree )
ReleaseSemaphore(hSemaphone, 1, &dwSemCount); ReleaseSemaphore(hSemaphone, 1, &dwSemCount);
} }
} }
}__except(EXCEPTION_EXECUTE_HANDLER ){ }
__except (EXCEPTION_EXECUTE_HANDLER)
{
//_asm int 3 //_asm int 3
} }
} }