mirror of
https://git.eden-emu.dev/eden-emu/eden.git
synced 2025-07-21 05:15:47 +00:00
service/vi: Implement OpenDefaultDisplay in terms of OpenDisplay
Internally within the vi services, this is essentially all that OpenDefaultDisplay does, so it's trivial to just do the same, and forward the default display string into the function.
This commit is contained in:
parent
79fe1a3513
commit
91431c27c8
1 changed files with 17 additions and 4 deletions
|
@ -888,10 +888,23 @@ private:
|
||||||
LOG_WARNING(Service_VI, "(STUBBED) called");
|
LOG_WARNING(Service_VI, "(STUBBED) called");
|
||||||
|
|
||||||
IPC::RequestParser rp{ctx};
|
IPC::RequestParser rp{ctx};
|
||||||
auto name_buf = rp.PopRaw<std::array<u8, 0x40>>();
|
const auto name_buf = rp.PopRaw<std::array<char, 0x40>>();
|
||||||
auto end = std::find(name_buf.begin(), name_buf.end(), '\0');
|
|
||||||
|
|
||||||
std::string name(name_buf.begin(), end);
|
OpenDisplayImpl(ctx, std::string_view{name_buf.data(), name_buf.size()});
|
||||||
|
}
|
||||||
|
|
||||||
|
void OpenDefaultDisplay(Kernel::HLERequestContext& ctx) {
|
||||||
|
LOG_DEBUG(Service_VI, "called");
|
||||||
|
|
||||||
|
OpenDisplayImpl(ctx, "Default");
|
||||||
|
}
|
||||||
|
|
||||||
|
void OpenDisplayImpl(Kernel::HLERequestContext& ctx, std::string_view name) {
|
||||||
|
const auto trim_pos = name.find('\0');
|
||||||
|
|
||||||
|
if (trim_pos != std::string_view::npos) {
|
||||||
|
name.remove_suffix(name.size() - trim_pos);
|
||||||
|
}
|
||||||
|
|
||||||
ASSERT_MSG(name == "Default", "Non-default displays aren't supported yet");
|
ASSERT_MSG(name == "Default", "Non-default displays aren't supported yet");
|
||||||
|
|
||||||
|
@ -1082,7 +1095,7 @@ IApplicationDisplayService::IApplicationDisplayService(
|
||||||
"GetIndirectDisplayTransactionService"},
|
"GetIndirectDisplayTransactionService"},
|
||||||
{1000, &IApplicationDisplayService::ListDisplays, "ListDisplays"},
|
{1000, &IApplicationDisplayService::ListDisplays, "ListDisplays"},
|
||||||
{1010, &IApplicationDisplayService::OpenDisplay, "OpenDisplay"},
|
{1010, &IApplicationDisplayService::OpenDisplay, "OpenDisplay"},
|
||||||
{1011, nullptr, "OpenDefaultDisplay"},
|
{1011, &IApplicationDisplayService::OpenDefaultDisplay, "OpenDefaultDisplay"},
|
||||||
{1020, &IApplicationDisplayService::CloseDisplay, "CloseDisplay"},
|
{1020, &IApplicationDisplayService::CloseDisplay, "CloseDisplay"},
|
||||||
{1101, nullptr, "SetDisplayEnabled"},
|
{1101, nullptr, "SetDisplayEnabled"},
|
||||||
{1102, &IApplicationDisplayService::GetDisplayResolution, "GetDisplayResolution"},
|
{1102, &IApplicationDisplayService::GetDisplayResolution, "GetDisplayResolution"},
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue