From 12b1a7c7c81322f3a788c206026f9fe3691a48e9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20=C5=A0imek?= Date: Wed, 25 May 2022 14:25:45 +0200 Subject: [PATCH] Remove obsolete OS version check --- src/win32.cc | 60 ++++++++-------------------------------------------- src/win32.h | 2 -- 2 files changed, 9 insertions(+), 53 deletions(-) diff --git a/src/win32.cc b/src/win32.cc index c966d37..0054f3e 100644 --- a/src/win32.cc +++ b/src/win32.cc @@ -5,7 +5,6 @@ #include "main.h" #include "window_manager.h" -#include #include // 0x51E430 @@ -30,19 +29,13 @@ int main(int argc, char* argv[]) _GNW95_mutex = CreateMutexA(0, TRUE, "GNW95MUTEX"); if (GetLastError() == ERROR_SUCCESS) { - ShowCursor(0); - if (_InitInstance()) { - if (_LoadDirectX()) { - argsInit(&args); - if (argsParse(&args, argc, argv)) { - signal(1, _SignalHandler); - signal(3, _SignalHandler); - signal(5, _SignalHandler); - gProgramIsActive = true; - falloutMain(args.argc, args.argv); - argsFree(&args); - return 1; - } + SDL_ShowCursor(SDL_DISABLE); + if (_LoadDirectX()) { + argsInit(&args); + if (argsParse(&args, argc, argv)) { + gProgramIsActive = true; + falloutMain(args.argc, args.argv); + argsFree(&args); } } CloseHandle(_GNW95_mutex); @@ -50,35 +43,6 @@ int main(int argc, char* argv[]) return 0; } -// 0x4DE864 -bool _InitInstance() -{ - OSVERSIONINFOA osvi; - bool result; - - osvi.dwOSVersionInfoSize = sizeof(OSVERSIONINFOA); - -#pragma warning(suppress : 4996 28159) - if (!GetVersionExA(&osvi)) { - return true; - } - - result = true; - - if (osvi.dwPlatformId == 0 || osvi.dwPlatformId == 2 && osvi.dwMajorVersion < 4) { - result = false; - } - - if (!result) { - SDL_ShowSimpleMessageBox(SDL_MESSAGEBOX_ERROR, - "Wrong Windows Version", - "This program requires Windows 95 or Windows NT version 4.0 or greater.", - NULL); - } - - return result; -} - // 0x4DE8D0 bool _LoadDirectX() { @@ -98,8 +62,8 @@ bool _LoadDirectX() err: _UnloadDirectX(); - - MessageBoxA(NULL, "This program requires Windows 95 with DirectX 3.0a or later or Windows NT version 4.0 with Service Pack 3 or greater.", "Could not load DirectX", MB_ICONSTOP); + + SDL_ShowSimpleMessageBox(SDL_MESSAGEBOX_ERROR, "Could not load DirectX", "This program requires DirectX 3.0a or later.", NULL); return false; } @@ -112,9 +76,3 @@ void _UnloadDirectX(void) gDSoundDLL = NULL; } } - -// 0x4DE9F4 -void _SignalHandler(int sig) -{ - // TODO: Incomplete. -} diff --git a/src/win32.h b/src/win32.h index d61ce85..c52a900 100644 --- a/src/win32.h +++ b/src/win32.h @@ -20,9 +20,7 @@ extern bool gProgramIsActive; extern HANDLE _GNW95_mutex; extern HMODULE gDSoundDLL; -bool _InitInstance(); bool _LoadDirectX(); void _UnloadDirectX(void); -void _SignalHandler(int sig); #endif /* WIN32_H */