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

Prepare APC support

Browse Source
This commit is contained in:
momo5502
2025-04-13 09:48:02 +02:00
parent 4bf2e9287e
commit f58dec38a2
6 changed files with 18 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/windows-emulator/emulator_thread.hpp
View File

@@ -54,6 +54,7 @@ class emulator_thread : public ref_counted_object
bool await_any{false};
bool waiting_for_alert{false};
bool alerted{false};
bool apc_alertable{false};
uint32_t suspended{0};
std::optional<std::chrono::steady_clock::time_point> await_time{};
@@ -123,6 +124,7 @@ class emulator_thread : public ref_counted_object
buffer.write(this->waiting_for_alert);
buffer.write(this->alerted);
buffer.write(this->apc_alertable);
buffer.write(this->suspended);
@@ -158,6 +160,7 @@ class emulator_thread : public ref_counted_object
buffer.read(this->waiting_for_alert);
buffer.read(this->alerted);
buffer.read(this->apc_alertable);
buffer.read(this->suspended);

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

@@ -413,10 +413,10 @@ namespace syscalls
return STATUS_NOT_SUPPORTED;
}
NTSTATUS handle_NtTestAlert()
NTSTATUS handle_NtTestAlert(const syscall_context& c)
{
// puts("NtTestAlert not supported");
return STATUS_NOT_SUPPORTED;
c.win_emu.yield_thread(true);
return STATUS_SUCCESS;
}
NTSTATUS handle_NtUserSystemParametersInfo()

14
src/windows-emulator/syscalls/object.cpp
View File

@@ -116,11 +116,6 @@ namespace syscalls
const emulator_object<handle> handles, const WAIT_TYPE wait_type,
const BOOLEAN alertable, const emulator_object<LARGE_INTEGER> timeout)
{
if (alertable)
{
c.win_emu.log.print(color::gray, "Alertable NtWaitForMultipleObjects not supported yet!\n");
}
if (wait_type != WaitAny && wait_type != WaitAll)
{
c.win_emu.log.error("Wait type not supported!\n");
@@ -151,18 +146,13 @@ namespace syscalls
t.await_time = utils::convert_delay_interval_to_time_point(c.win_emu.clock(), timeout.read());
}
c.win_emu.yield_thread();
c.win_emu.yield_thread(alertable);
return STATUS_SUCCESS;
}
NTSTATUS handle_NtWaitForSingleObject(const syscall_context& c, const handle h, const BOOLEAN alertable,
const emulator_object<LARGE_INTEGER> timeout)
{
if (alertable)
{
c.win_emu.log.print(color::gray, "Alertable NtWaitForSingleObject not supported yet!\n");
}
if (!is_awaitable_object_type(h))
{
c.win_emu.log.print(color::gray, "Unsupported handle type for NtWaitForSingleObject: %d!\n", h.value.type);
@@ -178,7 +168,7 @@ namespace syscalls
t.await_time = utils::convert_delay_interval_to_time_point(c.win_emu.clock(), timeout.read());
}
c.win_emu.yield_thread();
c.win_emu.yield_thread(alertable);
return STATUS_SUCCESS;
}

17
src/windows-emulator/syscalls/thread.cpp
View File

@@ -282,17 +282,9 @@ namespace syscalls
NTSTATUS handle_NtDelayExecution(const syscall_context& c, const BOOLEAN alertable,
const emulator_object<LARGE_INTEGER> delay_interval)
{
if (alertable)
{
c.win_emu.log.error("Alertable NtDelayExecution not supported yet!\n");
c.emu.stop();
return STATUS_NOT_SUPPORTED;
}
auto& t = c.win_emu.current_thread();
t.await_time = utils::convert_delay_interval_to_time_point(c.win_emu.clock(), delay_interval.read());
c.win_emu.yield_thread();
c.win_emu.yield_thread(alertable);
return STATUS_SUCCESS;
}
@@ -370,10 +362,15 @@ namespace syscalls
}
NTSTATUS handle_NtContinue(const syscall_context& c, const emulator_object<CONTEXT64> thread_context,
const BOOLEAN /*raise_alert*/)
const BOOLEAN raise_alert)
{
c.write_status = false;
if (raise_alert)
{
c.win_emu.current_thread().apc_alertable = false;
}
const auto context = thread_context.read();
cpu_context::restore(c.emu, context);

3
src/windows-emulator/windows_emulator.cpp
View File

@@ -298,9 +298,10 @@ void windows_emulator::setup_process(const application_settings& app_settings)
switch_to_thread(*this, main_thread_id);
}
void windows_emulator::yield_thread()
void windows_emulator::yield_thread(const bool alertable)
{
this->switch_thread_ = true;
this->current_thread().apc_alertable = alertable;
this->emu().stop();
}

2
src/windows-emulator/windows_emulator.hpp
View File

@@ -183,7 +183,7 @@ class windows_emulator
bool buffer_stdout{false};
bool fuzzing{false};
void yield_thread();
void yield_thread(bool alertable = false);
void perform_thread_switch();
bool activate_thread(uint32_t id);