eukara
/
fallout2-ce
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove obsolete OS version check

This commit is contained in:
Jan Šimek 2022-05-25 14:25:45 +02:00
parent 8e2169ef78
commit 12b1a7c7c8
2 changed files with 9 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
src/win32.cc
View File

@ -5,7 +5,6 @@
#include "main.h" #include "main.h"
#include "window_manager.h" #include "window_manager.h"
#include <signal.h>
#include <SDL.h> #include <SDL.h>
// 0x51E430 // 0x51E430
@ -30,19 +29,13 @@ int main(int argc, char* argv[])
_GNW95_mutex = CreateMutexA(0, TRUE, "GNW95MUTEX"); _GNW95_mutex = CreateMutexA(0, TRUE, "GNW95MUTEX");
if (GetLastError() == ERROR_SUCCESS) { if (GetLastError() == ERROR_SUCCESS) {
ShowCursor(0); SDL_ShowCursor(SDL_DISABLE);
if (_InitInstance()) { if (_LoadDirectX()) {
if (_LoadDirectX()) { argsInit(&args);
argsInit(&args); if (argsParse(&args, argc, argv)) {
if (argsParse(&args, argc, argv)) { gProgramIsActive = true;
signal(1, _SignalHandler); falloutMain(args.argc, args.argv);
signal(3, _SignalHandler); argsFree(&args);
signal(5, _SignalHandler);
gProgramIsActive = true;
falloutMain(args.argc, args.argv);
argsFree(&args);
return 1;
}
} }
} }
CloseHandle(_GNW95_mutex); CloseHandle(_GNW95_mutex);
@ -50,35 +43,6 @@ int main(int argc, char* argv[])
return 0; 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 // 0x4DE8D0
bool _LoadDirectX() bool _LoadDirectX()
{ {
@ -98,8 +62,8 @@ bool _LoadDirectX()
err: err:
_UnloadDirectX(); _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; return false;
} }
@ -112,9 +76,3 @@ void _UnloadDirectX(void)
gDSoundDLL = NULL; gDSoundDLL = NULL;
} }
} }
// 0x4DE9F4
void _SignalHandler(int sig)
{
// TODO: Incomplete.
}

2
src/win32.h
View File

@ -20,9 +20,7 @@ extern bool gProgramIsActive;
extern HANDLE _GNW95_mutex; extern HANDLE _GNW95_mutex;
extern HMODULE gDSoundDLL; extern HMODULE gDSoundDLL;
bool _InitInstance();
bool _LoadDirectX(); bool _LoadDirectX();
void _UnloadDirectX(void); void _UnloadDirectX(void);
void _SignalHandler(int sig);
#endif /* WIN32_H */ #endif /* WIN32_H */