Heroic-Games-Launcher · flavioislima · Jul 24, 2023 · Jul 16, 2023 · Jul 17, 2023 · Jul 17, 2023
diff --git a/public/bin/darwin/gogdl b/public/bin/darwin/gogdl
diff --git a/public/bin/darwin/nile b/public/bin/darwin/nile
diff --git a/public/bin/linux/gogdl b/public/bin/linux/gogdl
diff --git a/public/bin/linux/nile b/public/bin/linux/nile
diff --git a/public/bin/win32/gogdl.exe b/public/bin/win32/gogdl.exe
diff --git a/public/bin/win32/nile.exe b/public/bin/win32/nile.exe
diff --git a/src/backend/config.ts b/src/backend/config.ts
@@ -320,7 +320,9 @@ class GlobalConfigV0 extends GlobalConfig {
       },
       wineCrossoverBottle: 'Heroic',
       winePrefix: isWindows ? '' : defaultWinePrefix,
-      wineVersion: defaultWine
+      wineVersion: defaultWine,
+      enableEsync: true,
+      enableFsync: true
     } as AppSettings
   }
 

diff --git a/src/backend/launcher.ts b/src/backend/launcher.ts
@@ -236,9 +236,13 @@ async function prepareWineLaunch(
     }
   }
 
-  const { folder_name: installFolderName } =
+  const { folder_name: installFolderName, install } =
     gameManagerMap[runner].getGameInfo(appName)
-  const envVars = setupWineEnvVars(gameSettings, installFolderName)
+  const envVars = setupWineEnvVars(
+    gameSettings,
+    installFolderName,
+    install.install_path
+  )
 
   return { success: true, envVars: envVars }
 }
