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

Reserve space for current directory

Browse Source
This commit is contained in:
momo5502
2025-02-08 18:52:13 +01:00
parent 2da494a370
commit fe84448bf5
2 changed files with 14 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/windows-emulator/emulator_utils.hpp
View File

@@ -187,13 +187,17 @@ class emulator_allocator
return reinterpret_cast<char16_t*>(uc_str.Buffer);
}
void make_unicode_string(UNICODE_STRING<EmulatorTraits<Emu64>>& result, const std::u16string_view str)
void make_unicode_string(UNICODE_STRING<EmulatorTraits<Emu64>>& result, const std::u16string_view str,
const std::optional<size_t> maximum_length = std::nullopt)
{
constexpr auto element_size = sizeof(str[0]);
constexpr auto required_alignment = alignof(decltype(str[0]));
const auto total_length = str.size() * element_size;
const auto total_buffer_length = total_length + element_size;
const auto string_buffer = this->reserve(total_length + element_size, required_alignment);
const auto max_length = std::max(maximum_length.value_or(total_buffer_length), total_buffer_length);
const auto string_buffer = this->reserve(max_length, required_alignment);
this->emu_->write_memory(string_buffer, str.data(), total_length);
@@ -202,15 +206,17 @@ class emulator_allocator
result.Buffer = string_buffer;
result.Length = static_cast<USHORT>(total_length);
result.MaximumLength = static_cast<USHORT>(total_length + element_size);
result.MaximumLength = static_cast<USHORT>(max_length);
}
emulator_object<UNICODE_STRING<EmulatorTraits<Emu64>>> make_unicode_string(const std::u16string_view str)
emulator_object<UNICODE_STRING<EmulatorTraits<Emu64>>> make_unicode_string(
const std::u16string_view str, const std::optional<size_t> maximum_length = std::nullopt)
{
const auto unicode_string = this->reserve<UNICODE_STRING<EmulatorTraits<Emu64>>>();
unicode_string.access(
[&](UNICODE_STRING<EmulatorTraits<Emu64>>& unicode_str) { this->make_unicode_string(unicode_str, str); });
unicode_string.access([&](UNICODE_STRING<EmulatorTraits<Emu64>>& unicode_str) {
this->make_unicode_string(unicode_str, str, maximum_length); //
});
return unicode_string;
}

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

@@ -210,7 +210,7 @@ namespace
}
void setup_context(windows_emulator& win_emu, const emulator_settings& settings, const windows_path& application,
const windows_path& working_directory)
const windows_path& working_dir)
{
auto& emu = win_emu.emu();
auto& context = win_emu.process();
@@ -270,7 +270,7 @@ namespace
}
allocator.make_unicode_string(proc_params.CommandLine, command_line);
allocator.make_unicode_string(proc_params.CurrentDirectory.DosPath, working_directory.u16string() + u"\\");
allocator.make_unicode_string(proc_params.CurrentDirectory.DosPath, working_dir.u16string() + u"\\", 1024);
allocator.make_unicode_string(proc_params.ImagePathName, application_str);
const auto total_length = allocator.get_next_address() - context.process_params.value();