stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

8035736: [parfait] JNI primitive type mismatch in jdk/src/windows/native/sun/windows/awt_Component.cpp

Browse Source 
Reviewed-by: pchelko, anthony
This commit is contained in:
Sergey Bylokhov 2014-04-01 01:03:52 +04:00
parent 41f9ffd645
commit 120f43985c
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
jdk/src/windows/native/sun/windows/awt.h
View File

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 1996, 2013, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 1996, 2014, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* *
* This code is free software; you can redistribute it and/or modify it * This code is free software; you can redistribute it and/or modify it
@ -47,6 +47,8 @@ extern COLORREF DesktopColor2RGB(int colorIndex);
class AwtObject; class AwtObject;
typedef AwtObject* PDATA; typedef AwtObject* PDATA;
#define JNI_IS_TRUE(obj) ((obj) ? JNI_TRUE : JNI_FALSE)
#define JNI_CHECK_NULL_GOTO(obj, msg, where) { \ #define JNI_CHECK_NULL_GOTO(obj, msg, where) { \
if (obj == NULL) { \ if (obj == NULL) { \
env->ExceptionClear(); \ env->ExceptionClear(); \

10
jdk/src/windows/native/sun/windows/awt_Component.cpp
View File

@ -6112,7 +6112,7 @@ jboolean AwtComponent::_NativeHandlesWheelScrolling(void *param)
c = (AwtComponent *)pData; c = (AwtComponent *)pData;
if (::IsWindow(c->GetHWnd())) if (::IsWindow(c->GetHWnd()))
{ {
result = (jboolean)c->InheritsNativeMouseWheelBehavior(); result = JNI_IS_TRUE(c->InheritsNativeMouseWheelBehavior());
} }
ret: ret:
env->DeleteGlobalRef(self); env->DeleteGlobalRef(self);
@ -6928,9 +6928,9 @@ Java_sun_awt_windows_WComponentPeer_nativeHandlesWheelScrolling (JNIEnv* env,
{ {
TRY; TRY;
return (jboolean)AwtToolkit::GetInstance().SyncCall( return JNI_IS_TRUE(AwtToolkit::GetInstance().SyncCall(
(void *(*)(void *))AwtComponent::_NativeHandlesWheelScrolling, (void *(*)(void *))AwtComponent::_NativeHandlesWheelScrolling,
env->NewGlobalRef(self)); env->NewGlobalRef(self)));
// global ref is deleted in _NativeHandlesWheelScrolling // global ref is deleted in _NativeHandlesWheelScrolling
CATCH_BAD_ALLOC_RET(NULL); CATCH_BAD_ALLOC_RET(NULL);
@ -6949,9 +6949,9 @@ Java_sun_awt_windows_WComponentPeer_isObscured(JNIEnv* env,
jobject selfGlobalRef = env->NewGlobalRef(self); jobject selfGlobalRef = env->NewGlobalRef(self);
return (jboolean)AwtToolkit::GetInstance().SyncCall( return JNI_IS_TRUE(AwtToolkit::GetInstance().SyncCall(
(void*(*)(void*))AwtComponent::_IsObscured, (void*(*)(void*))AwtComponent::_IsObscured,
(void *)selfGlobalRef); (void *)selfGlobalRef));
// selfGlobalRef is deleted in _IsObscured // selfGlobalRef is deleted in _IsObscured
CATCH_BAD_ALLOC_RET(NULL); CATCH_BAD_ALLOC_RET(NULL);