Skip to content

Main #8

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
maxjivi05 merged 2 commits into from
Jan 20, 2026
Merged

Main #8

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
24ed19f
Remove logs from git and add to gitignore
maxjivi05 Jan 20, 2026
f8a1cfd
Fix vcrun2022 crash, resolve persistent graphics test, and add a8xx-g…
maxjivi05 Jan 20, 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 .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,3 +60,4 @@ app/keystores/*
*.pyc
__pycache__/
resign.keystore
logs/
Binary file added app/src/main/assets/graphics_driver/a8xx-gen8-V21.zip
View file
Open in desktop
Binary file not shown.
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 @@ -6,6 +6,7 @@
"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"],
"vcrun2010" : ["msvcp100", "msvcr100", "vcomp100", "atl100"],
"vcrun2022" : ["msvcp140", "msvcp140_1", "msvcp140_2", "msvcp140_codecvt_ids", "vcomp140", "vcruntime140", "vcruntime140_1", "concrt140"],
"wmdecoder" : ["wmvcore", "wmasf", "wmadmod", "wmvdecod"],
"opengl" : ["libgallium_wgl", "opengl32"]
}
2 changes: 2 additions & 0 deletions app/src/main/java/app/gamenative/ui/component/dialog/ContainerConfigDialog.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,9 @@ private fun winComponentsItemTitleRes(string: String): Int {
"directplay" -> R.string.directplay
"directshow" -> R.string.directshow
"directx" -> R.string.directx
"xaudio" -> R.string.xaudio
"vcrun2010" -> R.string.vcrun2010
"vcrun2022" -> R.string.vcrun2022
"wmdecoder" -> R.string.wmdecoder
"opengl" -> R.string.wmdecoder
else -> throw IllegalArgumentException("No string res found for Win Components title: $string")
Expand Down
2 changes: 2 additions & 0 deletions app/src/main/java/app/gamenative/ui/model/MainViewModel.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -279,6 +279,8 @@ class MainViewModel @Inject constructor(
bootingSplashTimeoutJob?.cancel()
bootingSplashTimeoutJob = null
setShowBootingSplash(false)
setTestGraphics(false)
setBootToContainer(false)
// Check if we have a temporary override before doing anything
val hadTemporaryOverride = IntentLaunchManager.hasTemporaryOverride(appId)

Expand Down
16 changes: 10 additions & 6 deletions app/src/main/java/app/gamenative/ui/screen/xserver/XServerScreen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2554,12 +2554,16 @@ private fun extractGraphicsDriverFiles(
}

if (changed) {
TarCompressorUtils.extract(
TarCompressorUtils.Type.ZSTD,
context.assets,
"graphics_driver/turnip-${turnipVersion}.tzst",
rootDir,
)
if (turnipVersion.endsWith(".zip")) {
com.winlator.core.FileUtils.extractZipFromAssets(context, "graphics_driver/$turnipVersion", rootDir)
} else {
TarCompressorUtils.extract(
TarCompressorUtils.Type.ZSTD,
context.assets,
"graphics_driver/turnip-${turnipVersion}.tzst",
rootDir,
)
}
TarCompressorUtils.extract(
TarCompressorUtils.Type.ZSTD,
context.assets,
Expand Down
2 changes: 2 additions & 0 deletions app/src/main/res/values-da/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,9 @@
<string name="directplay">DirectPlay</string>
<string name="directshow">DirectShow</string>
<string name="directx">DirectX</string>
<string name="xaudio">XAudio</string>
<string name="vcrun2010">Visual C++ 2010</string>
<string name="vcrun2022">Visual C++ 2022</string>
<string name="wmdecoder">Windows Media Decoder</string>
<string name="opengl">OpenGL</string>
<string name="dxvk_version">DXVK-version</string>
Expand Down
2 changes: 2 additions & 0 deletions app/src/main/res/values-de/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,9 @@
<string name="directplay">DirectPlay</string>
<string name="directshow">DirectShow</string>
<string name="directx">DirectX</string>
<string name="xaudio">XAudio</string>
<string name="vcrun2010">Visual C++ 2010</string>
<string name="vcrun2022">Visual C++ 2022</string>
<string name="wmdecoder">Windows Media Decoder</string>
<string name="opengl">OpenGL</string>
<string name="dxvk_version">DXVK-Version</string>
Expand Down
2 changes: 2 additions & 0 deletions app/src/main/res/values-fr/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,9 @@
<string name="directplay">DirectPlay</string>
<string name="directshow">DirectShow</string>
<string name="directx">DirectX</string>
<string name="xaudio">XAudio</string>
<string name="vcrun2010">Visual C++ 2010</string>
<string name="vcrun2022">Visual C++ 2022</string>
<string name="wmdecoder">Décodeur Windows Media</string>
<string name="opengl">OpenGL</string>
<string name="dxvk_version">Version DXVK</string>
Expand Down
2 changes: 2 additions & 0 deletions app/src/main/res/values-it/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,9 @@
<string name="directplay">DirectPlay</string>
<string name="directshow">DirectShow</string>
<string name="directx">DirectX</string>
<string name="xaudio">XAudio</string>
<string name="vcrun2010">Visual C++ 2010</string>
<string name="vcrun2022">Visual C++ 2022</string>
<string name="wmdecoder">Windows Media Decoder</string>
<string name="opengl">OpenGL</string>
<string name="dxvk_version">Versione DXVK</string>
Expand Down
2 changes: 2 additions & 0 deletions app/src/main/res/values-pt-rBR/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,9 @@
<string name="directplay">DirectPlay</string>
<string name="directshow">DirectShow</string>
<string name="directx">DirectX</string>
<string name="xaudio">XAudio</string>
<string name="vcrun2010">Visual C++ 2010</string>
<string name="vcrun2022">Visual C++ 2022</string>
<string name="wmdecoder">Windows Media Decoder</string>
<string name="opengl">OpenGL</string>
<string name="dxvk_version">DXVK Version</string>
Expand Down
2 changes: 2 additions & 0 deletions app/src/main/res/values-uk/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,9 @@
<string name="directplay">DirectPlay</string>
<string name="directshow">DirectShow</string>
<string name="directx">DirectX</string>
<string name="xaudio">XAudio</string>
<string name="vcrun2010">Visual C++ 2010</string>
<string name="vcrun2022">Visual C++ 2022</string>
<string name="wmdecoder">Декодер Windows Media</string>
<string name="opengl">OpenGL</string>
<string name="dxvk_version">Версія DXVK</string>
Expand Down
2 changes: 2 additions & 0 deletions app/src/main/res/values-zh-rCN/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,9 @@
<string name="directplay">DirectPlay</string>
<string name="directshow">DirectShow</string>
<string name="directx">DirectX</string>
<string name="xaudio">XAudio</string>
<string name="vcrun2010">Visual C++ 2010</string>
<string name="vcrun2022">Visual C++ 2022</string>
<string name="wmdecoder">Windows Media Decoder</string>
<string name="opengl">OpenGL</string>
<string name="dxvk_version">DXVK 版本</string>
Expand Down
2 changes: 2 additions & 0 deletions app/src/main/res/values-zh-rTW/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,9 @@
<string name="directplay">DirectPlay</string>
<string name="directshow">DirectShow</string>
<string name="directx">DirectX</string>
<string name="xaudio">XAudio</string>
<string name="vcrun2010">Visual C++ 2010</string>
<string name="vcrun2022">Visual C++ 2022</string>
<string name="wmdecoder">Windows Media Decoder</string>
<string name="opengl">OpenGL</string>
<string name="dxvk_version">DXVK 版本</string>
Expand Down
1 change: 1 addition & 0 deletions app/src/main/res/values/arrays.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@
<item>26.0.0_R8</item>
</string-array>
<string-array name="turnip_version_entries">
<item>a8xx-gen8-V21.zip</item>
<item>25.1.0</item>
<item>25.2.0</item>
<item>25.3.0</item>
Expand Down
2 changes: 2 additions & 0 deletions app/src/main/res/values/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,9 @@
<string name="directplay">DirectPlay</string>
<string name="directshow">DirectShow</string>
<string name="directx">DirectX</string>
<string name="xaudio">XAudio</string>
<string name="vcrun2010">Visual C++ 2010</string>
<string name="vcrun2022">Visual C++ 2022</string>
<string name="wmdecoder">Windows Media Decoder</string>
<string name="opengl">OpenGL</string>
<string name="dxvk_version">DXVK Version</string>
Expand Down
Loading
Loading