brunodev85 · Jun 12, 2024 · Jun 12, 2024 · Jun 12, 2024 · Jun 12, 2024 · Jul 13, 2024
diff --git a/.github/ISSUE_TEMPLATE/bug_report.en.md b/.github/ISSUE_TEMPLATE/bug_report.en.md
@@ -0,0 +1,38 @@
+---
+name: Bug Report
+about: Report a bug to help us improve
+title: "[BUG]"
+labels: bug
+assignees: ''
+---
+
+**Device Information**
+- Device Model: [e.g., Samsung Galaxy S21]
+- Device Processor Model: [e.g., Exynos 2100]
+- Android Version: [e.g., 11]
+- Kernel Version: [e.g., 4.19.112]
+
+**Application Configuration Information**
+- App Version: [e.g., 7.1.1]
+- Display Driver: [e.g., Turnip-24.1.0]
+- dxwrapper: [e.g., DXVK-2.3.1]
+- box64 Version: [e.g., 0.3.0]
+- box64 Preset: [e.g., Compatibility]
+
+**Description of the Issue**
+Please provide a clear and concise description of the problem. For example, "The app crashes when I try to open the settings menu."
+
+**Steps to Reproduce**
+Please describe the steps to reproduce the issue:
+1. step 1
+2. step 2
+3. step 3
+
+**Expected Behavior**
+Please describe what you expected to happen. For example, "I expected to see the advanced settings without the app crashing."
+
+**Screenshots**
+If applicable, add screenshots to help explain your problem. You can attach screenshots here.
+
+**Additional Information**
+Please provide any other relevant information or context. For example, "This issue started happening after updating to version 1.2.3."
diff --git a/.github/ISSUE_TEMPLATE/bug_report_zh.md b/.github/ISSUE_TEMPLATE/bug_report_zh.md
@@ -0,0 +1,38 @@
+---
+name: Bug反馈
+about: 反馈Bug以帮助我们改进
+title: "[BUG]"
+labels: bug
+assignees: ''
+---
+
+**设备信息**
+- 设备型号: [例如, 三星 Galaxy S21]
+- 设备处理器型号: [例如, Exynos 2100]
+- 安卓版本: [例如, 11]
+- 内核版本: [例如, 4.9.112]
+
+**应用程序配置信息**
+- Winlator 版本: [例如, 7.1.1]
+- 显示驱动: [例如, Turnip-24.1.0]
+- Dx Wrapper: [例如, DXVK-2.3.1]
+- box64 版本: [例如, 0.3.0]
+- box64 预设: [例如, Compatibility]
+
+**描述错误**
+请详细描述你遇到的问题。
+
+**重现步骤**
+请描述重现问题的步骤：
+1. 步骤 1
+2. 步骤 2
+3. 步骤 3
+
+**预期行为**
+请描述你期望发生的情况。
+
+**截图**
+如果有相关截图，请附上。
+
+**附加信息**
+如果有其他任何相关信息，请提供。
diff --git a/.gitignore b/.gitignore
@@ -0,0 +1,9 @@
+*.iml
+.gradle
+/local.properties
+/.idea/
+.DS_Store
+/build
+/captures
+.externalNativeBuild
+.cxx
diff --git a/.gitmodules b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "app/src/main/cpp/OpenXR-SDK"]
+	path = app/src/main/cpp/OpenXR-SDK
+	url = https://github.com/KhronosGroup/OpenXR-SDK.git
diff --git a/LICENSE b/LICENSE
@@ -1,3 +1,29 @@
+GPLv3/MIT License
+
+The code added or modified in this fork is subject to the GPLv3 license.
+The code from the upstream repository is licensed under the MIT license.
+
+---
+
+GPLv3 License
+
+Copyright (C) 2024 longjunyu2, lvonasek
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+---
+
 MIT License
 
 Copyright (c) 2023 BrunoSX

diff --git a/README.md b/README.md
@@ -1,48 +1,9 @@
-<p align="center">
-	<img src="logo.png" width="376" height="128" alt="Winlator Logo" />  
-</p>
+# Winlator-Glibc
 
