[Scummvm-git-logs] scummvm master -> 37ce69354496ff47e56ac2c14cfe77458eefc050

[lotharsm]

This automated email contains information about 2 new commits which have been
pushed to the 'scummvm' repo located at https://api.github.com/repos/scummvm/scummvm .

Summary:
3cc96963ba DISTS: WIN32: Drop old privilege escalation code from Inno Setup
37ce693544 DISTS: WIN32: Do not install DLLs that are now linked statically


Commit: 3cc96963ba6e725fa088516deb723a641dc6c829
    https://github.com/scummvm/scummvm/commit/3cc96963ba6e725fa088516deb723a641dc6c829
Author: Lothar Serra Mari (mail at serra.me)
Date: 2025-05-24T06:32:00+02:00

Commit Message:
DISTS: WIN32: Drop old privilege escalation code from Inno Setup

Changed paths:
    dists/win32/ScummVM.iss


diff --git a/dists/win32/ScummVM.iss b/dists/win32/ScummVM.iss
index b6fbd457fe5..151cdd474c4 100644
--- a/dists/win32/ScummVM.iss
+++ b/dists/win32/ScummVM.iss
@@ -45,137 +45,6 @@ LZMANumBlockThreads=4
 LZMADictionarySize=524288
 LZMAUseSeparateProcess=yes
 
-
-; This privilege escalation code comes from
-; https://stackoverflow.com/a/35435534/252087
-
-#define InnoSetupReg \
-  "Software\Microsoft\Windows\CurrentVersion\Uninstall\" + AppName + "_is1"
-#define InnoSetupAppPathReg "Inno Setup: App Path"
-
-[Code]
-function IsWinVista: Boolean;
-begin
-  Result := (GetWindowsVersion >= $06000000);
-end;
-
-function IsElevated: Boolean;
-begin
-  Result := IsAdminLoggedOn or IsPowerUserLoggedOn;
-end;
-
-function HaveWriteAccessToApp: Boolean;
-var
-  FileName: string;
-begin
-  FileName := AddBackslash(WizardDirValue) + 'writetest.tmp';
-  Result := SaveStringToFile(FileName, 'test', False);
-  if Result then
-  begin
-    Log(Format(
-      'Have write access to the last installation path [%s]', [WizardDirValue]));
-    DeleteFile(FileName);
-  end
-    else
-  begin
-    Log(Format('Does not have write access to the last installation path [%s]', [
-      WizardDirValue]));
-  end;
-end;
-
-procedure ExitProcess(uExitCode: UINT);
-  external 'ExitProcess at kernel32.dll stdcall';
-function ShellExecute(hwnd: HWND; lpOperation: string; lpFile: string;
-  lpParameters: string; lpDirectory: string; nShowCmd: Integer): THandle;
-  external 'ShellExecuteW at shell32.dll stdcall';
-
-function Elevate: Boolean;
-var
-  I: Integer;
-  RetVal: Integer;
-  Params: string;
-  S: string;
-begin
-  { Collect current instance parameters }
-  for I := 1 to ParamCount do
-  begin
-    S := ParamStr(I);
-    { Unique log file name for the elevated instance }
-    if CompareText(Copy(S, 1, 5), '/LOG=') = 0 then
-    begin
-      S := S + '-elevated';
-    end;
-    { Do not pass our /SL5 switch }
-    if CompareText(Copy(S, 1, 5), '/SL5=') <> 0 then
-    begin
-      Params := Params + AddQuotes(S) + ' ';
-    end;
-  end;
-
-  { ... and add selected language }
-  Params := Params + '/LANG=' + ActiveLanguage;
-
-  Log(Format('Elevating setup with parameters [%s]', [Params]));
-  RetVal := ShellExecute(0, 'runas', ExpandConstant('{srcexe}'), Params, '', SW_SHOW);
-  Log(Format('Running elevated setup returned [%d]', [RetVal]));
-  Result := (RetVal > 32);
-  { if elevated executing of this setup succeeded, then... }
-  if Result then
-  begin
-    Log('Elevation succeeded');
-    { exit this non-elevated setup instance }
-    ExitProcess(0);
-  end
-    else
-  begin
-    Log(Format('Elevation failed [%s]', [SysErrorMessage(RetVal)]));
-  end;
-end;
-
-procedure InitializeWizard;
-var
-  S: string;
-  Upgrade: Boolean;
-begin
-  Upgrade :=
-    RegQueryStringValue(HKLM, '{#InnoSetupReg}', '{#InnoSetupAppPathReg}', S) or
-    RegQueryStringValue(HKCU, '{#InnoSetupReg}', '{#InnoSetupAppPathReg}', S);
-
-  { elevate }
-
-  if not IsWinVista then
-  begin
-    Log(Format('This version of Windows [%x] does not support elevation', [
-      GetWindowsVersion]));
-  end
-    else
-  if IsElevated then
-  begin
-    Log('Running elevated');
-  end
-    else
-  begin
-    Log('Running non-elevated');
-    if Upgrade then
-    begin
-      if not HaveWriteAccessToApp then
-      begin
-        Elevate;
-      end;
-    end
-      else
-    begin
-      if not Elevate then
-      begin
-        WizardForm.DirEdit.Text := ExpandConstant('{localappdata}\{#AppName}');
-        Log(Format('Falling back to local application user folder [%s]', [
-          WizardForm.DirEdit.Text]));
-      end;
-    end;
-  end;
-end;
-
-
 [Languages]
 Name: english; MessagesFile: compiler:Default.isl
 Name: brazilian; MessagesFile: compiler:Languages\BrazilianPortuguese.isl


