moonlight-stream/moonlight-android
1
0
Fork 0
mirror of https://github.com/moonlight-stream/moonlight-android.git synced 2025-07-18 10:32:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix CheckJNI abort with rumble values greater than 0x7FFF

Browse Source
This commit is contained in:
Cameron Gutman 2020-04-07 19:21:24 -07:00
parent 800f97ae85
commit 07fabc0663
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/src/main/jni/moonlight-core/callbacks.c
View File

@ -304,7 +304,10 @@ void BridgeClConnectionTerminated(int errorCode) {
void BridgeClRumble(unsigned short controllerNumber, unsigned short lowFreqMotor, unsigned short highFreqMotor) { void BridgeClRumble(unsigned short controllerNumber, unsigned short lowFreqMotor, unsigned short highFreqMotor) {
JNIEnv* env = GetThreadEnv(); JNIEnv* env = GetThreadEnv();
(*env)->CallStaticVoidMethod(env, GlobalBridgeClass, BridgeClRumbleMethod, controllerNumber, lowFreqMotor, highFreqMotor); // The seemingly redundant short casts are required in order to convert the unsigned short to a signed short.
// If we leave it as an unsigned short, CheckJNI will fail when the value exceeds 32767. The cast itself is
// fine because the Java code treats the value as unsigned even though it's stored in a signed type.
(*env)->CallStaticVoidMethod(env, GlobalBridgeClass, BridgeClRumbleMethod, controllerNumber, (short)lowFreqMotor, (short)highFreqMotor);
if ((*env)->ExceptionCheck(env)) { if ((*env)->ExceptionCheck(env)) {
// We will crash here // We will crash here
(*JVM)->DetachCurrentThread(JVM); (*JVM)->DetachCurrentThread(JVM);