From 5609de9dde5171d0f7c8473dd74530d0e14061a1 Mon Sep 17 00:00:00 2001 From: momo5502 Date: Wed, 4 Jun 2025 19:17:09 +0200 Subject: [PATCH] Small fixes and prepare for more semantic logging --- src/windows-emulator/devices/afd_endpoint.cpp | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/src/windows-emulator/devices/afd_endpoint.cpp b/src/windows-emulator/devices/afd_endpoint.cpp index bc1ab997..d067eb1a 100644 --- a/src/windows-emulator/devices/afd_endpoint.cpp +++ b/src/windows-emulator/devices/afd_endpoint.cpp @@ -519,13 +519,14 @@ namespace { if (_AFD_BASE(c.io_control_code) != FSCTL_AFD_BASE) { - win_emu.log.print(color::cyan, "Bad AFD IOCTL: 0x%X\n", c.io_control_code); + win_emu.log.error("Bad AFD IOCTL: 0x%X\n", static_cast(c.io_control_code)); return STATUS_NOT_SUPPORTED; } const auto request = _AFD_REQUEST(c.io_control_code); - win_emu.log.print(color::dark_gray, "--> AFD IOCTL: 0x%X (%d)\n", c.io_control_code, request); + win_emu.log.print(color::dark_gray, "--> AFD IOCTL: 0x%X (%u)\n", static_cast(c.io_control_code), + static_cast(request)); switch (request) { @@ -562,7 +563,8 @@ namespace case AFD_TRANSPORT_IOCTL: return STATUS_SUCCESS; default: - win_emu.log.print(color::gray, "Unsupported AFD IOCTL: 0x%X (%d)\n", c.io_control_code, request); + win_emu.log.error("Unsupported AFD IOCTL: 0x%X (%u)\n", static_cast(c.io_control_code), + static_cast(request)); return STATUS_NOT_SUPPORTED; } } @@ -995,8 +997,8 @@ namespace { const auto timeout_callback = [](windows_emulator& win_emu, const io_device_context& c) { const emulator_object info_obj{win_emu.emu(), c.input_buffer}; - info_obj.access([&](AFD_POLL_INFO64& info) { - info.NumberOfHandles = 0; // + info_obj.access([&](AFD_POLL_INFO64& poll_info) { + poll_info.NumberOfHandles = 0; // }); }; @@ -1275,4 +1277,4 @@ std::unique_ptr create_afd_endpoint() std::unique_ptr create_afd_async_connect_hlp() { return std::make_unique(); -} \ No newline at end of file +}