Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
openanolis
dragonwell8_jdk
提交
9b1ead96
D
dragonwell8_jdk
项目概览
openanolis
/
dragonwell8_jdk
通知
4
Star
2
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
D
dragonwell8_jdk
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
提交
9b1ead96
编写于
3月 31, 2014
作者:
P
pchelko
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
8035335: [parfait] JNI exception pending in jdk/src/windows/native/sun/windows/awt_TrayIcon.cpp
Reviewed-by: serb, anthony
上级
6e3b273a
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
23 addition
and
6 deletion
+23
-6
src/windows/native/sun/windows/awt_TrayIcon.cpp
src/windows/native/sun/windows/awt_TrayIcon.cpp
+23
-6
未找到文件。
src/windows/native/sun/windows/awt_TrayIcon.cpp
浏览文件 @
9b1ead96
/*
* Copyright (c) 2005, 201
3
, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2005, 201
4
, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
...
...
@@ -503,6 +503,7 @@ void AwtTrayIcon::SendMouseEvent(jint id, jlong when, jint x, jint y,
env
->
GetMethodID
(
mouseEventCls
,
"<init>"
,
"(Ljava/awt/Component;IJIIIIIIZI)V"
);
DASSERT
(
mouseEventConst
);
CHECK_NULL
(
mouseEventConst
);
}
if
(
env
->
EnsureLocalCapacity
(
2
)
<
0
)
{
return
;
...
...
@@ -556,6 +557,7 @@ void AwtTrayIcon::SendActionEvent(jint id, jlong when, jint modifiers, MSG *pMsg
env
->
GetMethodID
(
actionEventCls
,
"<init>"
,
"(Ljava/lang/Object;ILjava/lang/String;JI)V"
);
DASSERT
(
actionEventConst
);
CHECK_NULL
(
actionEventConst
);
}
if
(
env
->
EnsureLocalCapacity
(
2
)
<
0
)
{
return
;
...
...
@@ -736,6 +738,7 @@ void AwtTrayIcon::_SetToolTip(void *param)
}
tooltipStr
=
JNU_GetStringPlatformChars
(
env
,
jtooltip
,
(
jboolean
*
)
NULL
);
if
(
env
->
ExceptionCheck
())
goto
ret
;
trayIcon
->
SetToolTip
(
tooltipStr
);
JNU_ReleaseStringPlatformChars
(
env
,
jtooltip
,
tooltipStr
);
ret:
...
...
@@ -855,9 +858,18 @@ void AwtTrayIcon::_DisplayMessage(void *param)
trayIcon
=
(
AwtTrayIcon
*
)
pData
;
captionStr
=
JNU_GetStringPlatformChars
(
env
,
jcaption
,
(
jboolean
*
)
NULL
);
if
(
env
->
ExceptionCheck
())
goto
ret
;
textStr
=
JNU_GetStringPlatformChars
(
env
,
jtext
,
(
jboolean
*
)
NULL
);
if
(
env
->
ExceptionCheck
())
{
JNU_ReleaseStringPlatformChars
(
env
,
jcaption
,
captionStr
);
goto
ret
;
}
msgTypeStr
=
JNU_GetStringPlatformChars
(
env
,
jmsgType
,
(
jboolean
*
)
NULL
);
if
(
env
->
ExceptionCheck
())
{
JNU_ReleaseStringPlatformChars
(
env
,
jcaption
,
captionStr
);
JNU_ReleaseStringPlatformChars
(
env
,
jtext
,
textStr
);
goto
ret
;
}
trayIcon
->
DisplayMessage
(
captionStr
,
textStr
,
msgTypeStr
);
JNU_ReleaseStringPlatformChars
(
env
,
jcaption
,
captionStr
);
...
...
@@ -889,10 +901,12 @@ Java_java_awt_TrayIcon_initIDs(JNIEnv *env, jclass cls)
/* init field ids */
AwtTrayIcon
::
idID
=
env
->
GetFieldID
(
cls
,
"id"
,
"I"
);
AwtTrayIcon
::
actionCommandID
=
env
->
GetFieldID
(
cls
,
"actionCommand"
,
"Ljava/lang/String;"
);
DASSERT
(
AwtTrayIcon
::
idID
!=
NULL
);
CHECK_NULL
(
AwtTrayIcon
::
idID
);
AwtTrayIcon
::
actionCommandID
=
env
->
GetFieldID
(
cls
,
"actionCommand"
,
"Ljava/lang/String;"
);
DASSERT
(
AwtTrayIcon
::
actionCommandID
!=
NULL
);
CHECK_NULL
(
AwtTrayIcon
::
actionCommandID
);
CATCH_BAD_ALLOC
;
}
...
...
@@ -981,8 +995,11 @@ Java_sun_awt_windows_WTrayIconPeer_setNativeIcon(JNIEnv *env, jobject self,
jint
*
intRasterDataPtr
=
NULL
;
HBITMAP
hColor
=
NULL
;
try
{
intRasterDataPtr
=
(
jint
*
)
env
->
GetPrimitiveArrayCritical
(
intRasterData
,
0
);
intRasterDataPtr
=
(
jint
*
)
env
->
GetPrimitiveArrayCritical
(
intRasterData
,
0
);
if
(
intRasterDataPtr
==
NULL
)
{
::
DeleteObject
(
hMask
);
return
;
}
hColor
=
AwtTrayIcon
::
CreateBMP
(
NULL
,
(
int
*
)
intRasterDataPtr
,
nSS
,
nW
,
nH
);
}
catch
(...)
{
if
(
intRasterDataPtr
!=
NULL
)
{
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录