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

move popup message to logging file

This commit is contained in:
RadWolfie 2020-06-09 23:16:33 -05:00
parent 9bee8ea17b
commit dbae5dbb79
4 changed files with 77 additions and 77 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
src/common/Logging.cpp
View File

@ -232,6 +232,53 @@ void log_generate_active_filter_output(const CXBXR_MODULE cxbxr_module)
std::cout << std::flush;
}
int CxbxMessageBox(const char* msg, UINT uType, HWND hWnd)
{
return MessageBox(hWnd, msg, /*lpCaption=*/TEXT("Cxbx-Reloaded"), uType);
}
void CxbxShowError(const char* msg, HWND hWnd)
{
const UINT uType = MB_OK | MB_TOPMOST | MB_SETFOREGROUND | MB_ICONERROR; // Note : MB_ICONERROR == MB_ICONSTOP == MB_ICONHAND
(void)CxbxMessageBox(msg, uType, hWnd);
}
void CxbxPopupMessageEx(CXBXR_MODULE cxbxr_module, LOG_LEVEL level, CxbxMsgDlgIcon icon, const char *message, ...)
{
char Buffer[1024];
va_list argp;
UINT uType = MB_OK | MB_TOPMOST | MB_SETFOREGROUND;
switch (icon) {
case CxbxMsgDlgIcon_Warn: {
uType |= MB_ICONWARNING;
break;
}
case CxbxMsgDlgIcon_Error: {
uType |= MB_ICONERROR;
break;
}
case CxbxMsgDlgIcon_Info: {
uType |= MB_ICONINFORMATION;
break;
}
case CxbxMsgDlgIcon_Unknown:
default: {
uType |= MB_ICONQUESTION;
break;
}
}
va_start(argp, message);
vsprintf(Buffer, message, argp);
va_end(argp);
EmuLogEx(cxbxr_module, level, "Popup : %s", Buffer);
(void)CxbxMessageBox(Buffer, uType);
}
const bool needs_escape(const wint_t _char)
{
// Escaping is needed for control characters,

24
src/common/Logging.h
View File

@ -132,6 +132,30 @@ void log_set_config(int LogLevel, unsigned int* LoggedModules, bool LogPopupTest
void log_generate_active_filter_output(const CXBXR_MODULE cxbxr_module);
typedef enum _CxbxMsgDlgIcon {
Info = 0,
Warn,
Error,
Unknown
} CxbxMsgDlgIcon;
int CxbxMessageBox(const char* msg, UINT uType = MB_OK, HWND hWnd = NULL);
void CxbxShowError(const char* msg, HWND hWnd = NULL);
void CxbxPopupMessageEx(CXBXR_MODULE cxbxr_module, LOG_LEVEL level, CxbxMsgDlgIcon icon, const char* message, ...);
#define CxbxPopupMessage(level, icon, fmt, ...) CxbxPopupMessageEx(LOG_PREFIX, level, icon, fmt, ##__VA_ARGS__)
#define LOG_TEST_CASE(message) do { static bool bTestCaseLogged = false; \
if (bTestCaseLogged) break; \
bTestCaseLogged = true; \
if (!g_CurrentLogPopupTestcase) break;\
LOG_CHECK_ENABLED(LOG_LEVEL::INFO) { \
CxbxPopupMessage(LOG_LEVEL::INFO, CxbxMsgDlgIcon::Info, "Please report that %s shows the following message:\nLOG_TEST_CASE: %s\nIn %s (%s line %d)", \
CxbxKrnl_Xbe->m_szAsciiTitle, message, __func__, __FILE__, __LINE__); } } while (0)
// was g_pCertificate->wszTitleName
//
// __FILENAME__
//

59
src/core/kernel/init/CxbxKrnl.cpp
View File

@ -276,53 +276,6 @@ std::string CxbxGetLastErrorString(char * lpszFunction)
#pragma optimize("", off)
int CxbxMessageBox(const char* msg, UINT uType, HWND hWnd)
{
return MessageBox(hWnd, msg, /*lpCaption=*/TEXT("Cxbx-Reloaded"), uType);
}
void CxbxShowError(const char* msg, HWND hWnd)
{
const UINT uType = MB_OK | MB_TOPMOST | MB_SETFOREGROUND | MB_ICONERROR; // Note : MB_ICONERROR == MB_ICONSTOP == MB_ICONHAND
(void)CxbxMessageBox(msg, uType, hWnd);
}
void CxbxPopupMessageEx(CXBXR_MODULE cxbxr_module, LOG_LEVEL level, CxbxMsgDlgIcon icon, const char *message, ...)
{
char Buffer[1024];
va_list argp;
UINT uType = MB_OK | MB_TOPMOST | MB_SETFOREGROUND;
switch (icon) {
case CxbxMsgDlgIcon_Warn: {
uType |= MB_ICONWARNING;
break;
}
case CxbxMsgDlgIcon_Error: {
uType |= MB_ICONERROR;
break;
}
case CxbxMsgDlgIcon_Info: {
uType |= MB_ICONINFORMATION;
break;
}
case CxbxMsgDlgIcon_Unknown:
default: {
uType |= MB_ICONQUESTION;
break;
}
}
va_start(argp, message);
vsprintf(Buffer, message, argp);
va_end(argp);
EmuLogEx(cxbxr_module, level, "Popup : %s", Buffer);
(void)CxbxMessageBox(Buffer, uType);
}
void PrintCurrentConfigurationLog()
{
if (g_bIsWine) {
@ -924,7 +877,7 @@ void CxbxKrnlEmulate(unsigned int reserved_systems, blocks_reserved_t blocks_res
// verify base of code of our executable is 0x00001000
if (ExeNtHeader->OptionalHeader.BaseOfCode != CXBX_BASE_OF_CODE)
{
CxbxPopupMessage(LOG_LEVEL::FATAL, CxbxMsgDlgIcon_Error, "Cxbx-Reloaded executuable requires it's base of code to be 0x00001000");
CxbxPopupMessage(LOG_LEVEL::FATAL, CxbxMsgDlgIcon::Error, "Cxbx-Reloaded executuable requires it's base of code to be 0x00001000");
return; // TODO : Halt(0);
}
@ -932,7 +885,7 @@ void CxbxKrnlEmulate(unsigned int reserved_systems, blocks_reserved_t blocks_res
// verify virtual_memory_placeholder is located at 0x00011000
if ((UINT_PTR)(&(virtual_memory_placeholder[0])) != (XBE_IMAGE_BASE + CXBX_BASE_OF_CODE))
{
CxbxPopupMessage(LOG_LEVEL::FATAL, CxbxMsgDlgIcon_Error, "virtual_memory_placeholder is not loaded to base address 0x00011000 (which is a requirement for Xbox emulation)");
CxbxPopupMessage(LOG_LEVEL::FATAL, CxbxMsgDlgIcon::Error, "virtual_memory_placeholder is not loaded to base address 0x00011000 (which is a requirement for Xbox emulation)");
return; // TODO : Halt(0);
}
#endif
@ -991,7 +944,7 @@ void CxbxKrnlEmulate(unsigned int reserved_systems, blocks_reserved_t blocks_res
EEPROM = CxbxRestoreEEPROM(szFilePath_EEPROM_bin);
if (EEPROM == nullptr)
{
CxbxPopupMessage(LOG_LEVEL::FATAL, CxbxMsgDlgIcon_Error, "Couldn't init EEPROM!");
CxbxPopupMessage(LOG_LEVEL::FATAL, CxbxMsgDlgIcon::Error, "Couldn't init EEPROM!");
return; // TODO : Halt(0);
}
@ -1694,7 +1647,7 @@ __declspec(noreturn) void CxbxKrnlCleanupEx(CXBXR_MODULE cxbxr_module, const cha
vsprintf(szBuffer2, szErrorMessage, argp);
va_end(argp);
CxbxPopupMessageEx(cxbxr_module, LOG_LEVEL::FATAL, CxbxMsgDlgIcon_Error, "Received Fatal Message:\n\n* %s\n", szBuffer2); // Will also EmuLogEx
CxbxPopupMessageEx(cxbxr_module, LOG_LEVEL::FATAL, CxbxMsgDlgIcon::Error, "Received Fatal Message:\n\n* %s\n", szBuffer2); // Will also EmuLogEx
}
EmuLogInit(LOG_LEVEL::INFO, "MAIN: Terminating Process");
@ -1898,11 +1851,11 @@ void CxbxPrintUEMInfo(ULONG ErrorCode)
if (it != UEMErrorTable.end())
{
std::string ErrorMessage = "Fatal error. " + it->second + ". This error screen will persist indefinitely. Stop the emulation to close it";
CxbxPopupMessage(LOG_LEVEL::FATAL, CxbxMsgDlgIcon_Error, ErrorMessage.c_str());
CxbxPopupMessage(LOG_LEVEL::FATAL, CxbxMsgDlgIcon::Error, ErrorMessage.c_str());
}
else
{
CxbxPopupMessage(LOG_LEVEL::FATAL, CxbxMsgDlgIcon_Error, "Unknown fatal error. This error screen will persist indefinitely. Stop the emulation to close it");
CxbxPopupMessage(LOG_LEVEL::FATAL, CxbxMsgDlgIcon::Error, "Unknown fatal error. This error screen will persist indefinitely. Stop the emulation to close it");
}
}

24
src/core/kernel/init/CxbxKrnl.h
View File

@ -135,30 +135,6 @@ extern "C" {
#define XBOX_MEM_NOZERO 0x800000 // Replaces MEM_ROTATE on WinXP+
#define XBOX_MEM_IMAGE 0x1000000 // ?
typedef enum _CxbxMsgDlgIcon {
CxbxMsgDlgIcon_Info=0,
CxbxMsgDlgIcon_Warn,
CxbxMsgDlgIcon_Error,
CxbxMsgDlgIcon_Unknown
} CxbxMsgDlgIcon;
int CxbxMessageBox(const char* msg, UINT uType = MB_OK, HWND hWnd = NULL);
void CxbxShowError(const char* msg, HWND hWnd = NULL);
void CxbxPopupMessageEx(CXBXR_MODULE cxbxr_module, LOG_LEVEL level, CxbxMsgDlgIcon icon, const char *message, ...);
#define CxbxPopupMessage(level, icon, fmt, ...) CxbxPopupMessageEx(LOG_PREFIX, level, icon, fmt, ##__VA_ARGS__)
#define LOG_TEST_CASE(message) do { static bool bTestCaseLogged = false; \
if (bTestCaseLogged) break; \
bTestCaseLogged = true; \
if (!g_CurrentLogPopupTestcase) break;\
LOG_CHECK_ENABLED(LOG_LEVEL::INFO) { \
CxbxPopupMessage(LOG_LEVEL::INFO, CxbxMsgDlgIcon_Info, "Please report that %s shows the following message:\nLOG_TEST_CASE: %s\nIn %s (%s line %d)", \
CxbxKrnl_Xbe->m_szAsciiTitle, message, __func__, __FILE__, __LINE__); } } while (0)
// was g_pCertificate->wszTitleName
extern Xbe::Certificate *g_pCertificate;
/*! validate version string match */