From 8b096b833d53fa0a4f6440c83124b34560ee0b72 Mon Sep 17 00:00:00 2001 From: "matanki.saito" Date: Sun, 16 Jun 2024 09:45:39 +0900 Subject: [PATCH] #257 --- Plugin64/list_field_adjustment_asm.asm | 11 +++++---- Plugin64/tooltip_and_button.cpp | 32 -------------------------- 2 files changed, 7 insertions(+), 36 deletions(-) diff --git a/Plugin64/list_field_adjustment_asm.asm b/Plugin64/list_field_adjustment_asm.asm index 9c4db0e..8d2edba 100644 --- a/Plugin64/list_field_adjustment_asm.asm +++ b/Plugin64/list_field_adjustment_asm.asm @@ -21,6 +21,7 @@ NOT_DEF = 2026h .DATA listFieldAdjustmentProc1MultibyteFlag DD 0 listFieldAdjustmentProc2MultibyteFlag DD 0 + listFieldAdjustmentProc2length DD 0 .CODE listFieldAdjustmentProc1 PROC @@ -323,6 +324,8 @@ JMP_A: xor r10d, r10d cmp ebx, ecx + mov listFieldAdjustmentProc2length, ebx + push listFieldAdjustmentProc2ReturnAddress; ret; @@ -376,8 +379,8 @@ listFieldAdjustmentProc3V137A PROC cmp listFieldAdjustmentProc1MultibyteFlag, 1h; jnz JMP_A; - mov r9d, ebx; - sub r9d, 3; + mov r9d, listFieldAdjustmentProc2length + sub r9d, 4; JMP_A: xor r8d, r8d @@ -396,8 +399,8 @@ listFieldAdjustmentProc3V137B PROC cmp listFieldAdjustmentProc1MultibyteFlag, 1h; jnz JMP_A; - mov r9d, ebx; - sub r9d, 3; + mov r9d, listFieldAdjustmentProc2length + sub r9d, 4; JMP_A: xor r8d, r8d diff --git a/Plugin64/tooltip_and_button.cpp b/Plugin64/tooltip_and_button.cpp index 8501db8..08582fd 100644 --- a/Plugin64/tooltip_and_button.cpp +++ b/Plugin64/tooltip_and_button.cpp @@ -690,37 +690,6 @@ namespace TooltipAndButton { return e; } - DllError tooltipAndButtonProc10Injector(RunOptions options) { - DllError e = {}; - - switch (options.version) { - case v1_36_0_0: - case v1_35_1_0: - case v1_34_2_0: - case v1_33_3_0: - // - tooltipAndButtonProc10BufferWidth = options.lineBreakBufferWidth; - - BytePattern::temp_instance().find_pattern("0F 28 B4 24 C0 00 00 00 48 81 C4 F0 00 00 00 41"); - if (BytePattern::temp_instance().has_size(1, u8"DEBUG")) { - uintptr_t address = BytePattern::temp_instance().get_first().address(); - - // retn - tooltipAndButtonProc10ReturnAddress1 = address + 0x11; - - Injector::MakeJMP(address, tooltipAndButtonProc10, true); - } - else { - e.tooltipAndButton.unmatchdTooltipAndButtonProc9Injector = true; - } - break; - default: - e.tooltipAndButton.versionTooltipAndButtonProc9Injector = true; - } - - return e; - } - DllError Init(RunOptions options) { DllError result = {}; @@ -733,7 +702,6 @@ namespace TooltipAndButton { result |= tooltipAndButtonProc7Injector(options); //result |= tooltipAndButtonProc8Injector(options); //result |= tooltipAndButtonProc9Injector(options); - //result |= tooltipAndButtonProc10Injector(options); return result; }