Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
openanolis
dragonwell8_jdk
提交
b46fefbb
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看板
提交
b46fefbb
编写于
7月 20, 2018
作者:
R
robm
浏览文件
操作
浏览文件
下载
差异文件
Merge
上级
69e5b3e6
8e14679d
变更
14
隐藏空白更改
内联
并排
Showing
14 changed file
with
99 addition
and
24 deletion
+99
-24
make/mapfiles/libawt_xawt/mapfile-vers
make/mapfiles/libawt_xawt/mapfile-vers
+1
-0
src/share/classes/java/security/IdentityScope.java
src/share/classes/java/security/IdentityScope.java
+2
-2
src/share/classes/java/security/Signature.java
src/share/classes/java/security/Signature.java
+1
-1
src/share/classes/sun/security/jca/ProviderList.java
src/share/classes/sun/security/jca/ProviderList.java
+1
-1
src/share/classes/sun/security/pkcs/PKCS8Key.java
src/share/classes/sun/security/pkcs/PKCS8Key.java
+0
-1
src/share/classes/sun/security/provider/AuthPolicyFile.java
src/share/classes/sun/security/provider/AuthPolicyFile.java
+2
-1
src/share/classes/sun/security/provider/DSA.java
src/share/classes/sun/security/provider/DSA.java
+0
-12
src/share/classes/sun/security/provider/PolicyFile.java
src/share/classes/sun/security/provider/PolicyFile.java
+3
-1
src/share/classes/sun/security/util/AnchorCertificates.java
src/share/classes/sun/security/util/AnchorCertificates.java
+1
-1
src/share/classes/sun/security/util/SignatureFileVerifier.java
...hare/classes/sun/security/util/SignatureFileVerifier.java
+3
-2
src/share/classes/sun/security/x509/CertificateExtensions.java
...hare/classes/sun/security/x509/CertificateExtensions.java
+2
-1
src/share/classes/sun/security/x509/X509Key.java
src/share/classes/sun/security/x509/X509Key.java
+0
-1
src/solaris/classes/sun/awt/X11/XRobotPeer.java
src/solaris/classes/sun/awt/X11/XRobotPeer.java
+5
-0
src/solaris/native/sun/awt/awt_Robot.c
src/solaris/native/sun/awt/awt_Robot.c
+78
-0
未找到文件。
make/mapfiles/libawt_xawt/mapfile-vers
浏览文件 @
b46fefbb
...
...
@@ -158,6 +158,7 @@ SUNWprivate_1.1 {
Java_sun_awt_X11_XRobotPeer_mouseReleaseImpl;
Java_sun_awt_X11_XRobotPeer_mouseWheelImpl;
Java_sun_awt_X11_XRobotPeer_setup;
Java_sun_awt_X11_XRobotPeer_loadNativeLibraries;
Java_sun_awt_X11_XToolkit_getNumberOfButtonsImpl;
Java_java_awt_Component_initIDs;
Java_java_awt_Container_initIDs;
...
...
src/share/classes/java/security/IdentityScope.java
浏览文件 @
b46fefbb
...
...
@@ -88,8 +88,8 @@ class IdentityScope extends Identity {
try
{
Class
.
forName
(
classname
);
}
catch
(
ClassNotFoundException
e
)
{
//Security.error
("unable to establish a system scope from " +
//
classname);
System
.
err
.
println
(
"unable to establish a system scope from "
+
classname
);
e
.
printStackTrace
();
}
}
...
...
src/share/classes/java/security/Signature.java
浏览文件 @
b46fefbb
...
...
@@ -1051,7 +1051,7 @@ public abstract class Signature extends SignatureSpi {
debug
.
println
(
"Further warnings of this type will "
+
"be suppressed"
);
}
new
Exception
(
"
C
all trace"
).
printStackTrace
();
new
Exception
(
"
Debug c
all trace"
).
printStackTrace
();
}
}
Exception
lastException
=
null
;
...
...
src/share/classes/sun/security/jca/ProviderList.java
浏览文件 @
b46fefbb
...
...
@@ -275,7 +275,7 @@ public final class ProviderList {
}
if
(
debug
!=
null
)
{
debug
.
println
(
"Loading all providers"
);
new
Exception
(
"
Call trace
"
).
printStackTrace
();
new
Exception
(
"
Debug Info. Call trace:
"
).
printStackTrace
();
}
int
n
=
0
;
for
(
int
i
=
0
;
i
<
configs
.
length
;
i
++)
{
...
...
src/share/classes/sun/security/pkcs/PKCS8Key.java
浏览文件 @
b46fefbb
...
...
@@ -347,7 +347,6 @@ public class PKCS8Key implements PrivateKey {
}
}
catch
(
IOException
e
)
{
// e.printStackTrace ();
throw
new
InvalidKeyException
(
"IOException : "
+
e
.
getMessage
());
}
...
...
src/share/classes/sun/security/provider/AuthPolicyFile.java
浏览文件 @
b46fefbb
...
...
@@ -186,6 +186,7 @@ public class AuthPolicyFile extends javax.security.auth.Policy {
}
catch
(
Exception
e
)
{
// ignore, treat it like we have no keystore
if
(
debug
!=
null
)
{
debug
.
println
(
"Debug info only. No keystore."
);
e
.
printStackTrace
();
}
return
null
;
...
...
@@ -260,7 +261,7 @@ public class AuthPolicyFile extends javax.security.auth.Policy {
loaded_one
=
true
;
}
catch
(
Exception
e
)
{
if
(
debug
!=
null
)
{
debug
.
println
(
"
e
rror reading policy "
+
e
);
debug
.
println
(
"
Debug info only. E
rror reading policy "
+
e
);
e
.
printStackTrace
();
}
// ignore that policy
...
...
src/share/classes/sun/security/provider/DSA.java
浏览文件 @
b46fefbb
...
...
@@ -434,18 +434,6 @@ abstract class DSA extends SignatureSpi {
return
printable
;
}
private
static
void
debug
(
Exception
e
)
{
if
(
debug
)
{
e
.
printStackTrace
();
}
}
private
static
void
debug
(
String
s
)
{
if
(
debug
)
{
System
.
err
.
println
(
s
);
}
}
/**
* Standard SHA224withDSA implementation as defined in FIPS186-3.
*/
...
...
src/share/classes/sun/security/provider/PolicyFile.java
浏览文件 @
b46fefbb
...
...
@@ -563,7 +563,8 @@ public class PolicyFile extends java.security.Policy {
loaded_policy
=
true
;
}
catch
(
Exception
e
)
{
if
(
debug
!=
null
)
{
debug
.
println
(
"error reading policy "
+
e
);
debug
.
println
(
"Debug info only. Error reading policy "
+
e
);
e
.
printStackTrace
();
}
// ignore that policy
...
...
@@ -616,6 +617,7 @@ public class PolicyFile extends java.security.Policy {
}
catch
(
Exception
e
)
{
// ignore, treat it like we have no keystore
if
(
debug
!=
null
)
{
debug
.
println
(
"Debug info only. Ignoring exception."
);
e
.
printStackTrace
();
}
}
...
...
src/share/classes/sun/security/util/AnchorCertificates.java
浏览文件 @
b46fefbb
...
...
@@ -75,8 +75,8 @@ public class AnchorCertificates {
}
catch
(
Exception
e
)
{
if
(
debug
!=
null
)
{
debug
.
println
(
"Error parsing cacerts"
);
e
.
printStackTrace
();
}
e
.
printStackTrace
();
}
return
null
;
}
...
...
src/share/classes/sun/security/util/SignatureFileVerifier.java
浏览文件 @
b46fefbb
...
...
@@ -380,8 +380,9 @@ public class SignatureFileVerifier {
if
(
e
.
getMessage
()
!=
null
)
{
debug
.
println
(
key
+
": "
+
e
.
getMessage
());
}
else
{
debug
.
println
(
key
+
": "
+
algorithm
+
" was disabled, no exception msg given."
);
debug
.
println
(
"Debug info only. "
+
key
+
": "
+
algorithm
+
" was disabled, no exception msg given."
);
e
.
printStackTrace
();
}
}
...
...
src/share/classes/sun/security/x509/CertificateExtensions.java
浏览文件 @
b46fefbb
...
...
@@ -124,7 +124,8 @@ public class CertificateExtensions implements CertAttrSet<Extension> {
unparseableExtensions
.
put
(
ext
.
getExtensionId
().
toString
(),
new
UnparseableExtension
(
ext
,
e
));
if
(
debug
!=
null
)
{
debug
.
println
(
"Error parsing extension: "
+
ext
);
debug
.
println
(
"Debug info only."
+
" Error parsing extension: "
+
ext
);
e
.
printStackTrace
();
HexDumpEncoder
h
=
new
HexDumpEncoder
();
System
.
err
.
println
(
h
.
encodeBuffer
(
ext
.
getExtensionValue
()));
...
...
src/share/classes/sun/security/x509/X509Key.java
浏览文件 @
b46fefbb
...
...
@@ -393,7 +393,6 @@ public class X509Key implements PublicKey {
throw
new
InvalidKeyException
(
"excess key data"
);
}
catch
(
IOException
e
)
{
// e.printStackTrace ();
throw
new
InvalidKeyException
(
"IOException: "
+
e
.
getMessage
());
}
...
...
src/solaris/classes/sun/awt/X11/XRobotPeer.java
浏览文件 @
b46fefbb
...
...
@@ -34,6 +34,10 @@ import sun.awt.X11GraphicsConfig;
class
XRobotPeer
implements
RobotPeer
{
static
{
loadNativeLibraries
();
}
private
X11GraphicsConfig
xgc
=
null
;
/*
* native implementation uses some static shared data (pipes, processes)
...
...
@@ -98,4 +102,5 @@ class XRobotPeer implements RobotPeer {
private
static
native
synchronized
void
keyReleaseImpl
(
int
keycode
);
private
static
native
synchronized
void
getRGBPixelsImpl
(
X11GraphicsConfig
xgc
,
int
x
,
int
y
,
int
width
,
int
height
,
int
pixelArray
[]);
private
static
native
void
loadNativeLibraries
();
}
src/solaris/native/sun/awt/awt_Robot.c
浏览文件 @
b46fefbb
...
...
@@ -27,6 +27,9 @@
#error This file should not be included in headless library
#endif
#include "jvm_md.h"
#include <dlfcn.h>
#include "awt_p.h"
#include "awt_GraphicsEnv.h"
#define XK_MISCELLANY
...
...
@@ -49,11 +52,46 @@
#include <sys/socket.h>
#endif
static
Bool
(
*
compositeQueryExtension
)
(
Display
*
,
int
*
,
int
*
);
static
Status
(
*
compositeQueryVersion
)
(
Display
*
,
int
*
,
int
*
);
static
Window
(
*
compositeGetOverlayWindow
)
(
Display
*
,
Window
);
extern
struct
X11GraphicsConfigIDs
x11GraphicsConfigIDs
;
static
jint
*
masks
;
static
jint
num_buttons
;
static
void
*
xCompositeHandle
;
static
const
char
*
XCOMPOSITE
=
JNI_LIB_NAME
(
"Xcomposite"
);
static
const
char
*
XCOMPOSITE_VERSIONED
=
VERSIONED_JNI_LIB_NAME
(
"Xcomposite"
,
"1"
);
static
Bool
checkXCompositeFunctions
(
void
)
{
return
(
compositeQueryExtension
!=
NULL
&&
compositeQueryVersion
!=
NULL
&&
compositeGetOverlayWindow
!=
NULL
);
}
static
void
initXCompositeFunctions
(
void
)
{
if
(
xCompositeHandle
==
NULL
)
{
xCompositeHandle
=
dlopen
(
XCOMPOSITE
,
RTLD_LAZY
|
RTLD_GLOBAL
);
if
(
xCompositeHandle
==
NULL
)
{
xCompositeHandle
=
dlopen
(
XCOMPOSITE_VERSIONED
,
RTLD_LAZY
|
RTLD_GLOBAL
);
}
}
//*(void **)(&asyncGetCallTraceFunction)
if
(
xCompositeHandle
!=
NULL
)
{
*
(
void
**
)(
&
compositeQueryExtension
)
=
dlsym
(
xCompositeHandle
,
"XCompositeQueryExtension"
);
*
(
void
**
)(
&
compositeQueryVersion
)
=
dlsym
(
xCompositeHandle
,
"XCompositeQueryVersion"
);
*
(
void
**
)(
&
compositeGetOverlayWindow
)
=
dlsym
(
xCompositeHandle
,
"XCompositeGetOverlayWindow"
);
}
if
(
xCompositeHandle
&&
!
checkXCompositeFunctions
())
{
dlclose
(
xCompositeHandle
);
}
}
static
int32_t
isXTestAvailable
()
{
int32_t
major_opcode
,
first_event
,
first_error
;
int32_t
event_basep
,
error_basep
,
majorp
,
minorp
;
...
...
@@ -88,6 +126,35 @@ static int32_t isXTestAvailable() {
return
isXTestAvailable
;
}
static
Bool
hasXCompositeOverlayExtension
(
Display
*
display
)
{
int
xoverlay
=
False
;
int
eventBase
,
errorBase
;
if
(
checkXCompositeFunctions
()
&&
compositeQueryExtension
(
display
,
&
eventBase
,
&
errorBase
))
{
int
major
=
0
;
int
minor
=
0
;
compositeQueryVersion
(
display
,
&
major
,
&
minor
);
if
(
major
>
0
||
minor
>=
3
)
{
xoverlay
=
True
;
}
}
return
xoverlay
;
}
static
jboolean
isXCompositeDisplay
(
Display
*
display
,
int
screenNumber
)
{
char
NET_WM_CM_Sn
[
25
];
snprintf
(
NET_WM_CM_Sn
,
sizeof
(
NET_WM_CM_Sn
),
"_NET_WM_CM_S%d
\0
"
,
screenNumber
);
Atom
managerSelection
=
XInternAtom
(
display
,
NET_WM_CM_Sn
,
0
);
Window
owner
=
XGetSelectionOwner
(
display
,
managerSelection
);
return
owner
!=
0
;
}
static
XImage
*
getWindowImage
(
Display
*
display
,
Window
window
,
int32_t
x
,
int32_t
y
,
...
...
@@ -232,6 +299,12 @@ Java_sun_awt_X11_XRobotPeer_getRGBPixelsImpl( JNIEnv *env,
DASSERT
(
adata
!=
NULL
);
rootWindow
=
XRootWindow
(
awt_display
,
adata
->
awt_visInfo
.
screen
);
if
(
hasXCompositeOverlayExtension
(
awt_display
)
&&
isXCompositeDisplay
(
awt_display
,
adata
->
awt_visInfo
.
screen
))
{
rootWindow
=
compositeGetOverlayWindow
(
awt_display
,
rootWindow
);
}
image
=
getWindowImage
(
awt_display
,
rootWindow
,
x
,
y
,
width
,
height
);
/* Array to use to crunch around the pixel values */
...
...
@@ -412,3 +485,8 @@ Java_sun_awt_X11_XRobotPeer_mouseWheelImpl (JNIEnv *env,
AWT_UNLOCK
();
}
JNIEXPORT
void
JNICALL
Java_sun_awt_X11_XRobotPeer_loadNativeLibraries
(
JNIEnv
*
env
,
jclass
cls
)
{
initXCompositeFunctions
();
}
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录