From 3757f660f237408e843584c224f03a64657f7b31 Mon Sep 17 00:00:00 2001
From: Daniel Gredler <dgredler@openjdk.org>
Date: Mon, 7 Apr 2025 19:53:36 +0000
Subject: [PATCH] 8353002: Remove unnecessary Windows version check in
 WTaskbarPeer

Reviewed-by: prr, serb, aivanov
---
 .../classes/sun/awt/windows/WTaskbarPeer.java |  7 +--
 .../java/awt/Dialog/TaskbarFeatureTest.java   | 50 +++++++++++++++++++
 2 files changed, 52 insertions(+), 5 deletions(-)
 create mode 100644 test/jdk/java/awt/Dialog/TaskbarFeatureTest.java

diff --git a/src/java.desktop/windows/classes/sun/awt/windows/WTaskbarPeer.java b/src/java.desktop/windows/classes/sun/awt/windows/WTaskbarPeer.java
index 98abeff562f..09cafc3bed9 100644
--- a/src/java.desktop/windows/classes/sun/awt/windows/WTaskbarPeer.java
+++ b/src/java.desktop/windows/classes/sun/awt/windows/WTaskbarPeer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2025, 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
@@ -34,7 +34,6 @@ import java.awt.Window;
 import java.awt.image.BufferedImage;
 import java.awt.image.DataBufferInt;
 import sun.awt.AWTAccessor;
-import sun.awt.OSInfo;
 import sun.awt.shell.ShellFolder;
 
 final class WTaskbarPeer implements TaskbarPeer {
@@ -44,9 +43,7 @@ final class WTaskbarPeer implements TaskbarPeer {
 
     private static synchronized void init() {
         if (!initExecuted) {
-            supported = OSInfo.getWindowsVersion()
-                    .compareTo(OSInfo.WINDOWS_7) >= 0
-                    && ShellFolder.invoke(() -> nativeInit());
+            supported = ShellFolder.invoke(() -> nativeInit());
         }
         initExecuted = true;
     }
diff --git a/test/jdk/java/awt/Dialog/TaskbarFeatureTest.java b/test/jdk/java/awt/Dialog/TaskbarFeatureTest.java
new file mode 100644
index 00000000000..5392019d5a3
--- /dev/null
+++ b/test/jdk/java/awt/Dialog/TaskbarFeatureTest.java
@@ -0,0 +1,50 @@
+/*
+ * Copyright (c) 2025, 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.
+ */
+
+import java.awt.Taskbar;
+import java.awt.Taskbar.Feature;
+
+/*
+ * @test
+ * @bug 8353002
+ * @key headful
+ * @requires (os.family == "windows")
+ * @summary Verifies that expected taskbar features are supported on Windows.
+ */
+
+public class TaskbarFeatureTest {
+
+    public static void main(String[] args) throws Exception {
+        Taskbar taskbar = Taskbar.getTaskbar();
+        testFeature(taskbar, Feature.ICON_BADGE_IMAGE_WINDOW);
+        testFeature(taskbar, Feature.PROGRESS_STATE_WINDOW);
+        testFeature(taskbar, Feature.PROGRESS_VALUE_WINDOW);
+        testFeature(taskbar, Feature.USER_ATTENTION_WINDOW);
+    }
+
+    private static void testFeature(Taskbar taskbar, Feature feature) {
+        if (!taskbar.isSupported(feature)) {
+            throw new RuntimeException("Feature not supported: " + feature);
+        }
+    }
+}