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

More threading support

Browse Source
This commit is contained in:
momo5502
2024-10-21 07:22:41 +02:00
parent 9692e15c1e
commit 72bcac1536
2 changed files with 81 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/windows-emulator/process_context.hpp
View File

@@ -219,6 +219,7 @@ public:
std::optional<uint32_t> exit_status{};
std::optional<handle> await_object{};
std::optional<bool> alerted{};
std::optional<std::chrono::steady_clock::time_point> await_time{};
std::optional<emulator_allocator> gs_segment;

90
src/windows-emulator/syscalls.cpp
View File

@@ -2074,35 +2074,46 @@ namespace
const BOOLEAN alertable,
const emulator_object<LARGE_INTEGER> timeout)
{
if (timeout.value())
{
puts("NtWaitForSingleObject timeout not supported yet!");
return STATUS_NOT_SUPPORTED;
}
if (alertable)
{
puts("Alertable NtWaitForSingleObject not supported yet!");
c.emu.stop();
return STATUS_NOT_SUPPORTED;
}
handle h{};
h.bits = handle_value;
if (h.value.type != handle_types::thread)
auto& t = c.win_emu.current_thread();
if (h.value.type != handle_types::thread && h.value.type != handle_types::event)
{
puts("NtWaitForSingleObject only supported with thread handles yet!");
puts("Unsupported handle type for NtWaitForSingleObject!");
c.emu.stop();
return STATUS_NOT_SUPPORTED;
}
if (timeout.value() && !t.await_time.has_value())
{
t.await_time = convert_delay_interval_to_time_point(timeout.read());
}
if (is_object_signaled(c.proc, h))
{
t.await_time = {};
t.await_object = {};
return STATUS_WAIT_0;
}
c.retrigger_syscall = true;
if (t.await_time.has_value() && *t.await_time < std::chrono::steady_clock::now())
{
t.await_time = {};
t.await_object = {};
return STATUS_TIMEOUT;
}
c.win_emu.current_thread().await_object = h;
t.await_object = h;
c.retrigger_syscall = true;
c.win_emu.switch_thread = true;
c.emu.stop();
@@ -2137,6 +2148,7 @@ namespace
if (alertable)
{
puts("Alertable NtDelayExecution not supported yet!");
c.emu.stop();
return STATUS_NOT_SUPPORTED;
}
@@ -2158,6 +2170,62 @@ namespace
return STATUS_SUCCESS;
}
NTSTATUS handle_NtAlertThreadByThreadIdEx(const syscall_context& c, const uint64_t thread_id,
const emulator_object<RTL_SRWLOCK> lock)
{
if (lock.value())
{
puts("NtAlertThreadByThreadIdEx with lock not supported yet!");
//c.emu.stop();
//return STATUS_NOT_SUPPORTED;
}
for (auto& t : c.proc.threads)
{
if (t.second.id == thread_id)
{
t.second.alerted = true;
return STATUS_SUCCESS;
}
}
return STATUS_INVALID_HANDLE;
}
NTSTATUS handle_NtWaitForAlertByThreadId(const syscall_context& c, const uint64_t,
const emulator_object<LARGE_INTEGER> timeout)
{
auto& t = c.win_emu.current_thread();
if (timeout.value() && !t.await_time.has_value())
{
t.await_time = convert_delay_interval_to_time_point(timeout.read());
}
if (!t.alerted.has_value())
{
t.alerted = false;
}
else if (*t.alerted)
{
t.alerted = {};
t.await_time = {};
return STATUS_ALERTED;
}
else if (t.await_time.has_value() && *t.await_time < std::chrono::steady_clock::now())
{
t.alerted = {};
t.await_time = {};
return STATUS_TIMEOUT;
}
c.retrigger_syscall = true;
c.win_emu.switch_thread = true;
c.emu.stop();
return STATUS_SUCCESS;
}
}
void syscall_dispatcher::setup(const exported_symbols& ntdll_exports, const exported_symbols& win32u_exports)
@@ -2261,6 +2329,8 @@ void syscall_dispatcher::add_handlers()
add_handler(NtWaitForSingleObject);
add_handler(NtTerminateThread);
add_handler(NtDelayExecution);
add_handler(NtWaitForAlertByThreadId);
add_handler(NtAlertThreadByThreadIdEx);
#undef add_handler