ToxicMushroom/Dalamud
1
0
Fork 0
mirror of https://github.com/goatcorp/Dalamud.git synced 2025-12-12 10:17:22 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Fix broken GetInputDeviceManager signature (#972)

Browse source
This commit is contained in:
kizer 2022-08-24 15:54:31 +09:00 • committed by GitHub
parent 08e76364a6
commit 36955ed008
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 42 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

25
Dalamud.Boot/utils.cpp
View file

@ -348,6 +348,27 @@ utils::signature_finder& utils::signature_finder::look_for_hex(std::string_view
return *this;
}
const char* utils::signature_finder::result::resolve_jump_target(size_t instructionOffset) const {
nmd_x86_instruction instruction{};
if (!nmd_x86_decode(&Match[instructionOffset], NMD_X86_MAXIMUM_INSTRUCTION_LENGTH, &instruction, NMD_X86_MODE_64, NMD_X86_DECODER_FLAGS_ALL))
throw std::runtime_error("Matched address does not have a valid assembly instruction");
size_t numExplicitOperands = 0;
for (size_t i = 0; i < instruction.num_operands; i++)
numExplicitOperands += instruction.operands[i].is_implicit ? 0 : 1;
if (numExplicitOperands != 1)
throw std::runtime_error("Number of operands at the instruction at matched address is not 1");
if (!(instruction.group & NMD_GROUP_CALL) && !(instruction.group & NMD_GROUP_JUMP))
throw std::runtime_error("The instruction at matched address is not a call or jump instruction");
const auto& arg1 = instruction.operands[0];
if (arg1.type != NMD_X86_OPERAND_TYPE_IMMEDIATE)
throw std::runtime_error("The first operand for the instruction at matched address is not an immediate value");
return &Match[instructionOffset] + instruction.length + arg1.fields.imm;
}
std::vector<utils::signature_finder::result> utils::signature_finder::find(size_t minCount, size_t maxCount, bool bErrorOnMoreThanMaximum) const {
std::vector<result> res;
@ -383,8 +404,8 @@ std::vector<utils::signature_finder::result> utils::signature_finder::find(size_
return res;
}
std::span<const char> utils::signature_finder::find_one() const {
return find(1, 1, false).front().Match;
utils::signature_finder::result utils::signature_finder::find_one() const {
return find(1, 1, false).front();
}
utils::memory_tenderizer::memory_tenderizer(const void* pAddress, size_t length, DWORD dwNewProtect) : m_data(reinterpret_cast<char*>(const_cast<void*>(pAddress)), length) {