infernap12/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2026-05-19 18:07:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

8034037: [parfait] JNI exception pending in macosx/native/sun/awt/AWTEvent.m, AWTView.m

Browse Source 
Reviewed-by: pchelko, azvegint
This commit is contained in:
Sergey Bylokhov 2014-03-06 15:05:41 +04:00
parent 8843617840
commit f7a1ea8b57
2 changed files with 32 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
jdk/src/macosx/native/sun/awt/AWTEvent.m
View File

@ -28,6 +28,7 @@
#import <sys/time.h>
#include <Carbon/Carbon.h>
#import "jni_util.h"
#import "LWCToolkit.h"
#import "ThreadUtilities.h"
@ -687,6 +688,7 @@ JNF_COCOA_ENTER(env);
jboolean copy = JNI_FALSE;
jint *data = (*env)->GetIntArrayElements(env, inData, &copy);
CHECK_NULL_RETURN(data, postsTyped);
// in = [testChar, testDeadChar, modifierFlags, keyCode]
jchar testChar = (jchar)data[0];
@ -727,6 +729,7 @@ JNF_COCOA_ENTER(env);
jboolean copy = JNI_FALSE;
jint *data = (*env)->GetIntArrayElements(env, inData, &copy);
CHECK_NULL(data);
// in = [modifierFlags, keyCode]
jint modifierFlags = data[0];

48
jdk/src/macosx/native/sun/awt/AWTView.m
View File

@ -1081,21 +1081,22 @@ JNF_CLASS_CACHE(jc_CInputMethod, "sun/lwawt/macosx/CInputMethod");
jarray array;
jboolean isCopy;
jint *_array;
NSRange range;
NSRange range = NSMakeRange(NSNotFound, 0);
array = JNFCallObjectMethod(env, fInputMethodLOCKABLE, jm_markedRange); // AWT_THREADING Safe (AWTRunLoopMode)
if (array) {
_array = (*env)->GetIntArrayElements(env, array, &isCopy);
range = NSMakeRange(_array[0], _array[1]);
if (_array != NULL) {
range.location = _array[0];
range.length = _array[1];
#ifdef IM_DEBUG
fprintf(stderr, "markedRange returning (%lu, %lu)\n", (unsigned long)range.location, (unsigned long)range.length);
fprintf(stderr, "markedRange returning (%lu, %lu)\n",
(unsigned long)range.location, (unsigned long)range.length);
#endif // IM_DEBUG
(*env)->ReleaseIntArrayElements(env, array, _array, 0);
(*env)->ReleaseIntArrayElements(env, array, _array, 0);
}
(*env)->DeleteLocalRef(env, array);
} else {
range = NSMakeRange(NSNotFound, 0);
}
return range;
@ -1115,7 +1116,7 @@ JNF_CLASS_CACHE(jc_CInputMethod, "sun/lwawt/macosx/CInputMethod");
jarray array;
jboolean isCopy;
jint *_array;
NSRange range;
NSRange range = NSMakeRange(NSNotFound, 0);
#ifdef IM_DEBUG
fprintf(stderr, "AWTView InputMethod Selector Called : [selectedRange]\n");
@ -1124,15 +1125,15 @@ JNF_CLASS_CACHE(jc_CInputMethod, "sun/lwawt/macosx/CInputMethod");
array = JNFCallObjectMethod(env, fInputMethodLOCKABLE, jm_selectedRange); // AWT_THREADING Safe (AWTRunLoopMode)
if (array) {
_array = (*env)->GetIntArrayElements(env, array, &isCopy);
range = NSMakeRange(_array[0], _array[1]);
(*env)->ReleaseIntArrayElements(env, array, _array, 0);
if (_array != NULL) {
range.location = _array[0];
range.length = _array[1];
(*env)->ReleaseIntArrayElements(env, array, _array, 0);
}
(*env)->DeleteLocalRef(env, array);
} else {
range = NSMakeRange(NSNotFound, 0);
}
return range;
}
/* This method returns the first frame of rects for theRange in screen coordindate system.
@ -1140,7 +1141,7 @@ JNF_CLASS_CACHE(jc_CInputMethod, "sun/lwawt/macosx/CInputMethod");
- (NSRect) firstRectForCharacterRange:(NSRange)theRange actualRange:(NSRangePointer)actualRange
{
if (!fInputMethodLOCKABLE) {
return NSMakeRect(0, 0, 0, 0);
return NSZeroRect;
}
static JNF_MEMBER_CACHE(jm_firstRectForCharacterRange, jc_CInputMethod,
@ -1152,18 +1153,27 @@ JNF_CLASS_CACHE(jc_CInputMethod, "sun/lwawt/macosx/CInputMethod");
NSRect rect;
#ifdef IM_DEBUG
fprintf(stderr, "AWTView InputMethod Selector Called : [firstRectForCharacterRange:] location=%lu, length=%lu\n", (unsigned long)theRange.location, (unsigned long)theRange.length);
fprintf(stderr,
"AWTView InputMethod Selector Called : [firstRectForCharacterRange:] location=%lu, length=%lu\n",
(unsigned long)theRange.location, (unsigned long)theRange.length);
#endif // IM_DEBUG
array = JNFCallObjectMethod(env, fInputMethodLOCKABLE, jm_firstRectForCharacterRange, theRange.location); // AWT_THREADING Safe (AWTRunLoopMode)
array = JNFCallObjectMethod(env, fInputMethodLOCKABLE, jm_firstRectForCharacterRange,
theRange.location); // AWT_THREADING Safe (AWTRunLoopMode)
_array = (*env)->GetIntArrayElements(env, array, &isCopy);
rect = ConvertNSScreenRect(env, NSMakeRect(_array[0], _array[1], _array[2], _array[3]));
(*env)->ReleaseIntArrayElements(env, array, _array, 0);
if (_array) {
rect = ConvertNSScreenRect(env, NSMakeRect(_array[0], _array[1], _array[2], _array[3]));
(*env)->ReleaseIntArrayElements(env, array, _array, 0);
} else {
rect = NSZeroRect;
}
(*env)->DeleteLocalRef(env, array);
#ifdef IM_DEBUG
fprintf(stderr, "firstRectForCharacterRange returning x=%f, y=%f, width=%f, height=%f\n", rect.origin.x, rect.origin.y, rect.size.width, rect.size.height);
fprintf(stderr,
"firstRectForCharacterRange returning x=%f, y=%f, width=%f, height=%f\n",
rect.origin.x, rect.origin.y, rect.size.width, rect.size.height);
#endif // IM_DEBUG
return rect;
}