mirror
/
devilutionX
mirror of https://github.com/diasurgical/devilutionX.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Clean up appfat.cpp

pull/910/head
Anders Jenbo 5 years ago
parent
30e61ed9a0
commit
5a8f8eadb1
4 changed files with 98 additions and 106 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 180
      Source/appfat.cpp
  2. 16
      Source/appfat.h
  3. 6
      Source/dthread.cpp
  4. 2
      Source/nthread.cpp

180
Source/appfat.cpp
Unescape View File

@ -21,25 +21,8 @@ void __cdecl operator delete(void *ptr)
}
}
void TriggerBreak()
{
#ifdef _DEBUG
LPTOP_LEVEL_EXCEPTION_FILTER pFilter;
pFilter = SetUnhandledExceptionFilter(BreakFilter);
#ifdef USE_ASM
__asm {
int 3
}
#else
__debugbreak();
#endif
SetUnhandledExceptionFilter(pFilter);
#endif
}
#ifdef _DEBUG
LONG __stdcall BreakFilter(PEXCEPTION_POINTERS pExc)
static LONG __stdcall BreakFilter(PEXCEPTION_POINTERS pExc)
{
if (pExc->ExceptionRecord == NULL) {
return EXCEPTION_CONTINUE_SEARCH;
@ -56,38 +39,21 @@ LONG __stdcall BreakFilter(PEXCEPTION_POINTERS pExc)
}
#endif
/**
* @brief Returns a formatted error message based on the given error code.
* @param error_code DirectX error code
*/
char *GetErrorStr(DWORD error_code)
void TriggerBreak()
{
int size;
char *chr;
if (HRESULT_FACILITY(error_code) == _FACDS) {
TraceErrorDS(error_code, sz_error_buf, sizeof(sz_error_buf) / sizeof(sz_error_buf[0]));
} else if (HRESULT_FACILITY(error_code) == _FACDD) {
TraceErrorDD(error_code, sz_error_buf, sizeof(sz_error_buf) / sizeof(sz_error_buf[0]));
} else if (!SErrGetErrorStr(error_code, sz_error_buf, sizeof(sz_error_buf) / sizeof(sz_error_buf[0]))
&& !FormatMessage(FORMAT_MESSAGE_FROM_SYSTEM, NULL, error_code, MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), sz_error_buf, sizeof(sz_error_buf) / sizeof(sz_error_buf[0]), NULL)) {
wsprintf(sz_error_buf, "unknown error 0x%08x", error_code);
}
size = strlen(sz_error_buf);
chr = &sz_error_buf[size - 1];
while (size-- > 0) {
chr--;
if (*chr != '\r' && *chr != '\n')
break;
#ifdef _DEBUG
LPTOP_LEVEL_EXCEPTION_FILTER pFilter;
*chr = 0x00;
pFilter = SetUnhandledExceptionFilter(BreakFilter);
#ifdef USE_ASM
__asm {
int 3
}
return sz_error_buf;
#else
__debugbreak();
#endif
SetUnhandledExceptionFilter(pFilter);
#endif
}
/**
@ -96,7 +62,7 @@ char *GetErrorStr(DWORD error_code)
* @param pszBuffer Buffer for the error message
* @param dwMaxChars Length of pszBuffer
*/
void TraceErrorDD(HRESULT hError, char *pszBuffer, DWORD dwMaxChars)
static void TraceErrorDD(HRESULT hError, char *pszBuffer, DWORD dwMaxChars)
{
const char *szError;
@ -412,7 +378,7 @@ void TraceErrorDD(HRESULT hError, char *pszBuffer, DWORD dwMaxChars)
* @param pszBuffer Buffer for the error message
* @param dwMaxChars Length of pszBuffer
*/
void TraceErrorDS(HRESULT hError, char *pszBuffer, DWORD dwMaxChars)
static void TraceErrorDS(HRESULT hError, char *pszBuffer, DWORD dwMaxChars)
{
const char *szError;
@ -468,36 +434,44 @@ void TraceErrorDS(HRESULT hError, char *pszBuffer, DWORD dwMaxChars)
}
/**
* @brief Returns a formatted error message of the last error.
* @brief Returns a formatted error message based on the given error code.
* @param error_code DirectX error code
*/
char *TraceLastError()
const char *GetErrorStr(DWORD error_code)
{
return GetErrorStr(GetLastError());
}
int size;
char *chr;
/**
* @brief Terminates the game and displays an error message box.
* @param pszFmt Optional error message.
* @param ... (see printf)
*/
void __cdecl app_fatal(const char *pszFmt, ...)
{
va_list va;
if (HRESULT_FACILITY(error_code) == _FACDS) {
TraceErrorDS(error_code, sz_error_buf, sizeof(sz_error_buf) / sizeof(sz_error_buf[0]));
} else if (HRESULT_FACILITY(error_code) == _FACDD) {
TraceErrorDD(error_code, sz_error_buf, sizeof(sz_error_buf) / sizeof(sz_error_buf[0]));
} else if (!SErrGetErrorStr(error_code, sz_error_buf, sizeof(sz_error_buf) / sizeof(sz_error_buf[0]))
&& !FormatMessage(FORMAT_MESSAGE_FROM_SYSTEM, NULL, error_code, MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), sz_error_buf, sizeof(sz_error_buf) / sizeof(sz_error_buf[0]), NULL)) {
wsprintf(sz_error_buf, "unknown error 0x%08x", error_code);
}
va_start(va, pszFmt);
FreeDlg();
#ifdef _DEBUG
TriggerBreak();
#endif
size = strlen(sz_error_buf);
if (pszFmt)
MsgBox(pszFmt, va);
chr = &sz_error_buf[size - 1];
while (size-- > 0) {
chr--;
va_end(va);
if (*chr != '\r' && *chr != '\n')
break;
init_cleanup(FALSE);
exit(1);
ExitProcess(1);
*chr = 0x00;
}
return sz_error_buf;
}
/**
* @brief Returns a formatted error message of the last error.
*/
const char *TraceLastError()
{
return GetErrorStr(GetLastError());
}
/**
@ -505,7 +479,7 @@ void __cdecl app_fatal(const char *pszFmt, ...)
* @param pszFmt Error message format
* @param va Additional parameters for message format
*/
void MsgBox(const char *pszFmt, va_list va)
static void MsgBox(const char *pszFmt, va_list va)
{
char Text[256];
@ -518,7 +492,7 @@ void MsgBox(const char *pszFmt, va_list va)
/**
* @brief Cleans up after a fatal application error.
*/
void FreeDlg()
static void FreeDlg()
{
if (terminating && cleanup_thread_id != GetCurrentThreadId())
Sleep(20000);
@ -537,6 +511,34 @@ void FreeDlg()
ShowCursor(TRUE);
}
/**
* @brief Terminates the game and displays an error message box.
* @param pszFmt Optional error message.
* @param ... (see printf)
*/
#ifdef HELLFIRE
__declspec(naked)
#endif
void __cdecl app_fatal(const char *pszFmt, ...)
{
va_list va;
va_start(va, pszFmt);
FreeDlg();
#if defined(_DEBUG) || defined(HELLFIRE)
TriggerBreak();
#endif
if (pszFmt)
MsgBox(pszFmt, va);
va_end(va);
init_cleanup(FALSE);
exit(1);
ExitProcess(1);
}
/**
* @brief Displays a warning message box based on the given formatted error message.
* @param pszFmt Error message format
@ -571,7 +573,7 @@ void assert_fail(int nLineNo, const char *pszFile, const char *pszFail)
*/
void DDErrMsg(DWORD error_code, int log_line_nr, const char *log_file_path)
{
char *msg;
const char *msg;
if (error_code) {
msg = GetErrorStr(error_code);
@ -584,7 +586,7 @@ void DDErrMsg(DWORD error_code, int log_line_nr, const char *log_file_path)
*/
void DSErrMsg(DWORD error_code, int log_line_nr, const char *log_file_path)
{
char *msg;
const char *msg;
if (error_code) {
msg = GetErrorStr(error_code);
@ -615,6 +617,17 @@ void center_window(HWND hDlg)
}
}
/**
* @brief Sets the text of the given dialog.
*/
static void TextDlg(HWND hDlg, const char *text)
{
center_window(hDlg);
if (text)
SetDlgItemText(hDlg, 1000, text);
}
/**
* @brief Callback function which processes messages sent to the given dialog box.
*/
@ -659,17 +672,7 @@ void ErrDlg(int dialog_id, DWORD error_code, const char *log_file_path, int log_
app_fatal(NULL);
}
/**
* @brief Sets the text of the given dialog.
*/
static void TextDlg(HWND hDlg, const char *text)
{
center_window(hDlg);
if (text)
SetDlgItemText(hDlg, 1000, text);
}
#ifndef HELLFIRE
/**
* @brief Displays a warning dialog box based on the given dialog_id and error code.
*/
@ -685,6 +688,7 @@ void ErrOkDlg(int dialog_id, DWORD error_code, const char *log_file_path, int lo
wsprintf((LPSTR)dwInitParam, "%s\nat: %s line %d", GetErrorStr(error_code), log_file_path, log_line_nr);
DialogBoxParam(ghInst, MAKEINTRESOURCE(dialog_id), ghMainWnd, (DLGPROC)FuncDlg, (LPARAM)dwInitParam);
}
#endif
/**
* @brief Terminates the game with a file not found error dialog.
@ -733,6 +737,7 @@ BOOL InsertCDDlg()
return nResult == IDOK;
}
#ifndef HELLFIRE
/**
* @brief Terminates the game with a read-only directory error dialog.
*/
@ -745,3 +750,4 @@ void DirErrorDlg(const char *error)
app_fatal(NULL);
}
#endif

16
Source/appfat.h
Unescape View File

@ -6,30 +6,16 @@
#ifndef __APPFAT_H__
#define __APPFAT_H__
extern char sz_error_buf[256];
extern BOOL terminating;
extern int cleanup_thread_id;
void TriggerBreak();
#ifdef _DEBUG
LONG __stdcall BreakFilter(PEXCEPTION_POINTERS pExc);
#endif
char *GetErrorStr(DWORD error_code);
void TraceErrorDD(HRESULT hError, char *pszBuffer, DWORD dwMaxChars);
void TraceErrorDS(HRESULT hError, char *pszBuffer, DWORD dwMaxChars);
char *TraceLastError();
const char *TraceLastError();
void __cdecl app_fatal(const char *pszFmt, ...);
void MsgBox(const char *pszFmt, va_list va);
void FreeDlg();
void __cdecl DrawDlg(const char *pszFmt, ...);
#ifdef _DEBUG
void assert_fail(int nLineNo, const char *pszFile, const char *pszFail);
#endif
void DDErrMsg(DWORD error_code, int log_line_nr, const char *log_file_path);
void DSErrMsg(DWORD error_code, int log_line_nr, const char *log_file_path);
void center_window(HWND hDlg);
void ErrDlg(int template_id, DWORD error_code, const char *log_file_path, int log_line_nr);
void TextDlg(HWND hDlg, const char *text);
void ErrOkDlg(int template_id, DWORD error_code, const char *log_file_path, int log_line_nr);
void FileErrDlg(const char *error);
void DiskFreeDlg(const char *error);

6
Source/dthread.cpp
Unescape View File

@ -55,7 +55,7 @@ void dthread_send_delta(int pnum, char cmd, void *pbSrc, int dwLen)
void dthread_start()
{
char *error_buf;
const char *error_buf;
if (gbMaxPlayers == 1) {
return;
@ -78,7 +78,7 @@ void dthread_start()
unsigned int __stdcall dthread_handler(void *data)
{
char *error_buf;
const char *error_buf;
TMegaPkt *pkt;
DWORD dwMilliseconds;
@ -116,7 +116,7 @@ unsigned int __stdcall dthread_handler(void *data)
void dthread_cleanup()
{
char *error_buf;
const char *error_buf;
TMegaPkt *tmp;
if (sghWorkToDoEvent == NULL) {

2
Source/nthread.cpp
Unescape View File

@ -114,7 +114,7 @@ void nthread_set_turn_upper_bit()
void nthread_start(BOOL set_turn_upper_bit)
{
char *err, *err2;
const char *err, *err2;
DWORD largestMsgSize;
_SNETCAPS caps;

Write Preview
Loading…
Cancel
Save