|
2 | 2 |
|
3 | 3 | #include "demangler/MicrosoftDemangle.h" |
4 | 4 | #include "ll/api/memory/Hook.h" |
| 5 | +#include "ll/api/memory/Memory.h" |
5 | 6 |
|
6 | 7 | #include <magic_enum.hpp> |
7 | 8 |
|
@@ -340,13 +341,13 @@ Local<Value> ScriptNativeFunction::fromScript(const Arguments& args) { |
340 | 341 | ); |
341 | 342 | } |
342 | 343 |
|
343 | | - nativeScriptFunction->mEngine = args.engine(); |
344 | | - nativeScriptFunction->mNativeCallack = dcbNewCallback( |
| 344 | + nativeScriptFunction->mEngine = args.engine(); |
| 345 | + nativeScriptFunction->mNativeCallback = dcbNewCallback( |
345 | 346 | nativeScriptFunction->buildDynCallbackSig().c_str(), |
346 | 347 | &nativeCallbackHandler, |
347 | 348 | nativeScriptFunction |
348 | 349 | ); |
349 | | - nativeScriptFunction->mFunction = nativeScriptFunction->mNativeCallack; |
| 350 | + nativeScriptFunction->mFunction = nativeScriptFunction->mNativeCallback; |
350 | 351 | nativeScriptFunction->mScriptCallback = args[args.size() - 1].asFunction(); |
351 | 352 |
|
352 | 353 | return scriptResult; |
@@ -512,15 +513,15 @@ Local<Value> ScriptNativeFunction::hook(const Arguments& args) { |
512 | 513 | DynamicHookData* hookSymbol = args.engine()->getNativeInstance<DynamicHookData>(scriptResult); |
513 | 514 | hookSymbol->cloneFrom(NativeFunction(*args.engine()->getNativeInstance<ScriptNativeFunction>(args.thiz()))); |
514 | 515 | hookSymbol->mEngine = args.engine(); |
515 | | - hookSymbol->mNativeCallack = |
| 516 | + hookSymbol->mNativeCallback = |
516 | 517 | dcbNewCallback(hookSymbol->buildDynCallbackSig().c_str(), &nativeCallbackHandler, hookSymbol); |
517 | 518 | hookSymbol->mScriptCallback = args[0].asFunction(); |
518 | 519 | void* hookOriginl = nullptr; |
519 | 520 | int hookResult = ll::memory::hook( |
520 | 521 | hookSymbol->mFunction, |
521 | | - &hookOriginl, |
522 | | - (ll::memory::FuncPtr*)hookSymbol->mNativeCallack, |
523 | | - ll::memory::HookPriority::Low |
| 522 | + hookSymbol->mNativeCallback, |
| 523 | + reinterpret_cast<ll::memory::FuncPtr*>(hookOriginl), |
| 524 | + ll::memory::HookPriority::Normal |
524 | 525 | ); |
525 | 526 | hookSymbol->mFunction = hookOriginl; |
526 | 527 | return scriptResult; |
|
0 commit comments