sf: Change interface definition methodology (#1074)
* sf: Begin experimenting with new interface declaration format * sf: convert fs interfaces to new format * sf: finish conversion of libstrat to new definitions * sf: convert loader to new format * sf: convert spl to new format * sf: update ncm for new format * sf: convert pm to new format * sf: convert ro/sm to new format * sf: update fatal for new format * sf: support building dmnt under new scheme * sf: update ams.mitm for new format * sf: correct invocation def for pointer holder * fs: correct 10.x+ user bindings for Get*SpaceSize
This commit is contained in:
@@ -69,20 +69,22 @@ namespace ams::pgl::srv {
|
||||
}
|
||||
|
||||
Result ShellInterface::GetShellEventObserver(ams::sf::Out<std::shared_ptr<pgl::sf::IEventObserver>> out) {
|
||||
using Interface = typename pgl::sf::IEventObserver::ImplHolder<ShellEventObserver>;
|
||||
|
||||
/* Allocate a new interface. */
|
||||
auto *observer_memory = this->memory_resource->Allocate(sizeof(EventObserverInterface), alignof(EventObserverInterface));
|
||||
auto *observer_memory = this->memory_resource->Allocate(sizeof(Interface), alignof(Interface));
|
||||
AMS_ABORT_UNLESS(observer_memory != nullptr);
|
||||
|
||||
/* Create the interface object. */
|
||||
new (observer_memory) EventObserverInterface;
|
||||
new (observer_memory) Interface;
|
||||
|
||||
/* Set the output. */
|
||||
out.SetValue(std::shared_ptr<EventObserverInterface>(reinterpret_cast<EventObserverInterface *>(observer_memory), [&](EventObserverInterface *obj) {
|
||||
out.SetValue(std::shared_ptr<pgl::sf::IEventObserver>(reinterpret_cast<Interface *>(observer_memory), [&](Interface *obj) {
|
||||
/* Destroy the object. */
|
||||
obj->~EventObserverInterface();
|
||||
obj->~Interface();
|
||||
|
||||
/* Custom deleter: use the memory resource to free. */
|
||||
this->memory_resource->Deallocate(obj, sizeof(EventObserverInterface), alignof(EventObserverInterface));
|
||||
this->memory_resource->Deallocate(obj, sizeof(Interface), alignof(Interface));
|
||||
}));
|
||||
return ResultSuccess();
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user