diff --git a/src/include/86box/plat.h b/src/include/86box/plat.h index af7434d09..a93118223 100644 --- a/src/include/86box/plat.h +++ b/src/include/86box/plat.h @@ -64,7 +64,7 @@ extern "C" { /* Global variables residing in the platform module. */ extern int dopause, /* system is paused */ doresize, /* screen resize requested */ - quited, /* system exit requested */ + is_quit, /* system exit requested */ mouse_capture; /* mouse is captured in app */ #ifdef MTR_ENABLED diff --git a/src/win/win.c b/src/win/win.c index a47de48c0..155498abb 100644 --- a/src/win/win.c +++ b/src/win/win.c @@ -402,7 +402,7 @@ WinMain(HINSTANCE hInst, HINSTANCE hPrev, LPSTR lpszArg, int nCmdShow) free(argw); return(1); } - + /* Enable crash dump services. */ if (enable_crashdump) InitCrashDump(); @@ -431,7 +431,7 @@ main_thread(void *param) title_update = 1; old_time = GetTickCount(); drawits = frames = 0; - while (!quited) { + while (!is_quit) { /* See if it is time to run a frame of code. */ new_time = GetTickCount(); drawits += (new_time - old_time); @@ -474,7 +474,7 @@ do_start(void) LARGE_INTEGER qpc; /* We have not stopped yet. */ - quited = 0; + is_quit = 0; /* Initialize the high-precision timer. */ timeBeginPeriod(1); @@ -483,7 +483,7 @@ do_start(void) win_log("Main timer precision: %llu\n", timer_freq); /* Start the emulator, really. */ - thMain = thread_create(main_thread, &quited); + thMain = thread_create(main_thread, &is_quit); SetThreadPriority(thMain, THREAD_PRIORITY_HIGHEST); } @@ -492,7 +492,7 @@ do_start(void) void do_stop(void) { - quited = 1; + is_quit = 1; plat_delay_ms(100); @@ -719,7 +719,7 @@ plat_get_ticks(void) LARGE_INTEGER EndingTime, ElapsedMicroseconds; if (first_use) { - QueryPerformanceFrequency(&Frequency); + QueryPerformanceFrequency(&Frequency); QueryPerformanceCounter(&StartingTime); first_use = 0; } @@ -911,7 +911,7 @@ plat_setfullscreen(int on) temp_y = unscaled_size_y; } - /* Main Window. */ + /* Main Window. */ ResizeWindowByClientArea(hwndMain, temp_x, temp_y + sbar_height); } diff --git a/src/win/win_ui.c b/src/win/win_ui.c index 7f7f66e5e..dbd35429b 100644 --- a/src/win/win_ui.c +++ b/src/win/win_ui.c @@ -118,7 +118,7 @@ int win_get_system_metrics(int index, int dpi) { if (pAreDpiAwarenessContextsEqual(c, DPI_AWARENESS_CONTEXT_PER_MONITOR_AWARE_V2)) return pGetSystemMetricsForDpi(index, dpi); } - + return GetSystemMetrics(index); } @@ -312,7 +312,7 @@ LowLevelKeyboardProc(int nCode, WPARAM wParam, LPARAM lParam) if (nCode < 0 || nCode != HC_ACTION || (!mouse_capture && !video_fullscreen)) return(CallNextHookEx(hKeyboardHook, nCode, wParam, lParam)); - + p = (KBDLLHOOKSTRUCT*)lParam; /* disable alt-tab */ @@ -666,7 +666,7 @@ MainWindowProcedure(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam) case IDM_VID_FS_FULL: case IDM_VID_FS_43: - case IDM_VID_FS_KEEPRATIO: + case IDM_VID_FS_KEEPRATIO: case IDM_VID_FS_INT: CheckMenuItem(hmenu, IDM_VID_FS_FULL+video_fullscreen_scale, MF_UNCHECKED); video_fullscreen_scale = LOWORD(wParam) - IDM_VID_FS_FULL; @@ -888,7 +888,7 @@ MainWindowProcedure(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam) else if ((wParam >= 0x8000) && (wParam <= 0x80ff)) ui_sb_timer_callback(wParam & 0xff); break; - + case WM_LEAVEFULLSCREEN: plat_setfullscreen(0); config_save(); @@ -1332,16 +1332,16 @@ ui_init(int nCmdShow) do_start(); /* Run the message loop. It will run until GetMessage() returns 0 */ - while (! quited) { + while (! is_quit) { bRet = GetMessage(&messages, NULL, 0, 0); - if ((bRet == 0) || quited) break; + if ((bRet == 0) || is_quit) break; if (bRet == -1) { fatal("bRet is -1\n"); } if (messages.message == WM_QUIT) { - quited = 1; + is_quit = 1; break; }