Commit: 37ce69354496ff47e56ac2c14cfe77458eefc050
    https://github.com/scummvm/scummvm/commit/37ce69354496ff47e56ac2c14cfe77458eefc050
Author: Lothar Serra Mari (mail at serra.me)
Date: 2025-05-24T06:32:50+02:00

Commit Message:
DISTS: WIN32: Do not install DLLs that are now linked statically

Changed paths:
    dists/win32/ScummVM.iss


diff --git a/dists/win32/ScummVM.iss b/dists/win32/ScummVM.iss
index 151cdd474c4..a569b78a783 100644
--- a/dists/win32/ScummVM.iss
+++ b/dists/win32/ScummVM.iss
@@ -133,14 +133,8 @@ Source: *Manual*.pdf; DestDir: {app}; Flags: ignoreversion isreadme
 ; ScummVM executables and libraries
 ; for 32 bit aka. i686:
 Source: scummvm-i686.exe; DestDir: {app}; DestName: scummvm.exe; Flags: sign ignoreversion; Check: not Is64BitInstallMode
-Source: SDL2-i686.dll; DestDir: {app}; DestName: SDL2.dll; Flags: replacesameversion; Check: not Is64BitInstallMode
-Source: SDL2_net-i686.dll; DestDir: {app}; DestName: SDL2_net.dll; Flags: replacesameversion; Check: not Is64BitInstallMode
 Source: WinSparkle-i686.dll; DestDir: {app}; DestName: WinSparkle.dll; Flags: replacesameversion; Check: not Is64BitInstallMode
-Source: discord-rpc-i686.dll; DestDir: {app}; DestName: discord-rpc.dll; Flags: replacesameversion; Check: not Is64BitInstallMode
 
 ; for 64 bit aka. x86_64
 Source: scummvm-x86_64.exe; DestDir: {app}; DestName: scummvm.exe; Flags: sign ignoreversion; Check: Is64BitInstallMode
-Source: SDL2-x86_64.dll; DestDir: {app}; DestName: SDL2.dll; Flags: replacesameversion; Check: Is64BitInstallMode
-Source: SDL2_net-x86_64.dll; DestDir: {app}; DestName: SDL2_net.dll; Flags: replacesameversion; Check: Is64BitInstallMode
 Source: WinSparkle-x86_64.dll; DestDir: {app}; DestName: WinSparkle.dll; Flags: replacesameversion; Check: Is64BitInstallMode
-Source: discord-rpc-x86_64.dll; DestDir: {app}; DestName: discord-rpc.dll; Flags: replacesameversion; Check: Is64BitInstallMode