Mercurial > hg > shenandoah-preopenjdk-archive > openjdk8 > jdk
changeset 10171:f07bc5dab84c
8049583: Test closed/java/awt/List/ListMultipleSelectTest/ListMultipleSelectTest fails on Window XP
Reviewed-by: pchelko, anthony
| author | serb |
|---|---|
| date | Fri, 11 Jul 2014 13:32:12 +0400 |
| parents | c9666782c0cd |
| children | e575fa34931c |
| files | src/windows/native/sun/windows/awt_Component.cpp src/windows/native/sun/windows/awt_List.cpp |
| diffstat | 2 files changed, 6 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/src/windows/native/sun/windows/awt_Component.cpp Tue Jul 29 15:52:50 2014 +0400 +++ b/src/windows/native/sun/windows/awt_Component.cpp Fri Jul 11 13:32:12 2014 +0400 @@ -6930,9 +6930,9 @@ { 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); @@ -6951,9 +6951,9 @@ 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);
--- a/src/windows/native/sun/windows/awt_List.cpp Tue Jul 29 15:52:50 2014 +0400 +++ b/src/windows/native/sun/windows/awt_List.cpp Fri Jul 11 13:32:12 2014 +0400 @@ -1018,8 +1018,8 @@ 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);