Skip to content

Update Enter the Matrix Widescreen Fix for Patch v1.2 #1648

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Update Enter the Matrix Widescreen Fix for Patch v1.2 #1648

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
117 changes: 85 additions & 32 deletions source/EnterTheMatrix.WidescreenFix/dllmain.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,31 +22,31 @@ struct Screen
int32_t nWidescreenHudOffset;
} Screen;

injector::hook_back<void*(__cdecl*)(int a1, int a2, int a3, int a4, int a5, int a6, int a7, int a8, int a9)> hb_5F27E2;
void* __cdecl sub_5F27E2(int a1, int a2, int a3, int a4, int a5, int a6, int a7, int a8, int a9)
injector::hook_back<void*(__cdecl*)(int a1, int a2, int a3, int a4, int a5, int a6, int a7, int a8, int a9)> hb_5F34C0;
void* __cdecl sub_5F34C0(int a1, int a2, int a3, int a4, int a5, int a6, int a7, int a8, int a9)
{
if ((a8 == 642 && a9 == 450) || (a8 == 640 && a9 == 448) || (a8 == 641 && a9 == 58))
return hb_5F27E2.fun(a1, a2, a3, a4, a5, a6, a7, a8, a9);
return hb_5F34C0.fun(a1, a2, a3, a4, a5, a6, a7, a8, a9);

a5 = static_cast<int32_t>(static_cast<float>(a5) / Screen.fHudScale);
a8 = static_cast<int32_t>(static_cast<float>(a8) / Screen.fHudScale);
a5 += static_cast<int32_t>(Screen.fHudOffsetReal / (Screen.fWidth / 640.0f));

return hb_5F27E2.fun(a1, a2, a3, a4, a5, a6, a7, a8, a9);
return hb_5F34C0.fun(a1, a2, a3, a4, a5, a6, a7, a8, a9);
}

injector::hook_back<void*(__cdecl*)(int a1, int a2, int a3, int a4, int a5, int a6, int a7, int a8, int a9)> hb_5F28E2;
void* __cdecl sub_5F28E2(int a1, int a2, int a3, int a4, int a5, int a6, int a7, int a8, int a9)
injector::hook_back<void*(__cdecl*)(int a1, int a2, int a3, int a4, int a5, int a6, int a7, int a8, int a9)> hb_5F35C0;
void* __cdecl sub_5F35C0(int a1, int a2, int a3, int a4, int a5, int a6, int a7, int a8, int a9)
{
a5 = static_cast<int32_t>(static_cast<float>(a5) / Screen.fHudScale);
a6 = static_cast<int32_t>(static_cast<float>(a6) / Screen.fHudScale);
a5 += static_cast<int32_t>(Screen.fHudOffsetReal / (Screen.fWidth / 640.0f));

return hb_5F28E2.fun(a1, a2, a3, a4, a5, a6, a7, a8, a9);
return hb_5F35C0.fun(a1, a2, a3, a4, a5, a6, a7, a8, a9);
}

injector::hook_back<void*(__cdecl*)(int a1, int a2, int a3, int a4, int a5, int a6, float a7, void* a8, float a9, int a10)> hb_608BF9;
void* __cdecl sub_608BF9(int a1, int a2, int a3, int a4, int a5, int a6, float a7, void* a8, float a9, int a10)
injector::hook_back<void*(__cdecl*)(int a1, int a2, int a3, int a4, int a5, int a6, float a7, void* a8, float a9, int a10)> hb_60AC93;
void* __cdecl sub_60AC93(int a1, int a2, int a3, int a4, int a5, int a6, float a7, void* a8, float a9, int a10)
{
if (Screen.nWidescreenHudOffset)
{
Expand All @@ -62,10 +62,10 @@ void* __cdecl sub_608BF9(int a1, int a2, int a3, int a4, int a5, int a6, float a
}
}

return hb_608BF9.fun(a1, a2, a3, a4, a5, a6, a7, a8, a9, a10);
return hb_60AC93.fun(a1, a2, a3, a4, a5, a6, a7, a8, a9, a10);
}

void InitSettings()
void InitCDSettings()
{
static std::vector<std::string> list;
GetResolutionsList(list);
Expand Down Expand Up @@ -117,15 +117,67 @@ void InitSettings()
}; injector::MakeInline<MatrixOptionsHook>(pattern.get_first(0), pattern.get_first(18)); //0x406B9F, 0x406BB1
}