-# Winlator
+![image](https://github.com/user-attachments/assets/f355574f-af5b-45be-8afc-641ab297da34)
 
-Winlator is an Android application that lets you to run Windows (x86_64) applications with Wine and Box86/Box64.
+It's been a few months since the lead developer `longjunyu2` has been online. He originally mentioned studying and planned to return in 2025, but after October 15, 2024, the level of communication with him went to zero.
 
-# Installation
+Development of this project is on hold and will not resume until `longjunyu2` returns.
 
-1. Download and install the APK (Winlator_9.0.apk) from [GitHub Releases](https://github.com/brunodev85/winlator/releases)
-2. Launch the app and wait for the installation process to finish
-
-----
-
-[![Play on Youtube](https://img.youtube.com/vi/ETYDgKz4jBQ/3.jpg)](https://www.youtube.com/watch?v=ETYDgKz4jBQ)
-[![Play on Youtube](https://img.youtube.com/vi/9E4wnKf2OsI/2.jpg)](https://www.youtube.com/watch?v=9E4wnKf2OsI)
-[![Play on Youtube](https://img.youtube.com/vi/czEn4uT3Ja8/2.jpg)](https://www.youtube.com/watch?v=czEn4uT3Ja8)
-[![Play on Youtube](https://img.youtube.com/vi/eD36nxfT_Z0/2.jpg)](https://www.youtube.com/watch?v=eD36nxfT_Z0)
-
-----
-
-# Useful Tips
-
-- If you are experiencing performance issues, try changing the Box64 preset to `Performance` in Container Settings -> Advanced Tab.
-- For applications that use .NET Framework, try installing `Wine Mono` found in Start Menu -> System Tools.
-- If some older games don't open, try adding the environment variable `MESA_EXTENSION_MAX_YEAR=2003` in Container Settings -> Environment Variables.
-- Try running the games using the shortcut on the Winlator home screen, there you can define individual settings for each game.
-- To display low resolution games correctly, try to enabling the `Force Fullscreen` option in the shortcut settings.
-- To improve stability in games that uses Unity Engine, try changing the Box64 preset to `Stability` or in the shortcut settings add the exec argument `-force-gfx-direct`.
-
-# Information
-
-This project has been in constant development since version 1.0, the current app source code is up to version 7.1, I do not update this repository frequently precisely to avoid unofficial releases before the official releases of Winlator.
-
-# Credits and Third-party apps
-- Ubuntu RootFs ([Focal Fossa](https://releases.ubuntu.com/focal))
-- Wine ([winehq.org](https://www.winehq.org/))
-- Box86/Box64 by [ptitseb](https://github.com/ptitSeb)
-- PRoot ([proot-me.github.io](https://proot-me.github.io))
-- Mesa (Turnip/Zink/VirGL) ([mesa3d.org](https://www.mesa3d.org))
-- DXVK ([github.com/doitsujin/dxvk](https://github.com/doitsujin/dxvk))
-- VKD3D ([gitlab.winehq.org/wine/vkd3d](https://gitlab.winehq.org/wine/vkd3d))
-- D8VK ([github.com/AlpyneDreams/d8vk](https://github.com/AlpyneDreams/d8vk))
-- CNC DDraw ([github.com/FunkyFr3sh/cnc-ddraw](https://github.com/FunkyFr3sh/cnc-ddraw))
-
-Many thanks to [ptitSeb](https://github.com/ptitSeb) (Box86/Box64), [Danylo](https://blogs.igalia.com/dpiliaiev/tags/mesa/) (Turnip), [alexvorxx](https://github.com/alexvorxx) (Mods/Tips) and others.<br>
-Thank you to all the people who believe in this project.
+This repository was also home to WinlatorXR. The XR version is planned to be rebased on the original Winlator.
diff --git a/app/.gitignore b/app/.gitignore
@@ -1,2 +1,3 @@
 /.cxx
 /build
+/release
diff --git a/app/.gitmodules b/app/.gitmodules
diff --git a/app/build.gradle b/app/build.gradle
@@ -1,46 +1,61 @@
-apply plugin: 'com.android.application'
+plugins {
+    alias(libs.plugins.android.application)
+}
 
 android {
-    compileSdk 30
+    namespace 'com.winlator'
+    compileSdk 34
 
     defaultConfig {
-        applicationId 'com.winlator'
-        minSdkVersion 26
-        targetSdkVersion 28
-        versionCode 16
-        versionName "7.1"
+        applicationId "com.winlator"
+        minSdk 26
+        targetSdk 28
+        versionCode 21
+        versionName "7.1.5-glibc"
+        externalNativeBuild {
+            cmake {
+                cppFlags ''
+            }
+        }
+
+        ndk {
+            abiFilters 'arm64-v8a'
+        }
     }
 
     buildTypes {
         debug {
-            minifyEnabled true
+            minifyEnabled false
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
-
-            ndk {
-                abiFilters 'arm64-v8a', 'armeabi-v7a'
-            }
         }
     }
 
     lintOptions {
         checkReleaseBuilds false
     }
 
-    ndkVersion '22.1.7171670'
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_17
+        targetCompatibility JavaVersion.VERSION_17
+    }
 
     externalNativeBuild {
         cmake {
+            path file('src/main/cpp/CMakeLists.txt')
             version '3.22.1'
-            path 'src/main/cpp/CMakeLists.txt'
         }
     }
 }
 
 dependencies {
-    implementation 'androidx.appcompat:appcompat:1.2.0'
-    implementation 'androidx.preference:preference:1.1.1'
-    implementation 'com.google.android.material:material:1.4.0'
-    implementation 'com.github.luben:zstd-jni:1.5.2-3@aar'
-    implementation 'org.tukaani:xz:1.7'
-    implementation 'org.apache.commons:commons-compress:1.20'
-}
+    implementation libs.appcompat
+    implementation libs.material
+    implementation libs.preference
+    implementation libs.xz
+    implementation libs.commons.compress
+    testImplementation libs.junit
+    androidTestImplementation libs.ext.junit
+    androidTestImplementation libs.espresso.core
+    implementation(libs.zstd.jni) { artifact { type = 'aar' } }
+    implementation files('libs/MidiSynth/MidiSynth.jar')
+}
diff --git a/app/libs/MidiSynth/LICENSE.txt b/app/libs/MidiSynth/LICENSE.txt
@@ -0,0 +1,13 @@
+Copyright 2015, KyoSherlock
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+   http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
diff --git a/app/libs/MidiSynth/MidiSynth.jar b/app/libs/MidiSynth/MidiSynth.jar
diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro
@@ -1,19 +1,21 @@
 # Add project specific ProGuard rules here.
-# By default, the flags in this file are appended to flags specified
-# in C:\tools\adt-bundle-windows-x86_64-20131030\sdk/tools/proguard/proguard-android.txt
-# You can edit the include path and order by changing the proguardFiles
-# directive in build.gradle.
+# You can control the set of applied configuration files using the
+# proguardFiles setting in build.gradle.
 #
 # For more details, see
 #   http://developer.android.com/guide/developing/tools/proguard.html
 
-# Add any project specific keep options here:
-
 # If your project uses WebView with JS, uncomment the following
 # and specify the fully qualified class name to the JavaScript interface
 # class:
 #-keepclassmembers class fqcn.of.javascript.interface.for.webview {
 #   public *;
 #}
 
--dontobfuscate
+# Uncomment this to preserve the line number information for
+# debugging stack traces.
+#-keepattributes SourceFile,LineNumberTable
+
+# If you keep the line number information, uncomment this to
+# hide the original source file name.
+#-renamesourcefileattribute SourceFile
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -22,6 +22,8 @@
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
     <uses-permission android:name="android.permission.MODIFY_AUDIO_SETTINGS"/>
+    <uses-permission android:name="android.permission.VIBRATE"/>
+    <uses-permission android:name="com.android.launcher.permission.INSTALL_SHORTCUT"/>
 
     <application
         android:icon="@mipmap/ic_launcher"
@@ -68,11 +70,22 @@
         <activity android:name="com.winlator.ControlsEditorActivity"
             android:exported="false"
             android:theme="@style/AppThemeFullscreen"
-            android:screenOrientation="sensorLandscape" />
+            android:screenOrientation="sensor" />
 
         <activity android:name="com.winlator.ExternalControllerBindingsActivity"
             android:theme="@style/AppTheme"
             android:exported="false"
             android:screenOrientation="sensor" />
+
+        <provider
+            android:name=".core.WinlatorFilesProvider"
+            android:authorities="com.winlator.core.WinlatorFilesProvider"
+            android:exported="true"
+            android:grantUriPermissions="true"
+            android:permission="android.permission.MANAGE_DOCUMENTS">
+            <intent-filter>
+                <action android:name="android.content.action.DOCUMENTS_PROVIDER" />
+            </intent-filter>
+        </provider>
     </application>
 </manifest>
diff --git a/app/src/main/assets/.gitattributes b/app/src/main/assets/.gitattributes
@@ -1 +1,3 @@
 *.txz filter=lfs diff=lfs merge=lfs -text
+*.tzst filter=lfs diff=lfs merge=lfs -text
+*.sf2 filter=lfs diff=lfs merge=lfs -text
diff --git a/app/src/main/assets/box64_env_vars.json b/app/src/main/assets/box64_env_vars.json
@@ -7,5 +7,7 @@
     {"name" : "BOX64_DYNAREC_STRONGMEM", "values" : ["0", "1", "2", "3"], "defaultValue" : "0"},
     {"name" : "BOX64_DYNAREC_FORWARD", "values" : ["0", "128", "256", "512", "1024"], "defaultValue" : "128"},
     {"name" : "BOX64_DYNAREC_CALLRET", "values" : ["0", "1"], "toggleSwitch" : true, "defaultValue" : "1"},
-    {"name" : "BOX64_DYNAREC_WAIT", "values" : ["0", "1"], "toggleSwitch" : true, "defaultValue" : "1"}
+    {"name" : "BOX64_DYNAREC_WAIT", "values" : ["0", "1"], "toggleSwitch" : true, "defaultValue" : "1"},
+    {"name" : "BOX64_AVX", "values" : ["0", "1", "2"], "defaultValue" : "0"},
+    {"name" : "BOX64_UNITYPLAYER", "values" : ["0", "1"], "toggleSwitch" : true, "defaultValue" : "1"}
 ]
diff --git a/app/src/main/assets/box86_64/box64-0.2.8.tzst b/app/src/main/assets/box86_64/box64-0.2.8.tzst
diff --git a/app/src/main/assets/box86_64/box64-0.2.9.tzst b/app/src/main/assets/box86_64/box64-0.2.9.tzst
diff --git a/app/src/main/assets/box86_64/box64-0.3.0.tzst b/app/src/main/assets/box86_64/box64-0.3.0.tzst
diff --git a/app/src/main/assets/box86_64/box86-0.3.2.tzst b/app/src/main/assets/box86_64/box86-0.3.2.tzst
diff --git a/app/src/main/assets/box86_64/box86-0.3.7.tzst b/app/src/main/assets/box86_64/box86-0.3.7.tzst
diff --git a/app/src/main/assets/box86_64/rcfiles/box86_64rc-1.rcp b/app/src/main/assets/box86_64/rcfiles/box86_64rc-1.rcp
@@ -0,0 +1 @@
+{"id":1,"name":"Default","groups":[{"name":"Steam","desc":"","enabled":true,"items":[{"processName":"steam.exe","desc":"","vars":{"BOX64_ARGS":"-cef-disable-breakpad -cef-disable-d3d11 -cef-disable-delaypageload -cef-force-occlusion -cef-disable-sandbox -cef-disable--seccomp-sandbox -no-cef-sandbox -disable-winh264 -cef-disable-gpu -vgui -oldtraymenu -cef-single-process","BOX64_DYNAREC_BIGBLOCK":"3","BOX64_DYNAREC_CALLRET":"1","BOX64_DYNAREC_SAFEFLAGS":"0"}},{"processName":"steamwebhelper.exe","desc":"","vars":{"BOX64_DYNAREC_STRONGMEM":"1"}}]},{"name":"Flatout","desc":"","enabled":true,"items":[{"processName":"flatout.exe","desc":"","vars":{"BOX64_DYNAREC_BIGBLOCK":"3","BOX64_DYNAREC_CALLRET":"1"}}]}]}
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		{"id":1,"name":"Default","groups":[{"name":"Steam","desc":"","enabled":true,"items":[{"processName":"steam.exe","desc":"","vars":{"BOX64_ARGS":"-cef-disable-breakpad -cef-disable-d3d11 -cef-disable-delaypageload -cef-force-occlusion -cef-disable-sandbox -cef-disable--seccomp-sandbox -no-cef-sandbox -disable-winh264 -cef-disable-gpu -vgui -oldtraymenu -cef-single-process","BOX64_DYNAREC_BIGBLOCK":"3","BOX64_DYNAREC_CALLRET":"1","BOX64_DYNAREC_SAFEFLAGS":"0"}},{"processName":"steamwebhelper.exe","desc":"","vars":{"BOX64_DYNAREC_STRONGMEM":"1"}}]},{"name":"Flatout","desc":"","enabled":true,"items":[{"processName":"flatout.exe","desc":"","vars":{"BOX64_DYNAREC_BIGBLOCK":"3","BOX64_DYNAREC_CALLRET":"1"}}]}]}