From 94b7ca4a3b441143db7267208b2ffe2031d9aba7 Mon Sep 17 00:00:00 2001 From: Anders Jenbo Date: Wed, 27 Feb 2019 20:03:28 +0100 Subject: [PATCH] Unstub restrict.cpp --- CMakeLists.txt | 3 +-- SourceS/miniwin.h | 14 ++++++++++++++ SourceX/miniwin.cpp | 8 ++++++++ SourceX/restrict.cpp | 13 ------------- 4 files changed, 23 insertions(+), 15 deletions(-) delete mode 100644 SourceX/restrict.cpp diff --git a/CMakeLists.txt b/CMakeLists.txt index e39b8db5a..856c46fc2 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -134,7 +134,7 @@ add_library(devilution STATIC Source/portal.cpp Source/quests.cpp Source/render.cpp -# Source/restrict.cpp + Source/restrict.cpp Source/scrollrt.cpp Source/setmaps.cpp Source/sha.cpp @@ -162,7 +162,6 @@ add_executable(devilutionx SourceX/stub_rand.cpp SourceX/miniwin_thread.cpp SourceX/movie.cpp - SourceX/restrict.cpp SourceX/sound.cpp SourceX/storm.cpp SourceX/storm_net.cpp diff --git a/SourceS/miniwin.h b/SourceS/miniwin.h index 63125ab52..4482ffed8 100644 --- a/SourceS/miniwin.h +++ b/SourceS/miniwin.h @@ -483,6 +483,20 @@ typedef struct _OFSTRUCT { CHAR szPathName[OFS_MAXPATHNAME]; } OFSTRUCT, *LPOFSTRUCT, *POFSTRUCT; +#define VER_PLATFORM_WIN32_NT 2 + +typedef struct _OSVERSIONINFOA { + DWORD dwOSVersionInfoSize; + DWORD dwMajorVersion; + DWORD dwMinorVersion; + DWORD dwBuildNumber; + DWORD dwPlatformId; + CHAR szCSDVersion[128]; +} OSVERSIONINFO, *LPOSVERSIONINFOA; + +BOOL GetVersionExA(LPOSVERSIONINFOA lpVersionInformation); +#define GetVersionEx GetVersionExA + #define SEC_COMMIT 0x8000000 #define PAGE_READWRITE 0x04 diff --git a/SourceX/miniwin.cpp b/SourceX/miniwin.cpp index af7098165..a1d6de2f1 100644 --- a/SourceX/miniwin.cpp +++ b/SourceX/miniwin.cpp @@ -464,6 +464,14 @@ UINT WINAPI GetSystemPaletteEntries(HDC hdc, UINT iStart, UINT cEntries, LPPALET return 0; } +BOOL GetVersionExA(LPOSVERSIONINFOA lpVersionInformation) +{ + lpVersionInformation->dwMajorVersion = 5; + lpVersionInformation->dwMinorVersion = 0; + lpVersionInformation->dwPlatformId = VER_PLATFORM_WIN32_NT; + return TRUE; +} + WINBOOL WINAPI CreateProcessA(LPCSTR lpApplicationName, LPSTR lpCommandLine, LPSECURITY_ATTRIBUTES lpProcessAttributes, LPSECURITY_ATTRIBUTES lpThreadAttributes, WINBOOL bInheritHandles, DWORD dwCreationFlags, LPVOID lpEnvironment, LPCSTR lpCurrentDirectory, LPSTARTUPINFOA lpStartupInfo, diff --git a/SourceX/restrict.cpp b/SourceX/restrict.cpp deleted file mode 100644 index 84ab38024..000000000 --- a/SourceX/restrict.cpp +++ /dev/null @@ -1,13 +0,0 @@ -#include "pch.h" - -BOOL __cdecl RestrictedTest() -{ - DUMMY(); - return FALSE; -} - -BOOL __cdecl ReadOnlyTest() -{ - DUMMY(); - return FALSE; -}