stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

8269637: javax/swing/JFileChooser/FileSystemView/SystemIconTest.java fails on windows

Browse Source 
Reviewed-by: aivanov
This commit is contained in:
Alexander Zuev 2021-07-14 18:25:57 +00:00
parent 14da658d1c
commit a033866d78
2 changed files with 10 additions and 3 deletions
src/java.desktop/windows/classes/sun/awt/shell
Win32ShellFolder2.java
test/jdk
ProblemList.txt

12
src/java.desktop/windows/classes/sun/awt/shell/Win32ShellFolder2.java

@ -30,6 +30,7 @@ import java.awt.Toolkit;
import java.awt.image.AbstractMultiResolutionImage;
import java.awt.image.BufferedImage;
import java.awt.image.ImageObserver;
import java.awt.image.MultiResolutionImage;
import java.io.File;
import java.io.FileNotFoundException;
import java.io.IOException;
@ -1160,10 +1161,17 @@ final class Win32ShellFolder2 extends ShellFolder {
getRelativePIDL(), s, true);
if (hIcon <= 0) {
if (isDirectory()) {
return getShell32Icon(FOLDER_ICON_ID, size);
newIcon = getShell32Icon(FOLDER_ICON_ID, size);
} else {
return getShell32Icon(FILE_ICON_ID, size);
newIcon = getShell32Icon(FILE_ICON_ID, size);
}
if (newIcon == null) {
return null;
}
if (!(newIcon instanceof MultiResolutionImage)) {
newIcon = new MultiResolutionIconImage(size, newIcon);
}
return newIcon;
}
}
newIcon = makeIcon(hIcon);

1
test/jdk/ProblemList.txt

@ -742,7 +742,6 @@ javax/swing/Popup/TaskbarPositionTest.java 8065097 macosx-all,linux-all
javax/swing/JEditorPane/6917744/bug6917744.java 8213124 macosx-all
javax/swing/JRootPane/4670486/bug4670486.java 8042381 macosx-all
javax/swing/JPopupMenu/4634626/bug4634626.java 8017175 macosx-all
javax/swing/JFileChooser/FileSystemView/SystemIconTest.java 8268280 windows-x64
sanity/client/SwingSet/src/ToolTipDemoTest.java 8225012 windows-all,macosx-all
sanity/client/SwingSet/src/ScrollPaneDemoTest.java 8225013 linux-all