Free fork of NotProton: Windows Steam games in Mac Steam, on CodeWeavers' Wine and Apple's Game Porting Toolkit
Swift apple-silicond3dmetaldxmtdxvkgame-porting-toolkitgptkmac-gamingmacosmetalfxrosetta-2steamsteam-playwinewinecx
Merge remote-tracking branch 'upstream/main'
raymondchins53853082c61d
diff --cc dylib/feats/webpatch.cindex 3cd6cb6,13188c9..00f9151--- a/dylib/feats/webpatch.c+++ b/dylib/feats/webpatch.c@@@ -416,15 -348,14 +416,15 @@@ static int out_expand(np_out_t *o, cons"children:(0," RT ".jsx)(" BARREL ".m,{rgOptions:U," \"selectedOption:sw?(U.find(u=>u.data&&+u.data===fn)||{data:String(fn)}).data:\"\"," \"onChange:v=>s([[\"DXMT_METALFX_SPATIAL_SWAPCHAIN\",v.data?\"1\":\"\"],[\"DXMT_CONFIG\",fx(v.data)]])})},\"usf\")," \+ "FG()," \"(0," RT ".jsxs)(" BARREL ".XY,{label:npL(\"Controllers\",\"控制器\",\"Controller\"),children:[" \- "T([\"NOTPROTON_RAW_CONTROLLERS\"],npL(\"Let games read controllers directly (May break Steam Input. Not recommended)\"," \- "\"允许游戏直接读取控制器(可能导致 Steam Input 失效,不推荐)\"," \- "\"Lascia che i giochi leggano direttamente i controller (pu\\u00f2 interferire con Steam Input, sconsigliato)\"),\"1\",\"\")," \- "T([\"NOTPROTON_DISABLE_HIDRAW\"],npL(\"Disable hidraw\",\"停用 hidraw\",\"Disattiva hidraw\"),\"1\",\"\")" \+ "T([\"BRIDGEPLAY_RAW_CONTROLLERS\"],npL(\"Let games read controllers directly (Recommended on Mac. Turn off only for Steam Input remapping)\"," \+ "\"允许游戏直接读取控制器(Mac 上推荐,仅在需要 Steam Input 按键映射时关闭)\"," \+ "\"Lascia che i giochi leggano direttamente i controller (consigliato su Mac, disattiva solo per la rimappatura di Steam Input)\"),\"1\",\"\")," \- "T([\"BRIDGEPLAY_DISABLE_HIDRAW\"],npL(\"Disable hidraw\",\"停用 hidraw\",\"Disable hidraw\"),\"1\",\"\")" \++ "T([\"BRIDGEPLAY_DISABLE_HIDRAW\"],npL(\"Disable hidraw\",\"停用 hidraw\",\"Disattiva hidraw\"),\"1\",\"\")" \"]},\"ctl\")," \"fex&&(0," RT ".jsx)(" BARREL ".XY,{label:\"FEX\"," \- "children:D(\"FEX_X87REDUCEDPRECISION\"," \+ "children:X(\"FEX_X87REDUCEDPRECISION\"," \"\"Reduced x87 Precision (Reducing precision improves game performance, is enabled by default in CrossOver Preview)\")},\"fex\")" \"]})})}"diff --cc dylib/tests/panel-behavior/emit.cindex cb8311c,031ad54..b2a22a7--- a/dylib/tests/panel-behavior/emit.c+++ b/dylib/tests/panel-behavior/emit.c@@@ -62,7 -42,15 +62,16 @@@ int main(int argc, char **argv)fputs(NP_IMAGE_FILES_LABEL, stdout);return 0;}+ if (argc == 2 && strcmp(argv[1], "library-windows-hint") == 0) {+ fputs(NP_LIBRARY_WINDOWS_HINT, stdout);+ return 0;+ }+ if (argc == 2 && strcmp(argv[1], "library-windows-summary") == 0) {+ fputs(NP_LIBRARY_WINDOWS_SUMMARY, stdout);+ return 0;+ }- fputs("usage: emit component|statement [fallback [fex-tool...]]|migration|compat-hint|"- "image-files-label|library-windows-hint|library-windows-summary\n", stderr);+ fputs("usage: emit component|statement [fallback [fex-tool...]]|migration|"- "transform <chunk> <fallback tool>|compat-hint|image-files-label\n", stderr);++ "transform <chunk> <fallback tool>|compat-hint|image-files-label|"++ "library-windows-hint|library-windows-summary\n", stderr);return 2;}diff --cc dylib/tests/panel-behavior/localization.jsindex 6d7adad,a805c6e..b21aec6--- a/dylib/tests/panel-behavior/localization.js+++ b/dylib/tests/panel-behavior/localization.js@@@ -29,12 -29,12 +29,12 @@@ for (const form of Object.keys(FORMS))assert(nodes.some(n => n.props.label === t('Graphics', '图形', 'Grafica')));assert(nodes.some(n => n.props.label === t('Controllers', '控制器', 'Controller')));const raw = nodes.find(n => n.props.label === t(- 'Let games read controllers directly (May break Steam Input. Not recommended)',- '允许游戏直接读取控制器(可能导致 Steam Input 失效,不推荐)',- 'Lascia che i giochi leggano direttamente i controller (può interferire con Steam Input, sconsigliato)'));+ 'Let games read controllers directly (Recommended on Mac. Turn off only for Steam Input remapping)',+ '允许游戏直接读取控制器(Mac 上推荐,仅在需要 Steam Input 按键映射时关闭)',+ 'Lascia che i giochi leggano direttamente i controller (consigliato su Mac, disattiva solo per la rimappatura di Steam Input)'));- assert(nodes.some(n => n.props.label === t('Disable hidraw', '停用 hidraw', 'Disable hidraw')));+ assert(nodes.some(n => n.props.label === t('Disable hidraw', '停用 hidraw', 'Disattiva hidraw')));raw.props.onChange(true);- assert.equal(written.at(-1).opts, 'NOTPROTON_RAW_CONTROLLERS=1 CX_GRAPHICS_BACKEND=dxmt %command%');+ assert.equal(written.at(-1).opts, 'BRIDGEPLAY_RAW_CONTROLLERS=1 CX_GRAPHICS_BACKEND=dxmt %command%');const hud = nodes.find(n => n.props.label === t('Metal HUD', 'Metal 性能监视器', 'Metal HUD'));hud.props.onChange(true);assert.equal(written.at(-1).opts, 'MTL_HUD_ENABLED=1 CX_GRAPHICS_BACKEND=dxmt %command%');