mirror of
https://github.com/Ryujinx/Ryujinx.git
synced 2024-12-24 16:26:02 +00:00
Implement GetAccumulatedSuspendedTickChangedEvent to ISelfController (#702)
* Implement GetAccumulatedSuspendedTickChangedEvent to ISelfController - Add all IPC call to the Dictionary. - Rename _libraryAppletLaunchableEvent. - Implement GetAccumulatedSuspendedTickChangedEvent according to the RE: ``` undefined8 GetAccumulatedSuspendedTickChangedEvent (struct this, uint *ouput_event_handle) { svcArbitrateLock(&this->tag_location); if (this->event_created == 0) { if (CreateEvent(&this->event_object, 0, 1) != 0) { Assert(&DAT_710018f73b, &DAT_710018f73b, &DAT_710018f73b, 0, result, &DAT_710018f73b); } this->event_created = 1; svcSignalEvent(&this->event_object); } svcArbitrateUnlock(&this->tag_location); uint event_handle = GetEventHandle(&this->event_object); uint uVar1 = *ouput_event_handle; *ouput_event_handle = event_handle; char cVar2 = *(char *)(ouput_event_handle + 1); *(undefined *)(ouput_event_handle + 1) = 0; if (cVar2 != 0) { svcCloseHandle((ulonglong)uVar1); } return 0; } ``` * Fix the handle leak
This commit is contained in:
parent
350a3667f7
commit
5084164cd9
1 changed files with 68 additions and 18 deletions
|
@ -13,7 +13,10 @@ namespace Ryujinx.HLE.HOS.Services.Am
|
||||||
|
|
||||||
public override IReadOnlyDictionary<int, ServiceProcessRequest> Commands => _commands;
|
public override IReadOnlyDictionary<int, ServiceProcessRequest> Commands => _commands;
|
||||||
|
|
||||||
private KEvent _launchableEvent;
|
private KEvent _libraryAppletLaunchableEvent;
|
||||||
|
|
||||||
|
private KEvent _accumulatedSuspendedTickChangedEvent;
|
||||||
|
private int _accumulatedSuspendedTickChangedEventHandle = 0;
|
||||||
|
|
||||||
private int _idleTimeDetectionExtension;
|
private int _idleTimeDetectionExtension;
|
||||||
|
|
||||||
|
@ -21,23 +24,50 @@ namespace Ryujinx.HLE.HOS.Services.Am
|
||||||
{
|
{
|
||||||
_commands = new Dictionary<int, ServiceProcessRequest>
|
_commands = new Dictionary<int, ServiceProcessRequest>
|
||||||
{
|
{
|
||||||
{ 0, Exit },
|
{ 0, Exit },
|
||||||
{ 1, LockExit },
|
{ 1, LockExit },
|
||||||
{ 2, UnlockExit },
|
{ 2, UnlockExit },
|
||||||
{ 9, GetLibraryAppletLaunchableEvent },
|
//{ 3, EnterFatalSection }, // 2.0.0+
|
||||||
{ 10, SetScreenShotPermission },
|
//{ 4, LeaveFatalSection }, // 2.0.0+
|
||||||
{ 11, SetOperationModeChangedNotification },
|
{ 9, GetLibraryAppletLaunchableEvent },
|
||||||
{ 12, SetPerformanceModeChangedNotification },
|
{ 10, SetScreenShotPermission },
|
||||||
{ 13, SetFocusHandlingMode },
|
{ 11, SetOperationModeChangedNotification },
|
||||||
{ 14, SetRestartMessageEnabled },
|
{ 12, SetPerformanceModeChangedNotification },
|
||||||
{ 16, SetOutOfFocusSuspendingEnabled },
|
{ 13, SetFocusHandlingMode },
|
||||||
{ 19, SetScreenShotImageOrientation },
|
{ 14, SetRestartMessageEnabled },
|
||||||
{ 50, SetHandlesRequestToDisplay },
|
//{ 15, SetScreenShotAppletIdentityInfo }, // 2.0.0+
|
||||||
{ 62, SetIdleTimeDetectionExtension },
|
{ 16, SetOutOfFocusSuspendingEnabled }, // 2.0.0+
|
||||||
{ 63, GetIdleTimeDetectionExtension }
|
//{ 17, SetControllerFirmwareUpdateSection }, // 3.0.0+
|
||||||
|
//{ 18, SetRequiresCaptureButtonShortPressedMessage }, // 3.0.0+
|
||||||
|
{ 19, SetScreenShotImageOrientation }, // 3.0.0+
|
||||||
|
//{ 20, SetDesirableKeyboardLayout }, // 4.0.0+
|
||||||
|
//{ 40, CreateManagedDisplayLayer },
|
||||||
|
//{ 41, IsSystemBufferSharingEnabled }, // 4.0.0+
|
||||||
|
//{ 42, GetSystemSharedLayerHandle }, // 4.0.0+
|
||||||
|
//{ 43, GetSystemSharedBufferHandle }, // 5.0.0+
|
||||||
|
{ 50, SetHandlesRequestToDisplay },
|
||||||
|
//{ 51, ApproveToDisplay },
|
||||||
|
//{ 60, OverrideAutoSleepTimeAndDimmingTime },
|
||||||
|
//{ 61, SetMediaPlaybackState },
|
||||||
|
{ 62, SetIdleTimeDetectionExtension },
|
||||||
|
{ 63, GetIdleTimeDetectionExtension },
|
||||||
|
//{ 64, SetInputDetectionSourceSet },
|
||||||
|
//{ 65, ReportUserIsActive }, // 2.0.0+
|
||||||
|
//{ 66, GetCurrentIlluminance }, // 3.0.0+
|
||||||
|
//{ 67, IsIlluminanceAvailable }, // 3.0.0+
|
||||||
|
//{ 68, SetAutoSleepDisabled }, // 5.0.0+
|
||||||
|
//{ 69, IsAutoSleepDisabled }, // 5.0.0+
|
||||||
|
//{ 70, ReportMultimediaError }, // 4.0.0+
|
||||||
|
//{ 71, GetCurrentIlluminanceEx }, // 5.0.0+
|
||||||
|
//{ 80, SetWirelessPriorityMode }, // 4.0.0+
|
||||||
|
//{ 90, GetAccumulatedSuspendedTickValue }, // 6.0.0+
|
||||||
|
{ 91, GetAccumulatedSuspendedTickChangedEvent }, // 6.0.0+
|
||||||
|
//{ 100, SetAlbumImageTakenNotificationEnabled }, // 7.0.0+
|
||||||
|
//{ 110, SetApplicationAlbumUserData }, // 8.0.0+
|
||||||
|
//{ 1000, GetDebugStorageChannel }, // 7.0.0+
|
||||||
};
|
};
|
||||||
|
|
||||||
_launchableEvent = new KEvent(system);
|
_libraryAppletLaunchableEvent = new KEvent(system);
|
||||||
}
|
}
|
||||||
|
|
||||||
public long Exit(ServiceCtx context)
|
public long Exit(ServiceCtx context)
|
||||||
|
@ -63,9 +93,9 @@ namespace Ryujinx.HLE.HOS.Services.Am
|
||||||
|
|
||||||
public long GetLibraryAppletLaunchableEvent(ServiceCtx context)
|
public long GetLibraryAppletLaunchableEvent(ServiceCtx context)
|
||||||
{
|
{
|
||||||
_launchableEvent.ReadableEvent.Signal();
|
_libraryAppletLaunchableEvent.ReadableEvent.Signal();
|
||||||
|
|
||||||
if (context.Process.HandleTable.GenerateHandle(_launchableEvent.ReadableEvent, out int handle) != KernelResult.Success)
|
if (context.Process.HandleTable.GenerateHandle(_libraryAppletLaunchableEvent.ReadableEvent, out int handle) != KernelResult.Success)
|
||||||
{
|
{
|
||||||
throw new InvalidOperationException("Out of handles!");
|
throw new InvalidOperationException("Out of handles!");
|
||||||
}
|
}
|
||||||
|
@ -170,5 +200,25 @@ namespace Ryujinx.HLE.HOS.Services.Am
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// GetAccumulatedSuspendedTickChangedEvent() -> handle<copy>
|
||||||
|
public long GetAccumulatedSuspendedTickChangedEvent(ServiceCtx context)
|
||||||
|
{
|
||||||
|
if (_accumulatedSuspendedTickChangedEventHandle == 0)
|
||||||
|
{
|
||||||
|
_accumulatedSuspendedTickChangedEvent = new KEvent(context.Device.System);
|
||||||
|
|
||||||
|
_accumulatedSuspendedTickChangedEvent.ReadableEvent.Signal();
|
||||||
|
|
||||||
|
if (context.Process.HandleTable.GenerateHandle(_accumulatedSuspendedTickChangedEvent.ReadableEvent, out _accumulatedSuspendedTickChangedEventHandle) != KernelResult.Success)
|
||||||
|
{
|
||||||
|
throw new InvalidOperationException("Out of handles!");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
context.Response.HandleDesc = IpcHandleDesc.MakeCopy(_accumulatedSuspendedTickChangedEventHandle);
|
||||||
|
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue