Skip to content

Block on VPADRead() while the plugin menu is open. #109

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Maschell merged 3 commits into from
Feb 14, 2025
Merged

Block on VPADRead() while the plugin menu is open. #109

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
670329d
Block on `VPADRead()` while the plugin menu is open.
Feb 12, 2025
4a05e0c
Trying to please clang-format.
Feb 12, 2025
397e1fa
Block `VPADRead()` only for Hyrule Warriors.
Feb 14, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 13 additions & 0 deletions source/patcher/hooks_patcher_static.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,11 @@
#include "plugin/SectionInfo.h"
#include "utils/config/ConfigUtils.h"

#include <coreinit/cache.h>
#include <coreinit/core.h>
#include <coreinit/messagequeue.h>
#include <coreinit/time.h>
#include <coreinit/title.h>
#include <padscore/wpad.h>
#include <vpad/input.h>

Expand All @@ -21,9 +24,11 @@ DECL_FUNCTION(void, GX2SwapScanBuffers, void) {

if (sWantsToOpenConfigMenu && !gConfigMenuOpened) {
gConfigMenuOpened = true;
OSMemoryBarrier();
ConfigUtils::openConfigMenu();
gConfigMenuOpened = false;
sWantsToOpenConfigMenu = false;
OSMemoryBarrier();
}
}

Expand Down Expand Up @@ -89,6 +94,14 @@ DECL_FUNCTION(int32_t, VPADRead, int32_t chan, VPADStatus *buffer, uint32_t buff
if (gConfigMenuOpened) {
// Ignore reading vpad input only from other threads if the config menu is opened
if (OSGetCurrentThread() != gOnlyAcceptFromThread) {
// Quick fix for Hyrule Warriors: block VPADRead() in non-rendering threads.
switch (OSGetTitleID()) {
case 0x00050000'1017CD00: // Hyrule Warriors JPN
case 0x00050000'1017D800: // Hyrule Warriors USA
case 0x00050000'1017D900: // Hyrule Warriors EUR
while (gConfigMenuOpened)
OSSleepTicks(OSMillisecondsToTicks(10));
}
return 0;
}
}
Expand Down
2 changes: 2 additions & 0 deletions source/utils/config/ConfigUtils.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
#include <wups/config.h>
#include <wups/hooks.h>

#include <coreinit/cache.h>
#include <coreinit/title.h>
#include <sysapp/launch.h>

Expand Down Expand Up @@ -166,6 +167,7 @@ void ConfigUtils::displayMenu() {

gOnlyAcceptFromThread = OSGetCurrentThread();
ConfigSubState subStateReturnValue = SUB_STATE_ERROR;
OSMemoryBarrier();
while (true) {
startTime = OSGetTime();
if (gConfigMenuShouldClose) {
Expand Down