Remove usages of g_hFrameWindow and g_hInstance from core emulator files. And Resource related Win32 functions. (PR #915)

. Win32Frame: remove WM_USER_RESTART.
This commit is contained in:
Andrea
2021-01-19 20:37:43 +00:00
committed by GitHub
parent 81279904e2
commit cdf1cb9106
26 changed files with 158 additions and 218 deletions
+4 -4
View File
@@ -522,7 +522,7 @@ static bool HookFilterForKeyboard()
std::string msg("Failed to install hook filter for system keys");
DWORD dwErr = GetLastError();
MessageBox(GetDesktopWindow(), msg.c_str(), "Warning", MB_ICONASTERISK | MB_OK);
GetFrame().FrameMessageBox(msg.c_str(), "Warning", MB_ICONASTERISK | MB_OK);
msg += "\n";
LogFileOutput(msg.c_str());
@@ -599,7 +599,7 @@ static void UninitHookThread()
static void ExceptionHandler(const char* pError)
{
MessageBox( GetFrame().g_hFrameWindow,
GetFrame().FrameMessageBox(
pError,
TEXT("Runtime Exception"),
MB_ICONEXCLAMATION | MB_SETFOREGROUND);
@@ -930,7 +930,7 @@ static void RepeatInitialization(void)
if (!g_bSysClkOK)
{
MessageBox(GetFrame().g_hFrameWindow, "DirectX failed to create SystemClock instance", TEXT("AppleWin Error"), MB_OK);
GetFrame().FrameMessageBox("DirectX failed to create SystemClock instance", TEXT("AppleWin Error"), MB_OK);
g_cmdLine.bShutdown = true;
}
@@ -941,7 +941,7 @@ static void RepeatInitialization(void)
: "Unsupported -rom and -f8rom being used at the same time\n";
LogFileOutput("%s", msg.c_str());
MessageBox(GetFrame().g_hFrameWindow, msg.c_str(), TEXT("AppleWin Error"), MB_OK);
GetFrame().FrameMessageBox(msg.c_str(), TEXT("AppleWin Error"), MB_OK);
g_cmdLine.bShutdown = true;
}