use custom jna interfaces to support older versions of jna-platform, version 1.0.8

Author: LabyStudio

README.md

@@ -22,7 +22,7 @@ repositories {
 }
 
 dependencies {
-    implementation 'com.github.LabyStudio:java-spotify-api:1.0.7:all'
+    implementation 'com.github.LabyStudio:java-spotify-api:1.0.8:all'
 }
 ```
 

build.gradle

@@ -4,13 +4,18 @@ plugins {
 }
 
 group 'de.labystudio'
-version '1.0.7'
+version '1.0.8'
 
 compileJava {
     sourceCompatibility = '1.8'
     targetCompatibility = '1.8'
 }
 
+compileTestJava {
+    sourceCompatibility = '1.8'
+    targetCompatibility = '1.8'
+}
+
 repositories {
     mavenCentral()
 }

src/main/java/de/labystudio/spotifyapi/platform/windows/api/WinApi.java

@@ -3,13 +3,13 @@
 import com.sun.jna.Native;
 import com.sun.jna.Pointer;
 import com.sun.jna.platform.win32.BaseTSD;
-import com.sun.jna.platform.win32.Kernel32;
-import com.sun.jna.platform.win32.Tlhelp32;
 import com.sun.jna.platform.win32.User32;
 import com.sun.jna.platform.win32.WinDef;
 import com.sun.jna.platform.win32.WinNT;
 import com.sun.jna.platform.win32.WinUser;
 import com.sun.jna.ptr.IntByReference;
+import de.labystudio.spotifyapi.platform.windows.api.jna.Kernel32;
+import de.labystudio.spotifyapi.platform.windows.api.jna.Tlhelp32;
 
 import java.util.ArrayList;
 import java.util.Arrays;

src/main/java/de/labystudio/spotifyapi/platform/windows/api/WinProcess.java

@@ -2,10 +2,10 @@
 
 import com.sun.jna.Memory;
 import com.sun.jna.Pointer;
-import com.sun.jna.platform.win32.Kernel32;
 import com.sun.jna.platform.win32.WinDef;
 import com.sun.jna.platform.win32.WinNT;
 import com.sun.jna.ptr.IntByReference;
+import de.labystudio.spotifyapi.platform.windows.api.jna.Kernel32;
 
 import java.util.Map;
 

src/main/java/de/labystudio/spotifyapi/platform/windows/api/jna/Kernel32.java

@@ -0,0 +1,27 @@
+package de.labystudio.spotifyapi.platform.windows.api.jna;
+
+import com.sun.jna.Native;
+import com.sun.jna.Pointer;
+import com.sun.jna.platform.win32.WinNT;
+import com.sun.jna.ptr.IntByReference;
+import com.sun.jna.win32.StdCallLibrary;
+import com.sun.jna.win32.W32APIOptions;
+
+public interface Kernel32 extends WinNT, StdCallLibrary {
+
+    Kernel32 INSTANCE = (Kernel32) Native.loadLibrary("kernel32", Kernel32.class, W32APIOptions.UNICODE_OPTIONS);
+
+    boolean ReadProcessMemory(HANDLE hProcess, Pointer lpBaseAddress, Pointer lpBuffer, int nSize, IntByReference lpNumberOfBytesRead);
+
+    boolean Module32NextW(HANDLE hSnapshot, Tlhelp32.MODULEENTRY32W lpme);
+
+    boolean Process32First(HANDLE var1, Tlhelp32.PROCESSENTRY32.ByReference var2);
+
+    boolean Process32Next(HANDLE var1, Tlhelp32.PROCESSENTRY32.ByReference var2);
+
+    HANDLE CreateToolhelp32Snapshot(DWORD dwFlags, DWORD th32ProcessID);
+
+    boolean CloseHandle(HANDLE hObject);
+
+    HANDLE OpenProcess(int fdwAccess, boolean fInherit, int IDProcess);
+}

src/main/java/de/labystudio/spotifyapi/platform/windows/api/jna/Tlhelp32.java

@@ -0,0 +1,92 @@
+package de.labystudio.spotifyapi.platform.windows.api.jna;
+
+import com.sun.jna.Pointer;
+import com.sun.jna.Structure;
+import com.sun.jna.platform.win32.BaseTSD;
+import com.sun.jna.platform.win32.WinDef;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
+public interface Tlhelp32 {
+    WinDef.DWORD TH32CS_SNAPMODULE = new WinDef.DWORD(0x00000008);
+    WinDef.DWORD TH32CS_SNAPPROCESS = new WinDef.DWORD(0x00000002);
+
+    class MODULEENTRY32W extends Structure {
+        public static class ByReference extends MODULEENTRY32W implements Structure.ByReference {
+        }
+
+        public WinDef.DWORD dwSize;
+        public WinDef.DWORD th32ModuleID;
+        public WinDef.DWORD th32ProcessID;
+        public WinDef.DWORD GlblcntUsage;
+        public WinDef.DWORD ProccntUsage;
+        public Pointer modBaseAddr;
+        public WinDef.DWORD modBaseSize;
+        public WinDef.HMODULE hModule;
+        public char[] szModule = new char[255 + 1];
+        public char[] szExePath = new char[Kernel32.MAX_PATH];
+
+        public MODULEENTRY32W() {
+            this.dwSize = new WinDef.DWORD(this.size());
+        }
+
+        public MODULEENTRY32W(Pointer memory) {
+            super(memory);
+            this.read();
+        }
+
+        @Override
+        protected List<String> getFieldOrder() {
+            return new ArrayList<>(Arrays.asList("dwSize", "th32ModuleID", "th32ProcessID", "GlblcntUsage",
+                    "ProccntUsage", "modBaseAddr", "modBaseSize", "hModule",
+                    "szModule", "szExePath"));
+        }
+    }
+
+    class PROCESSENTRY32 extends Structure {
+        public WinDef.DWORD dwSize;
+        public WinDef.DWORD cntUsage;
+        public WinDef.DWORD th32ProcessID;
+        public BaseTSD.ULONG_PTR th32DefaultHeapID;
+        public WinDef.DWORD th32ModuleID;
+        public WinDef.DWORD cntThreads;
+        public WinDef.DWORD th32ParentProcessID;
+        public WinDef.LONG pcPriClassBase;
+        public WinDef.DWORD dwFlags;
+        public char[] szExeFile = new char[260];
+
+        public PROCESSENTRY32() {
+            this.dwSize = new WinDef.DWORD((long) this.size());
+        }
+
+        public PROCESSENTRY32(Pointer memory) {
+            super(memory);
+            this.read();
+        }
+
+        public static class ByReference extends com.sun.jna.platform.win32.Tlhelp32.PROCESSENTRY32 implements Structure.ByReference {
+            public ByReference() {
+            }
+
+            public ByReference(Pointer memory) {
+                super(memory);
+            }
+
+            @Override
+            protected List<String> getFieldOrder() {
+                return new ArrayList<>(Arrays.asList("dwSize", "cntUsage", "th32ProcessID", "th32DefaultHeapID",
+                        "th32ModuleID", "cntThreads", "th32ParentProcessID", "pcPriClassBase", "dwFlags",
+                        "szExeFile"));
+            }
+        }
+
+        @Override
+        protected List<String> getFieldOrder() {
+            return new ArrayList<>(Arrays.asList("dwSize", "cntUsage", "th32ProcessID", "th32DefaultHeapID",
+                    "th32ModuleID", "cntThreads", "th32ParentProcessID", "pcPriClassBase", "dwFlags",
+                    "szExeFile"));
+        }
+    }
+}