; Insert missing JNI prologues

* src/android.c (shouldForwardMultimediaButtons)
(shouldForwardCtrlSpace, notifyPixelsChanged, setupSystemThread):

* src/androidvfs.c (safSyncAndReadInput, safSync, safPostRequest)
(ftruncate): Insert absent JNI prologues.
This commit is contained in:
Po Lu 2024-02-22 13:30:18 +08:00
parent ee6343556a
commit 8e0f134653
2 changed files with 16 additions and 0 deletions

View file

@ -2519,6 +2519,8 @@ JNIEXPORT jboolean JNICALL
NATIVE_NAME (shouldForwardMultimediaButtons) (JNIEnv *env,
jobject object)
{
JNI_STACK_ALIGNMENT_PROLOGUE;
/* Yes, android_pass_multimedia_buttons_to_system is being
read from the UI thread. */
return !android_pass_multimedia_buttons_to_system;
@ -2527,6 +2529,8 @@ NATIVE_NAME (shouldForwardMultimediaButtons) (JNIEnv *env,
JNIEXPORT jboolean JNICALL
NATIVE_NAME (shouldForwardCtrlSpace) (JNIEnv *env, jobject object)
{
JNI_STACK_ALIGNMENT_PROLOGUE;
return !android_intercept_control_space;
}
@ -2630,6 +2634,8 @@ JNIEXPORT void JNICALL
NATIVE_NAME (notifyPixelsChanged) (JNIEnv *env, jobject object,
jobject bitmap)
{
JNI_STACK_ALIGNMENT_PROLOGUE;
void *data;
/* Lock and unlock the bitmap. This calls
@ -2683,6 +2689,8 @@ NATIVE_NAME (answerQuerySpin) (JNIEnv *env, jobject object)
JNIEXPORT void JNICALL
NATIVE_NAME (setupSystemThread) (void)
{
JNI_STACK_ALIGNMENT_PROLOGUE;
sigset_t sigset;
/* Block everything except for SIGSEGV and SIGBUS; those two are

View file

@ -6317,6 +6317,8 @@ static sem_t saf_completion_sem;
JNIEXPORT jint JNICALL
NATIVE_NAME (safSyncAndReadInput) (JNIEnv *env, jobject object)
{
JNI_STACK_ALIGNMENT_PROLOGUE;
while (sem_wait (&saf_completion_sem) < 0)
{
if (input_blocked_p ())
@ -6338,6 +6340,8 @@ NATIVE_NAME (safSyncAndReadInput) (JNIEnv *env, jobject object)
JNIEXPORT void JNICALL
NATIVE_NAME (safSync) (JNIEnv *env, jobject object)
{
JNI_STACK_ALIGNMENT_PROLOGUE;
while (sem_wait (&saf_completion_sem) < 0)
process_pending_signals ();
}
@ -6345,12 +6349,16 @@ NATIVE_NAME (safSync) (JNIEnv *env, jobject object)
JNIEXPORT void JNICALL
NATIVE_NAME (safPostRequest) (JNIEnv *env, jobject object)
{
JNI_STACK_ALIGNMENT_PROLOGUE;
sem_post (&saf_completion_sem);
}
JNIEXPORT jboolean JNICALL
NATIVE_NAME (ftruncate) (JNIEnv *env, jobject object, jint fd)
{
JNI_STACK_ALIGNMENT_PROLOGUE;
if (ftruncate (fd, 0) < 0)
return false;