use psapi to locate module addresses, version 1.1.7

Author: LabyStudio

README.md

@@ -23,7 +23,7 @@ repositories {
 }
 
 dependencies {
-    implementation 'com.github.LabyStudio:java-spotify-api:1.1.6:all'
+    implementation 'com.github.LabyStudio:java-spotify-api:1.1.7:all'
 }
 ```
 

build.gradle

@@ -4,7 +4,7 @@ plugins {
 }
 
 group 'de.labystudio'
-version '1.1.6'
+version '1.1.7'
 
 compileJava {
     sourceCompatibility = '1.8'

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

@@ -9,6 +9,7 @@
 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.Psapi;
 import de.labystudio.spotifyapi.platform.windows.api.jna.Tlhelp32;
 
 import java.util.ArrayList;
@@ -108,44 +109,76 @@ default String getWindowTitle(WinDef.HWND window) {
         return Native.toString(Arrays.copyOf(buffer, length));
     }
 
-    default Map<Long, Long> getModules(long pid) {
-        Map<Long, Long> map = new HashMap<>();
+    default Map<String, Psapi.ModuleInfo> getModules(WinNT.HANDLE handle) {
+        Map<String, Psapi.ModuleInfo> modules = new HashMap<>();
 
-        WinNT.HANDLE snapshot = Kernel32.INSTANCE.CreateToolhelp32Snapshot(
-                Tlhelp32.TH32CS_SNAPMODULE,
-                new WinDef.DWORD(pid)
+        Psapi psapi = Psapi.INSTANCE;
+
+        // Get the list of modules
+        Pointer[] moduleHandles = new Pointer[1024];
+        psapi.EnumProcessModulesEx(
+                handle,
+                moduleHandles,
+                moduleHandles.length,
+                null,
+                Psapi.ModuleFilter.X32BIT
         );
-        if (snapshot == null) {
-            return map;
-        }
 
-        Tlhelp32.MODULEENTRY32W moduleEntry = new Tlhelp32.MODULEENTRY32W.ByReference();
-        while (Kernel32.INSTANCE.Module32NextW(snapshot, moduleEntry)) {
-            map.put(Pointer.nativeValue(moduleEntry.modBaseAddr), moduleEntry.modBaseSize.longValue());
+        // Iterate over all modules
+        for (Pointer moduleHandle : moduleHandles) {
+            if (moduleHandle == null) {
+                break;
+            }
+
+            // Get module name
+            char[] characters = new char[1024];
+            int length = psapi.GetModuleBaseName(handle, moduleHandle, characters, characters.length);
+            String moduleName = new String(characters, 0, length);
+
+            // Get module info
+            Psapi.ModuleInfo moduleInfo = new Psapi.ModuleInfo();
+            psapi.GetModuleInformation(handle, moduleHandle, moduleInfo, moduleInfo.size());
+            modules.put(moduleName, moduleInfo);
         }
-        Kernel32.INSTANCE.CloseHandle(snapshot);
-        return map;
+
+        return modules;
     }
 
-    default long getModuleAddress(long pid, String moduleName) {
-        WinNT.HANDLE snapshot = Kernel32.INSTANCE.CreateToolhelp32Snapshot(
-                Tlhelp32.TH32CS_SNAPMODULE,
-                new WinDef.DWORD(pid)
+    default Psapi.ModuleInfo getModuleInfo(WinNT.HANDLE handle, String moduleName) {
+        Psapi psapi = Psapi.INSTANCE;
+
+        // Get the list of modules
+        Pointer[] moduleHandles = new Pointer[1024];
+        psapi.EnumProcessModulesEx(
+                handle,
+                moduleHandles,
+                moduleHandles.length,
+                null,
+                Psapi.ModuleFilter.X32BIT
         );
-        if (snapshot == null) {
-            return 0;
-        }
 
-        Tlhelp32.MODULEENTRY32W moduleEntry = new Tlhelp32.MODULEENTRY32W.ByReference();
-        while (Kernel32.INSTANCE.Module32NextW(snapshot, moduleEntry)) {
-            String name = Native.toString(moduleEntry.szModule);
-            if (name.equals(moduleName)) {
-                Kernel32.INSTANCE.CloseHandle(snapshot);
-                return Pointer.nativeValue(moduleEntry.modBaseAddr);
+        // Iterate over all modules
+        for (Pointer moduleHandle : moduleHandles) {
+            if (moduleHandle == null) {
+                break;
+            }
+
+            // Get module name
+            char[] characters = new char[1024];
+            int length = psapi.GetModuleBaseName(handle, moduleHandle, characters, characters.length);
+            String entryModuleName = new String(characters, 0, length);
+
+            // Compare with the name we are looking for
+            if (entryModuleName.equals(moduleName)) {
+
+                // Get module info
+                Psapi.ModuleInfo moduleInfo = new Psapi.ModuleInfo();
+                psapi.GetModuleInformation(handle, moduleHandle, moduleInfo, moduleInfo.size());
+
+                return moduleInfo;
             }
         }
-        Kernel32.INSTANCE.CloseHandle(snapshot);
-        return -1;
+        return null;
     }
 
     default void pressKey(int keyCode) {

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

@@ -6,6 +6,7 @@
 import com.sun.jna.platform.win32.WinNT;
 import com.sun.jna.ptr.IntByReference;
 import de.labystudio.spotifyapi.platform.windows.api.jna.Kernel32;
+import de.labystudio.spotifyapi.platform.windows.api.jna.Psapi;
 
 import java.util.Map;
 
@@ -21,8 +22,6 @@ public class WinProcess implements WinApi {
     protected final WinNT.HANDLE handle;
     protected final WinDef.HWND window;
 
-    protected final long maxContentAddress;
-
     /**
      * Creates a new instance of the {@link WinProcess} class.
      *
@@ -44,8 +43,6 @@ public WinProcess(String executableName) {
         if (this.getWindowTitle().isEmpty()) {
             throw new IllegalStateException("Window for process " + this.processId + " not found");
         }
-
-        this.maxContentAddress = this.getModuleAddress("wow64cpu.dll");
     }
 
     /**
@@ -231,7 +228,7 @@ public long findAddressOfText(long start, String text, int index) {
      * @return The address of the text at the given index
      */
     public long findAddressOfText(long start, String text, SearchCondition condition) {
-        return this.findInMemory(start, this.maxContentAddress, text.getBytes(), condition);
+        return this.findInMemory(start, Integer.MAX_VALUE, text.getBytes(), condition);
     }
 
     /**
@@ -271,22 +268,22 @@ public long findAddressUsingRules(SearchRule... rules) {
     }
 
     /**
-     * Find the base address of the given module name.
+     * Get the module information of the given module name.
      *
      * @param moduleName The name of the module.
-     * @return The base address of the module.
+     * @return Information of the given module
      */
-    public long getModuleAddress(String moduleName) {
-        return this.getModuleAddress(this.processId, moduleName);
+    public Psapi.ModuleInfo getModuleInfo(String moduleName) {
+        return this.getModuleInfo(this.handle, moduleName);
     }
 
     /**
-     * Collect all module addresses and their size of the given process.
+     * Collect all module names and address information.
      *
-     * @return A list of module addresses and their size.
+     * @return A map of all modules with their name and address information.
      */
-    public Map<Long, Long> getModules() {
-        return this.getModules(this.processId);
+    public Map<String, Psapi.ModuleInfo> getModules() {
+        return this.getModules(this.handle);
     }
 
     /**
@@ -296,8 +293,8 @@ public Map<Long, Long> getModules() {
      */
     public long getFirstModuleAddress() {
         long minAddress = Long.MAX_VALUE;
-        for (Map.Entry<Long, Long> module : this.getModules(this.processId).entrySet()) {
-            minAddress = Math.min(minAddress, module.getKey() + module.getValue());
+        for (Map.Entry<String, Psapi.ModuleInfo> module : this.getModules().entrySet()) {
+            minAddress = Math.min(minAddress, module.getValue().getBaseOfDll());
         }
         return minAddress;
     }
@@ -310,8 +307,8 @@ public long getFirstModuleAddress() {
      */
     public long getMaxProcessAddress() {
         long maxAddress = 0;
-        for (Map.Entry<Long, Long> module : this.getModules(this.processId).entrySet()) {
-            maxAddress = Math.max(maxAddress, module.getKey() + module.getValue());
+        for (Map.Entry<String, Psapi.ModuleInfo> module : this.getModules().entrySet()) {
+            maxAddress = Math.max(maxAddress, module.getValue().getBaseOfDll() + module.getValue().getSizeOfImage());
         }
         return maxAddress;
     }
@@ -359,15 +356,6 @@ public void close() {
         Kernel32.INSTANCE.CloseHandle(this.handle);
     }
 
-    /**
-     * Get the highest memory address with relevant content.
-     *
-     * @return The highest memory address with relevant content.
-     */
-    public long getMaxContentAddress() {
-        return this.maxContentAddress;
-    }
-
     /**
      * Search condition function to check if the address matches additional criteria.
      */

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

@@ -0,0 +1,55 @@
+package de.labystudio.spotifyapi.platform.windows.api.jna;
+
+import com.sun.jna.Native;
+import com.sun.jna.Pointer;
+import com.sun.jna.Structure;
+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;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
+public interface Psapi extends WinNT, StdCallLibrary {
+
+    Psapi INSTANCE = Native.loadLibrary("psapi", Psapi.class, W32APIOptions.UNICODE_OPTIONS);
+
+    boolean EnumProcessModulesEx(HANDLE hProcess, Pointer[] lphModule, int cb, IntByReference lpcbNeeded, int dwFilterFlag);
+
+    int GetModuleBaseName(HANDLE hProcess, Pointer hModule, char[] lpBaseName, int nSize);
+
+    boolean GetModuleInformation(HANDLE hProcess, Pointer hModule, ModuleInfo moduleInfo, int size);
+
+    class ModuleFilter {
+        public static final int NONE = 0x00;
+        public static final int X32BIT = 0x01;
+        public static final int X64BIT = 0x02;
+        public static final int ALL = 0x03;
+    }
+
+    class ModuleInfo extends Structure {
+
+        public Pointer BaseOfDll;
+        public int SizeOfImage;
+        public Pointer EntryPoint;
+
+        public long getBaseOfDll() {
+            return Pointer.nativeValue(this.BaseOfDll);
+        }
+
+        public long getEntryPoint() {
+            return Pointer.nativeValue(this.EntryPoint);
+        }
+
+        public int getSizeOfImage() {
+            return this.SizeOfImage;
+        }
+
+        @Override
+        protected List<String> getFieldOrder() {
+            return new ArrayList<>(Arrays.asList("BaseOfDll", "SizeOfImage", "EntryPoint"));
+        }
+    }
+}

src/main/java/de/labystudio/spotifyapi/platform/windows/api/spotify/SpotifyProcess.java

@@ -1,6 +1,7 @@
 package de.labystudio.spotifyapi.platform.windows.api.spotify;
 
 import de.labystudio.spotifyapi.platform.windows.api.WinProcess;
+import de.labystudio.spotifyapi.platform.windows.api.jna.Psapi;
 import de.labystudio.spotifyapi.platform.windows.api.playback.PlaybackAccessor;
 
 /**
@@ -13,7 +14,6 @@ public class SpotifyProcess extends WinProcess {
     private static final boolean DEBUG = System.getProperty("SPOTIFY_API_DEBUG") != null;
 
     // Spotify track id
-    private static final String CHROME_ELF_DLL_FUNCTION = "DumpHungProcessWithPtype_ExportThunk";
     private static final String PREFIX_SPOTIFY_TRACK = "spotify:track:";
 
     // Spotify playback
@@ -41,8 +41,13 @@ public SpotifyProcess() {
 
         long timeScanStart = System.currentTimeMillis();
 
+        Psapi.ModuleInfo chromeElf = this.getModuleInfo("chrome_elf.dll");
+        if (chromeElf == null) {
+            throw new IllegalStateException("Could not find chrome_elf.dll module");
+        }
+
         // Find address of track id (Located in the chrome_elf.dll module)
-        long chromeElfAddress = this.findAddressOfText(0, CHROME_ELF_DLL_FUNCTION, 1);
+        long chromeElfAddress = chromeElf.getBaseOfDll();
         this.addressTrackId = this.findAddressOfText(chromeElfAddress, PREFIX_SPOTIFY_TRACK, 0);
 
         if (this.addressTrackId == -1 || !this.isTrackIdValid(this.getTrackId())) {

src/test/java/SpotifyProcessTest.java

@@ -1,4 +1,5 @@
 import de.labystudio.spotifyapi.platform.windows.api.WinProcess;
+import de.labystudio.spotifyapi.platform.windows.api.jna.Psapi;
 import de.labystudio.spotifyapi.platform.windows.api.playback.PlaybackAccessor;
 
 public class SpotifyProcessTest {
@@ -7,13 +8,11 @@ public class SpotifyProcessTest {
 
     public static void main(String[] args) {
         WinProcess process = new WinProcess("Spotify.exe");
+        Psapi.ModuleInfo moduleInfo = process.getModuleInfo("chrome_elf.dll");
+        System.out.println("chrome_elf.dll address: 0x" + Long.toHexString(moduleInfo.getBaseOfDll()));
 
-        long addressTrackId = process.findAddressOfText(
-                process.getMaxContentAddress() / 2,
-                "spotify:track:",
-                (address, index) -> process.hasBytes(address + 1028, 0xDC, 0xA1)
-        );
-        System.out.println("Track Id Address: " + Long.toHexString(addressTrackId));
+        long addressTrackId = process.findAddressOfText(moduleInfo.getBaseOfDll(), "spotify:track:", 0);
+        System.out.println("Track Id Address: 0x" + Long.toHexString(addressTrackId));
 
         long addressPlayBack = process.findInMemory(
                 0,
@@ -24,8 +23,7 @@ public static void main(String[] args) {
                     return accessor.isValid();
                 }
         );
-        System.out.println("Playback Address: " + Long.toHexString(addressPlayBack));
-
+        System.out.println("Playback Address: 0x" + Long.toHexString(addressPlayBack));
     }
 
 }