diff --git a/CMakeLists.txt b/CMakeLists.txt
index d0fcd886..8a282d67 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -249,6 +249,7 @@ if(WIN32)
target_sources(CSE2 PRIVATE "${ASSETS_DIRECTORY}/resources/ICON/ICON.rc")
target_compile_definitions(CSE2 PRIVATE WINDOWS)
set_target_properties(CSE2 PROPERTIES WIN32_EXECUTABLE YES) # Disable the console window
+ target_link_libraries(CSE2 "version.lib") # Link this for some code in Generic.cpp
else()
list(APPEND RESOURCES "ICON/ICON_MINI.bmp")
endif()
diff --git a/msvc2003/CSE2.vcproj b/msvc2003/CSE2.vcproj
index fb57cc27..a70a3a8e 100644
--- a/msvc2003/CSE2.vcproj
+++ b/msvc2003/CSE2.vcproj
@@ -34,7 +34,7 @@
Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="SDL2/lib/SDL2.lib SDL2/lib/SDL2main.lib freetype/lib/freetype.lib"
+ AdditionalDependencies="SDL2/lib/SDL2.lib SDL2/lib/SDL2main.lib freetype/lib/freetype.lib Version.lib"
OutputFile="$(OutDir)\$(ProjectName).exe"
LinkIncremental="2"
AdditionalLibraryDirectories=""
@@ -85,7 +85,7 @@
Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="SDL2/lib/SDL2.lib SDL2/lib/SDL2main.lib freetype/lib/freetype.lib"
+ AdditionalDependencies="SDL2/lib/SDL2.lib SDL2/lib/SDL2main.lib freetype/lib/freetype.lib Version.lib"
OutputFile="$(OutDir)\$(ProjectName).exe"
LinkIncremental="1"
IgnoreAllDefaultLibraries="FALSE"
@@ -135,7 +135,7 @@
Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="SDL2/lib/SDL2.lib SDL2/lib/SDL2main.lib freetype/lib/freetype.lib"
+ AdditionalDependencies="SDL2/lib/SDL2.lib SDL2/lib/SDL2main.lib freetype/lib/freetype.lib Version.lib"
OutputFile="$(OutDir)\$(ProjectName).exe"
LinkIncremental="1"
IgnoreAllDefaultLibraries="FALSE"
@@ -186,7 +186,7 @@
Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="SDL2/lib/SDL2.lib SDL2/lib/SDL2main.lib freetype/lib/freetype.lib"
+ AdditionalDependencies="SDL2/lib/SDL2.lib SDL2/lib/SDL2main.lib freetype/lib/freetype.lib Version.lib"
OutputFile="$(OutDir)\$(ProjectName).exe"
LinkIncremental="2"
AdditionalLibraryDirectories=""
diff --git a/msvc2003/devilution/comparer-config.toml b/msvc2003/devilution/comparer-config.toml
index 8a38970d..76408966 100644
--- a/msvc2003/devilution/comparer-config.toml
+++ b/msvc2003/devilution/comparer-config.toml
@@ -579,6 +579,50 @@ addr = 0x40F9B0
name = "ModeAction"
addr = 0x410400
+[[func]]
+name = "GetCompileDate"
+addr = 0x4108B0
+
+[[func]]
+name = "GetCompileVersion"
+addr = 0x410990
+
+[[func]]
+name = "OpenVolumeConfiguration"
+addr = 0x410AB0
+
+[[func]]
+name = "DeleteDebugLog"
+addr = 0x410BC0
+
+[[func]]
+name = "PrintDebugLog"
+addr = 0x410C10
+
+[[func]]
+name = "CheckTime"
+addr = 0x410CA0
+
+[[func]]
+name = "CheckFileExists"
+addr = 0x410D10
+
+[[func]]
+name = "GetFileSizeLong"
+addr = 0x410D80
+
+[[func]]
+name = "PrintBitmapError"
+addr = 0x410DE0
+
+[[func]]
+name = "IsShiftJIS"
+addr = 0x410E90
+
+[[func]]
+name = "IsEnableBitmap"
+addr = 0x4112E0
+
[[func]]
name = "LoadGenericData"
addr = 0x411390
diff --git a/src/Generic.cpp b/src/Generic.cpp
index 72873bd4..ae2c7493 100644
--- a/src/Generic.cpp
+++ b/src/Generic.cpp
@@ -1,12 +1,101 @@
#include "Generic.h"
+#include <stddef.h>
#include <stdio.h>
+#include <string.h>
#include "WindowsWrapper.h"
#include "CommonDefines.h"
#include "Tags.h"
+void GetCompileDate(int *year, int *month, int *day)
+{
+ int i;
+ const char *months[13];
+ char month_string[0x10];
+
+ months[0] = "XXX";
+ months[1] = "Jan";
+ months[2] = "Feb";
+ months[3] = "Mar";
+ months[4] = "Apr";
+ months[5] = "May";
+ months[6] = "Jun";
+ months[7] = "Jul";
+ months[8] = "Aug";
+ months[9] = "Sep";
+ months[10] = "Oct";
+ months[11] = "Nov";
+ months[12] = "Dec";
+ sscanf(__DATE__, "%s %d %d", &month_string, day, year);
+
+ for (i = 0; i < 12; ++i) // This being 12 instead of 13 might be a bug, but it works anyway by accident
+ if (!memcmp(&month_string, months[i], 3))
+ break;
+
+ *month = i;
+}
+
+#ifdef WINDOWS
+BOOL GetCompileVersion(int *v1, int *v2, int *v3, int *v4)
+{
+ unsigned int puLen;
+ VS_FIXEDFILEINFO *lpBuffer;
+ DWORD dwHandle;
+ DWORD dwLen;
+ char path[PATH_LENGTH];
+ LPVOID lpData;
+ BOOL bResult;
+
+ lpData = NULL;
+ bResult = FALSE;
+
+ GetModuleFileNameA(NULL, path, sizeof(path));
+ dwLen = GetFileVersionInfoSizeA(path, &dwHandle);
+
+ if (dwLen == 0)
+ {
+
+ }
+ else
+ {
+ lpData = malloc(dwLen);
+
+ if (lpData == NULL)
+ {
+
+ }
+ else
+ {
+ if (!GetFileVersionInfoA(path, 0, dwLen, lpData))
+ {
+
+ }
+ else
+ {
+ if (!VerQueryValueA(lpData, "\\", (LPVOID*)&lpBuffer, &puLen))
+ {
+
+ }
+ else
+ {
+ *v1 = (unsigned short)(lpBuffer->dwFileVersionMS >> 16);
+ *v2 = (unsigned short)(lpBuffer->dwFileVersionMS & 0xFFFF);
+ *v3 = (unsigned short)(lpBuffer->dwFileVersionLS >> 16);
+ *v4 = (unsigned short)(lpBuffer->dwFileVersionLS & 0xFFFF);
+ bResult = TRUE;
+ }
+ }
+ }
+ }
+
+ if (lpData)
+ free(lpData);
+
+ return bResult;
+}
+#else
BOOL GetCompileVersion(int *v1, int *v2, int *v3, int *v4)
{
*v1 = 1;
@@ -15,42 +104,197 @@ BOOL GetCompileVersion(int *v1, int *v2, int *v3, int *v4)
*v4 = 6;
return TRUE;
}
+#endif
-long GetFileSizeLong(const char *path)
+#ifdef WINDOWS
+// This seems to be broken in recent Windows (Sndvol32.exe was renamed 'SndVol.exe')
+BOOL OpenVolumeConfiguration(HWND hWnd)
{
- long len = -1;
+ char path[PATH_LENGTH];
+ char path2[PATH_LENGTH];
+ char path3[PATH_LENGTH];
+ size_t error1;
+ size_t error2;
+ size_t i;
- FILE *fp = fopen(path, "rb");
- if (fp != NULL)
- {
- fseek(fp, 0, SEEK_END);
- len = ftell(fp);
- fclose(fp);
- }
+ GetSystemDirectoryA(path, sizeof(path));
+ sprintf(path2, "%s\\Sndvol32.exe", path);
- return len;
+ i = strlen(path);
+ while (path[i] != '\\')
+ --i;
+
+ path[i] = '\0';
+ sprintf(path3, "%s\\Sndvol32.exe", path);
+
+ error1 = (size_t)ShellExecuteA(hWnd, "open", path2, NULL, NULL, SW_SHOW); // Convert to size_t instead of int so 64-bit MinGW-w64 shuts up
+ error2 = (size_t)ShellExecuteA(hWnd, "open", path3, NULL, NULL, SW_SHOW);
+
+ if (error1 <= 32 && error2 <= 32)
+ return FALSE;
+ else
+ return TRUE;
}
+#endif
+
+#ifdef WINDOWS
+void DeleteDebugLog(void)
+{
+ char path[PATH_LENGTH];
+
+ sprintf(path, "%s\\debug.txt", gModulePath);
+ DeleteFileA(path);
+}
+
+BOOL PrintDebugLog(const char *string, int value1, int value2, int value3)
+{
+ char path[PATH_LENGTH];
+ FILE *fp;
+
+ sprintf(path, "%s\\debug.txt", gModulePath);
+ fp = fopen(path, "a+t");
+
+ if (fp == NULL)
+ return FALSE;
+
+ fprintf(fp, "%s,%d,%d,%d\n", string, value1, value2, value3);
+ fclose(fp);
+ return TRUE;
+}
+#endif
+
+#ifdef WINDOWS
+/*
+This function is a mystery. It seems to check if the system time is within
+a certain range, specified by the two parameters. Nothing in the original game
+uses this code.
+
+This is just speculation, but this *might* have been used in those prototypes
+Pixel released to testers, to prevent them from running after a certain date.
+*/
+int CheckTime(SYSTEMTIME *system_time_low, SYSTEMTIME *system_time_high)
+{
+ FILETIME FileTime1;
+ FILETIME FileTime2;
+ SYSTEMTIME SystemTime;
+
+ GetSystemTime(&SystemTime);
+ SystemTimeToFileTime(&SystemTime, &FileTime1);
+ SystemTimeToFileTime(system_time_low, &FileTime2);
+
+ if (CompareFileTime(&FileTime2, &FileTime1) >= 0)
+ return -1; // Return if actual time is lower than system_time_low
+
+ SystemTimeToFileTime(system_time_high, &FileTime2);
+
+ if (CompareFileTime(&FileTime2, &FileTime1) <= 0)
+ return 1; // Return if actual time is higher than system_time_high
+ else
+ return 0;
+}
+#endif
BOOL CheckFileExists(const char *name)
{
char path[PATH_LENGTH];
+
+#ifdef NONPORTABLE
+ sprintf(path, "%s\\%s", gModulePath, name);
+#else
sprintf(path, "%s/%s", gModulePath, name);
+#endif
FILE *file = fopen(path, "rb");
- if (file)
- {
- fclose(file);
+
+ if (file == NULL)
+ return FALSE;
+
+ fclose(file);
+ return TRUE;
+}
+
+long GetFileSizeLong(const char *path)
+{
+#ifdef NONPORTABLE
+ DWORD len;
+ HANDLE hFile;
+
+ len = 0;
+
+ hFile = CreateFileA(path, 0, FILE_SHARE_READ, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL);
+ if (hFile == INVALID_HANDLE_VALUE)
+ return -1;
+
+ len = GetFileSize(hFile, NULL);
+ CloseHandle(hFile);
+ return len;
+#else
+ long len;
+ FILE *fp;
+
+ len = 0;
+
+ fp = fopen(path, "rb");
+ if (fp == NULL)
+ return -1;
+
+ fseek(fp, 0, SEEK_END);
+ len = ftell(fp);
+ fclose(fp);
+ return len;
+#endif
+}
+
+#ifdef WINDOWS
+BOOL PrintBitmapError(char *string, int value)
+{
+ char path[PATH_LENGTH];
+ FILE *fp;
+
+ sprintf(path, "%s\\%s", gModulePath, "error.log");
+
+ if (GetFileSizeLong(path) > 0x19000) // Purge the error log if it gets too big, I guess
+ DeleteFileA(path);
+
+ fp = fopen(path, "a+t");
+ if (fp == NULL)
+ return FALSE;
+
+ fprintf(fp, "%s,%d\n", string, value);
+ fclose(fp);
+ return TRUE;
+}
+#endif
+
+BOOL IsShiftJIS(unsigned char c)
+{
+ if (c >= 0x81 && c <= 0x9F)
+ return TRUE;
+
+ if (c >= 0xE0 && c <= 0xEF)
return TRUE;
- }
return FALSE;
}
-BOOL IsShiftJIS(unsigned char c)
+BOOL IsEnableBitmap(const char *path)
{
- if (c > 0x80 && c < 0xA0)
- return TRUE;
- if (c < 0xE0 || c >= 0xF0)
+ char str[16];
+ static const char *extra_text = "(C)Pixel";
+
+ const long len = (long)strlen(extra_text);
+
+ FILE *fp = fopen(path, "rb");
+
+ if (fp == NULL)
return FALSE;
- return TRUE;
+
+ fseek(fp, len * -1, SEEK_END);
+ fread(str, 1, len, fp);
+ fclose(fp);
+
+ if (memcmp(str, extra_text, len) != 0)
+ return FALSE;
+ else
+ return TRUE;
}
diff --git a/src/Generic.h b/src/Generic.h
index 191b38d7..4eff39b0 100644
--- a/src/Generic.h
+++ b/src/Generic.h
@@ -2,7 +2,18 @@
#include "WindowsWrapper.h"
+void GetCompileDate(int *year, int *month, int *day);
BOOL GetCompileVersion(int *v1, int *v2, int *v3, int *v4);
-long GetFileSizeLong(const char *path);
+#ifdef WINDOWS
+BOOL OpenVolumeConfiguration(HWND hWnd);
+void DeleteDebugLog(void);
+BOOL PrintDebugLog(const char *string, int value1, int value2, int value3);
+int CheckTime(SYSTEMTIME *system_time_low, SYSTEMTIME *system_time_high);
+#endif
BOOL CheckFileExists(const char *name);
+long GetFileSizeLong(const char *path);
+#ifdef WINDOWS
+BOOL PrintBitmapError(char *string, int value);
+#endif
BOOL IsShiftJIS(unsigned char c);
+BOOL IsEnableBitmap(const char *path);