Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion GUI/Window.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -487,7 +487,12 @@ LRESULT Window::WndProc(UINT msg, WPARAM wParam, LPARAM lParam) {
notifCode = hdr.code;
}
try {
Window* target = managed.at(targetWindow); // 不需要锁
Window* target = nullptr;
{
lock_guard gg(managed_lock);
target = managed.at(targetWindow);
}
// FIXME: 这里可能target被销毁,如果target在这里被销毁,下一行代码会崩溃
return target->dispatchMessageToWindowAndGetResult(msg_t(notifCode + WINDOW_NOTIFICATION_CODES), (UINT)msg, lParam, true);
}
catch (std::out_of_range&) {
Expand Down
4 changes: 2 additions & 2 deletions System/Hooks.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ LRESULT w32oop::system::Hook::cb(int nCode, WPARAM wParam, LPARAM lParam, long l
return target->callback(nCode, wParam, lParam);
}

HOOKPROC w32oop::system::Hook::create_proc(MyHookProc pfn, long long userdata) {
void* w32oop::system::Hook::create_proc(MyHookProc pfn, long long userdata) {
void* memory = VirtualAlloc(NULL, 4096, MEM_COMMIT, PAGE_READWRITE); // 4096是最小的了
if (!memory) throw std::bad_alloc();
const auto fail = [&](const char* reason) {
Expand Down Expand Up @@ -72,7 +72,7 @@ HOOKPROC w32oop::system::Hook::create_proc(MyHookProc pfn, long long userdata) {
if (!VirtualProtect(memory, sizeof(payload), PAGE_EXECUTE_READ, &old_page_protection)) // 防止写入
fail("Failed to change memory protection");

return reinterpret_cast<HOOKPROC>(memory);
return memory;
}

void w32oop::system::Hook::set(int idHook, DWORD dwThreadId, HINSTANCE hMod) {
Expand Down
47 changes: 38 additions & 9 deletions System/Hooks.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ THE SOFTWARE IS PROVIDED “AS IS”, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR I
#endif

#include "./def.hpp"
#include <memory>


namespace w32oop::exceptions {
Expand All @@ -29,29 +30,57 @@ namespace w32oop::def {


namespace w32oop::system {
namespace detail {
struct VirtualFreeDeleter {
void operator()(void* p) const noexcept { VirtualFree(p, 0, MEM_RELEASE); }
};
}

class Hook : public w32HookObject {
protected:
w32HookHandle hHook;
HOOKPROC ptrCallback;

public:
Hook() {
ptrCallback = create_proc(cb, (long long)(void*)this);
void* memory = create_proc(cb, reinterpret_cast<long long>(this));
callbackMemory.reset(memory);
ptrCallback = reinterpret_cast<HOOKPROC>(memory);
}
virtual ~Hook() {
VirtualFree(ptrCallback, 0, MEM_RELEASE);

virtual ~Hook() = default;

Hook(const Hook&) = delete;
Hook& operator=(const Hook&) = delete;

Hook(Hook&& other) noexcept
: callbackMemory(std::move(other.callbackMemory))
, hHook(std::move(other.hHook))
, ptrCallback(other.ptrCallback)
{
other.ptrCallback = nullptr;
}

Hook& operator=(Hook&& other) noexcept {
if (this != &other) {
callbackMemory = std::move(other.callbackMemory);
hHook = std::move(other.hHook);
ptrCallback = other.ptrCallback;
other.ptrCallback = nullptr;
}
return *this;
}

virtual void set(int idHook, DWORD dwThreadId, HINSTANCE hMod = NULL) final;
virtual void unset() final;

protected:
std::unique_ptr<void, detail::VirtualFreeDeleter> callbackMemory;
w32HookHandle hHook;
HOOKPROC ptrCallback;

protected:
using MyHookProc = LRESULT(__stdcall*)(int code, WPARAM wParam, LPARAM lParam, long long userdata);
static LRESULT CALLBACK cb(int nCode, WPARAM wParam, LPARAM lParam, long long userdata);
static HOOKPROC create_proc(MyHookProc pfn, long long userdata);
static void* create_proc(MyHookProc pfn, long long userdata);

protected:
virtual LRESULT callback(int nCode, WPARAM wParam, LPARAM lParam) = 0;
};
}