dburr/eden
1
0
Fork 0
mirror of https://git.eden-emu.dev/eden-emu/eden.git synced 2025-07-21 13:25:45 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

hle: kernel: Migrate KProcess to KAutoObject.

Browse source
This commit is contained in:
bunnei 2021-04-03 22:22:36 -07:00
parent 8b224f05c9
commit 7a6bfbde24
14 changed files with 80 additions and 58 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/core/hle/kernel/handle_table.cpp
View file

@ -100,7 +100,7 @@ ResultCode HandleTable::Add(Handle* out_handle, KAutoObject* obj, u16 type) {
}
ResultVal<Handle> HandleTable::Duplicate(Handle handle) {
std::shared_ptr<Object> object = GetGeneric(handle);
std::shared_ptr<Object> object = SharedFrom(GetGeneric(handle));
if (object == nullptr) {
LOG_ERROR(Kernel, "Tried to duplicate invalid handle: {:08X}", handle);
return ResultInvalidHandle;
@ -140,17 +140,17 @@ bool HandleTable::IsValid(Handle handle) const {
return slot < table_size && is_object_valid && generations[slot] == generation;
}
std::shared_ptr<Object> HandleTable::GetGeneric(Handle handle) const {
Object* HandleTable::GetGeneric(Handle handle) const {
if (handle == CurrentThread) {
return SharedFrom(kernel.CurrentScheduler()->GetCurrentThread());
return (kernel.CurrentScheduler()->GetCurrentThread());
} else if (handle == CurrentProcess) {
return SharedFrom(kernel.CurrentProcess());
return (kernel.CurrentProcess());
}
if (!IsValid(handle)) {
return nullptr;
}
return objects[GetSlot(handle)];
return objects[GetSlot(handle)].get();
}
void HandleTable::Clear() {