void InitDVDSettings()
{
static std::vector<std::string> list;
GetResolutionsList(list);

static auto dword_4270D8 = *hook::get_pattern<uint32_t*>("8B 0D ? ? ? ? 8D 54 24 0C 51", 2);
auto pattern = hook::pattern("8B 45 04 85 C0 74");
struct ResListHook
{
void operator()(injector::reg_pack& regs)
{
char iniPath[MAX_PATH];
GetModuleFileNameA(NULL, iniPath, MAX_PATH);
*strrchr(iniPath, '\\') = '\0';
strcat_s(iniPath, "\\MatrixConfig.ini");
CIniReader iniReader(iniPath);
int32_t iniResX = 0, iniResY = 0;
std::tie(iniResX, iniResY) = GetDesktopRes();
char defVal[20];
sprintf_s(defVal, "%dx%d", iniResX, iniResY);
auto iniRes = iniReader.ReadString("RENDERING", "RESOLUTION", defVal);
//sscanf_s(iniRes, "%dx%d", &iniResX, &iniResY);
int32_t i = 0, mode = 0;
for (auto &res : list)
{
SendMessageA(*((HWND*)(regs.esi + 0x1460)), 0x143u, 0, (LPARAM)(res.c_str()));

if (res == iniRes)
mode = i;

++i;
}
SendMessageA(*((HWND*)(regs.esi + 0x1460)), 0x14Eu, mode, 0);
*dword_4270D8 = mode;
}
}; injector::MakeInline<ResListHook>(pattern.get_first(0), pattern.get_first(125)); //0x406055, 0x4060D2

pattern = hook::pattern("68 ? ? ? ? 50 68 ? ? ? ? 68 ? ? ? ? FF D6 8D 4C 24 0C 51");
struct MatrixOptionsHook
{
void operator()(injector::reg_pack& regs)
{
char iniPath[MAX_PATH];
GetModuleFileNameA(NULL, iniPath, MAX_PATH);
*strrchr(iniPath, '\\') = '\0';
strcat_s(iniPath, "\\MatrixConfig.ini");
CIniReader iniReader(iniPath);
iniReader.WriteString("RENDERING", "RESOLUTION", (char*)list[*dword_4270D8].c_str());
}
}; injector::MakeInline<MatrixOptionsHook>(pattern.get_first(0), pattern.get_first(18)); //0x406C0F, 0x406C21
}

void Init()
{
CIniReader iniReader("");
bool bFixHud = iniReader.ReadInteger("MAIN", "FixHud", 1) != 0;
Screen.fWidescreenHudOffset = iniReader.ReadFloat("MAIN", "WidescreenHudOffset", 100.0f);

auto pattern = hook::pattern("68 ? ? ? ? 6A 00 68 ? ? ? ? 68 ? ? ? ? FF 15 ? ? ? ? 89 85 EC FA FF FF 8B 8D");
static auto dword_93B7B0 = *hook::get_pattern<int32_t*>("A1 ? ? ? ? 89 45 E0 8B 0D ? ? ? ? 89 4D E4 33 D2", 1);
static auto dword_93B7B4 = *hook::get_pattern<int32_t*>("A1 ? ? ? ? 89 45 E0 8B 0D ? ? ? ? 89 4D E4 33 D2", 10);
static auto dword_947F60 = *hook::get_pattern<int32_t*>("8B ? ? ? ? 00 89 55 E0 A1 ? ? ? ? 89 45 E4 33 C9", 2);
static auto dword_947F64 = *hook::get_pattern<int32_t*>("8B ? ? ? ? 00 89 55 E0 A1 ? ? ? ? 89 45 E4 33 C9", 10);
struct ResHook
{
void operator()(injector::reg_pack& regs)
Expand All @@ -141,8 +193,8 @@ void Init()
auto iniRes = iniReader.ReadString("RENDERING", "RESOLUTION", defVal);
sscanf_s(iniRes.c_str(), "%dx%d", &Screen.nWidth, &Screen.nHeight);

*dword_93B7B0 = Screen.nWidth;
*dword_93B7B4 = Screen.nHeight;
*dword_947F60 = Screen.nWidth;
*dword_947F64 = Screen.nHeight;

Screen.fWidth = static_cast<float>(Screen.nWidth);
Screen.fHeight = static_cast<float>(Screen.nHeight);
Expand All @@ -164,20 +216,20 @@ void Init()
Screen.nWidescreenHudOffset = static_cast<int32_t>(Screen.fWidescreenHudOffset);
}
}
}; injector::MakeInline<ResHook>(pattern.get_first(0), pattern.get_first(186)); //0x7AD916, 0x7AD9D0
}; injector::MakeInline<ResHook>(pattern.get_first(0), pattern.get_first(237)); //0x7B8AF0, 0x7B8BDD

