Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
openanolis
dragonwell8_jdk
提交
13136f66
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看板
提交
13136f66
编写于
3月 20, 2013
作者:
A
alitvinov
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
6550588: java.awt.Desktop cannot open file with Windows UNC filename
Reviewed-by: art, uta
上级
25f1c1dd
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
115 addition
and
10 deletion
+115
-10
src/windows/classes/sun/awt/windows/WDesktopPeer.java
src/windows/classes/sun/awt/windows/WDesktopPeer.java
+12
-5
src/windows/native/sun/windows/awt_Desktop.cpp
src/windows/native/sun/windows/awt_Desktop.cpp
+5
-5
test/java/awt/Desktop/OpenByUNCPathNameTest/OpenByUNCPathNameTest.java
.../Desktop/OpenByUNCPathNameTest/OpenByUNCPathNameTest.java
+98
-0
未找到文件。
src/windows/classes/sun/awt/windows/WDesktopPeer.java
浏览文件 @
13136f66
/*
* Copyright (c) 2005, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2005,
2013,
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
...
...
@@ -51,15 +51,15 @@ public class WDesktopPeer implements DesktopPeer {
}
public
void
open
(
File
file
)
throws
IOException
{
this
.
ShellExecute
(
file
.
toURI
()
,
ACTION_OPEN_VERB
);
this
.
ShellExecute
(
file
,
ACTION_OPEN_VERB
);
}
public
void
edit
(
File
file
)
throws
IOException
{
this
.
ShellExecute
(
file
.
toURI
()
,
ACTION_EDIT_VERB
);
this
.
ShellExecute
(
file
,
ACTION_EDIT_VERB
);
}
public
void
print
(
File
file
)
throws
IOException
{
this
.
ShellExecute
(
file
.
toURI
()
,
ACTION_PRINT_VERB
);
this
.
ShellExecute
(
file
,
ACTION_PRINT_VERB
);
}
public
void
mail
(
URI
uri
)
throws
IOException
{
...
...
@@ -70,6 +70,13 @@ public class WDesktopPeer implements DesktopPeer {
this
.
ShellExecute
(
uri
,
ACTION_OPEN_VERB
);
}
private
void
ShellExecute
(
File
file
,
String
verb
)
throws
IOException
{
String
errMsg
=
ShellExecute
(
file
.
getAbsolutePath
(),
verb
);
if
(
errMsg
!=
null
)
{
throw
new
IOException
(
"Failed to "
+
verb
+
" "
+
file
+
". Error message: "
+
errMsg
);
}
}
private
void
ShellExecute
(
URI
uri
,
String
verb
)
throws
IOException
{
String
errmsg
=
ShellExecute
(
uri
.
toString
(),
verb
);
...
...
@@ -79,6 +86,6 @@ public class WDesktopPeer implements DesktopPeer {
}
}
private
static
native
String
ShellExecute
(
String
u
ri
,
String
verb
);
private
static
native
String
ShellExecute
(
String
fileOrU
ri
,
String
verb
);
}
src/windows/native/sun/windows/awt_Desktop.cpp
浏览文件 @
13136f66
/*
* Copyright (c) 2005, 201
0
, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2005, 201
3
, 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
...
...
@@ -38,17 +38,17 @@ extern "C" {
* Signature: (Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;
*/
JNIEXPORT
jstring
JNICALL
Java_sun_awt_windows_WDesktopPeer_ShellExecute
(
JNIEnv
*
env
,
jclass
cls
,
jstring
u
ri_j
,
jstring
verb_j
)
(
JNIEnv
*
env
,
jclass
cls
,
jstring
fileOrU
ri_j
,
jstring
verb_j
)
{
LPCWSTR
uri_c
=
JNU_GetStringPlatformChars
(
env
,
u
ri_j
,
JNI_FALSE
);
LPCWSTR
fileOrUri_c
=
JNU_GetStringPlatformChars
(
env
,
fileOrU
ri_j
,
JNI_FALSE
);
LPCWSTR
verb_c
=
JNU_GetStringPlatformChars
(
env
,
verb_j
,
JNI_FALSE
);
// 6457572: ShellExecute possibly changes FPU control word - saving it here
unsigned
oldcontrol87
=
_control87
(
0
,
0
);
HINSTANCE
retval
=
::
ShellExecute
(
NULL
,
verb_c
,
u
ri_c
,
NULL
,
NULL
,
SW_SHOWNORMAL
);
HINSTANCE
retval
=
::
ShellExecute
(
NULL
,
verb_c
,
fileOrU
ri_c
,
NULL
,
NULL
,
SW_SHOWNORMAL
);
_control87
(
oldcontrol87
,
0xffffffff
);
JNU_ReleaseStringPlatformChars
(
env
,
uri_j
,
u
ri_c
);
JNU_ReleaseStringPlatformChars
(
env
,
fileOrUri_j
,
fileOrU
ri_c
);
JNU_ReleaseStringPlatformChars
(
env
,
verb_j
,
verb_c
);
if
((
int
)
retval
<=
32
)
{
...
...
test/java/awt/Desktop/OpenByUNCPathNameTest/OpenByUNCPathNameTest.java
0 → 100644
浏览文件 @
13136f66
/*
* Copyright (c) 2013, 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.
*
* 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.
*/
/* @test
@bug 6550588
@summary java.awt.Desktop cannot open file with Windows UNC filename
@author Anton Litvinov
*/
import
java.awt.*
;
import
java.awt.event.*
;
import
java.io.*
;
public
class
OpenByUNCPathNameTest
{
private
static
boolean
validatePlatform
()
{
String
osName
=
System
.
getProperty
(
"os.name"
);
if
(
osName
==
null
)
{
throw
new
RuntimeException
(
"Name of the current OS could not be retrieved."
);
}
return
osName
.
startsWith
(
"Windows"
);
}
private
static
void
openFile
()
throws
IOException
{
if
(!
Desktop
.
isDesktopSupported
())
{
System
.
out
.
println
(
"java.awt.Desktop is not supported on this platform."
);
}
else
{
Desktop
desktop
=
Desktop
.
getDesktop
();
File
file
=
File
.
createTempFile
(
"Read Me File"
,
".txt"
);
try
{
// Test opening of the file with Windows local file path.
desktop
.
open
(
file
);
Robot
robot
=
null
;
try
{
Thread
.
sleep
(
5000
);
robot
=
new
Robot
();
}
catch
(
Exception
e
)
{
e
.
printStackTrace
();
}
pressAltF4Keys
(
robot
);
// Test opening of the file with Windows UNC pathname.
String
uncFilePath
=
"\\\\127.0.0.1\\"
+
file
.
getAbsolutePath
().
replace
(
':'
,
'$'
);
File
uncFile
=
new
File
(
uncFilePath
);
if
(!
uncFile
.
exists
())
{
throw
new
RuntimeException
(
String
.
format
(
"File with UNC pathname '%s' does not exist."
,
uncFilePath
));
}
desktop
.
open
(
uncFile
);
try
{
Thread
.
sleep
(
5000
);
}
catch
(
InterruptedException
ie
)
{
ie
.
printStackTrace
();
}
pressAltF4Keys
(
robot
);
}
finally
{
file
.
delete
();
}
}
}
private
static
void
pressAltF4Keys
(
Robot
robot
)
{
if
(
robot
!=
null
)
{
robot
.
keyPress
(
KeyEvent
.
VK_ALT
);
robot
.
keyPress
(
KeyEvent
.
VK_F4
);
robot
.
delay
(
50
);
robot
.
keyRelease
(
KeyEvent
.
VK_F4
);
robot
.
keyRelease
(
KeyEvent
.
VK_ALT
);
}
}
public
static
void
main
(
String
[]
args
)
throws
IOException
{
if
(!
validatePlatform
())
{
System
.
out
.
println
(
"This test is only for MS Windows OS."
);
}
else
{
openFile
();
}
}
}
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录