Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
openanolis
dragonwell8_jdk
提交
c56810fd
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看板
提交
c56810fd
编写于
7月 22, 2014
作者:
J
jeff
浏览文件
操作
浏览文件
下载
差异文件
Merge
上级
e9c5151e
dad671b5
变更
20
隐藏空白更改
内联
并排
Showing
20 changed file
with
151 addition
and
258 deletion
+151
-258
make/Tools.gmk
make/Tools.gmk
+1
-0
make/lib/Awt2dLibraries.gmk
make/lib/Awt2dLibraries.gmk
+1
-2
make/mapfiles/libawt/mapfile-mawt-vers
make/mapfiles/libawt/mapfile-mawt-vers
+1
-6
make/mapfiles/libawt/mapfile-vers
make/mapfiles/libawt/mapfile-vers
+1
-8
make/mapfiles/libawt/mapfile-vers-linux
make/mapfiles/libawt/mapfile-vers-linux
+1
-13
make/mapfiles/libawt_xawt/mapfile-vers
make/mapfiles/libawt_xawt/mapfile-vers
+1
-7
src/share/native/sun/awt/image/awt_parseImage.c
src/share/native/sun/awt/image/awt_parseImage.c
+1
-0
src/share/native/sun/awt/image/jpeg/imageioJPEG.c
src/share/native/sun/awt/image/jpeg/imageioJPEG.c
+6
-0
src/share/native/sun/awt/image/jpeg/jpegdecoder.c
src/share/native/sun/awt/image/jpeg/jpegdecoder.c
+6
-0
src/share/native/sun/awt/splashscreen/splashscreen_jpeg.c
src/share/native/sun/awt/splashscreen/splashscreen_jpeg.c
+6
-0
src/share/native/sun/awt/splashscreen/splashscreen_png.c
src/share/native/sun/awt/splashscreen/splashscreen_png.c
+5
-0
src/solaris/native/sun/awt/awt.h
src/solaris/native/sun/awt/awt.h
+4
-4
src/solaris/native/sun/awt/awt_LoadLibrary.c
src/solaris/native/sun/awt/awt_LoadLibrary.c
+0
-54
src/solaris/native/sun/awt/awt_Plugin.c
src/solaris/native/sun/awt/awt_Plugin.c
+0
-149
src/solaris/native/sun/awt/color.h
src/solaris/native/sun/awt/color.h
+3
-3
src/solaris/native/sun/awt/img_util_md.h
src/solaris/native/sun/awt/img_util_md.h
+3
-3
src/solaris/native/sun/awt/utility/rect.h
src/solaris/native/sun/awt/utility/rect.h
+11
-1
src/solaris/native/sun/java2d/x11/X11PMBlitLoops.c
src/solaris/native/sun/java2d/x11/X11PMBlitLoops.c
+14
-5
src/solaris/native/sun/java2d/x11/X11SurfaceData.c
src/solaris/native/sun/java2d/x11/X11SurfaceData.c
+15
-3
test/javax/xml/jaxp/validation/8049514/FeaturePropagationTest.java
...x/xml/jaxp/validation/8049514/FeaturePropagationTest.java
+71
-0
未找到文件。
make/Tools.gmk
浏览文件 @
c56810fd
...
...
@@ -80,6 +80,7 @@ TOOL_CHARACTERNAME = $(JAVA) -cp $(JDK_OUTPUTDIR)/btclasses \
build.tools.generatecharacter.CharacterName
TOOL_DTDBUILDER = $(JAVA) -Ddtd_home=$(JDK_TOPDIR)/make/data/dtdbuilder \
-Djava.awt.headless=true \
-cp $(JDK_OUTPUTDIR)/btclasses build.tools.dtdbuilder.DTDBuilder
TOOL_GENERATEBREAKITERATORDATA = $(JAVA) \
...
...
make/lib/Awt2dLibraries.gmk
浏览文件 @
c56810fd
...
...
@@ -318,7 +318,7 @@ ifeq ($(OPENJDK_TARGET_OS), aix)
endif
ifeq ($(OPENJDK_TARGET_OS), macosx)
LIBAWT_FILES += awt_LoadLibrary.c
img_colors.c
LIBAWT_FILES += awt_LoadLibrary.c
LIBAWT_CFLAGS += -F/System/Library/Frameworks/JavaVM.framework/Frameworks
endif
...
...
@@ -611,7 +611,6 @@ ifeq ($(findstring $(OPENJDK_TARGET_OS),windows macosx),)
debug_mem.c \
debug_trace.c \
debug_util.c \
awt_Plugin.c \
gnome_interface.c \
gtk2_interface.c \
swing_GTKEngine.c \
...
...
make/mapfiles/libawt/mapfile-mawt-vers
浏览文件 @
c56810fd
#
# Copyright (c) 2001, 201
3
, Oracle and/or its affiliates. All rights reserved.
# Copyright (c) 2001, 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
...
...
@@ -249,11 +249,6 @@ SUNWprivate_1.1 {
Java_sun_awt_motif_XsessionWMcommand;
Java_sun_awt_motif_XsessionWMcommand_New;
# Java Plugin
getAwtLockFunctions;
getAwtData;
getAwtDisplay;
# libfontmanager entry points
AWTIsHeadless;
AWTCountFonts;
...
...
make/mapfiles/libawt/mapfile-vers
浏览文件 @
c56810fd
#
# Copyright (c) 1997, 201
3
, Oracle and/or its affiliates. All rights reserved.
# Copyright (c) 1997, 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
...
...
@@ -174,13 +174,6 @@ SUNWprivate_1.1 {
Java_sun_awt_motif_XsessionWMcommand;
Java_sun_awt_motif_XsessionWMcommand_New;
# Java Plugin
# This is in awt_LoadLibrary.c and falls through to libmawt.
# Evidently plugin needs this for backward compatability.
getAwtLockFunctions;
getAwtData;
getAwtDisplay;
# libfontmanager entry points
AWTIsHeadless;
GrPrim_Sg2dGetCompInfo;
...
...
make/mapfiles/libawt/mapfile-vers-linux
浏览文件 @
c56810fd
#
# Copyright (c) 2002, 201
3
, Oracle and/or its affiliates. All rights reserved.
# Copyright (c) 2002, 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
...
...
@@ -152,13 +152,6 @@ SUNWprivate_1.1 {
# Evidently CDE needs this for backward compatability.
Java_sun_awt_motif_XsessionWMcommand;
# Java Plugin
# This is in awt_LoadLibrary.c and falls through to libmawt.
# Evidently plugin needs this for backward compatability.
getAwtLockFunctions;
getAwtData;
getAwtDisplay;
# libfontmanager entry points
AWTIsHeadless;
GrPrim_Sg2dGetCompInfo;
...
...
@@ -283,11 +276,6 @@ SUNWprivate_1.1 {
# CDE private entry point
Java_sun_awt_motif_XsessionWMcommand;
# Java Plugin
getAwtLockFunctions;
getAwtData;
getAwtDisplay;
# libfontmanager entry points
AWTIsHeadless;
AWTCountFonts;
...
...
make/mapfiles/libawt_xawt/mapfile-vers
浏览文件 @
c56810fd
#
# Copyright (c) 2002, 201
3
, Oracle and/or its affiliates. All rights reserved.
# Copyright (c) 2002, 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
...
...
@@ -449,12 +449,6 @@ SUNWprivate_1.1 {
awt_Lock;
awt_GetComponent;
# Java Plugin
# This is in awt_LoadLibrary.c and falls through to libmawt.
# Evidently plugin needs this for backward compatability.
getAwtLockFunctions;
getAwtData;
getAwtDisplay;
#XAWT entry point for CDE
Java_sun_awt_motif_XsessionWMcommand;
Java_sun_awt_motif_XsessionWMcommand_New;
...
...
src/share/native/sun/awt/image/awt_parseImage.c
浏览文件 @
c56810fd
...
...
@@ -508,6 +508,7 @@ int awt_parseColorModel (JNIEnv *env, jobject jcmodel, int imageType,
cmP
->
csType
=
(
*
env
)
->
GetIntField
(
env
,
cmP
->
jcmodel
,
g_CMcsTypeID
);
cmP
->
cmType
=
getColorModelType
(
env
,
jcmodel
);
JNU_CHECK_EXCEPTION_RETURN
(
env
,
-
1
);
cmP
->
isDefaultCM
=
FALSE
;
cmP
->
isDefaultCompatCM
=
FALSE
;
...
...
src/share/native/sun/awt/image/jpeg/imageioJPEG.c
浏览文件 @
c56810fd
...
...
@@ -56,6 +56,12 @@
#undef MAX
#define MAX(a,b) ((a) > (b) ? (a) : (b))
#ifdef __APPLE__
/* use setjmp/longjmp versions that do not save/restore the signal mask */
#define setjmp _setjmp
#define longjmp _longjmp
#endif
/* Cached Java method ids */
static
jmethodID
JPEGImageReader_readInputDataID
;
static
jmethodID
JPEGImageReader_skipInputBytesID
;
...
...
src/share/native/sun/awt/image/jpeg/jpegdecoder.c
浏览文件 @
c56810fd
...
...
@@ -47,6 +47,12 @@
#include <jpeglib.h>
#include "jerror.h"
#ifdef __APPLE__
/* use setjmp/longjmp versions that do not save/restore the signal mask */
#define setjmp _setjmp
#define longjmp _longjmp
#endif
/* The method IDs we cache. Note that the last two belongs to the
* java.io.InputStream class.
*/
...
...
src/share/native/sun/awt/splashscreen/splashscreen_jpeg.c
浏览文件 @
c56810fd
...
...
@@ -31,6 +31,12 @@
#include <setjmp.h>
#ifdef __APPLE__
/* use setjmp/longjmp versions that do not save/restore the signal mask */
#define setjmp _setjmp
#define longjmp _longjmp
#endif
/* stream input handling */
typedef
struct
...
...
src/share/native/sun/awt/splashscreen/splashscreen_png.c
浏览文件 @
c56810fd
...
...
@@ -71,7 +71,12 @@ SplashDecodePng(Splash * splash, png_rw_ptr read_func, void *io_ptr)
goto
done
;
}
#ifdef __APPLE__
/* use setjmp/longjmp versions that do not save/restore the signal mask */
if
(
_setjmp
(
png_set_longjmp_fn
(
png_ptr
,
_longjmp
,
sizeof
(
jmp_buf
))))
{
#else
if
(
setjmp
(
png_jmpbuf
(
png_ptr
)))
{
#endif
goto
done
;
}
...
...
src/solaris/native/sun/awt/awt.h
浏览文件 @
c56810fd
...
...
@@ -34,9 +34,9 @@
#include "jni_util.h"
#include "debug_util.h"
#if
ndef HEADLESS
#if
!defined(HEADLESS) && !defined(MACOSX)
#include <X11/Intrinsic.h>
#endif
/* !HEADLESS */
#endif
/* !HEADLESS
&& !MACOSX
*/
/* The JVM instance: defined in awt_MToolkit.c */
...
...
@@ -110,9 +110,9 @@ extern void awt_output_flush();
#define AWT_NOTIFY() AWT_NOTIFY_IMPL()
#define AWT_NOTIFY_ALL() AWT_NOTIFY_ALL_IMPL()
#if
ndef HEADLESS
#if
!defined(HEADLESS) && !defined(MACOSX)
extern
Display
*
awt_display
;
/* awt_GraphicsEnv.c */
extern
Boolean
awt_ModLockIsShiftLock
;
/* XToolkit.c */
#endif
/* !HEADLESS */
#endif
/* !HEADLESS
&& !MACOSX
*/
#endif
/* ! _AWT_ */
src/solaris/native/sun/awt/awt_LoadLibrary.c
浏览文件 @
c56810fd
...
...
@@ -35,8 +35,6 @@
#include <sys/param.h>
#include <sys/utsname.h>
#include "awt_Plugin.h"
#ifdef AIX
#include "porting_aix.h"
/* For the 'dladdr' function. */
#endif
...
...
@@ -236,55 +234,3 @@ Java_sun_awt_motif_XsessionWMcommand_New(JNIEnv *env, jobjectArray jargv)
(
*
XsessionWMcommand
)(
env
,
jargv
);
}
#define REFLECT_VOID_FUNCTION(name, arglist, paramlist) \
typedef name##_type arglist; \
void name arglist \
{ \
static name##_type *name##_ptr = NULL; \
if (name##_ptr == NULL && awtHandle == NULL) { \
return; \
} \
name##_ptr = (name##_type *) \
dlsym(awtHandle, #name); \
if (name##_ptr == NULL) { \
return; \
} \
(*name##_ptr)paramlist; \
}
#define REFLECT_FUNCTION(return_type, name, arglist, paramlist) \
typedef return_type name##_type arglist; \
return_type name arglist \
{ \
static name##_type *name##_ptr = NULL; \
if (name##_ptr == NULL && awtHandle == NULL) { \
return NULL; \
} \
name##_ptr = (name##_type *) \
dlsym(awtHandle, #name); \
if (name##_ptr == NULL) { \
return NULL; \
} \
return (*name##_ptr)paramlist; \
}
/*
* These entry point must remain in libawt.so ***for Java Plugin ONLY***
* Reflect this call over to the correct libawt_<toolkit>.so.
*/
REFLECT_VOID_FUNCTION
(
getAwtLockFunctions
,
(
void
(
**
AwtLock
)(
JNIEnv
*
),
void
(
**
AwtUnlock
)(
JNIEnv
*
),
void
(
**
AwtNoFlushUnlock
)(
JNIEnv
*
),
void
*
reserved
),
(
AwtLock
,
AwtUnlock
,
AwtNoFlushUnlock
,
reserved
))
REFLECT_VOID_FUNCTION
(
getAwtData
,
(
int32_t
*
awt_depth
,
Colormap
*
awt_cmap
,
Visual
**
awt_visual
,
int32_t
*
awt_num_colors
,
void
*
pReserved
),
(
awt_depth
,
awt_cmap
,
awt_visual
,
awt_num_colors
,
pReserved
))
REFLECT_FUNCTION
(
Display
*
,
getAwtDisplay
,
(
void
),
())
src/solaris/native/sun/awt/awt_Plugin.c
已删除
100644 → 0
浏览文件 @
e9c5151e
/*
* Copyright (c) 1999, 2001, 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
* under the terms of the GNU General Public License version 2 only, as
* published by the Free Software Foundation. Oracle designates this
* particular file as subject to the "Classpath" exception as provided
* by Oracle in the LICENSE file that accompanied this code.
*
* This code is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
* version 2 for more details (a copy is included in the LICENSE file that
* accompanied this code).
*
* You should have received a copy of the GNU General Public License version
* 2 along with this work; if not, write to the Free Software Foundation,
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
*
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
* or visit www.oracle.com if you need additional information or have any
* questions.
*/
#ifdef HEADLESS
#error This file should not be included in headless library
#endif
#include <jni.h>
#include <X11/Xlib.h>
#include <X11/Xutil.h>
#include <awt.h>
#include <awt_p.h>
/*
* Fix 4221246: Provide utility function for Netscape to use to
* get AWT display, depth, colormap, and number of colors.
*
*/
Display
*
getAwtDisplay
(
void
)
{
return
awt_display
;
}
void
getExtAwtData
(
Display
*
display
,
int32_t
screen
,
int32_t
*
awt_depth
,
Colormap
*
awt_cmap
,
Visual
**
awt_visual
,
int32_t
*
awt_num_colors
,
void
*
pReserved
)
{
AwtGraphicsConfigDataPtr
defaultConfig
=
NULL
;
#ifdef DEBUG
if
(
pReserved
!=
NULL
)
{
jio_fprintf
(
stderr
,
"getExtAwtData: warning: reserved pointer is not null
\n
"
);
}
#endif
if
(
screen
>=
0
)
{
defaultConfig
=
getDefaultConfig
(
screen
);
}
if
(
defaultConfig
)
{
if
(
awt_depth
!=
NULL
)
{
*
awt_depth
=
defaultConfig
->
awt_depth
;
}
if
(
awt_cmap
!=
NULL
)
{
*
awt_cmap
=
defaultConfig
->
awt_cmap
;
}
if
(
awt_visual
!=
NULL
)
{
*
awt_visual
=
defaultConfig
->
awt_visInfo
.
visual
;
}
if
(
awt_num_colors
!=
NULL
)
{
*
awt_num_colors
=
defaultConfig
->
awt_num_colors
;
}
}
}
/*
* getAwtData provided for compatibility with Solaris 1.2 Java Plug-in
*
*/
void
getAwtData
(
int32_t
*
awt_depth
,
Colormap
*
awt_cmap
,
Visual
**
awt_visual
,
int32_t
*
awt_num_colors
,
void
*
pReserved
)
{
Display
*
display
=
getAwtDisplay
();
getExtAwtData
(
display
,
DefaultScreen
(
display
),
awt_depth
,
awt_cmap
,
awt_visual
,
awt_num_colors
,
pReserved
);
}
/*
* Fix 4221246: Provide utility funtion for Netscape to get
* function pointers to AWT lock functions.
*
*/
static
void
awt_lock_wrapper
(
JNIEnv
*
env
)
{
AWT_LOCK
();
}
static
void
awt_unlock_wrapper
(
JNIEnv
*
env
)
{
AWT_UNLOCK
();
}
static
void
awt_noflush_unlock_wrapper
(
JNIEnv
*
env
)
{
AWT_NOFLUSH_UNLOCK
();
}
void
getAwtLockFunctions
(
void
(
**
AwtLock
)(
JNIEnv
*
),
void
(
**
AwtUnlock
)(
JNIEnv
*
),
void
(
**
AwtNoFlushUnlock
)(
JNIEnv
*
),
void
*
pReserved
)
{
#ifdef DEBUG
if
(
pReserved
!=
NULL
)
{
jio_fprintf
(
stderr
,
"getAwtLockFunctions: warning: reserved pointer is not null
\n
"
);
}
#endif
if
(
AwtLock
!=
NULL
)
{
*
AwtLock
=
awt_lock_wrapper
;
}
if
(
AwtUnlock
!=
NULL
)
{
*
AwtUnlock
=
awt_unlock_wrapper
;
}
if
(
AwtNoFlushUnlock
!=
NULL
)
{
*
AwtNoFlushUnlock
=
awt_noflush_unlock_wrapper
;
}
}
src/solaris/native/sun/awt/color.h
浏览文件 @
c56810fd
/*
* Copyright (c) 1995, 20
01
, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 1995, 20
14
, 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
...
...
@@ -28,13 +28,13 @@
#include "awt.h"
#include "colordata.h"
#if
ndef HEADLESS
#if
!defined(HEADLESS) && !defined(MACOSX)
typedef
struct
{
unsigned
int
Depth
;
XPixmapFormatValues
wsImageFormat
;
ImgColorData
clrdata
;
ImgConvertFcn
*
convert
[
NUM_IMGCV
];
}
awtImageData
;
#endif
/* !HEADLESS */
#endif
/* !HEADLESS
&& !MACOSX
*/
#endif
/* _COLOR_H_ */
src/solaris/native/sun/awt/img_util_md.h
浏览文件 @
c56810fd
/*
* Copyright (c) 1996, 20
01
, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 1996, 20
14
, 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
...
...
@@ -25,7 +25,7 @@
#include "color.h"
#if
ndef HEADLESS
#if
!defined(HEADLESS) && !defined(MACOSX)
typedef
struct
{
ImgConvertData
cvdata
;
/* The data needed by ImgConvertFcn's */
struct
Hsun_awt_image_ImageRepresentation
*
hJavaObject
;
/* backptr */
...
...
@@ -68,7 +68,7 @@ extern void *image_InitMask(IRData *ird, int x1, int y1, int x2, int y2);
#define MaskScan(cvdata) \
((((IRData *)cvdata)->maskim->bytes_per_line) >> 2)
#endif
/* !HEADLESS */
#endif
/* !HEADLESS
&& !MACOSX
*/
#define MaskOffset(x) ((x) >> 5)
...
...
src/solaris/native/sun/awt/utility/rect.h
浏览文件 @
c56810fd
/*
* Copyright (c) 2007, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2007,
2014
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
...
...
@@ -28,8 +28,18 @@
#ifndef _AWT_RECT_H
#define _AWT_RECT_H
#ifndef MACOSX
#include <X11/Xlib.h>
typedef
XRectangle
RECT_T
;
#else
// OSX still needs this for BitmapToYXBandedRectangles
typedef
struct
{
int
x
;
int
y
;
int
width
;
int
height
;
}
RECT_T
;
#endif
/* !MACOSX */
#define RECT_EQ_X(r1,r2) ((r1).x==(r2).x && (r1).width==(r2).width)
...
...
src/solaris/native/sun/java2d/x11/X11PMBlitLoops.c
浏览文件 @
c56810fd
...
...
@@ -241,9 +241,12 @@ Java_sun_java2d_x11_X11PMBlitLoops_updateBitmask
width
,
height
,
1
);
if
(
xsdo
->
bitmask
==
0
)
{
AWT_UNLOCK
();
JNU_ThrowOutOfMemoryError
(
env
,
"Cannot create bitmask for "
"offscreen surface"
);
if
(
!
(
*
env
)
->
ExceptionCheck
(
env
))
{
JNU_ThrowOutOfMemoryError
(
env
,
"Cannot create bitmask for "
"offscreen surface"
);
}
return
;
}
}
...
...
@@ -253,7 +256,10 @@ Java_sun_java2d_x11_X11PMBlitLoops_updateBitmask
1
,
XYBitmap
,
0
,
NULL
,
width
,
height
,
32
,
0
);
if
(
image
==
NULL
)
{
AWT_UNLOCK
();
JNU_ThrowOutOfMemoryError
(
env
,
"Cannot allocate bitmask for mask"
);
if
(
!
(
*
env
)
->
ExceptionCheck
(
env
))
{
JNU_ThrowOutOfMemoryError
(
env
,
"Cannot allocate bitmask for mask"
);
}
return
;
}
dstScan
=
image
->
bytes_per_line
;
...
...
@@ -261,7 +267,10 @@ Java_sun_java2d_x11_X11PMBlitLoops_updateBitmask
if
(
image
->
data
==
NULL
)
{
XFree
(
image
);
AWT_UNLOCK
();
JNU_ThrowOutOfMemoryError
(
env
,
"Cannot allocate bitmask for mask"
);
if
(
!
(
*
env
)
->
ExceptionCheck
(
env
))
{
JNU_ThrowOutOfMemoryError
(
env
,
"Cannot allocate bitmask for mask"
);
}
return
;
}
pDst
=
(
unsigned
char
*
)
image
->
data
;
...
...
src/solaris/native/sun/java2d/x11/X11SurfaceData.c
浏览文件 @
c56810fd
...
...
@@ -454,6 +454,7 @@ jboolean XShared_initSurface(JNIEnv *env, X11SDOps *xsdo, jint depth, jint width
AWT_LOCK
();
xsdo
->
drawable
=
X11SD_CreateSharedPixmap
(
xsdo
);
AWT_UNLOCK
();
JNU_CHECK_EXCEPTION_RETURN
(
env
,
JNI_FALSE
);
if
(
xsdo
->
drawable
)
{
xsdo
->
shmPMData
.
usingShmPixmap
=
JNI_TRUE
;
xsdo
->
shmPMData
.
shmPixmap
=
xsdo
->
drawable
;
...
...
@@ -469,6 +470,7 @@ jboolean XShared_initSurface(JNIEnv *env, X11SDOps *xsdo, jint depth, jint width
xsdo
->
configData
->
awt_visInfo
.
screen
),
width
,
height
,
depth
);
AWT_UNLOCK
();
JNU_CHECK_EXCEPTION_RETURN
(
env
,
JNI_FALSE
);
#ifdef MITSHM
xsdo
->
shmPMData
.
usingShmPixmap
=
JNI_FALSE
;
xsdo
->
shmPMData
.
pixmap
=
xsdo
->
drawable
;
...
...
@@ -504,6 +506,7 @@ Java_sun_java2d_x11_X11SurfaceData_initSurface(JNIEnv *env, jclass xsd,
if
(
xsdo
->
configData
->
awt_cmap
==
(
Colormap
)
NULL
)
{
awtJNI_CreateColorData
(
env
,
xsdo
->
configData
,
1
);
JNU_CHECK_EXCEPTION
(
env
);
}
/* color_data will be initialized in awtJNI_CreateColorData for
8-bit visuals */
...
...
@@ -805,7 +808,10 @@ static jint X11SD_Lock(JNIEnv *env,
xsdo
->
cData
->
awt_icmLUT
==
NULL
))
{
AWT_UNLOCK
();
JNU_ThrowNullPointerException
(
env
,
"colormap lookup table"
);
if
(
!
(
*
env
)
->
ExceptionCheck
(
env
))
{
JNU_ThrowNullPointerException
(
env
,
"colormap lookup table"
);
}
return
SD_FAILURE
;
}
if
((
lockflags
&
SD_LOCK_INVCOLOR
)
!=
0
&&
...
...
@@ -816,7 +822,10 @@ static jint X11SD_Lock(JNIEnv *env,
xsdo
->
cData
->
img_oda_blue
==
NULL
))
{
AWT_UNLOCK
();
JNU_ThrowNullPointerException
(
env
,
"inverse colormap lookup table"
);
if
(
!
(
*
env
)
->
ExceptionCheck
(
env
))
{
JNU_ThrowNullPointerException
(
env
,
"inverse colormap lookup table"
);
}
return
SD_FAILURE
;
}
if
((
lockflags
&
SD_LOCK_INVGRAY
)
!=
0
&&
...
...
@@ -824,7 +833,10 @@ static jint X11SD_Lock(JNIEnv *env,
xsdo
->
cData
->
pGrayInverseLutData
==
NULL
))
{
AWT_UNLOCK
();
JNU_ThrowNullPointerException
(
env
,
"inverse gray lookup table"
);
if
(
!
(
*
env
)
->
ExceptionCheck
(
env
))
{
JNU_ThrowNullPointerException
(
env
,
"inverse gray lookup table"
);
}
return
SD_FAILURE
;
}
if
(
xsdo
->
dgaAvailable
&&
(
lockflags
&
(
SD_LOCK_RD_WR
)))
{
...
...
src/solaris/native/sun/awt/awt_Plugin.h
→
test/javax/xml/jaxp/validation/8049514/FeaturePropagationTest.java
浏览文件 @
c56810fd
/*
* Copyright (c)
1999, 2001
, Oracle and/or its affiliates. All rights reserved.
* Copyright (c)
2014
, 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
* under the terms of the GNU General Public License version 2 only, as
* published by the Free Software Foundation. Oracle designates this
* particular file as subject to the "Classpath" exception as provided
* by Oracle in the LICENSE file that accompanied this code.
* published by the Free Software Foundation.
*
* This code is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
...
...
@@ -23,32 +21,51 @@
* questions.
*/
/*
* Fix 4221246: Export functions for Netscape to use to get AWT info
/**
* @test
* @bug 8049514
* @summary verifies that feature set on the factory is propagated properly
* to the validator
* @run main/othervm FeaturePropagationTest
*/
#ifndef _AWT_PLUGIN_H_
#define _AWT_PLUGIN_H_
#include <jni.h>
#include <X11/Xlib.h>
#include <X11/Xutil.h>
import
java.io.ByteArrayInputStream
;
import
java.io.InputStreamReader
;
import
javax.xml.XMLConstants
;
import
javax.xml.transform.stream.StreamSource
;
import
javax.xml.validation.*
;
/**
* JDK-8049514
*
* FEATURE_SECURE_PROCESSING can not be turned off on a validator through
* SchemaFactory
*/
public
class
FeaturePropagationTest
{
static
String
xsd
=
"<?xml version='1.0'?>\n"
+
"<schema xmlns='http://www.w3.org/2001/XMLSchema'\n"
+
" xmlns:test='jaxp13_test'\n"
+
" targetNamespace='jaxp13_test'\n"
+
" elementFormDefault='qualified'>\n"
+
" <element name='test' type='string'/>\n"
+
"</schema>\n"
;
void
getAwtLockFunctions
(
void
(
**
AwtLock
)(
JNIEnv
*
),
void
(
**
AwtUnlock
)(
JNIEnv
*
),
void
(
**
AwtNoFlushUnlock
)(
JNIEnv
*
),
void
*
);
public
static
void
main
(
String
[]
args
)
throws
Exception
{
InputStreamReader
reader
=
new
InputStreamReader
(
new
ByteArrayInputStream
(
xsd
.
getBytes
()));
StreamSource
xsdSource
=
new
StreamSource
(
reader
);
void
getExtAwtData
(
Display
*
,
int32_t
,
int32_t
*
,
/* awt_depth */
Colormap
*
,
/* awt_cmap */
Visual
**
,
/* awt_visInfo.visual */
int32_t
*
,
/* awt_num_colors */
void
*
);
SchemaFactory
schemaFactory
=
SchemaFactory
.
newInstance
(
"http://www.w3.org/2001/XMLSchema"
);
schemaFactory
.
setFeature
(
XMLConstants
.
FEATURE_SECURE_PROCESSING
,
false
);
Schema
schema
=
null
;
schema
=
schemaFactory
.
newSchema
(
xsdSource
);
void
getAwtData
(
int32_t
*
,
Colormap
*
,
Visual
**
,
int32_t
*
,
void
*
);
Validator
validator
=
schema
.
newValidator
(
);
Display
*
getAwtDisplay
(
void
);
if
(
validator
.
getFeature
(
XMLConstants
.
FEATURE_SECURE_PROCESSING
))
{
throw
new
RuntimeException
(
"Feature set on the factory is not inherited!"
);
}
#endif
/* _AWT_PLUGIN_H_ */
}
}
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录