From 398121f6cf28d3eac38a584ac54ef216772a9580 Mon Sep 17 00:00:00 2001
From: BlueAmulet <43395286+BlueAmulet@users.noreply.github.com>
Date: Sun, 29 Jan 2023 15:11:14 -0700
Subject: [PATCH] first commit
---
.gitignore | 398 +++++++++++++++++++++++++++++++++++++++++
BA_EngineFixes.sln | 28 +++
BA_EngineFixes.vcxproj | 136 ++++++++++++++
README.md | 5 +
dllmain.c | 167 +++++++++++++++++
packages.config | 5 +
6 files changed, 739 insertions(+)
create mode 100644 .gitignore
create mode 100644 BA_EngineFixes.sln
create mode 100644 BA_EngineFixes.vcxproj
create mode 100644 README.md
create mode 100644 dllmain.c
create mode 100644 packages.config
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..6864799
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,398 @@
+## Ignore Visual Studio temporary files, build results, and
+## files generated by popular Visual Studio add-ons.
+##
+## Get latest from https://github.com/github/gitignore/blob/main/VisualStudio.gitignore
+
+# User-specific files
+*.rsuser
+*.suo
+*.user
+*.userosscache
+*.sln.docstates
+
+# User-specific files (MonoDevelop/Xamarin Studio)
+*.userprefs
+
+# Mono auto generated files
+mono_crash.*
+
+# Build results
+[Dd]ebug/
+[Dd]ebugPublic/
+[Rr]elease/
+[Rr]eleases/
+[Rr]elVCLTL/
+x86/
+[Ww][Ii][Nn]32/
+bld/
+[Bb]in/
+[Oo]bj/
+[Ll]og/
+[Ll]ogs/
+
+# Visual Studio 2015/2017 cache/options directory
+.vs/
+# Uncomment if you have tasks that create the project's static files in wwwroot
+#wwwroot/
+
+# Visual Studio 2017 auto generated files
+Generated\ Files/
+
+# MSTest test Results
+[Tt]est[Rr]esult*/
+[Bb]uild[Ll]og.*
+
+# NUnit
+*.VisualState.xml
+TestResult.xml
+nunit-*.xml
+
+# Build Results of an ATL Project
+[Dd]ebugPS/
+[Rr]eleasePS/
+dlldata.c
+
+# Benchmark Results
+BenchmarkDotNet.Artifacts/
+
+# .NET Core
+project.lock.json
+project.fragment.lock.json
+artifacts/
+
+# ASP.NET Scaffolding
+ScaffoldingReadMe.txt
+
+# StyleCop
+StyleCopReport.xml
+
+# Files built by Visual Studio
+*_i.c
+*_p.c
+*_h.h
+*.ilk
+*.meta
+*.obj
+*.iobj
+*.pch
+*.pdb
+*.ipdb
+*.pgc
+*.pgd
+*.rsp
+*.sbr
+*.tlb
+*.tli
+*.tlh
+*.tmp
+*.tmp_proj
+*_wpftmp.csproj
+*.log
+*.tlog
+*.vspscc
+*.vssscc
+.builds
+*.pidb
+*.svclog
+*.scc
+
+# Chutzpah Test files
+_Chutzpah*
+
+# Visual C++ cache files
+ipch/
+*.aps
+*.ncb
+*.opendb
+*.opensdf
+*.sdf
+*.cachefile
+*.VC.db
+*.VC.VC.opendb
+
+# Visual Studio profiler
+*.psess
+*.vsp
+*.vspx
+*.sap
+
+# Visual Studio Trace Files
+*.e2e
+
+# TFS 2012 Local Workspace
+$tf/
+
+# Guidance Automation Toolkit
+*.gpState
+
+# ReSharper is a .NET coding add-in
+_ReSharper*/
+*.[Rr]e[Ss]harper
+*.DotSettings.user
+
+# TeamCity is a build add-in
+_TeamCity*
+
+# DotCover is a Code Coverage Tool
+*.dotCover
+
+# AxoCover is a Code Coverage Tool
+.axoCover/*
+!.axoCover/settings.json
+
+# Coverlet is a free, cross platform Code Coverage Tool
+coverage*.json
+coverage*.xml
+coverage*.info
+
+# Visual Studio code coverage results
+*.coverage
+*.coveragexml
+
+# NCrunch
+_NCrunch_*
+.*crunch*.local.xml
+nCrunchTemp_*
+
+# MightyMoose
+*.mm.*
+AutoTest.Net/
+
+# Web workbench (sass)
+.sass-cache/
+
+# Installshield output folder
+[Ee]xpress/
+
+# DocProject is a documentation generator add-in
+DocProject/buildhelp/
+DocProject/Help/*.HxT
+DocProject/Help/*.HxC
+DocProject/Help/*.hhc
+DocProject/Help/*.hhk
+DocProject/Help/*.hhp
+DocProject/Help/Html2
+DocProject/Help/html
+
+# Click-Once directory
+publish/
+
+# Publish Web Output
+*.[Pp]ublish.xml
+*.azurePubxml
+# Note: Comment the next line if you want to checkin your web deploy settings,
+# but database connection strings (with potential passwords) will be unencrypted
+*.pubxml
+*.publishproj
+
+# Microsoft Azure Web App publish settings. Comment the next line if you want to
+# checkin your Azure Web App publish settings, but sensitive information contained
+# in these scripts will be unencrypted
+PublishScripts/
+
+# NuGet Packages
+*.nupkg
+# NuGet Symbol Packages
+*.snupkg
+# The packages folder can be ignored because of Package Restore
+**/[Pp]ackages/*
+# except build/, which is used as an MSBuild target.
+!**/[Pp]ackages/build/
+# Uncomment if necessary however generally it will be regenerated when needed
+#!**/[Pp]ackages/repositories.config
+# NuGet v3's project.json files produces more ignorable files
+*.nuget.props
+*.nuget.targets
+
+# Microsoft Azure Build Output
+csx/
+*.build.csdef
+
+# Microsoft Azure Emulator
+ecf/
+rcf/
+
+# Windows Store app package directories and files
+AppPackages/
+BundleArtifacts/
+Package.StoreAssociation.xml
+_pkginfo.txt
+*.appx
+*.appxbundle
+*.appxupload
+
+# Visual Studio cache files
+# files ending in .cache can be ignored
+*.[Cc]ache
+# but keep track of directories ending in .cache
+!?*.[Cc]ache/
+
+# Others
+ClientBin/
+~$*
+*~
+*.dbmdl
+*.dbproj.schemaview
+*.jfm
+*.pfx
+*.publishsettings
+orleans.codegen.cs
+
+# Including strong name files can present a security risk
+# (https://github.com/github/gitignore/pull/2483#issue-259490424)
+#*.snk
+
+# Since there are multiple workflows, uncomment next line to ignore bower_components
+# (https://github.com/github/gitignore/pull/1529#issuecomment-104372622)
+#bower_components/
+
+# RIA/Silverlight projects
+Generated_Code/
+
+# Backup & report files from converting an old project file
+# to a newer Visual Studio version. Backup files are not needed,
+# because we have git ;-)
+_UpgradeReport_Files/
+Backup*/
+UpgradeLog*.XML
+UpgradeLog*.htm
+ServiceFabricBackup/
+*.rptproj.bak
+
+# SQL Server files
+*.mdf
+*.ldf
+*.ndf
+
+# Business Intelligence projects
+*.rdl.data
+*.bim.layout
+*.bim_*.settings
+*.rptproj.rsuser
+*- [Bb]ackup.rdl
+*- [Bb]ackup ([0-9]).rdl
+*- [Bb]ackup ([0-9][0-9]).rdl
+
+# Microsoft Fakes
+FakesAssemblies/
+
+# GhostDoc plugin setting file
+*.GhostDoc.xml
+
+# Node.js Tools for Visual Studio
+.ntvs_analysis.dat
+node_modules/
+
+# Visual Studio 6 build log
+*.plg
+
+# Visual Studio 6 workspace options file
+*.opt
+
+# Visual Studio 6 auto-generated workspace file (contains which files were open etc.)
+*.vbw
+
+# Visual Studio 6 auto-generated project file (contains which files were open etc.)
+*.vbp
+
+# Visual Studio 6 workspace and project file (working project files containing files to include in project)
+*.dsw
+*.dsp
+
+# Visual Studio 6 technical files
+*.ncb
+*.aps
+
+# Visual Studio LightSwitch build output
+**/*.HTMLClient/GeneratedArtifacts
+**/*.DesktopClient/GeneratedArtifacts
+**/*.DesktopClient/ModelManifest.xml
+**/*.Server/GeneratedArtifacts
+**/*.Server/ModelManifest.xml
+_Pvt_Extensions
+
+# Paket dependency manager
+.paket/paket.exe
+paket-files/
+
+# FAKE - F# Make
+.fake/
+
+# CodeRush personal settings
+.cr/personal
+
+# Python Tools for Visual Studio (PTVS)
+__pycache__/
+*.pyc
+
+# Cake - Uncomment if you are using it
+# tools/**
+# !tools/packages.config
+
+# Tabs Studio
+*.tss
+
+# Telerik's JustMock configuration file
+*.jmconfig
+
+# BizTalk build output
+*.btp.cs
+*.btm.cs
+*.odx.cs
+*.xsd.cs
+
+# OpenCover UI analysis results
+OpenCover/
+
+# Azure Stream Analytics local run output
+ASALocalRun/
+
+# MSBuild Binary and Structured Log
+*.binlog
+
+# NVidia Nsight GPU debugger configuration file
+*.nvuser
+
+# MFractors (Xamarin productivity tool) working folder
+.mfractor/
+
+# Local History for Visual Studio
+.localhistory/
+
+# Visual Studio History (VSHistory) files
+.vshistory/
+
+# BeatPulse healthcheck temp database
+healthchecksdb
+
+# Backup folder for Package Reference Convert tool in Visual Studio 2017
+MigrationBackup/
+
+# Ionide (cross platform F# VS Code tools) working folder
+.ionide/
+
+# Fody - auto-generated XML schema
+FodyWeavers.xsd
+
+# VS Code files for those working on multiple tools
+.vscode/*
+!.vscode/settings.json
+!.vscode/tasks.json
+!.vscode/launch.json
+!.vscode/extensions.json
+*.code-workspace
+
+# Local History for Visual Studio Code
+.history/
+
+# Windows Installer files from build outputs
+*.cab
+*.msi
+*.msix
+*.msm
+*.msp
+
+# JetBrains Rider
+*.sln.iml
+
+*.zip
diff --git a/BA_EngineFixes.sln b/BA_EngineFixes.sln
new file mode 100644
index 0000000..6c0a670
--- /dev/null
+++ b/BA_EngineFixes.sln
@@ -0,0 +1,28 @@
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio Version 17
+VisualStudioVersion = 17.4.33213.308
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "BA_EngineFixes", "BA_EngineFixes.vcxproj", "{D157FA91-9D06-48F0-8700-42873F47B4EE}"
+EndProject
+Global
+ GlobalSection(SolutionConfigurationPlatforms) = preSolution
+ Debug|x86 = Debug|x86
+ Release|x86 = Release|x86
+ RelVCLTL|x86 = RelVCLTL|x86
+ EndGlobalSection
+ GlobalSection(ProjectConfigurationPlatforms) = postSolution
+ {D157FA91-9D06-48F0-8700-42873F47B4EE}.Debug|x86.ActiveCfg = Debug|Win32
+ {D157FA91-9D06-48F0-8700-42873F47B4EE}.Debug|x86.Build.0 = Debug|Win32
+ {D157FA91-9D06-48F0-8700-42873F47B4EE}.Release|x86.ActiveCfg = Release|Win32
+ {D157FA91-9D06-48F0-8700-42873F47B4EE}.Release|x86.Build.0 = Release|Win32
+ {D157FA91-9D06-48F0-8700-42873F47B4EE}.RelVCLTL|x86.ActiveCfg = RelVCLTL|Win32
+ {D157FA91-9D06-48F0-8700-42873F47B4EE}.RelVCLTL|x86.Build.0 = RelVCLTL|Win32
+ EndGlobalSection
+ GlobalSection(SolutionProperties) = preSolution
+ HideSolutionNode = FALSE
+ EndGlobalSection
+ GlobalSection(ExtensibilityGlobals) = postSolution
+ SolutionGuid = {97BFCD9E-1DCE-4DAC-8CF8-6180A13590BD}
+ EndGlobalSection
+EndGlobal
diff --git a/BA_EngineFixes.vcxproj b/BA_EngineFixes.vcxproj
new file mode 100644
index 0000000..8f5e86c
--- /dev/null
+++ b/BA_EngineFixes.vcxproj
@@ -0,0 +1,136 @@
+
+
+
+
+
+
+ Debug
+ Win32
+
+
+ Release
+ Win32
+
+
+ RelVCLTL
+ Win32
+
+
+
+ 16.0
+ Win32Proj
+ {d157fa91-9d06-48f0-8700-42873f47b4ee}
+ BA_EngineFixes
+ 10.0
+
+
+
+ DynamicLibrary
+ true
+ v143
+ Unicode
+ false
+
+
+ DynamicLibrary
+ false
+ v143
+ true
+ Unicode
+ false
+
+
+ DynamicLibrary
+ false
+ v143
+ true
+ Unicode
+ true
+ 5.1.2600.0
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Level3
+ true
+ WIN32;_DEBUG;BA_EngineFixes_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)
+ true
+ NotUsing
+
+
+ Windows
+ true
+ false
+
+
+
+
+ Level3
+ true
+ true
+ WIN32;NDEBUG;BA_EngineFixes_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)
+ true
+ NotUsing
+ MultiThreaded
+ true
+
+
+ Windows
+ true
+ true
+ false
+ false
+
+
+
+
+ Level3
+ true
+ true
+ true
+ WIN32;NDEBUG;BA_EngineFixes_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)
+ true
+ NotUsing
+ MultiThreaded
+
+
+ Windows
+ true
+ true
+ false
+ false
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.
+
+
+
+
+
+
\ No newline at end of file
diff --git a/README.md b/README.md
new file mode 100644
index 0000000..ba2d072
--- /dev/null
+++ b/README.md
@@ -0,0 +1,5 @@
+# Blue's Oblivion Engine Fixes
+
+Currently just one bug fix.
+
+Oblivion looks for an underscore in a texture path with [strrchr](https://en.cppreference.com/w/c/string/byte/strrchr), but rather checking for NULL, it subtracts the result with the original string and checks if the length is negative. This happens to fail if the string is in the upper 2GB of memory.
diff --git a/dllmain.c b/dllmain.c
new file mode 100644
index 0000000..45a9769
--- /dev/null
+++ b/dllmain.c
@@ -0,0 +1,167 @@
+#define WIN32_LEAN_AND_MEAN
+#include
+
+// Version
+#define MAJOR 1
+#define MINOR 0
+#define BUILD 0
+
+#define _str(s) #s
+#define str(s) _str(s)
+
+// Quick logging routines
+static HANDLE hLogFile = INVALID_HANDLE_VALUE;
+
+static void lputs(const char* msg)
+{
+ if (hLogFile != INVALID_HANDLE_VALUE)
+ {
+ DWORD bytesWritten;
+ WriteFile(hLogFile, msg, strlen(msg), &bytesWritten, NULL);
+ FlushFileBuffers(hLogFile);
+ }
+}
+
+// Minimal OBSE Plugin structures
+#define OBL_1_2_0_416 0x10201A0
+
+typedef DWORD UInt32;
+
+typedef struct _OBSEInterface
+{
+ UInt32 obseVersion;
+ UInt32 runtimeVersion;
+ UInt32 editorVersion;
+ UInt32 isEditor;
+} OBSEInterface;
+
+enum
+{
+ kInfoVersion = 2
+};
+
+typedef struct _PluginInfo
+{
+ UInt32 infoVersion;
+ const char* name;
+ UInt32 version;
+} PluginInfo;
+
+// Patches
+#define JMPA(addr) push addr __asm ret
+
+// Improper strrchr return check
+__declspec(naked) int patch1(void)
+{
+ __asm
+ {
+ mov esi, eax
+ sub esi, ebx
+ add esp, 8
+ test eax, eax
+ jnz skip1
+ JMPA (4A27A1h)
+ skip1:
+ JMPA (4A26FEh)
+ }
+}
+
+// The patcher
+static void WriteBuffer(void* addr, void* data, size_t len)
+{
+ DWORD oldProtect;
+ VirtualProtect(addr, len, PAGE_EXECUTE_READWRITE, &oldProtect);
+ memcpy(addr, data, len);
+ VirtualProtect(addr, len, oldProtect, &oldProtect);
+}
+
+static void WriteJMP(char* dst, char* src, size_t len)
+{
+ // Make memory writable
+ DWORD oldProtect;
+ VirtualProtect(src, len, PAGE_EXECUTE_READWRITE, &oldProtect);
+
+ // Write JMP
+ src[0] = 0xE9;
+
+ // Calculate relative offset
+ unsigned char* address = dst - src - 5;
+ *(void**)(src + 1) = address;
+
+ // Fill rest of space with nops
+ for (size_t i = 5; i < len; i++)
+ {
+ src[i] = 0x90;
+ }
+
+ // Restore memory protections
+ VirtualProtect(src, len, oldProtect, &oldProtect);
+}
+
+// OBSE Plugin interface
+__declspec(dllexport) int OBSEPlugin_Query(const OBSEInterface* obse, PluginInfo* info)
+{
+ info->infoVersion = kInfoVersion;
+ info->name = "BA_EngineFixes";
+ info->version = MAJOR << 16 | MINOR << 8 | BUILD << 0;
+
+ if (obse->isEditor)
+ {
+ lputs("Invalid environment, loaded in editor\n");
+ return FALSE;
+ }
+ else if (obse->runtimeVersion != OBL_1_2_0_416)
+ {
+ lputs("Invalid environment, wrong oblivion version\n");
+ return FALSE;
+ }
+ return TRUE;
+}
+
+__declspec(dllexport) int OBSEPlugin_Load(const OBSEInterface* obse)
+{
+ if (obse->isEditor)
+ {
+ lputs("Invalid environment, loaded in editor\n");
+ return FALSE;
+ }
+ else if (obse->runtimeVersion != OBL_1_2_0_416)
+ {
+ lputs("Invalid environment, wrong oblivion version\n");
+ return FALSE;
+ }
+
+ // Apply patches
+ lputs("Patch1: Improper strrchr return check\n");
+ WriteJMP(&patch1, 0x4A26F7, 7);
+
+ // Done applying patches
+ lputs("Done applying patches\n");
+ return TRUE;
+}
+
+BOOL APIENTRY DllMain(HMODULE hModule, DWORD ul_reason_for_call, LPVOID lpReserved)
+{
+ switch (ul_reason_for_call)
+ {
+ case DLL_PROCESS_ATTACH:
+ // For optimization
+ DisableThreadLibraryCalls(hModule);
+
+ // Open Log file
+ hLogFile = CreateFileW(L"BA_EngineFixes.log", GENERIC_WRITE, FILE_SHARE_READ, NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL);
+ lputs("Blue's Engine Fixes v" str(MAJOR) "." str(MINOR) "." str(BUILD) " Initializing\n\n");
+ break;
+ case DLL_THREAD_ATTACH:
+ case DLL_THREAD_DETACH:
+ break;
+ case DLL_PROCESS_DETACH:
+ if (hLogFile != INVALID_HANDLE_VALUE)
+ {
+ CloseHandle(hLogFile);
+ hLogFile = INVALID_HANDLE_VALUE;
+ }
+ break;
+ }
+ return TRUE;
+}
diff --git a/packages.config b/packages.config
new file mode 100644
index 0000000..35dff17
--- /dev/null
+++ b/packages.config
@@ -0,0 +1,5 @@
+
+
+
+
+
\ No newline at end of file