mirror of
https://github.com/Mauler125/r5sdk.git
synced 2025-02-09 19:15:03 +01:00
commit 4da14d7ddecc0d8c322fc7ee372be67481fb0b99 Author: IcePixelx <41352111+PixieCore@users.noreply.github.com> Date: Sat Jan 15 20:13:11 2022 +0100 Cleaned up native server browser and commented functions. commit b366e4ce826c9c7dbeb2af26cb6c34656b2c93f2 Author: r-ex <67599507+r-ex@users.noreply.github.com> Date: Sat Jan 15 17:57:18 2022 +0000 sq server browser clean up (#63) * sq server browser clean up * Properly loop through std::vector on GetAvailableMaps. Co-authored-by: IcePixelx <41352111+PixieCore@users.noreply.github.com> commit 829e122cead5521d5ffa57daa7e9fbd10755d68f Author: IcePixelx <41352111+PixieCore@users.noreply.github.com> Date: Sat Jan 15 15:25:19 2022 +0100 SQ Serverbrowser V1 push. Clean-up following after @r-ex fixed SQ things. commit 29fe6be989f176321406e4e521da406e65229acd Author: IcePixelx <41352111+PixieCore@users.noreply.github.com> Date: Fri Jan 14 20:59:06 2022 +0100 Fix pre-compiled headers for imgui_utility.cpp commit f2f8a088bfbc8b7311f2efb402963eb3b0802a46 Author: Amos <48657826+Mauler125@users.noreply.github.com> Date: Fri Jan 14 20:51:32 2022 +0100 Fix compiler error caused merge from separate branch commit 1c5df4e178a29234139c3ebf06b25fcd795689ea Author: Amos <48657826+Mauler125@users.noreply.github.com> Date: Fri Jan 14 20:45:36 2022 +0100 Ansi terminal color support + big optimizations on all log systems + 'Warning()' hook * Ansi colors can now be enabled with the '-ansiclr- flag. * All loggers have been optimized and are all initialized only once at process startup. * New hook for 'Warning()' print function with warning level. commit 012a317c846ba4fcf727ffb97678ee080f2dd976 Author: Amos <48657826+Mauler125@users.noreply.github.com> Date: Fri Jan 14 15:39:09 2022 +0100 Update init.cpp commit a14480e7cfdb869d222da04275f2619ca1405ce3 Author: Amos <48657826+Mauler125@users.noreply.github.com> Date: Fri Jan 14 15:38:48 2022 +0100 Update stdafx.h commit bdc67e90cb5624ee5d9f8a3620fe64a0d80726a5 Author: Amos <48657826+Mauler125@users.noreply.github.com> Date: Fri Jan 14 15:37:08 2022 +0100 Set default spdlog level to trace commit 96ee434d4e58a79a091cb0fee0caa5d838f629df Author: Amos <48657826+Mauler125@users.noreply.github.com> Date: Fri Jan 14 15:36:51 2022 +0100 Fix missing header errors for SpdLog commit 6bbb16dcb9f821e6f71bbfa9f0b4b12167907f43 Author: IcePixelx <41352111+PixieCore@users.noreply.github.com> Date: Fri Jan 14 20:39:11 2022 +0100 Fix sendrequest crash. Due to htResults being null. commit 5612c7a3a7e38f725b17e98d17d06f146135feae Author: Amos <48657826+Mauler125@users.noreply.github.com> Date: Wed Jan 12 13:11:11 2022 +0100 This seems no longer needed for dedicated servers Shader/texture assets are no longer loaded where the pointer parameters to the asset unloading function won't be out of scope anymore commit e6254e3a036b26a70b4dc29df7f8a5082a0f5297 Author: Amos <48657826+Mauler125@users.noreply.github.com> Date: Wed Jan 12 13:09:06 2022 +0100 Fix issue with ImGui windows where input could loose focus and not work 'ImGui_ImplWin32_WndProcHandler' has to be called at all times from the HwndProc handler as it has to track all events to prevent issues with input. commit de3b3f53bd2c32015e9accaed873d06a722ab7da Author: Amos <48657826+Mauler125@users.noreply.github.com> Date: Wed Jan 12 02:53:07 2022 +0100 Optimizations + QoL improvements/cleanup * IConsole overlay now clears the oldest log entries to stay under the vector limit instead of clearing the whole vector. * IConsole code cleanup. * IBrowser code cleanup, reordered class methods. * Use ConVar utilities to get/set values for strings in IBrowser and IConsole. * New ConVar's for RUI console overlay to tweak colors. commit 44102abbcca2d088dcb253da8ec7c9b869064139 Author: Amos <48657826+Mauler125@users.noreply.github.com> Date: Mon Jan 10 02:47:19 2022 +0100 Execute dev configs when '-devsdk' parameter is passed commit 8d1023212abd8e2b250f5fb7b33fdfa329b07b40 Author: Amos <48657826+Mauler125@users.noreply.github.com> Date: Mon Jan 10 02:24:30 2022 +0100 Small alignment commit 38d9d431c9aaef1ede7b6ceb594aa9b9971c261f Author: Amos <48657826+Mauler125@users.noreply.github.com> Date: Mon Jan 10 02:03:31 2022 +0100 Fix potential bug where 'cm_return_false_cmdquery_all' cvar would never work commit c0f24e64ff04bacb8d5b51961de1687dfb75bc71 Author: Amos <48657826+Mauler125@users.noreply.github.com> Date: Mon Jan 10 01:31:25 2022 +0100 Rename global cvar pointer commit 0146f22e0a8bcd7ec137bb205d117cea49f533dc Author: Amos <48657826+Mauler125@users.noreply.github.com> Date: Mon Jan 10 01:20:44 2022 +0100 Implement CommandLine utilities commit 64c07af6e067bc85385a78981d29770eebd3eb6b Author: Amos <48657826+Mauler125@users.noreply.github.com> Date: Sun Jan 9 17:17:05 2022 +0100 Cleanup to use new ConVar utilities commit 19f5010bd26e010746436766c05515dff85d7695 Author: Amos <48657826+Mauler125@users.noreply.github.com> Date: Sun Jan 9 16:29:36 2022 +0100 Fix compiler error + rename debug dll's Rename for easier debugging and config separation commit c292d8ad46b22c7a34c6d3caf8143e131e8dd997 Author: Amos <48657826+Mauler125@users.noreply.github.com> Date: Sun Jan 9 16:14:17 2022 +0100 Implement new ConVar features Slight cleanup with new ConVar features to be used throughout the SDK commit 0177c17da94dc977f85babe2aa8168cefb56bf45 Author: Amos <48657826+Mauler125@users.noreply.github.com> Date: Sat Jan 8 02:05:33 2022 +0100 Draw simulation stats and GPU stats to debug text overlay commit 21a10e201b6ea7afd4ffdd7d6b9668806085b6a5 Author: IcePixelx <41352111+PixieCore@users.noreply.github.com> Date: Sun Jan 9 14:36:22 2022 +0100 Typos. commit ae09372cc79053f5515529e403402494ffa6dfe4 Author: IcePixelx <41352111+PixieCore@users.noreply.github.com> Date: Sun Jan 9 14:35:43 2022 +0100 Pylon system changes. commit 98a428ace9226442fa623a0870af9f7e12f35eb0 Author: Amos <48657826+Mauler125@users.noreply.github.com> Date: Fri Jan 7 01:03:35 2022 +0100 Fix S2 crash when launching a different version commit c98301d175b8b1b80b2f480bc29e0703cf12c350 Author: Amos <48657826+Mauler125@users.noreply.github.com> Date: Thu Jan 6 17:30:10 2022 +0100 Fix LZHAM recompiling pch for each implementation file commit b80be10c4dc2c1f27917cd68a2c4c47819ee5fe5 Author: Amos <48657826+Mauler125@users.noreply.github.com> Date: Thu Jan 6 15:08:39 2022 +0100 Compile LZHAM with the solution. Fix missing detours files for sdklauncher commit a0b7bbf3661cc9b4d2d0cdefe9050a78f1c2bc67 Author: Amos <48657826+Mauler125@users.noreply.github.com> Date: Thu Jan 6 02:22:28 2022 +0100 Compile Microsoft Detours with the solution commit 9a3175fb6df047445e26ca3d4692e42f01cbabc8 Author: Amos <48657826+Mauler125@users.noreply.github.com> Date: Thu Jan 6 01:51:55 2022 +0100 Fix console input text reclaim to reflect latest ImGui changes commit 556894b3e3d81e41fa461321a749f50aa0eb169f Author: Amos <48657826+Mauler125@users.noreply.github.com> Date: Wed Jan 5 23:50:14 2022 +0100 Add connect command fix back Accidentally removed. commit 1612c439d2bb68fea29b4804b67c7de7a2aeaed7 Author: Amos <48657826+Mauler125@users.noreply.github.com> Date: Wed Jan 5 23:44:01 2022 +0100 Fix project filters commit 47fdd4211d3088a84aeb93e425288928d1b37e70 Author: Amos <48657826+Mauler125@users.noreply.github.com> Date: Wed Jan 5 23:43:51 2022 +0100 Fix for S3 For some reason the same byte pattern wasn't found in the miles dll for the S3 game, even though they where identical. Changed the byte patterns to search for the last 2 bytes of the instruction as well and made the conditional jmp instructions, unconditional for making sure mileswin64.dll doesn't close the process when a debugger is found. commit d52bd5eeec4f9f86422b3864446521c4ca46f02b Author: Amos <48657826+Mauler125@users.noreply.github.com> Date: Wed Jan 5 22:56:49 2022 +0100 Initial support for S1 commit 7c3994dfc280d8312632c9256f40a776c13158a4 Author: IcePixelx <41352111+PixieCore@users.noreply.github.com> Date: Wed Jan 5 19:23:53 2022 +0100 dedicated refuselist commit c486c2d59354b3672709013c24454017fdce5cf2 Author: Amos <48657826+Mauler125@users.noreply.github.com> Date: Wed Jan 5 02:07:37 2022 +0100 Portability to S2 completed CServer functions are evolving quite heavily over these seasons, so these need a bit of work commit fbcea85631fe9ee1b378a3fc6657908230b85403 Author: Amos <48657826+Mauler125@users.noreply.github.com> Date: Tue Jan 4 12:11:59 2022 +0100 Fix compiler error caused by merging commits from different branches commit 84e7729ca045c05e4add7f05d09d032833e39a7b Author: Amos <48657826+Mauler125@users.noreply.github.com> Date: Tue Jan 4 11:53:54 2022 +0100 Add client and debug utilities + cleanup commit 477152b35443246dace6f5b4deccd52ea1cc6e9c Author: Amos <48657826+Mauler125@users.noreply.github.com> Date: Fri Dec 31 03:45:48 2021 +0100 Fix compiler error commit 5f664d8e6ba9a2e0bd72c29c5f4ba5279e29e75a Author: Amos <48657826+Mauler125@users.noreply.github.com> Date: Fri Dec 31 03:41:33 2021 +0100 Create signatures for all used Dedicated functions commit 2c7ced128d8c48a5abf8fd64dbb06909dc632f35 Author: Amos <48657826+Mauler125@users.noreply.github.com> Date: Thu Dec 30 22:13:15 2021 +0100 Heavy dedicated cleanup * Since the material mode is set to '2', all of the render loops and shader loading functions are no longer called. These have all been removed. * Added description for patches that missed them * Traced root caller/cause for certain patches to skip even more unnecessary code and save more memory. commit 22c0b5c867664a2524c18d865dbc54ff067dda22 Author: Amos <48657826+Mauler125@users.noreply.github.com> Date: Thu Dec 30 17:20:41 2021 +0100 Dedicated server improvements commit 6d4f7e345f38872ce45751604b40871b969cec8f Author: Amos <48657826+Mauler125@users.noreply.github.com> Date: Thu Dec 30 02:47:42 2021 +0100 Fix a typo commit 39a8a8fd30612522a274e1474c9a66e5019aeea3 Author: Amos <48657826+Mauler125@users.noreply.github.com> Date: Thu Dec 30 02:36:43 2021 +0100 Implement patch to enable 'DrawAllOverlays()'. commit 83129e88f8a6033f8f4c13e3cac639097068cb3c Author: Amos <48657826+Mauler125@users.noreply.github.com> Date: Wed Dec 29 22:59:34 2021 +0100 Fix LLVM compiler error commit c48ed7f7a53a9985e3c2642db3639007d7c9129a Author: Amos <48657826+Mauler125@users.noreply.github.com> Date: Wed Dec 29 18:06:37 2021 +0100 Rename dedicated variables commit d1ba2bd56720a0776824a8e309d7d859704244bc Author: IcePixelx <41352111+PixieCore@users.noreply.github.com> Date: Wed Dec 29 15:35:48 2021 +0100 Fixed changelevel, needs more research tho. commit 46950125716c05171f25a12d8805811112e90551 Author: Amos <48657826+Mauler125@users.noreply.github.com> Date: Wed Dec 29 13:58:03 2021 +0100 Fix 'C_PropDoor' not spawning properly on the server commit 6a9a00735a9d4b8c415acc248c83e6e8d6dc2ff1 Author: Amos <48657826+Mauler125@users.noreply.github.com> Date: Wed Dec 29 13:57:16 2021 +0100 Rename hooked command callbacks commit b514f928a69a9c4ac1d3d1e5c662f93a1f0d131d Author: Amos <48657826+Mauler125@users.noreply.github.com> Date: Wed Dec 29 02:16:21 2021 +0100 Use a separate executable for dedicated server The dedicated server still has directx dll imports which will cause issues with ReShade or 3DMigoto, or trying to load it on a headless machine with no directx installed. The imports have to be cleared to avoid issues. The most convenient approach is to do this with a separate exe rather then patching it in runtime. commit bc8f9400d3911e360757059700a31510e329546d Author: Amos <48657826+Mauler125@users.noreply.github.com> Date: Wed Dec 29 00:18:56 2021 +0100 Fix collisions for headless dedicated server commit 0e36aa647ffb15ca4f8c76b0431f7c3a83741d80 Author: Amos <48657826+Mauler125@users.noreply.github.com> Date: Tue Dec 28 20:19:17 2021 +0100 Dedicated without ShaderApi and DirectX pre-alpha The instruction at 'CalcPropStaticFrustumCull' [0x14028F3B0 + 0x5C7] moves RSP + 0x70 into the R13 register. RSP + 0x70 seems to contain a pointer to collission data for that particular prop model. When running NoShaderApi() and passing the dedicated server the '-noshaderapi' command line parameter, RSP + 0x70 will be a nullptr. This has to be fixed to have prop static collissions on the server.
336 lines
12 KiB
C++
336 lines
12 KiB
C++
//////////////////////////////////////////////////////////////////////////////
|
|
//
|
|
// Add DLLs to a module import table (uimports.cpp of detours.lib)
|
|
//
|
|
// Microsoft Research Detours Package, Version 4.0.1
|
|
//
|
|
// Copyright (c) Microsoft Corporation. All rights reserved.
|
|
//
|
|
// Note that this file is included into creatwth.cpp one or more times
|
|
// (once for each supported module format).
|
|
//
|
|
|
|
#include "../include/detours.h"
|
|
|
|
#if DETOURS_VERSION != 0x4c0c1 // 0xMAJORcMINORcPATCH
|
|
#error detours.h version mismatch
|
|
#endif
|
|
|
|
// UpdateImports32 aka UpdateImports64
|
|
static BOOL UPDATE_IMPORTS_XX(HANDLE hProcess,
|
|
HMODULE hModule,
|
|
__in_ecount(nDlls) LPCSTR *plpDlls,
|
|
DWORD nDlls)
|
|
{
|
|
BOOL fSucceeded = FALSE;
|
|
DWORD cbNew = 0;
|
|
|
|
BYTE * pbNew = NULL;
|
|
DWORD i;
|
|
SIZE_T cbRead;
|
|
DWORD n;
|
|
|
|
PBYTE pbModule = (PBYTE)hModule;
|
|
|
|
IMAGE_DOS_HEADER idh;
|
|
ZeroMemory(&idh, sizeof(idh));
|
|
if (!ReadProcessMemory(hProcess, pbModule, &idh, sizeof(idh), &cbRead)
|
|
|| cbRead < sizeof(idh)) {
|
|
|
|
DETOUR_TRACE(("ReadProcessMemory(idh@%p..%p) failed: %lu\n",
|
|
pbModule, pbModule + sizeof(idh), GetLastError()));
|
|
|
|
finish:
|
|
if (pbNew != NULL) {
|
|
delete[] pbNew;
|
|
pbNew = NULL;
|
|
}
|
|
return fSucceeded;
|
|
}
|
|
|
|
IMAGE_NT_HEADERS_XX inh;
|
|
ZeroMemory(&inh, sizeof(inh));
|
|
|
|
if (!ReadProcessMemory(hProcess, pbModule + idh.e_lfanew, &inh, sizeof(inh), &cbRead)
|
|
|| cbRead < sizeof(inh)) {
|
|
DETOUR_TRACE(("ReadProcessMemory(inh@%p..%p) failed: %lu\n",
|
|
pbModule + idh.e_lfanew,
|
|
pbModule + idh.e_lfanew + sizeof(inh),
|
|
GetLastError()));
|
|
goto finish;
|
|
}
|
|
|
|
if (inh.OptionalHeader.Magic != IMAGE_NT_OPTIONAL_HDR_MAGIC_XX) {
|
|
DETOUR_TRACE(("Wrong size image (%04x != %04x).\n",
|
|
inh.OptionalHeader.Magic, IMAGE_NT_OPTIONAL_HDR_MAGIC_XX));
|
|
SetLastError(ERROR_INVALID_BLOCK);
|
|
goto finish;
|
|
}
|
|
|
|
// Zero out the bound table so loader doesn't use it instead of our new table.
|
|
inh.BOUND_DIRECTORY.VirtualAddress = 0;
|
|
inh.BOUND_DIRECTORY.Size = 0;
|
|
|
|
// Find the size of the mapped file.
|
|
DWORD dwSec = idh.e_lfanew +
|
|
FIELD_OFFSET(IMAGE_NT_HEADERS_XX, OptionalHeader) +
|
|
inh.FileHeader.SizeOfOptionalHeader;
|
|
|
|
for (i = 0; i < inh.FileHeader.NumberOfSections; i++) {
|
|
IMAGE_SECTION_HEADER ish;
|
|
ZeroMemory(&ish, sizeof(ish));
|
|
|
|
if (!ReadProcessMemory(hProcess, pbModule + dwSec + sizeof(ish) * i, &ish,
|
|
sizeof(ish), &cbRead)
|
|
|| cbRead < sizeof(ish)) {
|
|
|
|
DETOUR_TRACE(("ReadProcessMemory(ish@%p..%p) failed: %lu\n",
|
|
pbModule + dwSec + sizeof(ish) * i,
|
|
pbModule + dwSec + sizeof(ish) * (i + 1),
|
|
GetLastError()));
|
|
goto finish;
|
|
}
|
|
|
|
DETOUR_TRACE(("ish[%lu] : va=%08lx sr=%lu\n", i, ish.VirtualAddress, ish.SizeOfRawData));
|
|
|
|
// If the linker didn't suggest an IAT in the data directories, the
|
|
// loader will look for the section of the import directory to be used
|
|
// for this instead. Since we put out new IMPORT_DIRECTORY outside any
|
|
// section boundary, the loader will not find it. So we provide one
|
|
// explicitly to avoid the search.
|
|
//
|
|
if (inh.IAT_DIRECTORY.VirtualAddress == 0 &&
|
|
inh.IMPORT_DIRECTORY.VirtualAddress >= ish.VirtualAddress &&
|
|
inh.IMPORT_DIRECTORY.VirtualAddress < ish.VirtualAddress + ish.SizeOfRawData) {
|
|
|
|
inh.IAT_DIRECTORY.VirtualAddress = ish.VirtualAddress;
|
|
inh.IAT_DIRECTORY.Size = ish.SizeOfRawData;
|
|
}
|
|
}
|
|
|
|
if (inh.IMPORT_DIRECTORY.VirtualAddress != 0 && inh.IMPORT_DIRECTORY.Size == 0) {
|
|
|
|
// Don't worry about changing the PE file,
|
|
// because the load information of the original PE header has been saved and will be restored.
|
|
// The change here is just for the following code to work normally
|
|
|
|
PIMAGE_IMPORT_DESCRIPTOR pImageImport = (PIMAGE_IMPORT_DESCRIPTOR)(pbModule + inh.IMPORT_DIRECTORY.VirtualAddress);
|
|
|
|
do {
|
|
IMAGE_IMPORT_DESCRIPTOR ImageImport;
|
|
if (!ReadProcessMemory(hProcess, pImageImport, &ImageImport, sizeof(ImageImport), NULL)) {
|
|
DETOUR_TRACE(("ReadProcessMemory failed: %lu\n", GetLastError()));
|
|
goto finish;
|
|
}
|
|
inh.IMPORT_DIRECTORY.Size += sizeof(IMAGE_IMPORT_DESCRIPTOR);
|
|
if (!ImageImport.Name) {
|
|
break;
|
|
}
|
|
++pImageImport;
|
|
} while (TRUE);
|
|
|
|
DWORD dwLastError = GetLastError();
|
|
OutputDebugString(TEXT("[This PE file has an import table, but the import table size is marked as 0. This is an error.")
|
|
TEXT("If it is not repaired, the launched program will not work properly, Detours has automatically repaired its import table size for you! ! !]\r\n"));
|
|
if (GetLastError() != dwLastError) {
|
|
SetLastError(dwLastError);
|
|
}
|
|
}
|
|
|
|
DETOUR_TRACE((" Imports: %p..%p\n",
|
|
pbModule + inh.IMPORT_DIRECTORY.VirtualAddress,
|
|
pbModule + inh.IMPORT_DIRECTORY.VirtualAddress +
|
|
inh.IMPORT_DIRECTORY.Size));
|
|
|
|
// Calculate new import directory size. Note that since inh is from another
|
|
// process, inh could have been corrupted. We need to protect against
|
|
// integer overflow in allocation calculations.
|
|
DWORD nOldDlls = inh.IMPORT_DIRECTORY.Size / sizeof(IMAGE_IMPORT_DESCRIPTOR);
|
|
DWORD obRem;
|
|
if (DWordMult(sizeof(IMAGE_IMPORT_DESCRIPTOR), nDlls, &obRem) != S_OK) {
|
|
DETOUR_TRACE(("too many new DLLs.\n"));
|
|
goto finish;
|
|
}
|
|
DWORD obOld;
|
|
if (DWordAdd(obRem, sizeof(IMAGE_IMPORT_DESCRIPTOR) * nOldDlls, &obOld) != S_OK) {
|
|
DETOUR_TRACE(("DLL entries overflow.\n"));
|
|
goto finish;
|
|
}
|
|
DWORD obTab = PadToDwordPtr(obOld);
|
|
// Check for integer overflow.
|
|
if (obTab < obOld) {
|
|
DETOUR_TRACE(("DLL entries padding overflow.\n"));
|
|
goto finish;
|
|
}
|
|
DWORD stSize;
|
|
if (DWordMult(sizeof(DWORD_XX) * 4, nDlls, &stSize) != S_OK) {
|
|
DETOUR_TRACE(("String table overflow.\n"));
|
|
goto finish;
|
|
}
|
|
DWORD obDll;
|
|
if (DWordAdd(obTab, stSize, &obDll) != S_OK) {
|
|
DETOUR_TRACE(("Import table size overflow\n"));
|
|
goto finish;
|
|
}
|
|
DWORD obStr = obDll;
|
|
cbNew = obStr;
|
|
for (n = 0; n < nDlls; n++) {
|
|
if (DWordAdd(cbNew, PadToDword((DWORD)strlen(plpDlls[n]) + 1), &cbNew) != S_OK) {
|
|
DETOUR_TRACE(("Overflow adding string table entry\n"));
|
|
goto finish;
|
|
}
|
|
}
|
|
pbNew = new BYTE [cbNew];
|
|
if (pbNew == NULL) {
|
|
DETOUR_TRACE(("new BYTE [cbNew] failed.\n"));
|
|
goto finish;
|
|
}
|
|
ZeroMemory(pbNew, cbNew);
|
|
|
|
PBYTE pbBase = pbModule;
|
|
PBYTE pbNext = pbBase
|
|
+ inh.OptionalHeader.BaseOfCode
|
|
+ inh.OptionalHeader.SizeOfCode
|
|
+ inh.OptionalHeader.SizeOfInitializedData
|
|
+ inh.OptionalHeader.SizeOfUninitializedData;
|
|
if (pbBase < pbNext) {
|
|
pbBase = pbNext;
|
|
}
|
|
DETOUR_TRACE(("pbBase = %p\n", pbBase));
|
|
|
|
PBYTE pbNewIid = FindAndAllocateNearBase(hProcess, pbModule, pbBase, cbNew);
|
|
if (pbNewIid == NULL) {
|
|
DETOUR_TRACE(("FindAndAllocateNearBase failed.\n"));
|
|
goto finish;
|
|
}
|
|
|
|
PIMAGE_IMPORT_DESCRIPTOR piid = (PIMAGE_IMPORT_DESCRIPTOR)pbNew;
|
|
IMAGE_THUNK_DATAXX *pt = NULL;
|
|
|
|
DWORD obBase = (DWORD)(pbNewIid - pbModule);
|
|
DWORD dwProtect = 0;
|
|
|
|
if (inh.IMPORT_DIRECTORY.VirtualAddress != 0) {
|
|
// Read the old import directory if it exists.
|
|
DETOUR_TRACE(("IMPORT_DIRECTORY perms=%lx\n", dwProtect));
|
|
|
|
if (!ReadProcessMemory(hProcess,
|
|
pbModule + inh.IMPORT_DIRECTORY.VirtualAddress,
|
|
&piid[nDlls],
|
|
nOldDlls * sizeof(IMAGE_IMPORT_DESCRIPTOR), &cbRead)
|
|
|| cbRead < nOldDlls * sizeof(IMAGE_IMPORT_DESCRIPTOR)) {
|
|
|
|
DETOUR_TRACE(("ReadProcessMemory(imports) failed: %lu\n", GetLastError()));
|
|
goto finish;
|
|
}
|
|
}
|
|
|
|
for (n = 0; n < nDlls; n++) {
|
|
HRESULT hrRet = StringCchCopyA((char*)pbNew + obStr, cbNew - obStr, plpDlls[n]);
|
|
if (FAILED(hrRet)) {
|
|
DETOUR_TRACE(("StringCchCopyA failed: %08lx\n", hrRet));
|
|
goto finish;
|
|
}
|
|
|
|
// After copying the string, we patch up the size "??" bits if any.
|
|
hrRet = ReplaceOptionalSizeA((char*)pbNew + obStr,
|
|
cbNew - obStr,
|
|
DETOURS_STRINGIFY(DETOURS_BITS_XX));
|
|
if (FAILED(hrRet)) {
|
|
DETOUR_TRACE(("ReplaceOptionalSizeA failed: %08lx\n", hrRet));
|
|
goto finish;
|
|
}
|
|
|
|
DWORD nOffset = obTab + (sizeof(IMAGE_THUNK_DATAXX) * (4 * n));
|
|
piid[n].OriginalFirstThunk = obBase + nOffset;
|
|
|
|
// We need 2 thunks for the import table and 2 thunks for the IAT.
|
|
// One for an ordinal import and one to mark the end of the list.
|
|
pt = ((IMAGE_THUNK_DATAXX*)(pbNew + nOffset));
|
|
pt[0].u1.Ordinal = IMAGE_ORDINAL_FLAG_XX + 1;
|
|
pt[1].u1.Ordinal = 0;
|
|
|
|
nOffset = obTab + (sizeof(IMAGE_THUNK_DATAXX) * ((4 * n) + 2));
|
|
piid[n].FirstThunk = obBase + nOffset;
|
|
pt = ((IMAGE_THUNK_DATAXX*)(pbNew + nOffset));
|
|
pt[0].u1.Ordinal = IMAGE_ORDINAL_FLAG_XX + 1;
|
|
pt[1].u1.Ordinal = 0;
|
|
piid[n].TimeDateStamp = 0;
|
|
piid[n].ForwarderChain = 0;
|
|
piid[n].Name = obBase + obStr;
|
|
|
|
obStr += PadToDword((DWORD)strlen(plpDlls[n]) + 1);
|
|
}
|
|
_Analysis_assume_(obStr <= cbNew);
|
|
|
|
#if 0
|
|
for (i = 0; i < nDlls + nOldDlls; i++) {
|
|
DETOUR_TRACE(("%8d. Look=%08x Time=%08x Fore=%08x Name=%08x Addr=%08x\n",
|
|
i,
|
|
piid[i].OriginalFirstThunk,
|
|
piid[i].TimeDateStamp,
|
|
piid[i].ForwarderChain,
|
|
piid[i].Name,
|
|
piid[i].FirstThunk));
|
|
if (piid[i].OriginalFirstThunk == 0 && piid[i].FirstThunk == 0) {
|
|
break;
|
|
}
|
|
}
|
|
#endif
|
|
|
|
if (!WriteProcessMemory(hProcess, pbNewIid, pbNew, obStr, NULL)) {
|
|
DETOUR_TRACE(("WriteProcessMemory(iid) failed: %lu\n", GetLastError()));
|
|
goto finish;
|
|
}
|
|
|
|
DETOUR_TRACE(("obBaseBef = %08lx..%08lx\n",
|
|
inh.IMPORT_DIRECTORY.VirtualAddress,
|
|
inh.IMPORT_DIRECTORY.VirtualAddress + inh.IMPORT_DIRECTORY.Size));
|
|
DETOUR_TRACE(("obBaseAft = %08lx..%08lx\n", obBase, obBase + obStr));
|
|
|
|
// In this case the file didn't have an import directory in first place,
|
|
// so we couldn't fix the missing IAT above. We still need to explicitly
|
|
// provide an IAT to prevent to loader from looking for one.
|
|
//
|
|
if (inh.IAT_DIRECTORY.VirtualAddress == 0) {
|
|
inh.IAT_DIRECTORY.VirtualAddress = obBase;
|
|
inh.IAT_DIRECTORY.Size = cbNew;
|
|
}
|
|
|
|
inh.IMPORT_DIRECTORY.VirtualAddress = obBase;
|
|
inh.IMPORT_DIRECTORY.Size = cbNew;
|
|
|
|
/////////////////////// Update the NT header for the new import directory.
|
|
//
|
|
if (!DetourVirtualProtectSameExecuteEx(hProcess, pbModule, inh.OptionalHeader.SizeOfHeaders,
|
|
PAGE_EXECUTE_READWRITE, &dwProtect)) {
|
|
DETOUR_TRACE(("VirtualProtectEx(inh) write failed: %lu\n", GetLastError()));
|
|
goto finish;
|
|
}
|
|
|
|
inh.OptionalHeader.CheckSum = 0;
|
|
|
|
if (!WriteProcessMemory(hProcess, pbModule, &idh, sizeof(idh), NULL)) {
|
|
DETOUR_TRACE(("WriteProcessMemory(idh) failed: %lu\n", GetLastError()));
|
|
goto finish;
|
|
}
|
|
DETOUR_TRACE(("WriteProcessMemory(idh:%p..%p)\n", pbModule, pbModule + sizeof(idh)));
|
|
|
|
if (!WriteProcessMemory(hProcess, pbModule + idh.e_lfanew, &inh, sizeof(inh), NULL)) {
|
|
DETOUR_TRACE(("WriteProcessMemory(inh) failed: %lu\n", GetLastError()));
|
|
goto finish;
|
|
}
|
|
DETOUR_TRACE(("WriteProcessMemory(inh:%p..%p)\n",
|
|
pbModule + idh.e_lfanew,
|
|
pbModule + idh.e_lfanew + sizeof(inh)));
|
|
|
|
if (!VirtualProtectEx(hProcess, pbModule, inh.OptionalHeader.SizeOfHeaders,
|
|
dwProtect, &dwProtect)) {
|
|
DETOUR_TRACE(("VirtualProtectEx(idh) restore failed: %lu\n", GetLastError()));
|
|
goto finish;
|
|
}
|
|
|
|
fSucceeded = TRUE;
|
|
goto finish;
|
|
}
|