From ed80b86e22a2da1428e3062cbde3aa99dd2a99ee Mon Sep 17 00:00:00 2001 From: momo5502 Date: Sun, 1 Jun 2025 07:54:42 +0200 Subject: [PATCH] Fix compilation --- src/windows-emulator/syscalls.cpp | 43 ++++++++++++-------------- src/windows-emulator/syscalls/file.cpp | 4 +-- 2 files changed, 21 insertions(+), 26 deletions(-) diff --git a/src/windows-emulator/syscalls.cpp b/src/windows-emulator/syscalls.cpp index c4d52edb..388d24e8 100644 --- a/src/windows-emulator/syscalls.cpp +++ b/src/windows-emulator/syscalls.cpp @@ -5,16 +5,12 @@ #include "syscall_utils.hpp" #include -#include #include #include -#include #include #include #include -#include - namespace syscalls { // syscalls/event.cpp: @@ -22,23 +18,21 @@ namespace syscalls NTSTATUS handle_NtTraceEvent(); NTSTATUS handle_NtClearEvent(const syscall_context& c, handle event_handle); NTSTATUS handle_NtCreateEvent(const syscall_context& c, emulator_object event_handle, - ACCESS_MASK /*desired_access*/, + ACCESS_MASK desired_access, emulator_object>> object_attributes, EVENT_TYPE event_type, BOOLEAN initial_state); NTSTATUS handle_NtOpenEvent(const syscall_context& c, emulator_object event_handle, - ACCESS_MASK /*desired_access*/, + ACCESS_MASK desired_access, emulator_object>> object_attributes); // syscalls/exception.cpp - NTSTATUS handle_NtRaiseHardError(const syscall_context& c, NTSTATUS error_status, ULONG /*number_of_parameters*/, - emulator_object>> - /*unicode_string_parameter_mask*/, - emulator_object /*parameters*/, - HARDERROR_RESPONSE_OPTION /*valid_response_option*/, - emulator_object response); + NTSTATUS handle_NtRaiseHardError( + const syscall_context& c, NTSTATUS error_status, ULONG number_of_parameters, + emulator_object>> unicode_string_parameter_mask, + emulator_object parameters, HARDERROR_RESPONSE_OPTION valid_response_option, + emulator_object response); NTSTATUS handle_NtRaiseException(const syscall_context& c, - emulator_object>> - /*exception_record*/, + emulator_object>> exception_record, emulator_object thread_context, BOOLEAN handle_exception); // syscalls/file.cpp @@ -49,15 +43,16 @@ namespace syscalls const syscall_context& c, handle file_handle, emulator_object>> io_status_block, uint64_t fs_information, ULONG length, FS_INFORMATION_CLASS fs_information_class); - NTSTATUS handle_NtQueryDirectoryFileEx(const syscall_context& c, handle file_handle, handle /*event_handle*/, - emulator_pointer /*PIO_APC_ROUTINE*/ /*apc_routine*/, - emulator_pointer /*apc_context*/, + NTSTATUS handle_NtQueryDirectoryFileEx(const syscall_context& c, handle file_handle, handle event_handle, + EMULATOR_CAST(emulator_pointer, PIO_APC_ROUTINE) apc_routine, + emulator_pointer apc_context, emulator_object>> io_status_block, uint64_t file_information, uint32_t length, uint32_t info_class, ULONG query_flags, emulator_object>> file_name); NTSTATUS handle_NtQueryDirectoryFile(const syscall_context& c, handle file_handle, handle event_handle, - emulator_pointer /*PIO_APC_ROUTINE*/ apc_routine, emulator_pointer apc_context, + EMULATOR_CAST(emulator_pointer, PIO_APC_ROUTINE) apc_routine, + emulator_pointer apc_context, emulator_object>> io_status_block, uint64_t file_information, uint32_t length, uint32_t info_class, BOOLEAN return_single_entry, @@ -151,7 +146,7 @@ namespace syscalls emulator_object bytes_to_allocate, uint32_t allocation_type, uint32_t page_protection); NTSTATUS handle_NtAllocateVirtualMemory(const syscall_context& c, handle process_handle, - emulator_object base_address, uint64_t /*zero_bits*/, + emulator_object base_address, uint64_t zero_bits, emulator_object bytes_to_allocate, uint32_t allocation_type, uint32_t page_protection); NTSTATUS handle_NtFreeVirtualMemory(const syscall_context& c, handle process_handle, @@ -165,11 +160,11 @@ namespace syscalls // syscalls/mutant.cpp: NTSTATUS handle_NtReleaseMutant(const syscall_context& c, handle mutant_handle, emulator_object previous_count); - NTSTATUS handle_NtOpenMutant(const syscall_context& c, const emulator_object mutant_handle, - const ACCESS_MASK /*desired_access*/, - const emulator_object>> object_attributes); + NTSTATUS handle_NtOpenMutant(const syscall_context& c, emulator_object mutant_handle, + ACCESS_MASK desired_access, + emulator_object>> object_attributes); NTSTATUS handle_NtCreateMutant(const syscall_context& c, emulator_object mutant_handle, - ACCESS_MASK /*desired_access*/, + ACCESS_MASK desired_access, emulator_object>> object_attributes, BOOLEAN initial_owner); @@ -177,7 +172,7 @@ namespace syscalls NTSTATUS handle_NtClose(const syscall_context& c, handle h); NTSTATUS handle_NtDuplicateObject(const syscall_context& c, handle source_process_handle, handle source_handle, handle target_process_handle, emulator_object target_handle, - ACCESS_MASK /*desired_access*/, ULONG /*handle_attributes*/, ULONG /*options*/); + ACCESS_MASK desired_access, ULONG handle_attributes, ULONG options); NTSTATUS handle_NtQueryObject(const syscall_context& c, handle handle, OBJECT_INFORMATION_CLASS object_information_class, emulator_pointer object_information, ULONG object_information_length, diff --git a/src/windows-emulator/syscalls/file.cpp b/src/windows-emulator/syscalls/file.cpp index 1aa0257f..033f7d11 100644 --- a/src/windows-emulator/syscalls/file.cpp +++ b/src/windows-emulator/syscalls/file.cpp @@ -328,7 +328,7 @@ namespace syscalls NTSTATUS handle_NtQueryDirectoryFileEx( const syscall_context& c, const handle file_handle, const handle /*event_handle*/, - const emulator_pointer /*PIO_APC_ROUTINE*/ /*apc_routine*/, const emulator_pointer /*apc_context*/, + const EMULATOR_CAST(emulator_pointer, PIO_APC_ROUTINE) /*apc_routine*/, const emulator_pointer /*apc_context*/, const emulator_object>> io_status_block, const uint64_t file_information, const uint32_t length, const uint32_t info_class, const ULONG query_flags, const emulator_object>> file_name) @@ -364,7 +364,7 @@ namespace syscalls } NTSTATUS handle_NtQueryDirectoryFile(const syscall_context& c, const handle file_handle, const handle event_handle, - const emulator_pointer /*PIO_APC_ROUTINE*/ apc_routine, + const EMULATOR_CAST(emulator_pointer, PIO_APC_ROUTINE) apc_routine, const emulator_pointer apc_context, const emulator_object>> io_status_block, const uint64_t file_information, const uint32_t length,