Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
9bef5a8ac1
|
||
|
|
cfe339f3b2
|
||
|
|
ace6a59026
|
No files matched your search
@@ -8,6 +8,7 @@ on:
|
||||
- scripts
|
||||
paths:
|
||||
- 'build-aux/src/vk_gpu_info.c'
|
||||
- 'build-aux/src/wine_gpu_names.h'
|
||||
- '.gitea/workflows/build-vk-gpu-info-debian.yml'
|
||||
|
||||
jobs:
|
||||
|
||||
@@ -30,8 +30,6 @@ jobs:
|
||||
run: python dev-scripts/get_id.py
|
||||
env:
|
||||
STEAM_KEY: ${{ secrets.STEAM_KEY }}
|
||||
LINUX_GAMING_API_KEY: ${{ secrets.LINUX_GAMING_API_KEY }}
|
||||
LINUX_GAMING_API_USERNAME: ${{ secrets.LINUX_GAMING_API_USERNAME }}
|
||||
|
||||
- name: Commit and push changes
|
||||
env:
|
||||
|
||||
@@ -40,6 +40,6 @@ jobs:
|
||||
env:
|
||||
RENOVATE_CONFIG_FILE: "/tmp/renovate-config/config.js"
|
||||
RENOVATE_BINARY_SOURCE: "global"
|
||||
GITHUB_COM_TOKEN: ${{ secrets.GITHUB_COM_TOKEN }}
|
||||
GITHUB_COM_TOKEN: ${{ secrets.GHP_COM_TOKEN }}
|
||||
LOG_LEVEL: "debug"
|
||||
RENOVATE_TOKEN: ${{ secrets.RENOVATE_TOKEN }}
|
||||
@@ -0,0 +1,49 @@
|
||||
name: Update Wine GPU names
|
||||
|
||||
on:
|
||||
workflow_dispatch:
|
||||
schedule:
|
||||
- cron: '0 4 * * 1'
|
||||
|
||||
concurrency:
|
||||
group: update-wine-gpu-names
|
||||
cancel-in-progress: false
|
||||
|
||||
jobs:
|
||||
update:
|
||||
if: gitea.repository == 'Linux-Gaming/PortProtonQt'
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
- name: Checkout
|
||||
uses: https://git.linux-gaming.ru/actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7
|
||||
with:
|
||||
ref: main
|
||||
token: ${{ secrets.GITEA_TOKEN }}
|
||||
|
||||
- name: Set up Python
|
||||
uses: https://git.linux-gaming.ru/actions/setup-python@6d4fd22b20465ccc0f7354476588e8df7c9ca0e0 # v7
|
||||
with:
|
||||
python-version-file: pyproject.toml
|
||||
|
||||
- name: Update Wine GPU names
|
||||
id: update
|
||||
run: |
|
||||
python dev-scripts/update_wine_gpu_names.py
|
||||
if git diff --quiet -- build-aux/src/wine_gpu_names.h; then
|
||||
echo "changed=false" >> "$GITHUB_OUTPUT"
|
||||
else
|
||||
echo "changed=true" >> "$GITHUB_OUTPUT"
|
||||
fi
|
||||
|
||||
- name: Commit and push table changes
|
||||
if: steps.update.outputs.changed == 'true'
|
||||
run: |
|
||||
git add -- build-aux/src/wine_gpu_names.h
|
||||
if git diff --cached --quiet; then
|
||||
echo "Wine GPU names are unchanged."
|
||||
exit 0
|
||||
fi
|
||||
git config --local user.name 'Gitea Actions'
|
||||
git config --local user.email 'gitea-actions@users.noreply.gitea.com'
|
||||
git commit -m 'chore: sync Wine GPU names'
|
||||
git push origin HEAD:main
|
||||
@@ -43,6 +43,7 @@
|
||||
|
||||
### Fixed
|
||||
|
||||
- Исправлена фильтрация видеокарт DXVK и VKD3D при расхождении нативного имени GPU с именем Wine
|
||||
- Запросы установки других игр GOG и EGS во время получения списка DLC добавляются в очередь вместо ошибки «Другая загрузка уже выполняется»
|
||||
- Виртуальная мышь создаётся только при включении эмуляции геймпадом и удаляется при её выключении
|
||||
- При ошибке загрузки каталога WINE/Proton отображаются локально установленные версии
|
||||
|
||||
Binary file not shown.
@@ -2008,6 +2008,37 @@ pw_init_db () {
|
||||
return 0
|
||||
}
|
||||
|
||||
pw_select_gpu () {
|
||||
[[ -n "${PW_GPU_USE}" && "${PW_GPU_USE}" != "disabled" ]] || return 0
|
||||
local vk_gpu_info_cmd vk_info_output line current_device_name="" filter_name="${PW_GPU_USE}"
|
||||
vk_gpu_info_cmd="$(dirname "${BASH_SOURCE[0]}")/../../../bin/vk_gpu_info"
|
||||
if [[ ! -x "${vk_gpu_info_cmd}" ]] ; then
|
||||
vk_gpu_info_cmd="$(command -v vk_gpu_info 2>/dev/null || true)"
|
||||
fi
|
||||
if [[ -n "${vk_gpu_info_cmd}" ]] ; then
|
||||
if vk_info_output="$("${vk_gpu_info_cmd}" 2>/dev/null)" ; then
|
||||
while IFS= read -r line ; do
|
||||
case "$line" in
|
||||
"GPU #"*) current_device_name="" ;;
|
||||
"device_name: "*) current_device_name="${line#device_name: }" ;;
|
||||
"wine_device_name: "*)
|
||||
if [[ "${current_device_name}" == "${PW_GPU_USE}" && -n "${line#wine_device_name: }" ]] ; then
|
||||
filter_name="${line#wine_device_name: }"
|
||||
break
|
||||
fi
|
||||
;;
|
||||
esac
|
||||
done <<< "${vk_info_output}"
|
||||
else
|
||||
print_warning "vk_gpu_info failed; using the native GPU name for device filters."
|
||||
fi
|
||||
fi
|
||||
[[ -v DXVK_FILTER_DEVICE_NAME ]] || export DXVK_FILTER_DEVICE_NAME="${filter_name}"
|
||||
[[ -v VKD3D_FILTER_DEVICE_NAME ]] || export VKD3D_FILTER_DEVICE_NAME="${filter_name}"
|
||||
export MESA_VK_DEVICE_SELECT_FORCE_DEFAULT_DEVICE="1"
|
||||
export MESA_VK_DEVICE_SELECT="$PW_vendorID:$PW_deviceID"
|
||||
}
|
||||
|
||||
pw_check_vulkan_extensions () {
|
||||
local ext_name="$1"
|
||||
local ext_key
|
||||
@@ -3012,12 +3043,7 @@ start_portproton () {
|
||||
|
||||
[[ "${PW_VKBASALT_USER_CONF}" == 1 ]] && pw_select_vkbasalt_user_conf
|
||||
|
||||
if [[ $PW_GPU_USE != "disabled" ]] ; then
|
||||
export DXVK_FILTER_DEVICE_NAME="$PW_GPU_USE"
|
||||
export VKD3D_FILTER_DEVICE_NAME="$PW_GPU_USE"
|
||||
export MESA_VK_DEVICE_SELECT_FORCE_DEFAULT_DEVICE="1"
|
||||
export MESA_VK_DEVICE_SELECT="$PW_vendorID:$PW_deviceID"
|
||||
fi
|
||||
pw_select_gpu
|
||||
|
||||
if [[ -f "$PATH_TO_GAME/dxvk.conf" ]] ; then
|
||||
export DXVK_CONFIG_FILE="$PATH_TO_GAME/dxvk.conf"
|
||||
|
||||
@@ -2,6 +2,7 @@
|
||||
#include <stdlib.h>
|
||||
#include <string.h>
|
||||
#include <vulkan/vulkan.h>
|
||||
#include "wine_gpu_names.h"
|
||||
|
||||
typedef struct {
|
||||
uint32_t vendor_id;
|
||||
@@ -275,6 +276,7 @@ int main() {
|
||||
printf("vendor_id: 0x%04x\n", props.vendorID);
|
||||
printf("device_id: 0x%04x\n", props.deviceID);
|
||||
printf("device_name: %s\n", device_name);
|
||||
printf("wine_device_name: %s\n", wine_device_name(props.vendorID, props.deviceID, device_name));
|
||||
printf("driver_name: %s\n", driver_name);
|
||||
printf("driver_info: %s\n", driver_info);
|
||||
printf("api_version: %u.%u.%u\n",
|
||||
|
||||
@@ -0,0 +1,371 @@
|
||||
/*
|
||||
* GPU names derived from Wine gpu_device_name()
|
||||
*
|
||||
* Copyright 1994 Alexandre Julliard
|
||||
* Copyright 2019 Zhiyi Zhang for CodeWeavers
|
||||
* Copyright 2021 Jacek Caban for CodeWeavers
|
||||
*
|
||||
* Adapted from LGPL-2.1-or-later Wine code under section 3 of LGPL-2.1.
|
||||
* This adaptation is licensed under GPL-3.0.
|
||||
*
|
||||
* This program is free software: you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License version 3 as
|
||||
* published by the Free Software Foundation.
|
||||
*
|
||||
* 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/>.
|
||||
*/
|
||||
|
||||
// Source: wine-mirror/wine, dlls/win32u/sysparams.c
|
||||
// Revision: 9f8c4ae4d35c7ff4153267aba9618c026f5f5583
|
||||
#ifndef WINE_GPU_NAMES_H
|
||||
#define WINE_GPU_NAMES_H
|
||||
|
||||
#include <stddef.h>
|
||||
#include <stdint.h>
|
||||
|
||||
static const struct {
|
||||
uint32_t vendor_id;
|
||||
uint32_t device_id;
|
||||
const char *name;
|
||||
} wine_gpu_names[] = {
|
||||
{0x10de, 0x0018, "NVIDIA RIVA 128"},
|
||||
{0x10de, 0x0020, "NVIDIA RIVA TNT"},
|
||||
{0x10de, 0x0028, "NVIDIA RIVA TNT2/TNT2 Pro"},
|
||||
{0x10de, 0x0100, "NVIDIA GeForce 256"},
|
||||
{0x10de, 0x0150, "NVIDIA GeForce2 GTS/GeForce2 Pro"},
|
||||
{0x10de, 0x0110, "NVIDIA GeForce2 MX/MX 400"},
|
||||
{0x10de, 0x0200, "NVIDIA GeForce3"},
|
||||
{0x10de, 0x0170, "NVIDIA GeForce4 MX 460"},
|
||||
{0x10de, 0x0253, "NVIDIA GeForce4 Ti 4200"},
|
||||
{0x10de, 0x0320, "NVIDIA GeForce FX 5200"},
|
||||
{0x10de, 0x0312, "NVIDIA GeForce FX 5600"},
|
||||
{0x10de, 0x0302, "NVIDIA GeForce FX 5800"},
|
||||
{0x10de, 0x014f, "NVIDIA GeForce 6200"},
|
||||
{0x10de, 0x0140, "NVIDIA GeForce 6600 GT"},
|
||||
{0x10de, 0x0041, "NVIDIA GeForce 6800"},
|
||||
{0x10de, 0x01d7, "NVIDIA GeForce Go 7300"},
|
||||
{0x10de, 0x01d8, "NVIDIA GeForce Go 7400"},
|
||||
{0x10de, 0x0391, "NVIDIA GeForce 7600 GT"},
|
||||
{0x10de, 0x0092, "NVIDIA GeForce 7800 GT"},
|
||||
{0x10de, 0x0849, "NVIDIA GeForce 8200"},
|
||||
{0x10de, 0x084b, "NVIDIA GeForce 8200"},
|
||||
{0x10de, 0x0423, "NVIDIA GeForce 8300 GS"},
|
||||
{0x10de, 0x0404, "NVIDIA GeForce 8400 GS"},
|
||||
{0x10de, 0x0421, "NVIDIA GeForce 8500 GT"},
|
||||
{0x10de, 0x0402, "NVIDIA GeForce 8600 GT"},
|
||||
{0x10de, 0x0407, "NVIDIA GeForce 8600M GT"},
|
||||
{0x10de, 0x0193, "NVIDIA GeForce 8800 GTS"},
|
||||
{0x10de, 0x0191, "NVIDIA GeForce 8800 GTX"},
|
||||
{0x10de, 0x086d, "NVIDIA GeForce 9200"},
|
||||
{0x10de, 0x086c, "NVIDIA GeForce 9300"},
|
||||
{0x10de, 0x0863, "NVIDIA GeForce 9400M"},
|
||||
{0x10de, 0x042c, "NVIDIA GeForce 9400 GT"},
|
||||
{0x10de, 0x0640, "NVIDIA GeForce 9500 GT"},
|
||||
{0x10de, 0x0622, "NVIDIA GeForce 9600 GT"},
|
||||
{0x10de, 0x064a, "NVIDIA GeForce 9700M GT"},
|
||||
{0x10de, 0x0614, "NVIDIA GeForce 9800 GT"},
|
||||
{0x10de, 0x0a23, "NVIDIA GeForce 210"},
|
||||
{0x10de, 0x0a20, "NVIDIA GeForce GT 220"},
|
||||
{0x10de, 0x0ca3, "NVIDIA GeForce GT 240"},
|
||||
{0x10de, 0x0615, "NVIDIA GeForce GTS 250"},
|
||||
{0x10de, 0x05e2, "NVIDIA GeForce GTX 260"},
|
||||
{0x10de, 0x05e6, "NVIDIA GeForce GTX 275"},
|
||||
{0x10de, 0x05e1, "NVIDIA GeForce GTX 280"},
|
||||
{0x10de, 0x0a7a, "NVIDIA GeForce 315M"},
|
||||
{0x10de, 0x08a3, "NVIDIA GeForce 320M"},
|
||||
{0x10de, 0x0a2d, "NVIDIA GeForce GT 320M"},
|
||||
{0x10de, 0x0a35, "NVIDIA GeForce GT 325M"},
|
||||
{0x10de, 0x0ca0, "NVIDIA GeForce GT 330"},
|
||||
{0x10de, 0x0cb0, "NVIDIA GeForce GTS 350M"},
|
||||
{0x10de, 0x1055, "NVIDIA GeForce 410M"},
|
||||
{0x10de, 0x0de2, "NVIDIA GeForce GT 420"},
|
||||
{0x10de, 0x0df0, "NVIDIA GeForce GT 425M"},
|
||||
{0x10de, 0x0de1, "NVIDIA GeForce GT 430"},
|
||||
{0x10de, 0x0de0, "NVIDIA GeForce GT 440"},
|
||||
{0x10de, 0x0dc4, "NVIDIA GeForce GTS 450"},
|
||||
{0x10de, 0x0e22, "NVIDIA GeForce GTX 460"},
|
||||
{0x10de, 0x0dd1, "NVIDIA GeForce GTX 460M"},
|
||||
{0x10de, 0x06c4, "NVIDIA GeForce GTX 465"},
|
||||
{0x10de, 0x06cd, "NVIDIA GeForce GTX 470"},
|
||||
{0x10de, 0x06c0, "NVIDIA GeForce GTX 480"},
|
||||
{0x10de, 0x1040, "NVIDIA GeForce GT 520"},
|
||||
{0x10de, 0x0dec, "NVIDIA GeForce GT 525M"},
|
||||
{0x10de, 0x0df4, "NVIDIA GeForce GT 540M"},
|
||||
{0x10de, 0x1244, "NVIDIA GeForce GTX 550 Ti"},
|
||||
{0x10de, 0x04b8, "NVIDIA GeForce GT 555M"},
|
||||
{0x10de, 0x1200, "NVIDIA GeForce GTX 560 Ti"},
|
||||
{0x10de, 0x1251, "NVIDIA GeForce GTX 560M"},
|
||||
{0x10de, 0x1201, "NVIDIA GeForce GTX 560"},
|
||||
{0x10de, 0x1081, "NVIDIA GeForce GTX 570"},
|
||||
{0x10de, 0x1080, "NVIDIA GeForce GTX 580"},
|
||||
{0x10de, 0x104a, "NVIDIA GeForce GT 610"},
|
||||
{0x10de, 0x0f00, "NVIDIA GeForce GT 630"},
|
||||
{0x10de, 0x0de9, "NVIDIA GeForce GT 630M"},
|
||||
{0x10de, 0x0fc1, "NVIDIA GeForce GT 640"},
|
||||
{0x10de, 0x0fd2, "NVIDIA GeForce GT 640M"},
|
||||
{0x10de, 0x0fd1, "NVIDIA GeForce GT 650M"},
|
||||
{0x10de, 0x0fc6, "NVIDIA GeForce GTX 650"},
|
||||
{0x10de, 0x11c6, "NVIDIA GeForce GTX 650 Ti"},
|
||||
{0x10de, 0x11c0, "NVIDIA GeForce GTX 660"},
|
||||
{0x10de, 0x0fd4, "NVIDIA GeForce GTX 660M"},
|
||||
{0x10de, 0x1183, "NVIDIA GeForce GTX 660 Ti"},
|
||||
{0x10de, 0x1189, "NVIDIA GeForce GTX 670"},
|
||||
{0x10de, 0x11a1, "NVIDIA GeForce GTX 670MX"},
|
||||
{0x10de, 0x11a7, "NVIDIA GeForce GTX 675MX"},
|
||||
{0x10de, 0x11a2, "NVIDIA GeForce GTX 675MX"},
|
||||
{0x10de, 0x1180, "NVIDIA GeForce GTX 680"},
|
||||
{0x10de, 0x1188, "NVIDIA GeForce GTX 690"},
|
||||
{0x10de, 0x128b, "NVIDIA GeForce GT 720"},
|
||||
{0x10de, 0x1287, "NVIDIA GeForce GT 730"},
|
||||
{0x10de, 0x0fe1, "NVIDIA GeForce GT 730M"},
|
||||
{0x10de, 0x1292, "NVIDIA GeForce GT 740M"},
|
||||
{0x10de, 0x0fe9, "NVIDIA GeForce GT 750M"},
|
||||
{0x10de, 0x0fcd, "NVIDIA GeForce GT 755M"},
|
||||
{0x10de, 0x1381, "NVIDIA GeForce GTX 750"},
|
||||
{0x10de, 0x1380, "NVIDIA GeForce GTX 750 Ti"},
|
||||
{0x10de, 0x1187, "NVIDIA GeForce GTX 760"},
|
||||
{0x10de, 0x1193, "NVIDIA GeForce GTX 760 Ti"},
|
||||
{0x10de, 0x11e2, "NVIDIA GeForce GTX 765M"},
|
||||
{0x10de, 0x11e0, "NVIDIA GeForce GTX 770M"},
|
||||
{0x10de, 0x1184, "NVIDIA GeForce GTX 770"},
|
||||
{0x10de, 0x119d, "NVIDIA GeForce GTX 775M"},
|
||||
{0x10de, 0x1004, "NVIDIA GeForce GTX 780"},
|
||||
{0x10de, 0x119e, "NVIDIA GeForce GTX 780M"},
|
||||
{0x10de, 0x100a, "NVIDIA GeForce GTX 780 Ti"},
|
||||
{0x10de, 0x1005, "NVIDIA GeForce GTX TITAN"},
|
||||
{0x10de, 0x100c, "NVIDIA GeForce GTX TITAN Black"},
|
||||
{0x10de, 0x17c2, "NVIDIA GeForce GTX TITAN X"},
|
||||
{0x10de, 0x1001, "NVIDIA GeForce GTX TITAN Z"},
|
||||
{0x10de, 0x0fed, "NVIDIA GeForce 820M"},
|
||||
{0x10de, 0x1340, "NVIDIA GeForce 830M"},
|
||||
{0x10de, 0x1341, "NVIDIA GeForce 840M"},
|
||||
{0x10de, 0x1344, "NVIDIA GeForce 845M"},
|
||||
{0x10de, 0x1391, "NVIDIA GeForce GTX 850M"},
|
||||
{0x10de, 0x1392, "NVIDIA GeForce GTX 860M"},
|
||||
{0x10de, 0x119a, "NVIDIA GeForce GTX 860M"},
|
||||
{0x10de, 0x1199, "NVIDIA GeForce GTX 870M"},
|
||||
{0x10de, 0x1198, "NVIDIA GeForce GTX 880M"},
|
||||
{0x10de, 0x1347, "NVIDIA GeForce 940M"},
|
||||
{0x10de, 0x1402, "NVIDIA GeForce GTX 950"},
|
||||
{0x10de, 0x139a, "NVIDIA GeForce GTX 950M"},
|
||||
{0x10de, 0x1401, "NVIDIA GeForce GTX 960"},
|
||||
{0x10de, 0x139b, "NVIDIA GeForce GTX 960M"},
|
||||
{0x10de, 0x13c2, "NVIDIA GeForce GTX 970"},
|
||||
{0x10de, 0x13d8, "NVIDIA GeForce GTX 970M"},
|
||||
{0x10de, 0x13c0, "NVIDIA GeForce GTX 980"},
|
||||
{0x10de, 0x17c8, "NVIDIA GeForce GTX 980 Ti"},
|
||||
{0x10de, 0x1d01, "NVIDIA GeForce GT 1030"},
|
||||
{0x10de, 0x1c81, "NVIDIA GeForce GTX 1050"},
|
||||
{0x10de, 0x1c82, "NVIDIA GeForce GTX 1050 Ti"},
|
||||
{0x10de, 0x1c02, "NVIDIA GeForce GTX 1060 3GB"},
|
||||
{0x10de, 0x1c03, "NVIDIA GeForce GTX 1060"},
|
||||
{0x10de, 0x1c20, "NVIDIA GeForce GTX 1060M"},
|
||||
{0x10de, 0x1b81, "NVIDIA GeForce GTX 1070"},
|
||||
{0x10de, 0x1be1, "NVIDIA GeForce GTX 1070M"},
|
||||
{0x10de, 0x1b80, "NVIDIA GeForce GTX 1080"},
|
||||
{0x10de, 0x1be0, "NVIDIA GeForce GTX 1080M"},
|
||||
{0x10de, 0x1b06, "NVIDIA GeForce GTX 1080 Ti"},
|
||||
{0x10de, 0x1b00, "NVIDIA TITAN X (Pascal)"},
|
||||
{0x10de, 0x1d81, "NVIDIA TITAN V"},
|
||||
{0x10de, 0x1f82, "NVIDIA GeForce GTX 1650"},
|
||||
{0x10de, 0x2187, "NVIDIA GeForce GTX 1650 SUPER"},
|
||||
{0x10de, 0x21c4, "NVIDIA GeForce GTX 1660 SUPER"},
|
||||
{0x10de, 0x2182, "NVIDIA GeForce GTX 1660 Ti"},
|
||||
{0x10de, 0x1f08, "NVIDIA GeForce RTX 2060"},
|
||||
{0x10de, 0x1f07, "NVIDIA GeForce RTX 2070"},
|
||||
{0x10de, 0x1e87, "NVIDIA GeForce RTX 2080"},
|
||||
{0x10de, 0x1e07, "NVIDIA GeForce RTX 2080 Ti"},
|
||||
{0x10de, 0x2507, "NVIDIA GeForce RTX 3050"},
|
||||
{0x10de, 0x2544, "NVIDIA GeForce RTX 3060"},
|
||||
{0x10de, 0x2504, "NVIDIA GeForce RTX 3060 (Low Hash Rate)"},
|
||||
{0x10de, 0x2414, "NVIDIA GeForce RTX 3060 Ti (GA103)"},
|
||||
{0x10de, 0x2486, "NVIDIA GeForce RTX 3060 Ti (GA104)"},
|
||||
{0x10de, 0x2489, "NVIDIA GeForce RTX 3060 Ti (GA104, Low Hash Rate)"},
|
||||
{0x10de, 0x2484, "NVIDIA GeForce RTX 3070"},
|
||||
{0x10de, 0x2488, "NVIDIA GeForce RTX 3070 (Low Hash Rate)"},
|
||||
{0x10de, 0x249d, "NVIDIA GeForce RTX 3070 (mobile)"},
|
||||
{0x10de, 0x2482, "NVIDIA GeForce RTX 3070 Ti"},
|
||||
{0x10de, 0x2206, "NVIDIA GeForce RTX 3080 10GB"},
|
||||
{0x10de, 0x2216, "NVIDIA GeForce RTX 3080 10GB (Low Hash Rate)"},
|
||||
{0x10de, 0x220a, "NVIDIA GeForce RTX 3080 12GB"},
|
||||
{0x10de, 0x2208, "NVIDIA GeForce RTX 3080 Ti"},
|
||||
{0x10de, 0x2204, "NVIDIA GeForce RTX 3090"},
|
||||
{0x10de, 0x2203, "NVIDIA GeForce RTX 3090 Ti"},
|
||||
{0x10de, 0x1eb8, "NVIDIA Tesla T4"},
|
||||
{0x10de, 0x2236, "NVIDIA Ampere A10"},
|
||||
{0x10de, 0x2882, "NVIDIA GeForce RTX 4060"},
|
||||
{0x10de, 0x28a0, "NVIDIA GeForce RTX 4060M"},
|
||||
{0x10de, 0x2803, "NVIDIA GeForce RTX 4060 Ti 8GB"},
|
||||
{0x10de, 0x2805, "NVIDIA GeForce RTX 4060 Ti 16GB"},
|
||||
{0x10de, 0x2786, "NVIDIA GeForce RTX 4070"},
|
||||
{0x10de, 0x2783, "NVIDIA GeForce RTX 4070 SUPER"},
|
||||
{0x10de, 0x2782, "NVIDIA GeForce RTX 4070 Ti"},
|
||||
{0x10de, 0x2705, "NVIDIA GeForce RTX 4070 Ti SUPER"},
|
||||
{0x10de, 0x2704, "NVIDIA GeForce RTX 4080"},
|
||||
{0x10de, 0x2702, "NVIDIA GeForce RTX 4080 SUPER"},
|
||||
{0x10de, 0x2684, "NVIDIA GeForce RTX 4090"},
|
||||
{0x1002, 0x5246, "ATI Rage Fury"},
|
||||
{0x1002, 0x5144, "ATI RADEON 7200 SERIES"},
|
||||
{0x1002, 0x514c, "ATI RADEON 8500 SERIES"},
|
||||
{0x1002, 0x4144, "ATI Radeon 9500"},
|
||||
{0x1002, 0x5955, "ATI RADEON XPRESS 200M Series"},
|
||||
{0x1002, 0x5e4c, "ATI Radeon X700 SE"},
|
||||
{0x1002, 0x71c2, "ATI Radeon X1600 Series"},
|
||||
{0x1002, 0x94c7, "ATI Mobility Radeon HD 2350"},
|
||||
{0x1002, 0x9581, "ATI Mobility Radeon HD 2600"},
|
||||
{0x1002, 0x9400, "ATI Radeon HD 2900 XT"},
|
||||
{0x1002, 0x9620, "ATI Radeon HD 3200 Graphics"},
|
||||
{0x1002, 0x9515, "ATI Radeon HD 3850 AGP"},
|
||||
{0x1002, 0x9712, "ATI Mobility Radeon HD 4200"},
|
||||
{0x1002, 0x954f, "ATI Radeon HD 4350"},
|
||||
{0x1002, 0x9495, "ATI Radeon HD 4600 Series"},
|
||||
{0x1002, 0x944e, "ATI Radeon HD 4700 Series"},
|
||||
{0x1002, 0x944c, "ATI Radeon HD 4800 Series"},
|
||||
{0x1002, 0x68f9, "ATI Radeon HD 5400 Series"},
|
||||
{0x1002, 0x68d8, "ATI Radeon HD 5600 Series"},
|
||||
{0x1002, 0x68be, "ATI Radeon HD 5700 Series"},
|
||||
{0x1002, 0x6898, "ATI Radeon HD 5800 Series"},
|
||||
{0x1002, 0x689c, "ATI Radeon HD 5900 Series"},
|
||||
{0x1002, 0x9803, "AMD Radeon HD 6300 series Graphics"},
|
||||
{0x1002, 0x6770, "AMD Radeon HD 6400 Series"},
|
||||
{0x1002, 0x9644, "AMD Radeon HD 6410D"},
|
||||
{0x1002, 0x9648, "AMD Radeon HD 6480G"},
|
||||
{0x1002, 0x6760, "AMD Radeon HD 6490M"},
|
||||
{0x1002, 0x9640, "AMD Radeon HD 6550D"},
|
||||
{0x1002, 0x6758, "AMD Radeon HD 6600 Series"},
|
||||
{0x1002, 0x6741, "AMD Radeon HD 6600M Series"},
|
||||
{0x1002, 0x68ba, "AMD Radeon HD 6700 Series"},
|
||||
{0x1002, 0x6739, "AMD Radeon HD 6800 Series"},
|
||||
{0x1002, 0x6719, "AMD Radeon HD 6900 Series"},
|
||||
{0x1002, 0x9901, "AMD Radeon HD 7660D"},
|
||||
{0x1002, 0x683d, "AMD Radeon HD 7700 Series"},
|
||||
{0x1002, 0x6819, "AMD Radeon HD 7800 Series"},
|
||||
{0x1002, 0x6818, "AMD Radeon HD 7870 Series"},
|
||||
{0x1002, 0x679a, "AMD Radeon HD 7900 Series"},
|
||||
{0x1002, 0x6660, "AMD Radeon HD 8600M Series"},
|
||||
{0x1002, 0x6610, "AMD Radeon HD 8670"},
|
||||
{0x1002, 0x665c, "AMD Radeon HD 8770"},
|
||||
{0x1002, 0x9830, "AMD Radeon HD 8400 / R3 Series"},
|
||||
{0x1002, 0x130f, "AMD Radeon(TM) R7 Graphics"},
|
||||
{0x1002, 0x6939, "AMD Radeon R9 285"},
|
||||
{0x1002, 0x67b1, "AMD Radeon R9 290"},
|
||||
{0x1002, 0x67b0, "AMD Radeon R9 290X"},
|
||||
{0x1002, 0x7300, "AMD Radeon (TM) R9 Fury Series"},
|
||||
{0x1002, 0x6821, "AMD Radeon R9 M370X"},
|
||||
{0x1002, 0x6647, "AMD Radeon R9 M380"},
|
||||
{0x1002, 0x6920, "AMD Radeon R9 M395X"},
|
||||
{0x1002, 0x67ef, "Radeon(TM) RX 460 Graphics"},
|
||||
{0x1002, 0x67df, "Radeon (TM) RX 480 Graphics"},
|
||||
{0x1002, 0x73df, "AMD Radeon RX 6700 XT"},
|
||||
{0x1002, 0x687f, "Radeon RX Vega"},
|
||||
{0x1002, 0x69af, "Radeon Pro Vega 20"},
|
||||
{0x1002, 0x15dd, "AMD Radeon(TM) Vega 10 Mobile Graphics"},
|
||||
{0x1002, 0x66af, "Radeon RX Vega 20"},
|
||||
{0x1002, 0x731f, "Radeon RX 5700 / 5700 XT"},
|
||||
{0x1002, 0x7340, "Radeon RX 5500M"},
|
||||
{0x1002, 0x73bf, "Radeon RX 6800/6800 XT / 6900 XT"},
|
||||
{0x1002, 0x7480, "AMD Radeon RX 7600 XT"},
|
||||
{0x1002, 0x7590, "AMD Radeon RX 9060 XT"},
|
||||
{0x1002, 0x73a1, "Radeon Pro V620"},
|
||||
{0x1002, 0x73ae, "Radeon Pro V620 VF"},
|
||||
{0x1002, 0x163f, "AMD VANGOGH"},
|
||||
{0x1002, 0x164e, "AMD Radeon(TM) Graphics"},
|
||||
{0x8086, 0x3577, "Intel(R) 82830M Graphics Controller"},
|
||||
{0x8086, 0x3582, "Intel(R) 82852/82855 GM/GME Graphics Controller"},
|
||||
{0x8086, 0x2562, "Intel(R) 845G"},
|
||||
{0x8086, 0x2572, "Intel(R) 82865G Graphics Controller"},
|
||||
{0x8086, 0x2582, "Intel(R) 82915G/GV/910GL Express Chipset Family"},
|
||||
{0x8086, 0x258a, "Intel(R) E7221G"},
|
||||
{0x8086, 0x2592, "Mobile Intel(R) 915GM/GMS,910GML Express Chipset Family"},
|
||||
{0x8086, 0x2772, "Intel(R) 945G"},
|
||||
{0x8086, 0x27a2, "Mobile Intel(R) 945GM Express Chipset Family"},
|
||||
{0x8086, 0x27ae, "Intel(R) 945GME"},
|
||||
{0x8086, 0x29b2, "Intel(R) Q35"},
|
||||
{0x8086, 0x29c2, "Intel(R) G33"},
|
||||
{0x8086, 0x29d2, "Intel(R) Q33"},
|
||||
{0x8086, 0xa001, "Intel(R) IGD"},
|
||||
{0x8086, 0xa011, "Intel(R) IGD"},
|
||||
{0x8086, 0x2992, "Intel(R) 965Q"},
|
||||
{0x8086, 0x2982, "Intel(R) 965G"},
|
||||
{0x8086, 0x2972, "Intel(R) 946GZ"},
|
||||
{0x8086, 0x2a02, "Mobile Intel(R) 965 Express Chipset Family"},
|
||||
{0x8086, 0x2a12, "Intel(R) 965GME"},
|
||||
{0x8086, 0x2a42, "Mobile Intel(R) GM45 Express Chipset Family"},
|
||||
{0x8086, 0x2e02, "Intel(R) Integrated Graphics Device"},
|
||||
{0x8086, 0x2e22, "Intel(R) G45/G43"},
|
||||
{0x8086, 0x2e12, "Intel(R) Q45/Q43"},
|
||||
{0x8086, 0x2e32, "Intel(R) G41"},
|
||||
{0x8086, 0x2e92, "Intel(R) B43"},
|
||||
{0x8086, 0x0042, "Intel(R) HD Graphics"},
|
||||
{0x8086, 0x0046, "Intel(R) HD Graphics"},
|
||||
{0x8086, 0x0122, "Intel(R) HD Graphics 3000"},
|
||||
{0x8086, 0x0126, "Intel(R) HD Graphics 3000"},
|
||||
{0x8086, 0x010a, "Intel(R) HD Graphics Family"},
|
||||
{0x8086, 0x0162, "Intel(R) HD Graphics 4000"},
|
||||
{0x8086, 0x0166, "Intel(R) HD Graphics 4000"},
|
||||
{0x8086, 0x015a, "Intel(R) HD Graphics Family"},
|
||||
{0x8086, 0x0412, "Intel(R) HD Graphics 4600"},
|
||||
{0x8086, 0x0416, "Intel(R) HD Graphics 4600"},
|
||||
{0x8086, 0x0a26, "Intel(R) HD Graphics 5000"},
|
||||
{0x8086, 0x0422, "Intel(R) HD Graphics 5000"},
|
||||
{0x8086, 0x0a22, "Intel(R) Iris(TM) Graphics 5100"},
|
||||
{0x8086, 0x0a2a, "Intel(R) Iris(TM) Graphics 5100"},
|
||||
{0x8086, 0x0a2b, "Intel(R) Iris(TM) Graphics 5100"},
|
||||
{0x8086, 0x0a2e, "Intel(R) Iris(TM) Graphics 5100"},
|
||||
{0x8086, 0x0d22, "Intel(R) Iris(TM) Pro Graphics 5200"},
|
||||
{0x8086, 0x0d26, "Intel(R) Iris(TM) Pro Graphics 5200"},
|
||||
{0x8086, 0x0d2a, "Intel(R) Iris(TM) Pro Graphics 5200"},
|
||||
{0x8086, 0x0d2b, "Intel(R) Iris(TM) Pro Graphics 5200"},
|
||||
{0x8086, 0x0d2e, "Intel(R) Iris(TM) Pro Graphics 5200"},
|
||||
{0x8086, 0x0c22, "Intel(R) Iris(TM) Pro Graphics 5200"},
|
||||
{0x8086, 0x161e, "Intel(R) HD Graphics 5300"},
|
||||
{0x8086, 0x1616, "Intel(R) HD Graphics 5500"},
|
||||
{0x8086, 0x1612, "Intel(R) HD Graphics 5600"},
|
||||
{0x8086, 0x1626, "Intel(R) HD Graphics 6000"},
|
||||
{0x8086, 0x162b, "Intel(R) Iris(TM) Graphics 6100"},
|
||||
{0x8086, 0x1622, "Intel(R) Iris(TM) Pro Graphics 6200"},
|
||||
{0x8086, 0x162a, "Intel(R) Iris(TM) Pro Graphics P6300"},
|
||||
{0x8086, 0x1902, "Intel(R) HD Graphics 510"},
|
||||
{0x8086, 0x1906, "Intel(R) HD Graphics 510"},
|
||||
{0x8086, 0x190b, "Intel(R) HD Graphics 510"},
|
||||
{0x8086, 0x191e, "Intel(R) HD Graphics 515"},
|
||||
{0x8086, 0x1916, "Intel(R) HD Graphics 520"},
|
||||
{0x8086, 0x1921, "Intel(R) HD Graphics 520"},
|
||||
{0x8086, 0x1912, "Intel(R) HD Graphics 530"},
|
||||
{0x8086, 0x191b, "Intel(R) HD Graphics 530"},
|
||||
{0x8086, 0x191d, "Intel(R) HD Graphics P530"},
|
||||
{0x8086, 0x1926, "Intel(R) Iris(TM) Graphics 540"},
|
||||
{0x8086, 0x1927, "Intel(R) Iris(TM) Graphics 550"},
|
||||
{0x8086, 0x192b, "Intel(R) Iris(TM) Graphics 555"},
|
||||
{0x8086, 0x192d, "Intel(R) Iris(TM) Graphics P555"},
|
||||
{0x8086, 0x1932, "Intel(R) Iris(TM) Pro Graphics 580"},
|
||||
{0x8086, 0x193b, "Intel(R) Iris(TM) Pro Graphics 580"},
|
||||
{0x8086, 0x193a, "Intel(R) Iris(TM) Pro Graphics P580"},
|
||||
{0x8086, 0x193d, "Intel(R) Iris(TM) Pro Graphics P580"},
|
||||
{0x8086, 0x87c0, "Intel(R) UHD Graphics 617"},
|
||||
{0x8086, 0x3ea0, "Intel(R) UHD Graphics 620"},
|
||||
{0x8086, 0x5917, "Intel(R) UHD Graphics 620"},
|
||||
{0x8086, 0x591e, "Intel(R) HD Graphics 615"},
|
||||
{0x8086, 0x5916, "Intel(R) HD Graphics 620"},
|
||||
{0x8086, 0x5912, "Intel(R) HD Graphics 630"},
|
||||
{0x8086, 0x591b, "Intel(R) HD Graphics 630"},
|
||||
{0x8086, 0x3e9b, "Intel(R) UHD Graphics 630"},
|
||||
{0x8086, 0x3e91, "Intel(R) UHD Graphics 630"},
|
||||
};
|
||||
|
||||
static inline const char *wine_device_name(uint32_t vendor_id, uint32_t device_id, const char *native_name) {
|
||||
for (size_t i = 0; i < sizeof(wine_gpu_names) / sizeof(wine_gpu_names[0]); i++) {
|
||||
if (wine_gpu_names[i].vendor_id == vendor_id && wine_gpu_names[i].device_id == device_id) {
|
||||
return wine_gpu_names[i].name;
|
||||
}
|
||||
}
|
||||
return native_name;
|
||||
}
|
||||
|
||||
#endif
|
||||
@@ -0,0 +1,104 @@
|
||||
#!/usr/bin/env python3
|
||||
"""Synchronize GPU names with Wine without rewriting the surrounding header."""
|
||||
import os
|
||||
from pathlib import Path
|
||||
import re
|
||||
import subprocess
|
||||
import tempfile
|
||||
from urllib.request import urlopen
|
||||
|
||||
|
||||
ROOT = Path(__file__).resolve().parents[1]
|
||||
HEADER = ROOT / "build-aux/src/wine_gpu_names.h"
|
||||
WINE_REPOSITORY = "https://github.com/wine-mirror/wine.git"
|
||||
WINE_SOURCE = "dlls/win32u/sysparams.c"
|
||||
NETWORK_TIMEOUT = 30
|
||||
MAX_SOURCE_BYTES = 2 * 1024 * 1024
|
||||
C_STRING = r'"(?:[^"\\\r\n]|\\[^\r\n])*"'
|
||||
WINE_ROW = re.compile(
|
||||
r'case\s+MAKELONG\(\s*(0x[0-9a-fA-F]+)\s*,\s*(0x[0-9a-fA-F]+)\s*\)'
|
||||
r'\s*:\s*return\s+(' + C_STRING + r')\s*;'
|
||||
)
|
||||
HEADER_ROW = re.compile(
|
||||
r'^ \{(0x[0-9a-fA-F]+), (0x[0-9a-fA-F]+), (' + C_STRING + r')\},$', re.M,
|
||||
)
|
||||
TABLE = re.compile(r'(\} wine_gpu_names\[\] = \{\n)(.*?)(\n\};)', re.S)
|
||||
|
||||
|
||||
def parse_wine_names(source):
|
||||
function = re.search(
|
||||
r'\bconst char\s*\*gpu_device_name\([^)]*\)\s*\{(.*?)\n\};', source, re.S,
|
||||
)
|
||||
if function is None:
|
||||
raise ValueError("Wine gpu_device_name() was not found")
|
||||
body = function.group(1)
|
||||
rows = WINE_ROW.findall(body)
|
||||
if not rows or len(rows) != len(re.findall(r'\bcase\b', body)):
|
||||
raise ValueError("Wine GPU table is empty or contains unsupported cases")
|
||||
result = []
|
||||
seen = set()
|
||||
for vendor, device, name in rows:
|
||||
identity = (int(vendor, 16), int(device, 16))
|
||||
if identity in seen or any(value > 0xffff for value in identity) or name == '""':
|
||||
raise ValueError(f"Invalid or duplicate Wine GPU entry: {vendor}:{device}")
|
||||
seen.add(identity)
|
||||
result.append((f"0x{identity[0]:04x}", f"0x{identity[1]:04x}", name))
|
||||
return result
|
||||
|
||||
|
||||
def update_header(header, source, revision):
|
||||
if not re.fullmatch(r'[0-9a-f]{40}', revision):
|
||||
raise ValueError("Invalid Wine source revision")
|
||||
rows = parse_wine_names(source)
|
||||
tables = list(TABLE.finditer(header))
|
||||
if len(tables) != 1:
|
||||
raise ValueError("Expected exactly one wine_gpu_names array in the header")
|
||||
table = tables[0]
|
||||
existing = HEADER_ROW.findall(table.group(2))
|
||||
if not existing or len(existing) != len(table.group(2).strip().splitlines()):
|
||||
raise ValueError("Unsupported existing header table format")
|
||||
if rows == existing:
|
||||
return header
|
||||
replacement = "\n".join(f" {{{vendor}, {device}, {name}}}," for vendor, device, name in rows)
|
||||
updated = header[:table.start(2)] + replacement + header[table.end(2):]
|
||||
updated, count = re.subn(r'^// Revision: [0-9a-f]{40}$', f"// Revision: {revision}", updated, flags=re.M)
|
||||
if count != 1:
|
||||
raise ValueError("Expected exactly one Wine revision comment")
|
||||
return updated
|
||||
|
||||
|
||||
def main():
|
||||
print("Resolving Wine master revision...", flush=True)
|
||||
refs = subprocess.run(
|
||||
["git", "ls-remote", WINE_REPOSITORY, "refs/heads/master"],
|
||||
capture_output=True, text=True, check=True, timeout=NETWORK_TIMEOUT,
|
||||
).stdout.split()
|
||||
if len(refs) != 2 or not re.fullmatch(r'[0-9a-f]{40}', refs[0]):
|
||||
raise ValueError("Could not resolve Wine master revision")
|
||||
revision = refs[0]
|
||||
url = f"https://raw.githubusercontent.com/wine-mirror/wine/{revision}/{WINE_SOURCE}"
|
||||
print(f"Fetching Wine GPU names at {revision}...", flush=True)
|
||||
with urlopen(url, timeout=NETWORK_TIMEOUT) as response:
|
||||
source = response.read(MAX_SOURCE_BYTES + 1)
|
||||
if len(source) > MAX_SOURCE_BYTES:
|
||||
raise ValueError("Wine source exceeds the download size limit")
|
||||
header = HEADER.read_text(encoding="utf-8")
|
||||
updated = update_header(header, source.decode("utf-8"), revision)
|
||||
if updated == header:
|
||||
print("Wine GPU names are unchanged.")
|
||||
return
|
||||
temporary = None
|
||||
try:
|
||||
with tempfile.NamedTemporaryFile(mode="w", encoding="utf-8", dir=HEADER.parent, delete=False) as output:
|
||||
temporary = Path(output.name)
|
||||
output.write(updated)
|
||||
temporary.chmod(HEADER.stat().st_mode & 0o777)
|
||||
os.replace(temporary, HEADER)
|
||||
finally:
|
||||
if temporary is not None:
|
||||
temporary.unlink(missing_ok=True)
|
||||
print(f"Updated {len(parse_wine_names(source.decode('utf-8')))} Wine GPU names.")
|
||||
|
||||
|
||||
if __name__ == "__main__":
|
||||
main()
|
||||
@@ -1,101 +0,0 @@
|
||||
# macOS support (source installation)
|
||||
|
||||
The native macOS path uses macOS Wine builds, not the Linux PortProton runtime.
|
||||
Linux continues to use the existing PortProton scripts. This is an unsigned source
|
||||
installation, **not** a signed/notarized `.app` or a claim of macOS hardware testing.
|
||||
|
||||
## Build and run
|
||||
|
||||
Install Python 3.11 or newer, Xcode Command Line Tools, Meson, Ninja, pkg-config,
|
||||
SDL3 and libarchive. With Homebrew, the native libraries/build tools are available
|
||||
as `sdl3`, `libarchive`, `meson`, `ninja`, and `pkgconf`. Install the project's Python
|
||||
dependencies in a virtual environment using the existing project workflow. Ensure
|
||||
libarchive and SDL3 are discoverable by the dynamic loader/pkg-config; Homebrew's
|
||||
Apple Silicon prefix is usually `/opt/homebrew`, Intel's is usually `/usr/local`.
|
||||
|
||||
Build/install with the virtual environment's Python, for example:
|
||||
|
||||
```sh
|
||||
meson setup builddir --prefix="$VIRTUAL_ENV"
|
||||
meson compile -C builddir
|
||||
meson install -C builddir
|
||||
portprotonqt
|
||||
```
|
||||
|
||||
Meson builds `libportprotonqt_gamepad.dylib` against SDL3 and installs it beside the
|
||||
Python modules. The Linux Vulkan GPU inspection executable is not built on macOS.
|
||||
Running directly from an unbuilt checkout still requires the native gamepad
|
||||
library; do not rename a Linux `.so` to `.dylib`. A distributor must separately
|
||||
bundle Python/Qt/SDL3/libarchive, set appropriate install names/rpaths, handle
|
||||
architecture-specific dependencies, and sign/notarize the completed application.
|
||||
No `.app` packaging, signing identity, or Gatekeeper bypass is supplied here.
|
||||
|
||||
## Supported workflow
|
||||
|
||||
* Start the application without installing or running the Linux bootstrap.
|
||||
* Use the existing Wine manager to browse the macOS catalog directly from
|
||||
<https://git.linux-gaming.ru/Boria138/PortProton-Wine-Metadata/raw/branch/main/macos_wine_metadata.json>.
|
||||
The catalog groups include Wine Crossover, macOS Wine builds, Sikarugir engines,
|
||||
and Game Porting Toolkit engines. Catalog inclusion is not a compatibility
|
||||
guarantee; review each upstream project's license and macOS/CPU requirements.
|
||||
* Install each catalog version in its own managed directory. Archive extraction
|
||||
retains the existing traversal/link checks. Plain `bin/wine[64]`, common Wine
|
||||
`.app` layouts, and `wswine.bundle/bin/wine[64]` are recognized. Entries whose
|
||||
archive layout does not expose one of those binaries cannot be launched.
|
||||
* Select installed Wine versions and prefixes in the existing game settings.
|
||||
Wine/prefix settings are the supported macOS game settings. Linux graphics,
|
||||
synchronization and anticheat overrides are not silently applied.
|
||||
* Launch Windows EXEs through the existing game/EXE UI and its owned process
|
||||
tracking, or directly through the native adapter:
|
||||
|
||||
```sh
|
||||
python -m portprotonqt.macos '/path/to/Game.exe' 'argument with spaces'
|
||||
```
|
||||
|
||||
The adapter preserves arguments without a shell and replaces its own process
|
||||
with Wine, allowing the normal launcher stop/shutdown path to own the process.
|
||||
Wine configuration, registry editor, file manager, command prompt and uninstaller
|
||||
use the selected engine and prefix through the Wine tab. Tool processes are
|
||||
retained and terminated/waited during application shutdown.
|
||||
* Remove installed engines through the existing installed-versions manager.
|
||||
|
||||
The default data directory is
|
||||
`~/Library/Application Support/PortProtonQt`; an explicit `PORT_DATA_PATH` overrides
|
||||
it. Engines live under `data/dist/<catalog name>`, prefixes under
|
||||
`data/prefixes/<prefix name>`, and global Wine settings in `data/user.conf`.
|
||||
Per-EXE settings remain `<executable>.ppdb`. Configuration values are parsed as
|
||||
assignments, never sourced as shell code. If no engine is selected, the adapter
|
||||
uses the first usable managed engine or `wine` on PATH; an explicitly selected
|
||||
missing engine fails rather than launching another engine unexpectedly.
|
||||
|
||||
On Apple Silicon, x86_64 Wine builds generally require Rosetta 2 and a compatible
|
||||
macOS release. Install Rosetta using Apple's documented workflow if required.
|
||||
This project does not install it, choose a CPU architecture automatically, or
|
||||
make incompatible Wine distributions compatible. No private, machine-specific
|
||||
application bundle is used. NTLM-enabled applications may additionally need an
|
||||
upstream-supported `ntlm_auth` installation (for example Samba).
|
||||
|
||||
## Limits and verification
|
||||
|
||||
Linux D-Bus/system management is disabled on macOS; system power, audio, Bluetooth,
|
||||
network and storage controls are not ported. SDL gamepad navigation remains available,
|
||||
but Linux `/dev/uinput` virtual-mouse emulation is disabled. Linux PortProton autoinstall scripts,
|
||||
runtime downloads, Gamescope, MangoHud, vkBasalt, Linux Steam compatibility-tool
|
||||
registration, Linux XDG autostart, ISO mounting and store-specific Wine wrappers
|
||||
are not supported macOS workflows. Use local EXEs and macOS Wine engines. Basic
|
||||
Wine tools are supported, but prefix reset/default-prefix copying and Linux
|
||||
runtime-specific tools are not. Unsupported native-adapter CLI operations fail
|
||||
with an error rather than executing Linux scripts.
|
||||
|
||||
The current macOS catalog supplies URLs and human-readable sizes, **not SHA256
|
||||
checksums**. Downloads use HTTPS and existing extraction checks; this is not
|
||||
cryptographic artifact verification. Failed/partial extractions may remain for
|
||||
inspection and can be retried or removed; they count as installed only if a usable
|
||||
Wine executable is present.
|
||||
|
||||
Regression tests mock the host, catalog network, executable handoff, settings and
|
||||
shutdown. Linux CI cannot validate Mach-O loading, Rosetta, Wine runtime behavior,
|
||||
Qt appearance, signing or actual macOS gameplay. Those require a real macOS
|
||||
installation and remain release validation work.
|
||||
|
||||
Assisted-by: pz:gpt-6.1-sol
|
||||
@@ -57,7 +57,6 @@ install_data(configured_portprotonqt,
|
||||
rename: 'portprotonqt',
|
||||
)
|
||||
|
||||
if host_machine.system() != 'darwin'
|
||||
# Build and install vk_gpu_info executable
|
||||
vk_gpu_info_sources = files('build-aux/src/vk_gpu_info.c')
|
||||
vk_gpu_info_deps = [dependency('vulkan', required: true)]
|
||||
@@ -70,8 +69,6 @@ executable('vk_gpu_info',
|
||||
c_args: ['-std=c99'],
|
||||
)
|
||||
|
||||
endif
|
||||
|
||||
# Install desktop file
|
||||
install_data(
|
||||
'build-aux/share/applications/ru.linux_gaming.PortProtonQt.desktop',
|
||||
|
||||
+8
-9
@@ -816,14 +816,13 @@ def main():
|
||||
except (OSError, RequestException):
|
||||
logger.exception("Failed to update gogdl")
|
||||
|
||||
if sys.platform != "darwin":
|
||||
gogdl_update_worker = GOGDLUpdateWorker(window.gog_api)
|
||||
window.gogdlUpdateWorker = gogdl_update_worker
|
||||
gogdl_update_worker.finished.connect(
|
||||
lambda: setattr(window, "gogdlUpdateWorker", None)
|
||||
)
|
||||
gogdl_update_worker.finished.connect(gogdl_update_worker.deleteLater)
|
||||
gogdl_update_worker.start()
|
||||
gogdl_update_worker = GOGDLUpdateWorker(window.gog_api)
|
||||
window.gogdlUpdateWorker = gogdl_update_worker
|
||||
gogdl_update_worker.finished.connect(
|
||||
lambda: setattr(window, "gogdlUpdateWorker", None)
|
||||
)
|
||||
gogdl_update_worker.finished.connect(gogdl_update_worker.deleteLater)
|
||||
gogdl_update_worker.start()
|
||||
|
||||
# Execute the initial PortProton command after the UI is set up
|
||||
class InitialCommandWorker(QThread):
|
||||
@@ -890,7 +889,7 @@ def main():
|
||||
self.finished.emit()
|
||||
|
||||
# Initial setup can stop Wine and must not race a silent game launch.
|
||||
if start_sh and not silent_game_request and sys.platform != "darwin":
|
||||
if start_sh and not silent_game_request:
|
||||
worker = InitialCommandWorker(start_sh)
|
||||
window.initialCommandWorker = worker
|
||||
worker.finished.connect(
|
||||
|
||||
@@ -410,8 +410,6 @@ def add_steam_compat_tool(force_install: bool = False) -> bool:
|
||||
Returns:
|
||||
True if successful, False otherwise
|
||||
"""
|
||||
if sys.platform == "darwin":
|
||||
return False
|
||||
steam_home = get_steam_home()
|
||||
if not steam_home:
|
||||
print("Steam directory not found")
|
||||
@@ -593,8 +591,6 @@ def reinstall_steam_compat_tool() -> bool:
|
||||
|
||||
def remove_steam_compat_tool() -> bool:
|
||||
"""Remove PortProtonQt Steam compatibility tool from user Steam directory."""
|
||||
if sys.platform == "darwin":
|
||||
return False
|
||||
steam_home = get_steam_home()
|
||||
if not steam_home:
|
||||
print("Steam directory not found")
|
||||
@@ -651,8 +647,6 @@ def reset_settings() -> bool:
|
||||
|
||||
def is_steam_compat_tool_installed() -> bool:
|
||||
"""Check if PortProtonQt is installed as Steam compatibility tool."""
|
||||
if sys.platform == "darwin":
|
||||
return False
|
||||
steam_home = get_steam_home()
|
||||
if not steam_home:
|
||||
return False
|
||||
|
||||
@@ -114,11 +114,6 @@ def read_portdata_path_from_config() -> str | None:
|
||||
|
||||
def get_portproton_location() -> str | None:
|
||||
"""Return PortProton directory path."""
|
||||
if sys.platform == "darwin":
|
||||
from portprotonqt.macos import data_root
|
||||
root = data_root()
|
||||
root.mkdir(parents=True, exist_ok=True)
|
||||
return str(root)
|
||||
if os.getenv("FLATPAK_ID"):
|
||||
portdata_path = os.getenv("XDG_DATA_HOME", "").strip()
|
||||
if portdata_path:
|
||||
@@ -158,8 +153,6 @@ def save_portdata_path_to_config(portdata_path: str) -> bool:
|
||||
|
||||
def get_portproton_scripts_path() -> str | None:
|
||||
"""Return PortProton scripts directory path."""
|
||||
if sys.platform == "darwin":
|
||||
return None
|
||||
appdir_prefix = os.getenv("APPDIR")
|
||||
sharun_prefix = os.getenv("SHARUN_DIR")
|
||||
appimage_path = os.getenv("APPIMAGE", "").strip()
|
||||
@@ -198,8 +191,6 @@ def get_portproton_scripts_path() -> str | None:
|
||||
|
||||
def get_portproton_start_command() -> list[str] | None:
|
||||
"""Return command list for PortProton launch."""
|
||||
if sys.platform == "darwin":
|
||||
return [sys.executable, "-m", "portprotonqt.macos"]
|
||||
global _portproton_start_command
|
||||
if _portproton_start_command is not None:
|
||||
return _portproton_start_command
|
||||
|
||||
@@ -1,10 +1,11 @@
|
||||
"""UI configuration settings."""
|
||||
import asyncio
|
||||
import os
|
||||
import sys
|
||||
import subprocess
|
||||
from typing import Any, cast
|
||||
|
||||
from dbus_fast import BusType
|
||||
from dbus_fast.aio import MessageBus
|
||||
|
||||
from portprotonqt.config.base import BaseConfig, configparser, THEMES_DIRS
|
||||
from portprotonqt.config.validators import validate_string, validate_int, validate_bool
|
||||
@@ -12,10 +13,6 @@ from portprotonqt.localization import get_theme_translations
|
||||
from portprotonqt.logger import get_logger
|
||||
|
||||
|
||||
if sys.platform != "darwin":
|
||||
from dbus_fast import BusType
|
||||
from dbus_fast.aio import MessageBus
|
||||
|
||||
logger = get_logger(__name__)
|
||||
THEME_VARIANTS = ("dark", "light", "auto")
|
||||
DOWNLOADS_SECTION = "Downloads"
|
||||
@@ -207,8 +204,6 @@ def _is_qt_light_theme() -> bool:
|
||||
|
||||
|
||||
def _is_system_light_theme() -> bool:
|
||||
if sys.platform == "darwin":
|
||||
return _is_qt_light_theme()
|
||||
is_dark = _is_portal_dark_theme()
|
||||
if is_dark is None:
|
||||
is_dark = _is_gsettings_dark_theme()
|
||||
|
||||
@@ -1,7 +1,6 @@
|
||||
"""Detail pages for PortProtonQt."""
|
||||
|
||||
import os
|
||||
import sys
|
||||
import weakref
|
||||
from collections.abc import Callable, Sequence
|
||||
|
||||
@@ -617,8 +616,6 @@ class DetailPageManager:
|
||||
play_button.setIcon(
|
||||
self.main_window.theme_manager.get_icon("update", as_path=True)
|
||||
)
|
||||
if sys.platform == "darwin" and source in {"gog", "egs"}:
|
||||
play_button.setEnabled(False)
|
||||
buttons_layout.addWidget(play_button)
|
||||
|
||||
if source in {"steam", "gog", "egs"} and appid:
|
||||
|
||||
@@ -1,8 +1,6 @@
|
||||
"""Proton Manager dialog for PortProtonQt."""
|
||||
|
||||
import os
|
||||
import sys
|
||||
from pathlib import Path
|
||||
import platform
|
||||
import shutil
|
||||
import tempfile
|
||||
@@ -376,8 +374,6 @@ class ProtonManager(DraggableDialog):
|
||||
return True
|
||||
|
||||
def filter_entries_by_cpu_level(self, entries, source_name):
|
||||
if sys.platform == "darwin":
|
||||
return entries
|
||||
is_arm = platform.machine().lower().startswith(('arm', 'aarch64'))
|
||||
filtered_entries = []
|
||||
for entry in entries:
|
||||
@@ -475,7 +471,7 @@ class ProtonManager(DraggableDialog):
|
||||
url = entry.get('url', '')
|
||||
filename = entry.get('name', '')
|
||||
size_human = entry.get('size_human', _('Unknown'))
|
||||
if url and sys.platform != "darwin":
|
||||
if url:
|
||||
parsed_url = urllib.parse.urlparse(url)
|
||||
url_filename = os.path.basename(parsed_url.path)
|
||||
if url_filename:
|
||||
@@ -543,9 +539,6 @@ class ProtonManager(DraggableDialog):
|
||||
def is_asset_installed(self, asset_filename, source_name):
|
||||
if not self.portproton_location:
|
||||
return False
|
||||
if sys.platform == "darwin":
|
||||
from portprotonqt.macos import find_wine, version_directory
|
||||
return find_wine(version_directory(Path(self.portproton_location), asset_filename)) is not None
|
||||
name_without_ext = asset_filename
|
||||
for ext in ['.tar.gz', '.tar.xz']:
|
||||
if name_without_ext.lower().endswith(ext):
|
||||
@@ -569,9 +562,6 @@ class ProtonManager(DraggableDialog):
|
||||
return source == "proton_lg" and (asset.startswith("wine"))
|
||||
|
||||
def get_download_extract_dir(self, asset_data: dict) -> str:
|
||||
if sys.platform == "darwin":
|
||||
from portprotonqt.macos import version_directory
|
||||
return str(version_directory(Path(self.portproton_location), asset_data["asset_name"]))
|
||||
install_to_dist = self.should_install_to_dist(
|
||||
asset_data['source_name'], asset_data['asset_name']
|
||||
)
|
||||
@@ -639,7 +629,7 @@ class ProtonManager(DraggableDialog):
|
||||
installed_versions = []
|
||||
seen_paths = set()
|
||||
version_dirs = [dist_path]
|
||||
if sys.platform != "darwin" and not ui_config.get_disable_steam_proton_scanning():
|
||||
if not ui_config.get_disable_steam_proton_scanning():
|
||||
steam_dir = get_steam_compatibilitytools_dir()
|
||||
if steam_dir is not None:
|
||||
version_dirs.append(str(steam_dir))
|
||||
@@ -663,9 +653,6 @@ class ProtonManager(DraggableDialog):
|
||||
return installed_versions
|
||||
|
||||
def is_installed_version_dir(self, version_path: str) -> bool:
|
||||
if sys.platform == "darwin":
|
||||
from portprotonqt.macos import find_wine
|
||||
return not Path(version_path).name.startswith(".") and find_wine(Path(version_path)) is not None
|
||||
if not os.path.isdir(version_path):
|
||||
return False
|
||||
if os.path.isfile(os.path.join(version_path, "bin", "wine")):
|
||||
@@ -1036,7 +1023,7 @@ class ProtonManager(DraggableDialog):
|
||||
import subprocess
|
||||
try:
|
||||
start_cmd = get_portproton_start_command()
|
||||
if start_cmd and not self.initial_command_executed and sys.platform != "darwin":
|
||||
if start_cmd and not self.initial_command_executed:
|
||||
result = subprocess.run(start_cmd + ["cli", "--initial"], timeout=10)
|
||||
if result.returncode != 0:
|
||||
logger.warning(f"Initial PortProton command returned non-zero exit code: {result.returncode}")
|
||||
|
||||
@@ -1,7 +1,6 @@
|
||||
"""Settings dialog for PortProtonQt."""
|
||||
|
||||
import os
|
||||
import sys
|
||||
import re
|
||||
import subprocess
|
||||
from html import escape
|
||||
@@ -419,11 +418,10 @@ class ExeSettingsDialog(
|
||||
|
||||
self.tab_widget.addTab(self.main_tab, _("Main"))
|
||||
self.tab_widget.addTab(self.advanced_tab, _("Advanced"))
|
||||
if sys.platform != "darwin":
|
||||
self.tab_widget.addTab(self.mangohud_tab, "MangoHud")
|
||||
self.tab_widget.addTab(self.vkbasalt_tab, "vkBasalt")
|
||||
if self.gamescope_available:
|
||||
self.tab_widget.addTab(self.gamescope_tab, "Gamescope")
|
||||
self.tab_widget.addTab(self.mangohud_tab, "MangoHud")
|
||||
self.tab_widget.addTab(self.vkbasalt_tab, "vkBasalt")
|
||||
if self.gamescope_available:
|
||||
self.tab_widget.addTab(self.gamescope_tab, "Gamescope")
|
||||
|
||||
self.settings_table = QTableWidget()
|
||||
self.settings_table.setAlternatingRowColors(True)
|
||||
|
||||
@@ -1,9 +1,6 @@
|
||||
"""Wine archive extractor for PortProtonQt."""
|
||||
|
||||
import os
|
||||
import sys
|
||||
import shutil
|
||||
import tempfile
|
||||
import time
|
||||
import libarchive
|
||||
from PySide6.QtCore import QThread, Signal, QMutex
|
||||
@@ -49,13 +46,7 @@ class ExtractionThread(QThread):
|
||||
return target_path
|
||||
|
||||
def run(self):
|
||||
destination = self.extract_dir
|
||||
staging = None
|
||||
try:
|
||||
if sys.platform == "darwin":
|
||||
os.makedirs(os.path.dirname(destination), exist_ok=True)
|
||||
staging = tempfile.mkdtemp(prefix=".wine-install-", dir=os.path.dirname(destination))
|
||||
self.extract_dir = staging
|
||||
self.progress.emit(0)
|
||||
self.speed.emit(0.0)
|
||||
self.eta.emit(0)
|
||||
@@ -166,14 +157,6 @@ class ExtractionThread(QThread):
|
||||
except (OSError, PermissionError):
|
||||
pass
|
||||
|
||||
if self._should_stop():
|
||||
return
|
||||
if staging is not None:
|
||||
from pathlib import Path
|
||||
from portprotonqt.macos import find_wine
|
||||
if find_wine(Path(staging)) is None:
|
||||
raise ValueError("Archive does not contain a macOS Wine executable")
|
||||
os.rename(staging, destination)
|
||||
self.progress.emit(100)
|
||||
self.speed.emit(0.0)
|
||||
self.eta.emit(0)
|
||||
@@ -185,10 +168,6 @@ class ExtractionThread(QThread):
|
||||
except Exception as e:
|
||||
if not self._should_stop():
|
||||
self.error.emit(str(e))
|
||||
finally:
|
||||
self.extract_dir = destination
|
||||
if staging is not None:
|
||||
shutil.rmtree(staging, ignore_errors=True)
|
||||
|
||||
def stop(self):
|
||||
self._mutex.lock()
|
||||
|
||||
@@ -1,7 +1,6 @@
|
||||
"""Wine metadata loader for PortProtonQt."""
|
||||
|
||||
import os
|
||||
import sys
|
||||
import tempfile
|
||||
|
||||
import orjson
|
||||
@@ -105,10 +104,6 @@ class WineLoadingThread(QThread):
|
||||
else github_url
|
||||
)
|
||||
|
||||
if sys.platform == "darwin":
|
||||
from portprotonqt.macos import MACOS_WINE_METADATA_URL
|
||||
json_url = MACOS_WINE_METADATA_URL
|
||||
|
||||
with tempfile.NamedTemporaryFile(delete=False, suffix='.json') as tmp:
|
||||
temp_path = tmp.name
|
||||
|
||||
@@ -125,9 +120,6 @@ class WineLoadingThread(QThread):
|
||||
with open(temp_path, 'rb') as f:
|
||||
metadata = orjson.loads(f.read())
|
||||
|
||||
if sys.platform == "darwin":
|
||||
from portprotonqt.macos import validate_catalog
|
||||
validate_catalog(metadata)
|
||||
logger.info(f"Successfully loaded JSON metadata with {len(metadata)} entries")
|
||||
self.loading_complete.emit(metadata)
|
||||
finally:
|
||||
|
||||
@@ -1,10 +1,8 @@
|
||||
from __future__ import annotations
|
||||
|
||||
import time
|
||||
import os
|
||||
import sys
|
||||
import math
|
||||
from typing import TYPE_CHECKING, Protocol, cast, Any
|
||||
from typing import Protocol, cast, Any
|
||||
from evdev import UInput, ecodes
|
||||
from PySide6.QtWidgets import QWidget, QStackedWidget, QApplication, QScrollArea, QMenu, QMessageBox, QTableWidget, QSlider
|
||||
from PySide6.QtCore import Qt, QObject, Signal, Slot, QTimer, QThread
|
||||
from portprotonqt.logger import get_logger
|
||||
@@ -29,9 +27,6 @@ from portprotonqt.input_manager.runtime import GamepadRuntimeMixin
|
||||
from portprotonqt.input_manager.settings import SettingsInputMixin
|
||||
from portprotonqt.input_manager.settings_visual import SettingsVisualNavigationMixin
|
||||
|
||||
if sys.platform != "darwin" or TYPE_CHECKING:
|
||||
from evdev import UInput, ecodes
|
||||
|
||||
logger = get_logger(__name__)
|
||||
|
||||
class MainWindowProtocol(Protocol):
|
||||
@@ -258,10 +253,6 @@ class InputManager(
|
||||
|
||||
def _async_enable_mouse_emulation(self):
|
||||
"""Asynchronously enable mouse emulation to avoid blocking startup."""
|
||||
if sys.platform == "darwin":
|
||||
self.mouse_emulation_enabled = False
|
||||
logger.info("Virtual mouse emulation is Linux-only")
|
||||
return
|
||||
logger.info("EMUL: Attempting to create UInput virtual mouse...")
|
||||
self.mouse_emulation_thread = MouseEmulationThread()
|
||||
self.mouse_emulation_thread.finished.connect(self._on_mouse_emulation_finished)
|
||||
|
||||
@@ -1,193 +0,0 @@
|
||||
"""Native macOS Wine launching; Linux PortProton scripts are not used."""
|
||||
|
||||
import os
|
||||
from pathlib import Path
|
||||
import re
|
||||
import shlex
|
||||
import shutil
|
||||
import sys
|
||||
import tempfile
|
||||
|
||||
from portprotonqt.logger import get_logger
|
||||
|
||||
logger = get_logger(__name__)
|
||||
MACOS_WINE_METADATA_URL = (
|
||||
"https://git.linux-gaming.ru/Boria138/PortProton-Wine-Metadata/"
|
||||
"raw/branch/main/macos_wine_metadata.json"
|
||||
)
|
||||
WINE_TOOLS = {
|
||||
"--winecfg": "winecfg", "--winereg": "regedit", "--winecmd": "cmd",
|
||||
"--winefile": "winefile", "--wine_uninstaller": "uninstaller",
|
||||
}
|
||||
|
||||
|
||||
def data_root() -> Path:
|
||||
"""Respect explicit data paths, otherwise use macOS Application Support."""
|
||||
explicit = os.environ.get("PORT_DATA_PATH")
|
||||
if explicit:
|
||||
return Path(explicit).expanduser()
|
||||
return Path.home() / "Library" / "Application Support" / "PortProtonQt"
|
||||
|
||||
|
||||
def version_directory(root: Path, name: str) -> Path:
|
||||
"""Keep catalog version names inside the managed distribution directory."""
|
||||
if not name or name in (".", "..") or Path(name).name != name:
|
||||
raise ValueError(f"Invalid Wine version name: {name}")
|
||||
destination = root / "data" / "dist" / name
|
||||
if not destination.resolve().is_relative_to((root / "data" / "dist").resolve()):
|
||||
raise ValueError(f"Wine version escapes distribution directory: {name}")
|
||||
return destination
|
||||
|
||||
|
||||
def validate_catalog(metadata: object) -> None:
|
||||
"""Reject unsafe remote names before they become download paths."""
|
||||
if not isinstance(metadata, dict):
|
||||
raise ValueError("Invalid macOS Wine catalog")
|
||||
for entries in metadata.values():
|
||||
if not isinstance(entries, list):
|
||||
raise ValueError("Invalid macOS Wine catalog entries")
|
||||
for entry in entries:
|
||||
if not isinstance(entry, dict) or not isinstance(entry.get("name"), str):
|
||||
raise ValueError("Invalid macOS Wine version")
|
||||
version_directory(data_root(), entry["name"])
|
||||
if not isinstance(entry.get("url"), str) or not entry["url"].startswith("https://"):
|
||||
raise ValueError("macOS Wine downloads require HTTPS")
|
||||
|
||||
|
||||
def find_wine(version: Path) -> Path | None:
|
||||
"""Find Wine in supported plain, application and Wine wrapper layouts."""
|
||||
candidates = [version / "bin" / "wine", version / "bin" / "wine64"]
|
||||
candidates.extend(version.glob("Contents/Resources/wine/bin/wine*"))
|
||||
candidates.extend(version.glob("*.app/Contents/Resources/wine/bin/wine*"))
|
||||
candidates.extend(version.glob("*.app/Contents/Resources/wine*/bin/wine64"))
|
||||
candidates.extend(version.glob("wswine.bundle/bin/wine*"))
|
||||
candidates.extend(version.glob("*/bin/wine*"))
|
||||
candidates.extend(version.glob("*.app/Contents/SharedSupport/wine/bin/wine*"))
|
||||
return next((path for path in candidates if path.name in ("wine", "wine64")
|
||||
and path.is_file() and os.access(path, os.X_OK)), None)
|
||||
|
||||
|
||||
def read_settings(path: Path) -> dict[str, str]:
|
||||
"""Read shell-style assignments as data, never execute configuration."""
|
||||
if not path.exists():
|
||||
return {}
|
||||
values = {}
|
||||
for line in path.read_text(encoding="utf-8").splitlines():
|
||||
fields = shlex.split(line, comments=True)
|
||||
if fields and fields[0] == "export":
|
||||
fields = fields[1:]
|
||||
if len(fields) == 1 and "=" in fields[0]:
|
||||
key, value = fields[0].split("=", 1)
|
||||
values[key] = value
|
||||
return values
|
||||
|
||||
|
||||
def write_settings(path: Path, values: dict[str, str]) -> None:
|
||||
"""Persist macOS settings without evaluating shell expressions."""
|
||||
for key, value in values.items():
|
||||
if not re.fullmatch(r"[A-Za-z_][A-Za-z0-9_]*", key):
|
||||
raise ValueError(f"Invalid setting name: {key}")
|
||||
if "\n" in value or "\r" in value:
|
||||
raise ValueError(f"Setting must contain a single line: {key}")
|
||||
path.parent.mkdir(parents=True, exist_ok=True)
|
||||
temporary = None
|
||||
try:
|
||||
with tempfile.NamedTemporaryFile(mode="w", encoding="utf-8",
|
||||
dir=path.parent, delete=False) as output:
|
||||
temporary = Path(output.name)
|
||||
output.write("".join(f"export {key}={shlex.quote(value)}\n"
|
||||
for key, value in values.items()))
|
||||
os.replace(temporary, path)
|
||||
finally:
|
||||
if temporary is not None:
|
||||
temporary.unlink(missing_ok=True)
|
||||
|
||||
|
||||
def wine_command(root: Path, arguments: list[str], settings: dict[str, str]) -> tuple[list[str], dict[str, str]]:
|
||||
"""Build the native Wine command and isolated prefix environment."""
|
||||
version = settings.get("PW_WINE_USE") or settings.get("PW_DEFAULT_WINE_USE", "")
|
||||
system_wine = version == "USE_SYSTEM_WINE"
|
||||
wine = find_wine(version_directory(root, version)) if version and not system_wine else None
|
||||
if wine is None and not version:
|
||||
wine = next((found for child in sorted((root / "data" / "dist").glob("*"))
|
||||
if not child.name.startswith(".") and (found := find_wine(child)) is not None), None)
|
||||
executable = str(wine) if wine else (shutil.which("wine") if not version or system_wine else None)
|
||||
if not executable:
|
||||
raise FileNotFoundError("Install and select a macOS Wine version in the Wine manager")
|
||||
prefix = settings.get("PW_PREFIX_NAME") or settings.get("PW_DEFAULT_PREFIX_NAME") or "DEFAULT"
|
||||
if Path(prefix).name != prefix or prefix in (".", ".."):
|
||||
raise ValueError("Invalid Wine prefix name")
|
||||
prefix_path = root / "data" / "prefixes" / prefix
|
||||
if not prefix_path.resolve().is_relative_to((root / "data" / "prefixes").resolve()):
|
||||
raise ValueError("Wine prefix escapes prefix directory")
|
||||
prefix_path.mkdir(parents=True, exist_ok=True)
|
||||
environment = os.environ.copy()
|
||||
environment["WINEPREFIX"] = str(prefix_path)
|
||||
environment["PATH"] = str(Path(executable).parent) + os.pathsep + environment.get("PATH", "")
|
||||
return [executable, *arguments], environment
|
||||
|
||||
|
||||
def settings_command(root: Path, arguments: list[str]) -> bool:
|
||||
"""Implement settings operations used by the existing settings dialog."""
|
||||
action = arguments[0]
|
||||
user_conf = root / "data" / "user.conf"
|
||||
path = Path(arguments[1] + ".ppdb") if action in ("--show-ppdb", "--edit-db") else user_conf
|
||||
values = read_settings(path)
|
||||
if action in ("--get-user-conf", "--show-ppdb"):
|
||||
if action == "--get-user-conf" and len(arguments) > 1:
|
||||
sys.stdout.write(values.get(arguments[1], "") + "\n")
|
||||
else:
|
||||
sys.stdout.write("".join(f'{key}="{value}"\n' for key, value in values.items()))
|
||||
elif action == "--edit-db":
|
||||
for change in arguments[2:]:
|
||||
key, value = change.split("=", 1)
|
||||
values[key] = value
|
||||
write_settings(path, values)
|
||||
elif action == "--set-user-conf":
|
||||
values[arguments[1]] = arguments[2]
|
||||
write_settings(path, values)
|
||||
elif action == "--delete-user-conf":
|
||||
values.pop(arguments[1], None)
|
||||
write_settings(path, values)
|
||||
else:
|
||||
return False
|
||||
return True
|
||||
|
||||
|
||||
def main(arguments: list[str] | None = None) -> int:
|
||||
"""Run the native adapter through the existing PortProton command interface."""
|
||||
arguments = list(sys.argv[1:] if arguments is None else arguments)
|
||||
root = data_root()
|
||||
try:
|
||||
if not arguments:
|
||||
raise ValueError("An executable or Wine tool is required")
|
||||
settings = read_settings(root / "data" / "user.conf")
|
||||
if arguments[0] == "cli":
|
||||
arguments = arguments[1:]
|
||||
if not arguments:
|
||||
raise ValueError("A CLI operation is required")
|
||||
if settings_command(root, arguments):
|
||||
return 0
|
||||
tool = WINE_TOOLS.get(arguments[0])
|
||||
if not tool or len(arguments) != 3:
|
||||
raise ValueError(f"Unsupported macOS operation: {arguments[0]}")
|
||||
settings.update(PW_WINE_USE=arguments[1], PW_PREFIX_NAME=arguments[2])
|
||||
arguments = [tool]
|
||||
else:
|
||||
settings.update(read_settings(Path(arguments[0] + ".ppdb")))
|
||||
target = Path(arguments[0]).expanduser().resolve(strict=True)
|
||||
arguments[0] = str(target)
|
||||
dispatch = {".msi": ["msiexec", "/i"], ".bat": ["cmd", "/c"],
|
||||
".cmd": ["cmd", "/c"], ".reg": ["regedit"]}
|
||||
arguments = [*dispatch.get(target.suffix.lower(), []), *arguments]
|
||||
os.chdir(target.parent)
|
||||
command, environment = wine_command(root, arguments, settings)
|
||||
os.execvpe(command[0], command, environment)
|
||||
except (OSError, ValueError, IndexError) as error:
|
||||
logger.error("macOS Wine operation failed: %s", error)
|
||||
return 1
|
||||
return 0
|
||||
|
||||
|
||||
if __name__ == "__main__":
|
||||
sys.exit(main())
|
||||
@@ -343,7 +343,7 @@ class MainWindow(
|
||||
self.setWindowTitle(f"{app_name} {version}")
|
||||
self.setMinimumSize(890, 600)
|
||||
self._pending_resolution = resolution # Store resolution for later application
|
||||
self._show_system_tab = show_system_tab and sys.platform != "darwin"
|
||||
self._show_system_tab = show_system_tab
|
||||
self.system_tab_index = -1 # Default, set when system tab is created
|
||||
self._animated_covers_suspended = False
|
||||
|
||||
@@ -2488,7 +2488,7 @@ class MainWindow(
|
||||
return extract_exec_target_path(exec_line) or ""
|
||||
|
||||
def _has_running_game_process(self) -> bool:
|
||||
if sys.platform == "darwin" or getattr(self, "native_game_running", False):
|
||||
if getattr(self, "native_game_running", False):
|
||||
if any(process.poll() is None for process in self.game_processes):
|
||||
return True
|
||||
groups = {process.pid for process in self.game_processes}
|
||||
@@ -2695,17 +2695,6 @@ class MainWindow(
|
||||
|
||||
def _terminate_game_processes(self) -> None:
|
||||
for proc in self.game_processes:
|
||||
if sys.platform == "darwin":
|
||||
try:
|
||||
os.killpg(proc.pid, signal.SIGKILL)
|
||||
proc.wait(timeout=0)
|
||||
except ProcessLookupError:
|
||||
proc.poll()
|
||||
except subprocess.TimeoutExpired:
|
||||
logger.debug("macOS Wine process %s is still exiting", proc.pid)
|
||||
except OSError as error:
|
||||
logger.warning("Failed to stop macOS Wine process group %s: %s", proc.pid, error)
|
||||
continue
|
||||
if proc.poll() is not None and not getattr(self, "native_game_running", False):
|
||||
continue
|
||||
try:
|
||||
@@ -2719,8 +2708,6 @@ class MainWindow(
|
||||
|
||||
def _run_portproton_stop_command(self) -> bool:
|
||||
"""Run PortProton CLI stop command."""
|
||||
if sys.platform == "darwin":
|
||||
return True
|
||||
if not self.start_sh:
|
||||
logger.warning("PortProton start command is unavailable for stop")
|
||||
return False
|
||||
@@ -2740,16 +2727,13 @@ class MainWindow(
|
||||
if getattr(self, "native_game_running", False):
|
||||
self._terminate_game_processes()
|
||||
return True
|
||||
if sys.platform != "darwin" and getattr(self, "launcher_process_only", False):
|
||||
if getattr(self, "launcher_process_only", False):
|
||||
if self._run_portproton_stop_command():
|
||||
return True
|
||||
|
||||
if sys.platform != "darwin":
|
||||
self._analyze_short_launch()
|
||||
self._analyze_short_launch()
|
||||
|
||||
self._terminate_game_processes()
|
||||
if sys.platform == "darwin":
|
||||
return not any(proc.poll() is None for proc in self.game_processes)
|
||||
self.game_processes = []
|
||||
stopped = self._run_portproton_stop_command()
|
||||
if hasattr(self, 'checkProcessTimer') and self.checkProcessTimer is not None:
|
||||
@@ -2761,8 +2745,6 @@ class MainWindow(
|
||||
|
||||
def _check_missing_prefix_by_name_before_launch(self, prefix_name: str, env_vars: dict[str, str]) -> None:
|
||||
"""Check prefix presence and optionally disable default recommended libs."""
|
||||
if sys.platform == "darwin":
|
||||
return
|
||||
if not prefix_name or not self.portproton_location:
|
||||
return
|
||||
|
||||
@@ -2784,8 +2766,6 @@ class MainWindow(
|
||||
|
||||
def _check_missing_prefix_before_launch(self, game_exe_path: str, env_vars: dict[str, str]) -> None:
|
||||
"""Check game prefix and optionally disable default recommended libs."""
|
||||
if sys.platform == "darwin":
|
||||
return
|
||||
if not game_exe_path:
|
||||
return
|
||||
|
||||
@@ -3271,10 +3251,6 @@ class MainWindow(
|
||||
return True
|
||||
|
||||
def _launch_egs_game(self, app_id: str, button=None) -> None:
|
||||
if sys.platform == "darwin":
|
||||
self._finish_silent_launch()
|
||||
QMessageBox.warning(self, _("Error"), "Epic store launch wrappers are not supported on macOS. Open the installed Windows executable directly.")
|
||||
return
|
||||
target = self.egs_api.get_launch_target(app_id)
|
||||
if not target:
|
||||
self._finish_silent_launch()
|
||||
@@ -3342,10 +3318,6 @@ class MainWindow(
|
||||
def _launch_gog_game(
|
||||
self, app_id: str, button=None, play_sound: bool = True
|
||||
) -> None:
|
||||
if sys.platform == "darwin":
|
||||
self._finish_silent_launch()
|
||||
QMessageBox.warning(self, _("Error"), "GOG store launch wrappers are not supported on macOS. Open the installed Windows executable directly.")
|
||||
return
|
||||
self.gog_api.ensure_launch_parameters(app_id)
|
||||
discovered_path = self.gog_api.get_installed_path(app_id)
|
||||
install_path = str(discovered_path) if discovered_path else ""
|
||||
|
||||
@@ -1,7 +1,6 @@
|
||||
# Install Python source files
|
||||
install_data(
|
||||
['__init__.py',
|
||||
'macos.py',
|
||||
'appimage_integration.py',
|
||||
'appimage_updater.py',
|
||||
'cli.py',
|
||||
|
||||
@@ -1,9 +1,8 @@
|
||||
import ctypes
|
||||
import sys
|
||||
from dataclasses import dataclass
|
||||
from pathlib import Path
|
||||
|
||||
GAMEPAD_LIBRARY_NAME = "libportprotonqt_gamepad.dylib" if sys.platform == "darwin" else "libportprotonqt_gamepad.so"
|
||||
GAMEPAD_LIBRARY_NAME = "libportprotonqt_gamepad.so"
|
||||
SYSTEM_GAMEPAD_LIBRARY = Path(__file__).parent / GAMEPAD_LIBRARY_NAME
|
||||
DEV_GAMEPAD_LIBRARY = (
|
||||
Path(__file__).parent.parent / "build-aux" / "lib" / GAMEPAD_LIBRARY_NAME
|
||||
|
||||
@@ -18,11 +18,6 @@ MOUNT_ESCAPE_PATTERN = re.compile(r"\\([0-7]{3})")
|
||||
|
||||
def list_mounted_drive_paths(mounts_path: str = "/proc/mounts") -> list[str]:
|
||||
"""Return local mounted drive paths available to the user."""
|
||||
if sys.platform == "darwin":
|
||||
from pathlib import Path
|
||||
volumes = Path("/Volumes")
|
||||
return sorted(str(path) for path in volumes.iterdir()
|
||||
if path.is_dir() and os.access(path, os.R_OK)) if volumes.is_dir() else []
|
||||
try:
|
||||
mounts = _read_mounts(mounts_path)
|
||||
mounted_drives = set()
|
||||
|
||||
@@ -1,5 +1,4 @@
|
||||
import os
|
||||
import sys
|
||||
import shutil
|
||||
import subprocess
|
||||
from pathlib import Path
|
||||
@@ -59,13 +58,6 @@ def get_available_wine_options(
|
||||
key=version_sort_key
|
||||
)
|
||||
|
||||
if sys.platform == "darwin":
|
||||
from portprotonqt.macos import find_wine
|
||||
options = [name for name in options if find_wine(Path(dist_dir, name)) is not None]
|
||||
if system_wine_label and shutil.which("wine"):
|
||||
options.append(system_wine_label)
|
||||
return options
|
||||
|
||||
from portprotonqt.config import get_portproton_scripts_path
|
||||
scripts_path = get_portproton_scripts_path()
|
||||
if scripts_path:
|
||||
@@ -151,8 +143,6 @@ def get_toggle_settings():
|
||||
"""Get predefined toggle settings with descriptions."""
|
||||
from portprotonqt.localization import _
|
||||
|
||||
if sys.platform == "darwin":
|
||||
return {}
|
||||
return {
|
||||
# Graphics enhancements
|
||||
'PW_DGVOODOO2': _("Enable dgVoodoo2. Forced use all dgVoodoo2 libs (Glide 2.11-3.1, DirectDraw 1-7, Direct3D 2-9) on all 3D API."),
|
||||
@@ -404,9 +394,6 @@ def get_advanced_settings(disabled_text, logical_core_options=None, locale_optio
|
||||
'default': disabled_text
|
||||
})
|
||||
|
||||
if sys.platform == "darwin":
|
||||
return [setting for setting in advanced_settings
|
||||
if setting["key"] in ("PW_WINE_USE", "PW_PREFIX_NAME")]
|
||||
return advanced_settings
|
||||
|
||||
# Keys that should be recognized as advanced settings
|
||||
|
||||
@@ -16,7 +16,6 @@ from portprotonqt.image_utils import COVER_IMAGE_EXTENSIONS
|
||||
logger = get_logger(__name__)
|
||||
|
||||
STEAM_DATA_DIRS = (
|
||||
"~/Library/Application Support/Steam",
|
||||
"~/.steam/steam",
|
||||
"~/snap/steam/common/.local/share/Steam",
|
||||
"~/.var/app/com.valvesoftware.Steam/data/Steam",
|
||||
|
||||
@@ -1,5 +1,4 @@
|
||||
import os
|
||||
import sys
|
||||
from typing import TYPE_CHECKING, Any
|
||||
|
||||
from PySide6.QtCore import QObject, QRect, QSize, Qt, QTimer
|
||||
@@ -230,9 +229,6 @@ class MainWindowSettingsTabMixin(_MainWindowTypingBase):
|
||||
self.egsAccountTitle.setStyleSheet(self.theme.SETTINGS_TITLE_STYLE)
|
||||
gogForm.addRow(self.egsAccountTitle, egs_buttons)
|
||||
self._update_egs_account_state()
|
||||
if sys.platform == "darwin":
|
||||
self.gogLoginButton.setEnabled(False)
|
||||
self.egsLoginButton.setEnabled(False)
|
||||
|
||||
self.timeDetailCombo = CustomComboBox(theme=self.theme)
|
||||
self.timeDetailCombo.view().window().setWindowFlags(
|
||||
@@ -411,8 +407,6 @@ class MainWindowSettingsTabMixin(_MainWindowTypingBase):
|
||||
autostart_layout.addWidget(self.autostartTitle)
|
||||
autostart_layout.addStretch()
|
||||
uiForm.addRow(autostart_layout)
|
||||
if sys.platform == "darwin":
|
||||
uiForm.setRowVisible(autostart_layout, False)
|
||||
|
||||
self.startMinimizedCheckBox = QCheckBox()
|
||||
self.startMinimizedCheckBox.setStyleSheet(self.theme.CHECKBOX_STYLE)
|
||||
@@ -571,7 +565,7 @@ class MainWindowSettingsTabMixin(_MainWindowTypingBase):
|
||||
uiForm.addRow(disable_alt_dependency_check_layout)
|
||||
|
||||
disable_runtime_download_layout = None
|
||||
if sys.platform != "darwin" and not os.getenv("FLATPAK_ID"):
|
||||
if not os.getenv("FLATPAK_ID"):
|
||||
self.disableRuntimeDownloadCheckBox = QCheckBox()
|
||||
self.disableRuntimeDownloadCheckBox.setStyleSheet(self.theme.CHECKBOX_STYLE)
|
||||
self.disableRuntimeDownloadCheckBox.setFocusPolicy(Qt.FocusPolicy.StrongFocus)
|
||||
@@ -602,8 +596,6 @@ class MainWindowSettingsTabMixin(_MainWindowTypingBase):
|
||||
steam_compat_layout.addWidget(self.steamCompatTitle)
|
||||
steam_compat_layout.addStretch()
|
||||
uiForm.addRow(steam_compat_layout)
|
||||
if sys.platform == "darwin":
|
||||
uiForm.setRowVisible(steam_compat_layout, False)
|
||||
|
||||
self.disableSteamProtonScanningCheckBox = QCheckBox()
|
||||
self.disableSteamProtonScanningCheckBox.setStyleSheet(self.theme.CHECKBOX_STYLE)
|
||||
@@ -619,10 +611,8 @@ class MainWindowSettingsTabMixin(_MainWindowTypingBase):
|
||||
disable_steam_proton_scanning_layout.addWidget(self.disableSteamProtonScanningTitle)
|
||||
disable_steam_proton_scanning_layout.addStretch()
|
||||
uiForm.addRow(disable_steam_proton_scanning_layout)
|
||||
if sys.platform == "darwin":
|
||||
uiForm.setRowVisible(disable_steam_proton_scanning_layout, False)
|
||||
|
||||
if sys.platform != "darwin" and get_steam_compatibilitytools_dir() is not None:
|
||||
if get_steam_compatibilitytools_dir() is not None:
|
||||
self.downloadWineToSteamCheckBox = QCheckBox()
|
||||
self.downloadWineToSteamCheckBox.setStyleSheet(self.theme.CHECKBOX_STYLE)
|
||||
self.downloadWineToSteamCheckBox.setFocusPolicy(Qt.FocusPolicy.StrongFocus)
|
||||
@@ -779,7 +769,7 @@ class MainWindowSettingsTabMixin(_MainWindowTypingBase):
|
||||
hwForm.setRowWrapPolicy(QFormLayout.RowWrapPolicy.DontWrapRows)
|
||||
scrollLayout.addWidget(hwFrame)
|
||||
|
||||
filtered_gpu_list = [] if sys.platform == "darwin" else get_selectable_gpu_list()
|
||||
filtered_gpu_list = get_selectable_gpu_list()
|
||||
hwFrame.setVisible(len(filtered_gpu_list) > 1)
|
||||
if len(filtered_gpu_list) > 1:
|
||||
self.gpuCombo = CustomComboBox(theme=self.theme)
|
||||
@@ -1116,7 +1106,7 @@ class MainWindowSettingsTabMixin(_MainWindowTypingBase):
|
||||
|
||||
autostart_enabled = self.autostartCheckBox.isChecked()
|
||||
display_config.set_autostart_enabled(autostart_enabled)
|
||||
if sys.platform != "darwin" and not apply_xdg_autostart(autostart_enabled):
|
||||
if not apply_xdg_autostart(autostart_enabled):
|
||||
QMessageBox.warning(self, _("Error"), _("Failed to update xdg-autostart entry."))
|
||||
|
||||
start_minimized = self.startMinimizedCheckBox.isChecked()
|
||||
@@ -1126,13 +1116,12 @@ class MainWindowSettingsTabMixin(_MainWindowTypingBase):
|
||||
tray_menu_mode = self.tray_menu_mode_keys[tray_menu_mode_idx]
|
||||
display_config.set_tray_menu_mode(tray_menu_mode)
|
||||
|
||||
if sys.platform != "darwin":
|
||||
steam_compat = self.steamCompatCheckBox.isChecked()
|
||||
currently_installed = is_steam_compat_tool_installed()
|
||||
if steam_compat and not currently_installed:
|
||||
add_steam_compat_tool()
|
||||
elif not steam_compat and currently_installed:
|
||||
remove_steam_compat_tool()
|
||||
steam_compat = self.steamCompatCheckBox.isChecked()
|
||||
currently_installed = is_steam_compat_tool_installed()
|
||||
if steam_compat and not currently_installed:
|
||||
add_steam_compat_tool()
|
||||
elif not steam_compat and currently_installed:
|
||||
remove_steam_compat_tool()
|
||||
|
||||
ui_config.set_disable_steam_proton_scanning(self.disableSteamProtonScanningCheckBox.isChecked())
|
||||
|
||||
|
||||
@@ -1,5 +1,4 @@
|
||||
import os
|
||||
import sys
|
||||
import shlex
|
||||
from collections.abc import Callable
|
||||
from typing import TYPE_CHECKING, Any, cast
|
||||
@@ -37,13 +36,12 @@ from portprotonqt.localization import _
|
||||
from portprotonqt.logger import get_logger
|
||||
from portprotonqt.sound_manager import SoundManager
|
||||
from portprotonqt.preloader import Preloader
|
||||
if sys.platform != "darwin":
|
||||
from portprotonqt.system_manager import (
|
||||
AudioManagerWorker,
|
||||
BluetoothManagerWorker,
|
||||
NetworkManagerWorker,
|
||||
StorageManagerWorker,
|
||||
)
|
||||
from portprotonqt.system_manager import (
|
||||
AudioManagerWorker,
|
||||
BluetoothManagerWorker,
|
||||
NetworkManagerWorker,
|
||||
StorageManagerWorker,
|
||||
)
|
||||
|
||||
logger = get_logger(__name__)
|
||||
|
||||
|
||||
@@ -1,5 +1,4 @@
|
||||
import os
|
||||
import sys
|
||||
import re
|
||||
import shutil
|
||||
from typing import TYPE_CHECKING, Any
|
||||
@@ -153,9 +152,6 @@ class MainWindowWineTabMixin(_MainWindowTypingBase):
|
||||
self.defaultVulkanTitleLabel.setStyleSheet(self.theme.PARAMS_TITLE_STYLE)
|
||||
self.defaultVulkanTitleLabel.setFocusPolicy(Qt.FocusPolicy.NoFocus)
|
||||
formLayout.addRow(self.defaultVulkanTitleLabel, self.defaultVulkanCombo)
|
||||
if sys.platform == "darwin":
|
||||
self.defaultVulkanTitleLabel.hide()
|
||||
self.defaultVulkanCombo.hide()
|
||||
|
||||
layout.addLayout(formLayout)
|
||||
|
||||
@@ -199,9 +195,6 @@ class MainWindowWineTabMixin(_MainWindowTypingBase):
|
||||
(_("Manage WINE versions"), self.show_proton_manager),
|
||||
]
|
||||
|
||||
if sys.platform == "darwin":
|
||||
additional_buttons = [item for item in additional_buttons
|
||||
if item[1] == self.show_proton_manager]
|
||||
for i, (text, callback) in enumerate(additional_buttons):
|
||||
row = i // 2
|
||||
col = i % 2
|
||||
@@ -250,12 +243,6 @@ class MainWindowWineTabMixin(_MainWindowTypingBase):
|
||||
self.wine_progress_bar.setVisible(True)
|
||||
|
||||
proc = QProcess(self)
|
||||
if sys.platform == "darwin":
|
||||
proc.setUnixProcessParameters(QProcess.UnixProcessFlag.CreateNewSession)
|
||||
if not hasattr(self, "wine_tool_processes"):
|
||||
self.wine_tool_processes = []
|
||||
self.wine_tool_processes.append(proc)
|
||||
proc.finished.connect(lambda: self.wine_tool_processes.remove(proc))
|
||||
process_env = QProcessEnvironment.systemEnvironment()
|
||||
if env_vars.get("DISABLE_CP_DEFPFX") == "1":
|
||||
process_env.insert("DISABLE_CP_DEFPFX", "1")
|
||||
|
||||
@@ -1,7 +1,3 @@
|
||||
import os
|
||||
import signal
|
||||
import sys
|
||||
|
||||
from portprotonqt.logger import get_logger
|
||||
|
||||
logger = get_logger(__name__)
|
||||
@@ -20,19 +16,6 @@ class MainWindowWorkersMixin:
|
||||
if not process.waitForFinished():
|
||||
process.kill()
|
||||
process.waitForFinished()
|
||||
for process in list(getattr(self, "wine_tool_processes", [])):
|
||||
if sys.platform == "darwin" and process.processId():
|
||||
try:
|
||||
os.killpg(process.processId(), signal.SIGKILL)
|
||||
except ProcessLookupError:
|
||||
logger.debug("Wine tool process group already exited")
|
||||
except OSError as error:
|
||||
logger.warning("Failed to stop Wine tool process group: %s", error)
|
||||
process.terminate()
|
||||
if not process.waitForFinished():
|
||||
process.kill()
|
||||
process.waitForFinished()
|
||||
self.wine_tool_processes = []
|
||||
worker_timeouts = {
|
||||
"networkWorker": 3000,
|
||||
"bluetoothWorker": 12000,
|
||||
|
||||
@@ -3,13 +3,14 @@ import asyncio
|
||||
import hashlib
|
||||
import importlib.util
|
||||
import os
|
||||
import sys
|
||||
import re
|
||||
import shutil
|
||||
import stat
|
||||
import xml.etree.ElementTree as ET
|
||||
from typing import Any, cast
|
||||
import orjson
|
||||
from dbus_fast import BusType
|
||||
from dbus_fast.aio import MessageBus
|
||||
from portprotonqt.logger import get_logger
|
||||
from portprotonqt.theme_security import (
|
||||
check_theme_directory_safety,
|
||||
@@ -23,10 +24,6 @@ from portprotonqt.config import CACHE_DIR, ui_config, load_theme_metainfo
|
||||
from portprotonqt.config.ui import _is_system_light_theme, _unwrap_variant
|
||||
from portprotonqt.qt_utils import get_device_pixel_ratio
|
||||
|
||||
if sys.platform != "darwin":
|
||||
from dbus_fast import BusType
|
||||
from dbus_fast.aio import MessageBus
|
||||
|
||||
# Icon caching for performance optimization
|
||||
_icon_cache = {}
|
||||
# Directory structure cache for performance optimization
|
||||
@@ -953,8 +950,6 @@ class SystemThemeWatcher(QThread):
|
||||
self._poll_system_theme()
|
||||
|
||||
async def _watch_portal(self) -> None:
|
||||
if sys.platform == "darwin":
|
||||
raise OSError("Desktop portal is Linux-only")
|
||||
bus = await MessageBus(bus_type=BusType.SESSION).connect()
|
||||
try:
|
||||
introspection = await bus.introspect(
|
||||
|
||||
+1
-1
@@ -23,7 +23,7 @@ classifiers = [
|
||||
]
|
||||
dependencies = [
|
||||
"babel>=2.18.0",
|
||||
"evdev>=2.0.0; sys_platform == 'linux'",
|
||||
"evdev>=2.0.0",
|
||||
"libarchive-c>=5.3",
|
||||
"orjson>=3.12.0",
|
||||
"pillow>=12.3.0",
|
||||
|
||||
@@ -1,377 +0,0 @@
|
||||
"""Native macOS Wine integration regressions, without a macOS host or network."""
|
||||
|
||||
from pathlib import Path
|
||||
from types import SimpleNamespace
|
||||
from typing import Any, cast
|
||||
from unittest.mock import Mock
|
||||
|
||||
import orjson
|
||||
import pytest
|
||||
|
||||
from portprotonqt import macos
|
||||
|
||||
|
||||
@pytest.mark.parametrize("layout", [
|
||||
"bin/wine", "bin/wine64", "Wine.app/Contents/Resources/wine/bin/wine",
|
||||
"Contents/Resources/wine/bin/wine64", "wswine.bundle/bin/wine64",
|
||||
"wine-devel/bin/wine", "Wine.app/Contents/SharedSupport/wine/bin/wine64",
|
||||
])
|
||||
def test_find_wine_bundle_layouts(tmp_path: Path, layout: str) -> None:
|
||||
binary = tmp_path / layout
|
||||
binary.parent.mkdir(parents=True)
|
||||
binary.write_text("wine", encoding="utf-8")
|
||||
assert macos.find_wine(tmp_path) is None
|
||||
binary.chmod(0o755)
|
||||
assert macos.find_wine(tmp_path) == binary
|
||||
|
||||
|
||||
@pytest.mark.parametrize("name", ["", "..", "../outside", "/tmp/wine", "nested/wine"])
|
||||
def test_version_paths_reject_traversal(tmp_path: Path, name: str) -> None:
|
||||
with pytest.raises(ValueError):
|
||||
macos.version_directory(tmp_path, name)
|
||||
|
||||
|
||||
def test_version_paths_reject_symlink_escape(tmp_path: Path) -> None:
|
||||
dist = tmp_path / "data/dist"
|
||||
dist.mkdir(parents=True)
|
||||
(dist / "escape").symlink_to(tmp_path)
|
||||
with pytest.raises(ValueError):
|
||||
macos.version_directory(tmp_path, "escape")
|
||||
|
||||
|
||||
def test_native_command_uses_selected_version_prefix_and_arguments(tmp_path: Path) -> None:
|
||||
binary = macos.version_directory(tmp_path, "Wine 1") / "wswine.bundle/bin/wine64"
|
||||
binary.parent.mkdir(parents=True)
|
||||
binary.write_text("wine", encoding="utf-8")
|
||||
binary.chmod(0o755)
|
||||
command, environment = macos.wine_command(tmp_path, ["/games/A game.exe", "a b"], {
|
||||
"PW_WINE_USE": "Wine 1", "PW_PREFIX_NAME": "GAME",
|
||||
})
|
||||
assert command == [str(binary), "/games/A game.exe", "a b"]
|
||||
assert environment["WINEPREFIX"] == str(tmp_path / "data/prefixes/GAME")
|
||||
assert environment["PATH"].split(":")[0] == str(binary.parent)
|
||||
|
||||
|
||||
def test_native_command_does_not_fallback_from_missing_selection(tmp_path: Path, monkeypatch: pytest.MonkeyPatch) -> None:
|
||||
monkeypatch.setattr(macos.shutil, "which", lambda _name: "/usr/bin/wine")
|
||||
with pytest.raises(FileNotFoundError):
|
||||
macos.wine_command(tmp_path, ["game.exe"], {"PW_WINE_USE": "missing"})
|
||||
|
||||
|
||||
@pytest.mark.parametrize("prefix", ["..", "../other", "/tmp/prefix"])
|
||||
def test_native_command_rejects_prefix_traversal(tmp_path: Path, monkeypatch: pytest.MonkeyPatch, prefix: str) -> None:
|
||||
monkeypatch.setattr(macos.shutil, "which", lambda _name: "/usr/bin/wine")
|
||||
with pytest.raises(ValueError):
|
||||
macos.wine_command(tmp_path, ["game.exe"], {"PW_PREFIX_NAME": prefix})
|
||||
|
||||
|
||||
def test_settings_roundtrip_is_data_not_shell(tmp_path: Path) -> None:
|
||||
path = tmp_path / "game.exe.ppdb"
|
||||
values = {"PW_WINE_USE": "Wine Crossover", "PW_PREFIX_NAME": "GAME", "VALUE": "$(touch /tmp/not-run)"}
|
||||
macos.write_settings(path, values)
|
||||
assert macos.read_settings(path) == values
|
||||
|
||||
|
||||
@pytest.mark.parametrize("values", [
|
||||
{"BAD;command": "value"}, {"BAD\nNAME": "value"},
|
||||
{"VALUE": "first\nsecond"}, {"VALUE": "first\rsecond"},
|
||||
])
|
||||
def test_invalid_settings_preserve_existing_file(tmp_path: Path, values: dict[str, str]) -> None:
|
||||
path = tmp_path / "game.exe.ppdb"
|
||||
original = 'export PW_PREFIX_NAME=GAME\n'
|
||||
path.write_text(original)
|
||||
with pytest.raises(ValueError):
|
||||
macos.write_settings(path, values)
|
||||
assert path.read_text() == original
|
||||
assert not path.with_name(path.name + ".tmp").exists()
|
||||
|
||||
|
||||
def test_adapter_cli_edits_existing_ppdb_and_shows_dialog_format(tmp_path: Path, monkeypatch: pytest.MonkeyPatch, capsys: pytest.CaptureFixture[str]) -> None:
|
||||
monkeypatch.setenv("PORT_DATA_PATH", str(tmp_path))
|
||||
executable = str(tmp_path / "game.exe")
|
||||
assert macos.main(["cli", "--edit-db", executable, "PW_WINE_USE=Wine 1", "PW_PREFIX_NAME=GAME"]) == 0
|
||||
assert macos.main(["cli", "--show-ppdb", executable]) == 0
|
||||
assert 'PW_WINE_USE="Wine 1"' in capsys.readouterr().out
|
||||
assert macos.main(["cli", "--set-user-conf", "PW_DEFAULT_WINE_USE", "Wine 2"]) == 0
|
||||
assert macos.main(["cli", "--get-user-conf", "PW_DEFAULT_WINE_USE"]) == 0
|
||||
assert capsys.readouterr().out.strip() == "Wine 2"
|
||||
|
||||
|
||||
def test_adapter_exec_preserves_owned_pid_and_arguments(tmp_path: Path, monkeypatch: pytest.MonkeyPatch) -> None:
|
||||
monkeypatch.setenv("PORT_DATA_PATH", str(tmp_path))
|
||||
executable = tmp_path / "A game.exe"
|
||||
executable.touch()
|
||||
monkeypatch.setattr(macos.os, "chdir", Mock())
|
||||
macos.write_settings(Path(str(executable) + ".ppdb"), {"PW_PREFIX_NAME": "GAME"})
|
||||
monkeypatch.setattr(macos.shutil, "which", lambda _name: "/opt/homebrew/bin/wine")
|
||||
execute = Mock()
|
||||
monkeypatch.setattr(macos.os, "execvpe", execute)
|
||||
assert macos.main([str(executable), "a b"]) == 0
|
||||
assert execute.call_args.args[1] == ["/opt/homebrew/bin/wine", str(executable), "a b"]
|
||||
assert execute.call_args.args[2]["WINEPREFIX"] == str(tmp_path / "data/prefixes/GAME")
|
||||
|
||||
|
||||
def test_adapter_tools_use_existing_wine_and_prefix_selection(tmp_path: Path, monkeypatch: pytest.MonkeyPatch) -> None:
|
||||
monkeypatch.setenv("PORT_DATA_PATH", str(tmp_path))
|
||||
binary = macos.version_directory(tmp_path, "Wine 1") / "bin/wine"
|
||||
binary.parent.mkdir(parents=True)
|
||||
binary.touch(mode=0o755)
|
||||
execute = Mock()
|
||||
monkeypatch.setattr(macos.os, "execvpe", execute)
|
||||
assert macos.main(["cli", "--winecfg", "Wine 1", "TEST"]) == 0
|
||||
assert execute.call_args.args[1] == [str(binary), "winecfg"]
|
||||
assert execute.call_args.args[2]["WINEPREFIX"].endswith("/TEST")
|
||||
assert macos.main(["cli", "--autoinstall", "linux.sh"]) == 1
|
||||
|
||||
|
||||
def test_catalog_loader_uses_forgejo_and_completes_once(tmp_path: Path, monkeypatch: pytest.MonkeyPatch) -> None:
|
||||
from portprotonqt.dialogs import wine_loader
|
||||
monkeypatch.setenv("PORT_DATA_PATH", str(tmp_path))
|
||||
monkeypatch.setattr(wine_loader.sys, "platform", "darwin")
|
||||
monkeypatch.setattr("portprotonqt.portproton_api.get_user_conf_setting", lambda _key: "GITHUB")
|
||||
metadata = {"wine-crossover": [{"name": "Wine 1", "url": "https://example.org/wine.tar.xz", "size_human": "1 MiB"}]}
|
||||
response = SimpleNamespace(raise_for_status=lambda: None, iter_content=lambda **_kwargs: [orjson.dumps(metadata)])
|
||||
get = Mock(return_value=response)
|
||||
monkeypatch.setattr(wine_loader, "get_requests_session", lambda: SimpleNamespace(get=get))
|
||||
worker = wine_loader.WineLoadingThread()
|
||||
success, failure = Mock(), Mock()
|
||||
worker.loading_complete.connect(success)
|
||||
worker.loading_error.connect(failure)
|
||||
worker.run()
|
||||
assert get.call_args.args[0] == macos.MACOS_WINE_METADATA_URL
|
||||
success.assert_called_once_with(metadata)
|
||||
failure.assert_not_called()
|
||||
|
||||
|
||||
@pytest.mark.parametrize("entry", [{"name": "../escape", "url": "https://example.org/a"}, {"name": "Wine", "url": "http://example.org/a"}])
|
||||
def test_catalog_rejects_unsafe_download_paths(entry: dict[str, str]) -> None:
|
||||
with pytest.raises(ValueError):
|
||||
macos.validate_catalog({"wine-crossover": [entry]})
|
||||
|
||||
|
||||
def test_manager_installs_and_detects_separate_bundle_versions(tmp_path: Path, monkeypatch: pytest.MonkeyPatch) -> None:
|
||||
from portprotonqt.dialogs import proton_manager
|
||||
monkeypatch.setattr(proton_manager.sys, "platform", "darwin")
|
||||
manager = SimpleNamespace(portproton_location=str(tmp_path))
|
||||
for name in ("Wine 1", "Wine 2"):
|
||||
destination = proton_manager.ProtonManager.get_download_extract_dir(cast(Any, manager), {"asset_name": name})
|
||||
binary = Path(destination) / "wswine.bundle/bin/wine64"
|
||||
binary.parent.mkdir(parents=True)
|
||||
binary.touch(mode=0o755)
|
||||
assert proton_manager.ProtonManager.is_asset_installed(cast(Any, manager), name, "sikarugir-engines")
|
||||
assert proton_manager.ProtonManager.is_installed_version_dir(cast(Any, manager), destination)
|
||||
assert proton_manager.ProtonManager.filter_entries_by_cpu_level(cast(Any, manager), [{"name": "x86_64"}], "wine-crossover") == [{"name": "x86_64"}]
|
||||
|
||||
|
||||
def test_darwin_config_selects_native_backend(tmp_path: Path, monkeypatch: pytest.MonkeyPatch) -> None:
|
||||
from portprotonqt.config import portproton
|
||||
monkeypatch.setenv("PORT_DATA_PATH", str(tmp_path / "data root"))
|
||||
monkeypatch.setattr(portproton.sys, "platform", "darwin")
|
||||
assert portproton.get_portproton_location() == str(tmp_path / "data root")
|
||||
command = portproton.get_portproton_start_command()
|
||||
assert command is not None
|
||||
assert command[1:] == ["-m", "portprotonqt.macos"]
|
||||
|
||||
|
||||
def test_shutdown_waits_for_retained_wine_tools() -> None:
|
||||
from portprotonqt.tabs.workers import MainWindowWorkersMixin
|
||||
process = Mock()
|
||||
process.waitForFinished.side_effect = [False, True]
|
||||
window = SimpleNamespace(wine_tool_processes=[process], _stopWorkerThread=Mock(), _stopWorkerThreads=Mock())
|
||||
MainWindowWorkersMixin._stopBackgroundWorkers(cast(Any, window))
|
||||
process.terminate.assert_called_once()
|
||||
process.kill.assert_called_once()
|
||||
assert process.waitForFinished.call_count == 2
|
||||
assert window.wine_tool_processes == []
|
||||
|
||||
|
||||
def test_macos_extraction_is_per_version_and_rejects_escape(tmp_path: Path) -> None:
|
||||
import io
|
||||
import tarfile
|
||||
from portprotonqt.dialogs.wine_extractor import ExtractionThread
|
||||
archive = tmp_path / "wine.tar"
|
||||
with tarfile.open(archive, "w") as stream:
|
||||
entry = tarfile.TarInfo("wswine.bundle/bin/wine64")
|
||||
entry.mode = 0o755
|
||||
entry.size = len(b"wine")
|
||||
stream.addfile(entry, io.BytesIO(b"wine"))
|
||||
destination = macos.version_directory(tmp_path, "Engine 1")
|
||||
worker = ExtractionThread(str(archive), str(destination))
|
||||
worker.run()
|
||||
assert macos.find_wine(destination) == destination / "wswine.bundle/bin/wine64"
|
||||
assert not macos.version_directory(tmp_path, "Engine 2").exists()
|
||||
with tarfile.open(archive, "w") as stream:
|
||||
entry = tarfile.TarInfo("../escape")
|
||||
entry.size = len(b"bad")
|
||||
stream.addfile(entry, io.BytesIO(b"bad"))
|
||||
worker = ExtractionThread(str(archive), str(destination))
|
||||
failure = Mock()
|
||||
worker.error.connect(failure)
|
||||
worker.run()
|
||||
failure.assert_called_once()
|
||||
assert not (destination.parent / "escape").exists()
|
||||
|
||||
|
||||
def test_macos_shutdown_kills_only_owned_groups_and_waits(monkeypatch: pytest.MonkeyPatch) -> None:
|
||||
from portprotonqt import main_window
|
||||
monkeypatch.setattr(main_window.sys, "platform", "darwin")
|
||||
kill_group = Mock()
|
||||
monkeypatch.setattr(main_window.os, "killpg", kill_group)
|
||||
process = Mock(pid=1234)
|
||||
process.poll.return_value = 0
|
||||
window = SimpleNamespace(game_processes=[process])
|
||||
main_window.MainWindow._terminate_game_processes(cast(Any, window))
|
||||
kill_group.assert_called_once_with(1234, main_window.signal.SIGKILL)
|
||||
process.wait.assert_called_once_with(timeout=0)
|
||||
detached = Mock()
|
||||
monkeypatch.setattr(main_window.QProcess, "startDetached", detached)
|
||||
assert main_window.MainWindow._run_portproton_stop_command(cast(Any, window))
|
||||
detached.assert_not_called()
|
||||
|
||||
|
||||
def test_macos_tool_shutdown_kills_session_and_waits(monkeypatch: pytest.MonkeyPatch) -> None:
|
||||
from portprotonqt.tabs import workers
|
||||
monkeypatch.setattr(workers.sys, "platform", "darwin")
|
||||
kill_group = Mock()
|
||||
monkeypatch.setattr(workers.os, "killpg", kill_group)
|
||||
process = Mock()
|
||||
process.processId.return_value = 1234
|
||||
window = SimpleNamespace(wine_tool_processes=[process], _stopWorkerThread=Mock(), _stopWorkerThreads=Mock())
|
||||
workers.MainWindowWorkersMixin._stopBackgroundWorkers(cast(Any, window))
|
||||
kill_group.assert_called_once_with(1234, workers.signal.SIGKILL)
|
||||
process.waitForFinished.assert_called_once()
|
||||
|
||||
|
||||
def test_macos_does_not_start_linux_virtual_mouse_worker(monkeypatch: pytest.MonkeyPatch) -> None:
|
||||
from portprotonqt import input_manager
|
||||
monkeypatch.setattr(input_manager.sys, "platform", "darwin")
|
||||
worker = Mock()
|
||||
monkeypatch.setattr(input_manager, "MouseEmulationThread", worker)
|
||||
manager = SimpleNamespace(mouse_emulation_enabled=True)
|
||||
input_manager.InputManager._async_enable_mouse_emulation(cast(Any, manager))
|
||||
assert manager.mouse_emulation_enabled is False
|
||||
worker.assert_not_called()
|
||||
|
||||
|
||||
def test_macos_settings_offer_only_implemented_engine_and_prefix(monkeypatch: pytest.MonkeyPatch) -> None:
|
||||
from portprotonqt import settings_manager
|
||||
monkeypatch.setattr(settings_manager.sys, "platform", "darwin")
|
||||
assert settings_manager.get_toggle_settings() == {}
|
||||
settings = settings_manager.get_advanced_settings("disabled", ["1"], [], {}, ["Wine"], ["DEFAULT"])
|
||||
assert {setting["key"] for setting in settings} == {"PW_WINE_USE", "PW_PREFIX_NAME"}
|
||||
|
||||
|
||||
def test_explicit_system_wine_selection_uses_path(tmp_path: Path, monkeypatch: pytest.MonkeyPatch) -> None:
|
||||
monkeypatch.setattr(macos.shutil, "which", lambda _name: "/opt/homebrew/bin/wine")
|
||||
command, _environment = macos.wine_command(tmp_path, ["game.exe"], {"PW_WINE_USE": "USE_SYSTEM_WINE"})
|
||||
assert command == ["/opt/homebrew/bin/wine", "game.exe"]
|
||||
|
||||
|
||||
def test_macos_wine_options_exclude_incomplete_engines(tmp_path: Path, monkeypatch: pytest.MonkeyPatch) -> None:
|
||||
from portprotonqt import settings_manager
|
||||
monkeypatch.setattr(settings_manager.sys, "platform", "darwin")
|
||||
monkeypatch.setattr(settings_manager.shutil, "which", lambda _name: None)
|
||||
valid = macos.version_directory(tmp_path, "Wine") / "Wine.app/Contents/Resources/wine/bin/wine"
|
||||
valid.parent.mkdir(parents=True)
|
||||
valid.touch(mode=0o755)
|
||||
macos.version_directory(tmp_path, "incomplete").mkdir()
|
||||
assert settings_manager.get_available_wine_options(str(tmp_path)) == ["Wine"]
|
||||
|
||||
|
||||
@pytest.mark.parametrize("method", ["_launch_egs_game", "_launch_gog_game"])
|
||||
def test_macos_store_wrappers_fail_explicitly_before_linux_setup(monkeypatch: pytest.MonkeyPatch, method: str) -> None:
|
||||
from portprotonqt import main_window
|
||||
monkeypatch.setattr(main_window.sys, "platform", "darwin")
|
||||
warning = Mock()
|
||||
monkeypatch.setattr(main_window.QMessageBox, "warning", warning)
|
||||
window = SimpleNamespace(_finish_silent_launch=Mock(), egs_api=Mock(), gog_api=Mock())
|
||||
getattr(main_window.MainWindow, method)(cast(Any, window), "game")
|
||||
window._finish_silent_launch.assert_called_once()
|
||||
warning.assert_called_once()
|
||||
assert "macOS" in warning.call_args.args[2]
|
||||
assert "directly" in warning.call_args.args[2]
|
||||
assert window.egs_api.mock_calls == []
|
||||
assert window.gog_api.mock_calls == []
|
||||
|
||||
|
||||
def test_settings_ignores_predictable_temporary_symlink(tmp_path: Path) -> None:
|
||||
outside = tmp_path / "outside"
|
||||
outside.write_text("preserved")
|
||||
path = tmp_path / "user.conf"
|
||||
path.with_suffix(".conf.tmp").symlink_to(outside)
|
||||
macos.write_settings(path, {"KEY": "value"})
|
||||
assert outside.read_text() == "preserved"
|
||||
assert macos.read_settings(path) == {"KEY": "value"}
|
||||
|
||||
|
||||
def test_settings_replace_failure_preserves_original(tmp_path: Path, monkeypatch: pytest.MonkeyPatch) -> None:
|
||||
path = tmp_path / "user.conf"
|
||||
path.write_text("original")
|
||||
monkeypatch.setattr(macos.os, "replace", Mock(side_effect=OSError("disk failure")))
|
||||
with pytest.raises(OSError, match="disk failure"):
|
||||
macos.write_settings(path, {"KEY": "value"})
|
||||
assert path.read_text() == "original"
|
||||
assert list(tmp_path.iterdir()) == [path]
|
||||
|
||||
|
||||
@pytest.mark.parametrize("extension,dispatch", [
|
||||
(".msi", ["msiexec", "/i"]), (".bat", ["cmd", "/c"]),
|
||||
(".cmd", ["cmd", "/c"]), (".reg", ["regedit"]),
|
||||
])
|
||||
def test_adapter_dispatch_and_working_directory(tmp_path: Path, monkeypatch: pytest.MonkeyPatch,
|
||||
extension: str, dispatch: list[str]) -> None:
|
||||
target = tmp_path / ("game" + extension)
|
||||
target.touch()
|
||||
monkeypatch.setenv("PORT_DATA_PATH", str(tmp_path))
|
||||
monkeypatch.setattr(macos.shutil, "which", lambda _: "/wine")
|
||||
execute, change_directory = Mock(), Mock()
|
||||
monkeypatch.setattr(macos.os, "execvpe", execute)
|
||||
monkeypatch.setattr(macos.os, "chdir", change_directory)
|
||||
assert macos.main([str(target), "extra argument"]) == 0
|
||||
assert execute.call_args.args[1] == ["/wine", *dispatch, str(target), "extra argument"]
|
||||
change_directory.assert_called_once_with(tmp_path)
|
||||
|
||||
|
||||
def test_darwin_extraction_failure_and_cancel_preserve_version(tmp_path: Path, monkeypatch: pytest.MonkeyPatch) -> None:
|
||||
import io
|
||||
import tarfile
|
||||
from portprotonqt.dialogs import wine_extractor
|
||||
monkeypatch.setattr(wine_extractor.sys, "platform", "darwin")
|
||||
destination = macos.version_directory(tmp_path, "Engine")
|
||||
destination.mkdir(parents=True)
|
||||
(destination / "original").write_text("working")
|
||||
archive = tmp_path / "wine.tar"
|
||||
with tarfile.open(archive, "w") as stream:
|
||||
for name in ("bin/wine", "../escape"):
|
||||
entry = tarfile.TarInfo(name)
|
||||
entry.mode, entry.size = 0o755, 4
|
||||
stream.addfile(entry, io.BytesIO(b"wine"))
|
||||
worker = wine_extractor.ExtractionThread(str(archive), str(destination))
|
||||
failed = Mock()
|
||||
worker.error.connect(failed)
|
||||
worker.run()
|
||||
failed.assert_called_once()
|
||||
assert list(destination.iterdir()) == [destination / "original"]
|
||||
worker.stop()
|
||||
worker.run()
|
||||
assert list(destination.parent.iterdir()) == [destination]
|
||||
|
||||
|
||||
def test_darwin_extraction_promotes_complete_version(tmp_path: Path, monkeypatch: pytest.MonkeyPatch) -> None:
|
||||
import io
|
||||
import tarfile
|
||||
from portprotonqt.dialogs import wine_extractor
|
||||
monkeypatch.setattr(wine_extractor.sys, "platform", "darwin")
|
||||
archive = tmp_path / "wine.tar"
|
||||
with tarfile.open(archive, "w") as stream:
|
||||
entry = tarfile.TarInfo("bin/wine")
|
||||
entry.mode, entry.size = 0o755, 4
|
||||
stream.addfile(entry, io.BytesIO(b"wine"))
|
||||
destination = macos.version_directory(tmp_path, "Engine")
|
||||
worker = wine_extractor.ExtractionThread(str(archive), str(destination))
|
||||
complete = Mock()
|
||||
worker.finished.connect(complete)
|
||||
worker.run()
|
||||
complete.assert_called_once_with(str(archive), True)
|
||||
assert macos.find_wine(destination) == destination / "bin/wine"
|
||||
assert list(destination.parent.iterdir()) == [destination]
|
||||
@@ -1,9 +1,10 @@
|
||||
"""Tests for the bundled PortProton shell scripts."""
|
||||
import os
|
||||
import shutil
|
||||
import subprocess
|
||||
from pathlib import Path
|
||||
|
||||
from pytest import mark
|
||||
from pytest import mark, skip
|
||||
|
||||
|
||||
@mark.parametrize("case", [
|
||||
@@ -326,3 +327,107 @@ def test_run_after_wrapper_preserves_command_with_comma(tmp_path: Path) -> None:
|
||||
capture_output=True, text=True, check=True,
|
||||
)
|
||||
assert result.stdout.splitlines() == ["first,second", "game"]
|
||||
|
||||
|
||||
def test_wine_gpu_name_lookup(tmp_path: Path) -> None:
|
||||
compiler = shutil.which("cc")
|
||||
if compiler is None:
|
||||
skip("C compiler is unavailable")
|
||||
source = tmp_path / "wine_names.c"
|
||||
source.write_text(
|
||||
'#include <stdio.h>\n#include "wine_gpu_names.h"\n'
|
||||
'int main(void) {\n'
|
||||
'puts(wine_device_name(0x1002, 0x163f, "AMD Custom GPU 0405 (RADV VANGOGH)"));\n'
|
||||
'puts(wine_device_name(0x10de, 0x249d, "NVIDIA GeForce RTX 3070 Laptop GPU"));\n'
|
||||
'puts(wine_device_name(0x8086, 0x5912, "Intel native name"));\n'
|
||||
'puts(wine_device_name(0xffff, 0x163f, "Unknown vendor"));\n'
|
||||
'puts(wine_device_name(0x1002, 0xffff, "Unknown device"));\n'
|
||||
'puts(wine_device_name(0x11002, 0x163f, "Non-PCI vendor"));\n'
|
||||
'return 0;\n}\n',
|
||||
)
|
||||
binary = tmp_path / "wine_names"
|
||||
subprocess.run(
|
||||
[compiler, "-std=c99", "-Wall", "-Wextra", "-Werror", "-I",
|
||||
str(Path("build-aux/src").resolve()), str(source), "-o", str(binary)],
|
||||
capture_output=True, text=True, check=True,
|
||||
)
|
||||
result = subprocess.run([str(binary)], capture_output=True, text=True, check=True)
|
||||
assert result.stdout.splitlines() == [
|
||||
"AMD VANGOGH", "NVIDIA GeForce RTX 3070 (mobile)", "Intel(R) HD Graphics 630",
|
||||
"Unknown vendor", "Unknown device", "Non-PCI vendor",
|
||||
]
|
||||
|
||||
|
||||
@mark.parametrize("names", [
|
||||
("AMD Custom GPU 0405 (RADV VANGOGH)", "AMD VANGOGH"),
|
||||
("NVIDIA GeForce RTX 3070 Laptop GPU", "NVIDIA GeForce RTX 3070 (mobile)"),
|
||||
("Unknown GPU", "Unknown GPU"),
|
||||
])
|
||||
@mark.parametrize("override", [
|
||||
{}, {"DXVK_FILTER_DEVICE_NAME": "custom-dxvk"},
|
||||
{"VKD3D_FILTER_DEVICE_NAME": "custom-vkd3d"},
|
||||
{"DXVK_FILTER_DEVICE_NAME": "", "VKD3D_FILTER_DEVICE_NAME": ""},
|
||||
])
|
||||
def test_gpu_selection_uses_wine_name_for_both_filters(
|
||||
tmp_path: Path, names: tuple[str, str], override: dict[str, str],
|
||||
) -> None:
|
||||
helper = Path("build-aux/share/portproton/scripts/functions_helper").read_text()
|
||||
function = "pw_select_gpu () {" + helper.split("pw_select_gpu () {", 1)[1].split(
|
||||
"\npw_check_vulkan_extensions () {", 1,
|
||||
)[0]
|
||||
binary = tmp_path / "vk_gpu_info"
|
||||
binary.write_text('#!/bin/bash\nprintf "%s" "$GPU_OUTPUT"\n')
|
||||
binary.chmod(0o755)
|
||||
native, wine = names
|
||||
output = (
|
||||
"GPU #0\ndevice_name: Other GPU\nwine_device_name: Other Wine GPU\n\n"
|
||||
f"GPU #1\ndevice_name: {native}\nwine_device_name: {wine}\n\n"
|
||||
"GPU #2\ndevice_name: Last GPU\nwine_device_name: Last Wine GPU\n"
|
||||
)
|
||||
result = subprocess.run(
|
||||
["bash", "-c", function + '\npw_select_gpu\n'
|
||||
'printf "%s\\n" "$DXVK_FILTER_DEVICE_NAME" "$VKD3D_FILTER_DEVICE_NAME" '
|
||||
'"$PW_GPU_USE" "$MESA_VK_DEVICE_SELECT" "$MESA_VK_DEVICE_SELECT_FORCE_DEFAULT_DEVICE"'],
|
||||
cwd=tmp_path, capture_output=True, text=True, check=True,
|
||||
env={"PATH": f"{tmp_path}:{os.defpath}", "GPU_OUTPUT": output, "PW_GPU_USE": native,
|
||||
"PW_vendorID": "0x1002", "PW_deviceID": "0x163f", **override},
|
||||
)
|
||||
assert result.stdout.splitlines() == [
|
||||
override.get("DXVK_FILTER_DEVICE_NAME", wine),
|
||||
override.get("VKD3D_FILTER_DEVICE_NAME", wine), native, "0x1002:0x163f", "1",
|
||||
]
|
||||
|
||||
|
||||
@mark.parametrize("case", [
|
||||
("GPU #0\ndevice_name: Selected GPU\n", 0),
|
||||
("GPU #0\ndevice_name: Selected GPU\nwine_device_name: \n", 0),
|
||||
("GPU #0\ndevice_name: Other GPU\nwine_device_name: Other Wine GPU\n", 0),
|
||||
("GPU #0\ndevice_name: Selected GPU\nwine_device_name: Wine GPU\n", 1),
|
||||
])
|
||||
@mark.parametrize("selected", ["Selected GPU", "disabled", ""])
|
||||
def test_gpu_selection_falls_back_to_native_name(
|
||||
tmp_path: Path, case: tuple[str, int], selected: str,
|
||||
) -> None:
|
||||
helper = Path("build-aux/share/portproton/scripts/functions_helper").read_text()
|
||||
function = "pw_select_gpu () {" + helper.split("pw_select_gpu () {", 1)[1].split(
|
||||
"\npw_check_vulkan_extensions () {", 1,
|
||||
)[0]
|
||||
output, status = case
|
||||
binary = tmp_path / "vk_gpu_info"
|
||||
binary.write_text(
|
||||
'#!/bin/bash\ntouch probe-ran\nprintf "%s" "$GPU_OUTPUT"\n'
|
||||
f'exit {status}\n',
|
||||
)
|
||||
binary.chmod(0o755)
|
||||
result = subprocess.run(
|
||||
["bash", "-c", function + '\nprint_warning () { echo "$*" >&2; }\npw_select_gpu\n'
|
||||
'printf "%s\\n" "${DXVK_FILTER_DEVICE_NAME-unset}" '
|
||||
'"${VKD3D_FILTER_DEVICE_NAME-unset}"'],
|
||||
cwd=tmp_path, capture_output=True, text=True, check=True,
|
||||
env={"PATH": f"{tmp_path}:{os.defpath}", "GPU_OUTPUT": output,
|
||||
"PW_GPU_USE": selected, "PW_vendorID": "0x1002", "PW_deviceID": "0x163f"},
|
||||
)
|
||||
expected = selected if selected == "Selected GPU" else "unset"
|
||||
assert result.stdout.splitlines() == [expected, expected]
|
||||
assert (tmp_path / "probe-ran").exists() == (selected == "Selected GPU")
|
||||
assert ("vk_gpu_info failed" in result.stderr) == (status != 0 and selected == "Selected GPU")
|
||||
@@ -444,7 +444,7 @@ source = { editable = "." }
|
||||
dependencies = [
|
||||
{ name = "babel" },
|
||||
{ name = "dbus-fast" },
|
||||
{ name = "evdev", marker = "sys_platform == 'linux'" },
|
||||
{ name = "evdev" },
|
||||
{ name = "libarchive-c" },
|
||||
{ name = "orjson" },
|
||||
{ name = "pefile" },
|
||||
@@ -471,7 +471,7 @@ dev = [
|
||||
requires-dist = [
|
||||
{ name = "babel", specifier = ">=2.18.0" },
|
||||
{ name = "dbus-fast", specifier = ">=5.2.0" },
|
||||
{ name = "evdev", marker = "sys_platform == 'linux'", specifier = ">=2.0.0" },
|
||||
{ name = "evdev", specifier = ">=2.0.0" },
|
||||
{ name = "libarchive-c", specifier = ">=5.3" },
|
||||
{ name = "orjson", specifier = ">=3.12.0" },
|
||||
{ name = "pefile", specifier = ">=2024.8.26" },
|
||||
|
||||
Reference in new issue
Block a user