From 685e6d6d093fb98bc89d873b7cef20abe044ead4 Mon Sep 17 00:00:00 2001 From: ptmaster Date: Fri, 24 Jan 2025 01:52:11 +0800 Subject: [PATCH] fix missing function | scanner original use fasthook --- src/config.h | 5 +++++ src/patches/scanner.cpp | 12 ++++++------ 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/src/config.h b/src/config.h index be682de..7d3388c 100644 --- a/src/config.h +++ b/src/config.h @@ -459,6 +459,11 @@ public: const loggingConfig& getLoggingConfig() const { return config.logging; } const keybindingConfig& getKeyBindings() const { return keyBindings; } + void setRes(i32 x, i32 y) { + config.graphics.res.x = x; + config.graphics.res.y = y; + } + private: ConfigManager(); diff --git a/src/patches/scanner.cpp b/src/patches/scanner.cpp index 1f5eabf..1caeb05 100644 --- a/src/patches/scanner.cpp +++ b/src/patches/scanner.cpp @@ -189,19 +189,19 @@ namespace Card { return 1; } - HOOK (i64, bngrw_ReqCancelOfficial, PROC_ADDRESS ("bngrw.dll", "BngRwReqCancel"), u32 a1) { + FAST_HOOK (i64, bngrw_ReqCancelOfficial, PROC_ADDRESS ("bngrw.dll", "BngRwReqCancel"), u32 a1) { if (state != State::Disable) { state = State::Disable; patches::Plugins::UpdateStatus (StatusType::CardStatus, false); } - return originalbngrw_ReqCancelOfficial (a1); + return originalbngrw_ReqCancelOfficial.fastcall (a1); } - HOOK (u64, bngrw_ReqWaitTouchOfficial, PROC_ADDRESS ("bngrw.dll", "BngRwReqWaitTouch"), u32 a1, i32 a2, u32 a3, CallbackTouch callback, u64 a5) { + FAST_HOOK (u64, bngrw_ReqWaitTouchOfficial, PROC_ADDRESS ("bngrw.dll", "BngRwReqWaitTouch"), u32 a1, i32 a2, u32 a3, CallbackTouch callback, u64 a5) { state = State::Ready; patches::Plugins::UpdateStatus (StatusType::CardStatus, true); callbackTouch = callback; touchData = a5; - return originalbngrw_ReqWaitTouchOfficial (a1, a2, a3, Internal::AgentCallbackTouchOfficial, a5); + return originalbngrw_ReqWaitTouchOfficial.fastcall (a1, a2, a3, Internal::AgentCallbackTouchOfficial, a5); } bool @@ -237,8 +237,8 @@ namespace Card { LogMessage (LogLevel::INFO, "Init Card patches"); if (!emulateCardReader) { LogMessage (LogLevel::WARN, "[Card] Card reader emulation disabled!"); - INSTALL_HOOK (bngrw_ReqCancelOfficial); - INSTALL_HOOK (bngrw_ReqWaitTouchOfficial); + INSTALL_FAST_HOOK (bngrw_ReqCancelOfficial); + INSTALL_FAST_HOOK (bngrw_ReqWaitTouchOfficial); // patches::Plugins::InitCardReader (patches::Scanner::Card::Commit); return; }