Apple-2-Tools
/
AppleWin
mirror of https://github.com/AppleWin/AppleWin.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

A more elegant exit from the 'restart' loop (when SysClk fails to init)

This commit is contained in:
tomch 2007-03-27 20:46:14 +00:00
parent 4be82324be
commit 78b4dcb7f8
2 changed files with 35 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

71
AppleWin/source/Applewin.cpp
View File

@ -288,53 +288,50 @@ void EnterMessageLoop ()
{
MSG message;
PeekMessage( &message, NULL, 0, 0, PM_NOREMOVE);
PeekMessage(&message, NULL, 0, 0, PM_NOREMOVE);
while (message.message!=WM_QUIT)
{
// while (GetMessage(&message,0,0,0))
if (PeekMessage( &message, NULL, 0, 0, PM_REMOVE))
{
TranslateMessage(&message);
DispatchMessage(&message);
while ((g_nAppMode == MODE_RUNNING) || (g_nAppMode == MODE_STEPPING))
if (PeekMessage(&message, NULL, 0, 0, PM_REMOVE))
{
if (PeekMessage(&message,0,0,0,PM_REMOVE))
TranslateMessage(&message);
DispatchMessage(&message);
while ((g_nAppMode == MODE_RUNNING) || (g_nAppMode == MODE_STEPPING))
{
if (message.message == WM_QUIT)
return;
TranslateMessage(&message);
DispatchMessage(&message);
}
else if (g_nAppMode == MODE_STEPPING)
DebugContinueStepping();
else
{
ContinueExecution();
if (g_nAppMode != MODE_DEBUG)
if (g_bFullSpeed)
ContinueExecution();
if (PeekMessage(&message,0,0,0,PM_REMOVE))
{
if (message.message == WM_QUIT)
return;
TranslateMessage(&message);
DispatchMessage(&message);
}
else if (g_nAppMode == MODE_STEPPING)
{
DebugContinueStepping();
}
else
{
ContinueExecution();
if (g_nAppMode != MODE_DEBUG)
{
if (g_bFullSpeed)
ContinueExecution();
}
}
}
}
}
else
{
if (g_nAppMode == MODE_DEBUG)
else
{
DebuggerUpdate();
}
else if (g_nAppMode == MODE_LOGO)
{
Sleep(100); // Stop process hogging CPU
if (g_nAppMode == MODE_DEBUG)
DebuggerUpdate();
else if (g_nAppMode == MODE_LOGO)
Sleep(100); // Stop process hogging CPU
}
}
}
// while (PeekMessage(&message,0,0,0,PM_REMOVE))
// ; // intentional null statement
}
//===========================================================================
void GetProgramDirectory () {
GetModuleFileName((HINSTANCE)0,g_sProgramDir,MAX_PATH);
@ -619,9 +616,9 @@ int APIENTRY WinMain (HINSTANCE passinstance, HINSTANCE, LPSTR lpCmdLine, int)
//-----
// Initialize COM
// . NB. DSInit() is done when g_hFrameWindow is created (WM_CREATE)
CoInitialize( NULL );
bool bSysClkOK = SysClk_InitTimer();
// DSInit(); // Done when g_hFrameWindow is created (WM_CREATE)
// DO ONE-TIME INITIALIZATION
g_hInstance = passinstance;
@ -663,7 +660,7 @@ int APIENTRY WinMain (HINSTANCE passinstance, HINSTANCE, LPSTR lpCmdLine, int)
if (!bSysClkOK)
{
MessageBox(g_hFrameWindow, "DirectX failed to create SystemClock instance", TEXT("AppleWin Error"), MB_OK);
break;
PostMessage(g_hFrameWindow, WM_DESTROY, 0, 0); // Close everything down
}
tfe_init();

2
AppleWin/source/Frame.cpp
View File

@ -529,7 +529,7 @@ LRESULT CALLBACK FrameWndProc (
VideoDestroy();
MB_Destroy();
DeleteGdiObjects();
PostQuitMessage(0);
PostQuitMessage(0); // Post WM_QUIT message to the thread's message queue
break;
case WM_DISPLAYCHANGE: