From 64522e8f309f7729836bca9179b03ae1d52f40ac Mon Sep 17 00:00:00 2001 From: Sergey Bylokhov Date: Fri, 11 Jul 2014 13:32:12 +0400 Subject: [PATCH] 8049583: Test closed/java/awt/List/ListMultipleSelectTest/ListMultipleSelectTest fails on Window XP Reviewed-by: pchelko, anthony --- jdk/src/windows/native/sun/windows/awt_Component.cpp | 8 ++++---- jdk/src/windows/native/sun/windows/awt_List.cpp | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/jdk/src/windows/native/sun/windows/awt_Component.cpp b/jdk/src/windows/native/sun/windows/awt_Component.cpp index 66fb1284e19..5ab74c7e858 100644 --- a/jdk/src/windows/native/sun/windows/awt_Component.cpp +++ b/jdk/src/windows/native/sun/windows/awt_Component.cpp @@ -6935,9 +6935,9 @@ Java_sun_awt_windows_WComponentPeer_nativeHandlesWheelScrolling (JNIEnv* env, { TRY; - return JNI_IS_TRUE(AwtToolkit::GetInstance().SyncCall( + return (jboolean)AwtToolkit::GetInstance().SyncCall( (void *(*)(void *))AwtComponent::_NativeHandlesWheelScrolling, - env->NewGlobalRef(self))); + env->NewGlobalRef(self)); // global ref is deleted in _NativeHandlesWheelScrolling CATCH_BAD_ALLOC_RET(NULL); @@ -6956,9 +6956,9 @@ Java_sun_awt_windows_WComponentPeer_isObscured(JNIEnv* env, jobject selfGlobalRef = env->NewGlobalRef(self); - return JNI_IS_TRUE(AwtToolkit::GetInstance().SyncCall( + return (jboolean)AwtToolkit::GetInstance().SyncCall( (void*(*)(void*))AwtComponent::_IsObscured, - (void *)selfGlobalRef)); + (void *)selfGlobalRef); // selfGlobalRef is deleted in _IsObscured CATCH_BAD_ALLOC_RET(NULL); diff --git a/jdk/src/windows/native/sun/windows/awt_List.cpp b/jdk/src/windows/native/sun/windows/awt_List.cpp index c6cec8fe08b..5188c85984f 100644 --- a/jdk/src/windows/native/sun/windows/awt_List.cpp +++ b/jdk/src/windows/native/sun/windows/awt_List.cpp @@ -1018,8 +1018,8 @@ Java_sun_awt_windows_WListPeer_isSelected(JNIEnv *env, jobject self, ses->list = env->NewGlobalRef(self); ses->index = index; - return JNI_IS_TRUE(AwtToolkit::GetInstance().SyncCall( - (void *(*)(void *))AwtList::_IsSelected, ses)); + return (jboolean)AwtToolkit::GetInstance().SyncCall( + (void *(*)(void *))AwtList::_IsSelected, ses); // global ref and ses are deleted in _IsSelected CATCH_BAD_ALLOC_RET(FALSE);