Skip to content

Add dinput8 Native/Builtin component toggle #596

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Xnick417x merged 3 commits into from
Jul 6, 2026
+11 −6
Merged

Add dinput8 Native/Builtin component toggle #596

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
83fa2ac
Add dinput8 Native/Builtin component toggle
Xnick417x Jul 3, 2026
4819ddb
Merge branch 'main' into wincomponent-dinput8
Xnick417x Jul 3, 2026
b2ff8fb
Force builtin dinput8 override so game-folder native DLL is ignored
Xnick417x Jul 6, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions app/src/main/assets/wincomponents/wincomponents.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,6 @@
"directshow" : ["amstream", "qasf", "qcap", "qdvd", "qedit", "quartz"],
"directplay" : ["dplaysvr.exe", "dplayx", "dpmodemx", "dpnet", "dpnhpast", "dpnhupnp", "dpnsvr.exe", "dpwsockx"],
"xaudio" : ["x3daudio1_0", "x3daudio1_1", "x3daudio1_2", "x3daudio1_3", "x3daudio1_4", "x3daudio1_5", "x3daudio1_6", "x3daudio1_7", "xactengine2_0", "xactengine2_1", "xactengine2_2", "xactengine2_3", "xactengine2_4", "xactengine2_5", "xactengine2_6", "xactengine2_7", "xactengine2_8", "xactengine2_9", "xactengine2_10", "xactengine3_0", "xactengine3_1", "xactengine3_2", "xactengine3_3", "xactengine3_4", "xactengine3_5", "xactengine3_6", "xactengine3_7", "xapofx1_0", "xapofx1_1", "xapofx1_2", "xapofx1_3", "xapofx1_4", "xapofx1_5", "xaudio2_0", "xaudio2_1", "xaudio2_2", "xaudio2_3", "xaudio2_4", "xaudio2_5", "xaudio2_6", "xaudio2_7"],
"dinput8" : ["dinput8"],
"vcrun2010" : ["msvcp100", "msvcr100", "vcomp100", "atl100"]
}
4 changes: 2 additions & 2 deletions app/src/main/runtime/container/Container.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,8 @@ public class Container {
public static final String DEFAULT_GRAPHICSDRIVERCONFIG =
"vulkanVersion=1.3" + ";version=" + ";blacklistedExtensions=" + ";maxDeviceMemory=0" + ";presentMode=mailbox" + ";syncFrame=0" + ";disablePresentWait=1" + ";resourceType=auto" + ";bcnEmulation=auto" + ";bcnEmulationType=compute" + ";bcnEmulationCache=0" + ";gpuName=Device";
public static final String DEFAULT_DDRAWRAPPER = "none";
public static final String DEFAULT_WINCOMPONENTS = "direct3d=1,directsound=0,directmusic=0,directshow=0,directplay=0,xaudio=0,vcrun2010=1";
public static final String FALLBACK_WINCOMPONENTS = "direct3d=1,directsound=1,directmusic=1,directshow=1,directplay=1,xaudio=1,vcrun2010=1";
public static final String DEFAULT_WINCOMPONENTS = "direct3d=1,directsound=0,directmusic=0,directshow=0,directplay=0,xaudio=0,dinput8=1,vcrun2010=1";
public static final String FALLBACK_WINCOMPONENTS = "direct3d=1,directsound=1,directmusic=1,directshow=1,directplay=1,xaudio=1,dinput8=1,vcrun2010=1";
public static final String DEFAULT_DRIVES = "D:" + Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_DOWNLOADS).getAbsolutePath() + "F:" + Environment.getExternalStorageDirectory().getAbsolutePath();
public static final byte STARTUP_SELECTION_NORMAL = 0;
public static final byte STARTUP_SELECTION_ESSENTIAL = 1;
Expand Down
8 changes: 5 additions & 3 deletions app/src/main/runtime/container/WinComponentSetup.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,13 +37,15 @@ object WinComponentSetup {
val wincomponentsStr = FileUtils.readString(context, "wincomponents/wincomponents.json")
val wincomponentsJson = JSONObject(wincomponentsStr ?: "{}")
val dlls = ArrayList<String>()
val oldWinComponentsIter =
KeyValueSet(previousWincomponents.ifEmpty { Container.FALLBACK_WINCOMPONENTS }).iterator()
val oldValues = HashMap<String, String>()
for (old in KeyValueSet(previousWincomponents.ifEmpty { Container.FALLBACK_WINCOMPONENTS })) {
oldValues[old[0]] = old[1]
}

for (wincomponent in KeyValueSet(wincomponents)) {
val identifier = wincomponent[0]
val useNative = wincomponent[1] == "1"
val oldValue = oldWinComponentsIter.next()[1]
val oldValue = oldValues[identifier]
if (wincomponent[1] == oldValue && !firstTimeBoot) continue

if (useNative) {
Expand Down
4 changes: 3 additions & 1 deletion app/src/main/runtime/wine/WineUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -672,7 +672,7 @@ public static void applySystemTweaks(Context context, WineInfo wineInfo) {
"dxgi",
"wined3d"
};
final String[] dinputLibs = {"dinput", "dinput8"};
final String[] dinputLibs = {"dinput"};

final String dllOverridesKey = "Software\\Wine\\DllOverrides";

Expand Down Expand Up @@ -890,6 +890,8 @@ public static void overrideWinComponentDlls(
String dlname = dlnames.getString(i);
if (useNative) {
registryEditor.setStringValue(dllOverridesKey, dlname, "native,builtin");
} else if (identifier.equals("dinput8")) {
registryEditor.setStringValue(dllOverridesKey, dlname, "builtin");
} else registryEditor.removeValue(dllOverridesKey, dlname);
}
} catch (JSONException e) {
Expand Down