@@ -282,7 +286,11 @@ function setupEnvVars(gameSettings: GameSettings) {
  * @param gameId If Proton and the Steam Runtime are used, the SteamGameId variable will be set to `heroic-gameId`
  * @returns A Record that can be passed to execAsync/spawn
  */
-function setupWineEnvVars(gameSettings: GameSettings, gameId = '0') {
+function setupWineEnvVars(
+  gameSettings: GameSettings,
+  gameId = '0',
+  installPath?: string
+) {
   const { wineVersion, winePrefix, wineCrossoverBottle } = gameSettings
 
   const ret: Record<string, string> = {}
@@ -311,6 +319,9 @@ function setupWineEnvVars(gameSettings: GameSettings, gameId = '0') {
     case 'proton':
       ret.STEAM_COMPAT_CLIENT_INSTALL_PATH = steamInstallPath
       ret.STEAM_COMPAT_DATA_PATH = winePrefix
+      if (installPath) {
+        ret.STEAM_COMPAT_INSTALL_PATH = installPath
+      }
       break
     case 'crossover':
       ret.CX_BOTTLE = wineCrossoverBottle
@@ -539,6 +550,7 @@ function launchCleanup(rpcClient?: RpcClient) {
 async function runWineCommand({
   gameSettings,
   commandParts,
+  gameInstallPath,
   wait,
   protonVerb = 'run',
   installFolderName,
@@ -590,7 +602,7 @@ async function runWineCommand({
   const env_vars = {
     ...process.env,
     ...setupEnvVars(settings),
-    ...setupWineEnvVars(settings, installFolderName)
+    ...setupWineEnvVars(settings, installFolderName, gameInstallPath)
   }
 
   const isProton = wineVersion.type === 'proton'
@@ -710,7 +722,6 @@ async function callRunner(
   const safeCommand = getRunnerCallWithoutCredentials(
     [...commandParts],
     options?.env,
-    options?.wrappers,
     fullRunnerPath
   )
 
@@ -736,16 +747,7 @@ async function callRunner(
     }
   }
 
-  // If we have wrappers (things we want to run before the command), set bin to the first wrapper
-  // and add every other wrapper and the actual bin to the start of filteredArgs
-  const wrappers = options?.wrappers || []
-  let bin = ''
-  if (wrappers.length) {
-    bin = wrappers.shift()!
-    commandParts.unshift(...wrappers, runner.bin)
-  } else {
-    bin = runner.bin
-  }
+  const bin = runner.bin
 
   // check if the same command is currently running
   // if so, return the same promise instead of running it again
@@ -884,7 +886,6 @@ async function callRunner(
 function getRunnerCallWithoutCredentials(
   commandParts: string[],
   env: Record<string, string> | NodeJS.ProcessEnv = {},
-  wrappers: string[] = [],
   runnerPath: string
 ): string {
   const modifiedCommandParts = [...commandParts]
@@ -912,7 +913,6 @@ function getRunnerCallWithoutCredentials(
 
   return [
     ...formattedEnvVars,
-    ...wrappers.map(quoteIfNecessary),
     quoteIfNecessary(runnerPath),
     ...modifiedCommandParts.map(quoteIfNecessary)
   ].join(' ')

diff --git a/src/backend/main.ts b/src/backend/main.ts
@@ -577,12 +577,13 @@ async function runWineCommandOnGame(
     logError('runWineCommand called on native game!', LogPrefix.Gog)
     return { stdout: '', stderr: '' }
   }
-  const { folder_name } = gameManagerMap[runner].getGameInfo(appName)
+  const { folder_name, install } = gameManagerMap[runner].getGameInfo(appName)
   const gameSettings = await gameManagerMap[runner].getSettings(appName)
 
   return runWineCommand({
     gameSettings,
     installFolderName: folder_name,
+    gameInstallPath: install.install_path,
     commandParts,
     wait,
     protonVerb,

diff --git a/src/backend/storeManagers/gog/games.ts b/src/backend/storeManagers/gog/games.ts
@@ -467,7 +467,15 @@ export async function launch(
   let commandEnv = isWindows
     ? process.env
     : { ...process.env, ...setupEnvVars(gameSettings) }
-  let wineFlag: string[] = []
+
+  const wrappers = setupWrappers(
+    gameSettings,
+    mangoHudCommand,
+    gameModeBin,
+    steamRuntime?.length ? [...steamRuntime] : undefined
+  )
+
+  let wineFlag: string[] = ['--wrapper', shlex.join(wrappers)]
 
   if (!isNative(appName)) {
     const {
@@ -503,7 +511,7 @@ export async function launch(
         ? wineExec.replaceAll("'", '')
         : wineExec
 
-    wineFlag = getWineFlags(wineBin, wineType)
+    wineFlag = [...getWineFlags(wineBin, wineType, shlex.join(wrappers))]
   }
 
   const commandParts = [
@@ -517,17 +525,10 @@ export async function launch(
     ...shlex.split(launchArguments ?? ''),
     ...shlex.split(gameSettings.launcherArgs ?? '')
   ]
-  const wrappers = setupWrappers(
-    gameSettings,
-    mangoHudCommand,
-    gameModeBin,
-    steamRuntime?.length ? [...steamRuntime] : undefined
-  )
 
   const fullCommand = getRunnerCallWithoutCredentials(
     commandParts,
     commandEnv,
-    wrappers,
     join(...Object.values(getGOGdlBin()))
   )
   appendFileSync(

diff --git a/src/backend/storeManagers/gog/setup.ts b/src/backend/storeManagers/gog/setup.ts
@@ -177,6 +177,7 @@ async function setup(
           }
           await runWineCommand({
             gameSettings,
+            gameInstallPath: gameInfo.install.install_path,
             commandParts: command,
             wait: true,
             protonVerb: 'runinprefix'
@@ -282,6 +283,7 @@ async function setup(
 
           await runWineCommand({
             gameSettings,
+            gameInstallPath: gameInfo.install.install_path,
             commandParts: [executablePath, ...exeArguments],
             wait: true,
             protonVerb: 'waitforexitandrun',
@@ -485,6 +487,7 @@ async function setup(
       logInfo(['Setup: Executing', command, `${supportDir}`], LogPrefix.Gog)
       await runWineCommand({
         gameSettings,
+        gameInstallPath: gameInfo.install.install_path,
         commandParts: command,
         wait: true,
         protonVerb: 'waitforexitandrun',

diff --git a/src/backend/storeManagers/legendary/games.ts b/src/backend/storeManagers/legendary/games.ts
@@ -824,7 +824,16 @@ export async function launch(
   let commandEnv = isWindows
     ? process.env
     : { ...process.env, ...setupEnvVars(gameSettings) }
-  let wineFlag: string[] = []
+
+  const wrappers = setupWrappers(
+    gameSettings,
+    mangoHudCommand,
+    gameModeBin,
+    steamRuntime?.length ? [...steamRuntime] : undefined
+  )
+
+  let wineFlag: string[] = ['--wrapper', shlex.join(wrappers)]
+
   if (!isNative(appName)) {
     // -> We're using Wine/Proton on Linux or CX on Mac
     const {
@@ -860,7 +869,7 @@ export async function launch(
         ? wineExec.replaceAll("'", '')
         : wineExec
 
-    wineFlag = getWineFlags(wineBin, wineType)
+    wineFlag = [...getWineFlags(wineBin, wineType, shlex.join(wrappers))]
   }
 
   const commandParts = [
@@ -874,17 +883,10 @@ export async function launch(
     isCLINoGui ? '--skip-version-check' : '',
     ...shlex.split(gameSettings.launcherArgs ?? '')
   ]
-  const wrappers = setupWrappers(
-    gameSettings,
-    mangoHudCommand,
-    gameModeBin,
-    steamRuntime?.length ? [...steamRuntime] : undefined
-  )
 
   const fullCommand = getRunnerCallWithoutCredentials(
     commandParts,
     commandEnv,
-    wrappers,
     join(...Object.values(getLegendaryBin()))
   )
   appendFileSync(
@@ -990,11 +992,12 @@ export async function runWineCommandOnGame(
     return { stdout: '', stderr: '' }
   }
 
-  const { folder_name } = getGameInfo(appName)
+  const { folder_name, install } = getGameInfo(appName)
   const gameSettings = await getSettings(appName)
 
   return runWineCommandUtil({
     gameSettings,
+    gameInstallPath: install.install_path,
     installFolderName: folder_name,
     commandParts,
     wait,

diff --git a/src/backend/storeManagers/nile/games.ts b/src/backend/storeManagers/nile/games.ts
@@ -347,7 +347,15 @@ export async function launch(
   let commandEnv = isWindows
     ? process.env
     : { ...process.env, ...setupEnvVars(gameSettings) }
-  let wineFlag: string[] = []
+
+  const wrappers = setupWrappers(
+    gameSettings,
+    mangoHudCommand,
+    gameModeBin,
+    steamRuntime?.length ? [...steamRuntime] : undefined
+  )
+
+  let wineFlag: string[] = ['--wrapper', shlex.join(wrappers)]
 
   if (!isNative()) {
     // -> We're using Wine/Proton on Linux or CX on Mac
@@ -385,7 +393,7 @@ export async function launch(
         : wineExec
 
     wineFlag = [
-      ...getWineFlags(wineBin, wineType),
+      ...getWineFlags(wineBin, wineType, shlex.join(wrappers)),
       '--wine-prefix',
       gameSettings.winePrefix
     ]
@@ -399,17 +407,9 @@ export async function launch(
     ...shlex.split(gameSettings.launcherArgs ?? ''),
     appName
   ]
-  const wrappers = setupWrappers(
-    gameSettings,
-    mangoHudCommand,
-    gameModeBin,
-    steamRuntime?.length ? [...steamRuntime] : undefined
-  )
-
   const fullCommand = getRunnerCallWithoutCredentials(
     commandParts,
     commandEnv,
-    wrappers,
     join(...Object.values(getNileBin()))
   )
   appendFileSync(

diff --git a/src/backend/storeManagers/nile/setup.ts b/src/backend/storeManagers/nile/setup.ts
@@ -99,6 +99,7 @@ export default async function setup(
 
     await runWineCommand({
       gameSettings,
+      gameInstallPath: basePath,
       commandParts: [action.Command, ...exeArguments],
       wait: true,
       protonVerb: 'waitforexitandrun',

diff --git a/src/backend/utils/compatibility_layers.ts b/src/backend/utils/compatibility_layers.ts
@@ -374,14 +374,15 @@ export async function getGamingPortingToolkitWine(): Promise<
 
 export function getWineFlags(
   wineBin: string,
-  wineType: WineInstallation['type']
+  wineType: WineInstallation['type'],
+  wrapper: string
 ) {
   switch (wineType) {
     case 'wine':
     case 'toolkit':
-      return ['--wine', wineBin]
+      return ['--wine', wineBin, '--wrapper', wrapper]
     case 'proton':
-      return ['--no-wine', '--wrapper', `'${wineBin}' run`]
+      return ['--no-wine', '--wrapper', `${wrapper} '${wineBin}' run`]
     default:
       return []
   }

diff --git a/src/backend/wiki_game_info/gamesdb/utils.ts b/src/backend/wiki_game_info/gamesdb/utils.ts
@@ -10,7 +10,12 @@ export async function getInfoFromGamesDB(
 ): Promise<GamesDBInfo | null> {
   logInfo(`Getting GamesDB data for ${title}`, LogPrefix.ExtraGameInfo)
 
-  const storeMap = { legendary: 'epic', gog: 'gog', sideloaded: undefined }
+  const storeMap: { [key in Runner]: string | undefined } = {
+    legendary: 'epic',
+    gog: 'gog',
+    nile: 'amazon',
+    sideload: undefined
+  }
   const storeName = storeMap[runner]
   if (!storeName) {
     return { steamID: '' }

diff --git a/src/common/types.ts b/src/common/types.ts
@@ -533,6 +533,7 @@ export type WineCommandArgs = {
   wait?: boolean
   protonVerb?: ProtonVerb
   gameSettings?: GameSettings
+  gameInstallPath?: string
   installFolderName?: string
   options?: CallRunnerOptions
   startFolder?: string

diff --git a/src/frontend/hooks/useSettingsContext.ts b/src/frontend/hooks/useSettingsContext.ts
@@ -18,8 +18,11 @@ const useSettingsContext = ({ appName, gameInfo, runner }: Props) => {
   const isDefault = appName === 'default'
   const isLinux = platform === 'linux'
   const isMac = platform === 'darwin'
-  const isMacNative = isMac && (gameInfo?.is_mac_native || false)
-  const isLinuxNative = isLinux && (gameInfo?.is_linux_native || false)
+  const isMacNative =
+    isMac &&
+    (['Mac', 'osx'].includes(gameInfo?.install.platform ?? '') || false)
+  const isLinuxNative =
+    isLinux && (gameInfo?.install.platform === 'linux' || false)
 
   // Load Heroic's or game's config, only if not loaded already
   useEffect(() => {

diff --git a/src/frontend/state/GlobalState.tsx b/src/frontend/state/GlobalState.tsx
@@ -147,7 +147,7 @@ class GlobalState extends PureComponent<Props> {
     },
     amazon: {
       library: this.loadAmazonLibrary(),
-      username: nileConfigStore.get_nodefault('userData.name')
+      username: nileConfigStore.get_nodefault('userData.given_name')
     },
     wineVersions: wineDownloaderInfoStore.get('wine-releases', []),
     error: false,