//Aspect Ratio
pattern = hook::pattern("D9 05 ? ? ? ? D8 35 ? ? ? ? D9 1D ? ? ? ? 5D C3");
static auto flt_972448 = *pattern.get_first<float*>(8);
static auto flt_97244C = *pattern.get_first<float*>(14);
static auto flt_97EDA8 = *pattern.get_first<float*>(8);
static auto flt_97EDAC = *pattern.get_first<float*>(14);
struct ARHook
{
void operator()(injector::reg_pack& regs)
{
*flt_972448 = 1.0f;
*flt_97244C = 1.0f;
*flt_97EDA8 = 1.0f;
*flt_97EDAC = 1.0f;
}
}; injector::MakeInline<ARHook>(pattern.get_first(0), pattern.get_first(18)); //0x6E6024, 0x6E6024+18
}; injector::MakeInline<ARHook>(pattern.get_first(0), pattern.get_first(18)); //0x6EAE96, 0x6EAE96+18

//FMVs
pattern = hook::pattern("C7 45 10 00 00 00 00 C7 45 18 80 02 00 00 8B 45 E4");
Expand All @@ -188,26 +240,27 @@ void Init()
*(int32_t*)(regs.ebp + 0x10) = 0 + static_cast<int32_t>(Screen.fFMVOffset);
*(int32_t*)(regs.ebp + 0x18) = 640 - static_cast<int32_t>(Screen.fFMVOffset + Screen.fFMVOffset);
}
}; injector::MakeInline<FMVHook>(pattern.get_first(0), pattern.get_first(14)); //0x7B3369
}; injector::MakeInline<FMVHook>(pattern.get_first(0), pattern.get_first(14)); //0x7BE620

if (bFixHud)
{
pattern = hook::pattern("6A 02 FF 15 ? ? ? ? 83 C4 04 C7 05"); //0x40766C
hb_5F27E2.fun = injector::MakeJMP(*pattern.get_first<void*>(157), sub_5F27E2, true).get(); // hud
pattern = hook::pattern("E8 ? ? ? ? 83 C4 1C 83 3D ? ? ? ? 00 75 ? 8B 55 FC"); //0x403882
hb_5F28E2.fun = injector::MakeJMP(injector::GetBranchDestination(pattern.get_first(0)), sub_5F28E2, true).get(); // text
pattern = hook::pattern("E8 ? ? ? ? 83 C4 28 8B 15 ? ? ? ? DB 42 1C"); //0x407013
hb_608BF9.fun = injector::MakeJMP(injector::GetBranchDestination(pattern.get_first(0)), sub_608BF9, true).get();
pattern = hook::pattern("6A 02 FF 15 ? ? ? ? 83 C4 04 C7 05"); //0x4076CB
hb_5F34C0.fun = injector::MakeJMP(*pattern.get_first<void*>(157), sub_5F34C0, true).get(); // hud
pattern = hook::pattern("E8 ? ? ? ? 83 C4 1C 83 3D ? ? ? ? 00 75 ? 8B 55 FC"); //0x403887
hb_5F35C0.fun = injector::MakeJMP(injector::GetBranchDestination(pattern.get_first(0)), sub_5F35C0, true).get(); // text
pattern = hook::pattern("E8 ? ? ? ? 83 C4 28 8B 15 ? ? ? ? DB 42 1C"); //0x407068
hb_60AC93.fun = injector::MakeJMP(injector::GetBranchDestination(pattern.get_first(0)), sub_60AC93, true).get();
}
}

CEXP void InitializeASI()
{
std::call_once(CallbackHandler::flag, []()
{
CallbackHandler::RegisterCallback(Init, hook::pattern("55 8B EC 83 EC 34 56 6A 00 6A FF"));
CallbackHandler::RegisterCallback(InitSettings, hook::pattern("8B 45 04 85 C0 74 6B 8B 15"));
});
{
CallbackHandler::RegisterCallback(Init, hook::pattern("55 8B EC 83 EC 34 56 6A 00 6A FF"));
CallbackHandler::RegisterCallback(InitCDSettings, hook::pattern("8B 45 04 85 C0 74 6B 8B 15"));
CallbackHandler::RegisterCallback(InitDVDSettings, hook::pattern("8B 45 04 85 C0 74 6A A1 F8"));
});
}

BOOL APIENTRY DllMain(HMODULE hModule, DWORD reason, LPVOID lpReserved)
Expand Down