Use 'window_handler' for changing process CPU Affinity (Helps #91)

KreitinnSoftware · Feb 5, 2025 · cfee463 · cfee463
1 parent c34d0d4
commit cfee463
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 6 deletions.
diff --git a/app/src/main/java/com/micewine/emu/activities/MainActivity.kt b/app/src/main/java/com/micewine/emu/activities/MainActivity.kt
@@ -119,6 +119,7 @@ import com.micewine.emu.core.RatPackageManager.installRat
 import com.micewine.emu.core.ShellLoader.runCommand
 import com.micewine.emu.core.ShellLoader.runCommandWithOutput
 import com.micewine.emu.core.WineWrapper
+import com.micewine.emu.core.WineWrapper.getCpuHexMask
 import com.micewine.emu.databinding.ActivityMainBinding
 import com.micewine.emu.fragments.AskInstallRatPackageFragment
 import com.micewine.emu.fragments.AskInstallRatPackageFragment.Companion.ratCandidate
@@ -658,9 +659,9 @@ class MainActivity : AppCompatActivity() {
             }
 
             if (exePath == "") {
-                WineWrapper.wine("explorer /desktop=shell,$selectedResolution window_handler TFM")
+                WineWrapper.wine("explorer /desktop=shell,$selectedResolution window_handler ${getCpuHexMask()} TFM")
             } else {
-                WineWrapper.wine("start /unix C:\\\\windows\\\\window_handler.exe")
+                WineWrapper.wine("start /unix C:\\\\windows\\\\window_handler.exe ${getCpuHexMask()}")
 
                 if (exePath.endsWith(".lnk")) {
                     try {

diff --git a/app/src/main/java/com/micewine/emu/core/WineWrapper.kt b/app/src/main/java/com/micewine/emu/core/WineWrapper.kt
@@ -13,7 +13,7 @@ import kotlin.math.abs
 object WineWrapper {
     private var IS_BOX64 = if (Build.SUPPORTED_ABIS[0] == "x86_64") "" else "box64"
 
-    private fun getCpuHexMask(): String {
+    fun getCpuHexMask(): String {
         val availCpus = Runtime.getRuntime().availableProcessors()
         val cpuMask = MutableList(availCpus) { '0' }
         val cpuAffinity = cpuAffinity?.replace(",", "")
@@ -39,14 +39,14 @@ object WineWrapper {
 
     fun wine(args: String) {
         runCommand(
-            getEnv() + "WINEPREFIX=$winePrefix taskset ${getCpuHexMask()} $IS_BOX64 wine $args"
+            getEnv() + "WINEPREFIX=$winePrefix $IS_BOX64 wine $args"
         )
     }
 
     fun wine(args: String, retLog: Boolean): String {
         if (retLog) {
             return runCommandWithOutput(
-                getEnv() + "BOX64_LOG=0 WINEPREFIX=$winePrefix taskset ${getCpuHexMask()} $IS_BOX64 wine $args"
+                getEnv() + "BOX64_LOG=0 WINEPREFIX=$winePrefix $IS_BOX64 wine $args"
             )
         }
         return ""
@@ -75,7 +75,7 @@ object WineWrapper {
         runCommand("ln -sf $path $wineDisksFolder/${getAvailableDisks()[0]}:")
     }
 
-    fun getAvailableDisks(): List<String> {
+    private fun getAvailableDisks(): List<String> {
         var letter = 'c'
         val availableDisks = mutableListOf<String>()