fix forge crash

MORIMORI0317 · Jun 9, 2022 · 2b15764 · 2b15764
1 parent ddbea81
commit 2b15764
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 6 deletions.
diff --git a/common/src/main/java/net/morimori0317/bettertaskbar/BetterTaskbar.java b/common/src/main/java/net/morimori0317/bettertaskbar/BetterTaskbar.java
@@ -7,8 +7,6 @@
 import org.apache.logging.log4j.Logger;
 import org.jetbrains.annotations.NotNull;
 
-import javax.annotation.Nullable;
-
 public class BetterTaskbar {
     public static final String MODID = "bettertaskbar";
     private static final Logger LOGGER = LogManager.getLogger(BetterTaskbar.class);
@@ -31,7 +29,7 @@ private static ITaskbarAccess createTaskbarAccess() {
         String os = System.getProperty("os.name").toLowerCase();
         String arc = System.getProperty("os.arch").toLowerCase();
 
-        if (os.contains("windows") && arc.contains("amd64"))
+        if (os.contains("windows") && arc.contains("amd64") && WindowsTaskbarAccess.check())
             return new WindowsTaskbarAccess();
 
         return new DummyTaskbarAccess();

diff --git a/...on/src/main/java/net/morimori0317/bettertaskbar/taskbar/windows/WindowsTaskbarAccess.java b/...on/src/main/java/net/morimori0317/bettertaskbar/taskbar/windows/WindowsTaskbarAccess.java
@@ -55,4 +55,20 @@ private void taskbarList3(BiConsumer<ITaskbarList3, WinDef.HWND> consumer) {
             throw new RuntimeException("ITaskbarList3 release failed");
     }
 
+    public static boolean check() {
+        var clsid = new Guid.CLSID("56FDF344-FD6D-11d0-958A-006097C9A090");
+        var ref = new PointerByReference();
+        var hr = Ole32.INSTANCE.CoCreateInstance(clsid, null, WTypes.CLSCTX_SERVER, TaskbarList3.IID_ITaskbarList3, ref);
+        if (W32Errors.FAILED(hr))
+            return false;
+
+        var tbl3 = new TaskbarList3(ref.getValue());
+        var hret = tbl3.HrInit();
+        if (W32Errors.FAILED(hret))
+            return false;
+
+        var rret = tbl3.Release();
+        return !W32Errors.FAILED(rret);
+    }
+
 }
diff --git a/gradle.properties b/gradle.properties
@@ -5,7 +5,7 @@ enabled_platforms=fabric,forge
 
 archives_base_name=bettertaskbar
 mod_display_name=BetterTaskbar
-mod_version=1.3
+mod_version=1.4
 maven_group=net.morimori0317
 
 fabric_loader_version=0.14.0

diff --git a/settings.gradle b/settings.gradle
@@ -13,7 +13,7 @@ include("forge")
 
 rootProject.name = "BetterTaskbar"
 
-if (JavaVersion.current().ordinal() + 1 < 17) {
-    throw new IllegalStateException("申し訳ないがJava17+以外はNG")
+if (JavaVersion.current().ordinal() + 1 != 17) {
+    throw new IllegalStateException("申し訳ないがJava17以外はNG")
 }