Lightemerald/windows-user-space-emulator
2
0
Fork 0
mirror of https://github.com/momo5502/emulator.git synced 2026-01-24 14:11:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

fixing CI errors

Browse Source
This commit is contained in:
Elias Bachaalany
2025-01-22 05:55:46 -08:00
parent ebf563e313
commit 638a720ab8
2 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/common/utils/function.hpp
View File

@@ -15,11 +15,18 @@ namespace utils
public:
optional_function() = default;
optional_function(std::function<Ret(Args...)> f)
: func(std::move(f))
{
}
template <typename F, typename = std::enable_if_t<std::is_invocable_r_v<Ret, F, Args...>>>
optional_function(F&& f)
: func(std::forward<F>(f))
{
}
optional_function& operator=(std::function<Ret(Args...)> f)
{
func = std::move(f);
@@ -40,6 +47,7 @@ namespace utils
}
}
}
explicit operator bool() const noexcept
{
return static_cast<bool>(func);

6
src/windows-emulator/syscall_dispatcher.cpp
View File

@@ -92,7 +92,7 @@ void syscall_dispatcher::dispatch(windows_emulator& win_emu)
if (mod != context.ntdll && mod != context.win32u)
{
win_emu.callbacks().inline_syscall(syscall_id, address, mod ? mod->name.c_str() : "<N/A>",
entry->second.name.c_str());
entry->second.name.c_str());
win_emu.log.print(color::blue, "Executing inline syscall: %s (0x%X) at 0x%" PRIx64 " (%s)\n",
entry->second.name.c_str(), syscall_id, address, mod ? mod->name.c_str() : "<N/A>");
}
@@ -112,8 +112,8 @@ void syscall_dispatcher::dispatch(windows_emulator& win_emu)
{
const auto* previous_mod = context.mod_manager.find_by_address(context.previous_ip);
win_emu.callbacks().outofline_syscall(syscall_id, address, mod ? mod->name.c_str() : "<N/A>",
entry->second.name.c_str(), context.previous_ip,
previous_mod ? previous_mod->name.c_str() : "<N/A>");
entry->second.name.c_str(), context.previous_ip,
previous_mod ? previous_mod->name.c_str() : "<N/A>");
win_emu.log.print(color::blue,
"Crafted out-of-line syscall: %s (0x%X) at 0x%" PRIx64 " (%s) via 0x%" PRIx64
" (%s)\n",