Browse Source

Add separate ufAdminInstallMode.

Martijn Laan 6 năm trước cách đây
mục cha
commit
3e2eb246ff

+ 3 - 1
Projects/Install.pas

@@ -3030,9 +3030,11 @@ begin
       UninstLog.InstallMode64Bit := Is64BitInstallMode;
       UninstLog.InstallMode64Bit := Is64BitInstallMode;
       UninstLog.AppName := ExpandedAppName;
       UninstLog.AppName := ExpandedAppName;
       UninstLog.AppId := ExpandedAppId;
       UninstLog.AppId := ExpandedAppId;
+      if IsAdminInstallMode then
+        Include(UninstLog.Flags, ufAdminInstallMode);
       if IsWin64 then
       if IsWin64 then
         Include(UninstLog.Flags, ufWin64);
         Include(UninstLog.Flags, ufWin64);
-      if IsAdmin then { Setup or [Code] might have done administrative actions, so using IsAdmin here and not IsAdminInstallMode }
+      if IsAdmin then { Setup or [Code] might have done administrative actions, even if IsAdminInstallMode is False }
         Include(UninstLog.Flags, ufAdminInstalled)
         Include(UninstLog.Flags, ufAdminInstalled)
       else if IsPowerUserOrAdmin then
       else if IsPowerUserOrAdmin then
         { Note: This flag is only set in 5.1.9 and later }
         { Note: This flag is only set in 5.1.9 and later }

+ 1 - 1
Projects/Undo.pas

@@ -107,7 +107,7 @@ type
 
 
   TUninstallLogFlags = set of (ufAdminInstalled, ufDontCheckRecCRCs,
   TUninstallLogFlags = set of (ufAdminInstalled, ufDontCheckRecCRCs,
     ufModernStyle, ufAlwaysRestart, ufChangesEnvironment, ufWin64,
     ufModernStyle, ufAlwaysRestart, ufChangesEnvironment, ufWin64,
-    ufPowerUserInstalled);
+    ufPowerUserInstalled, ufAdminInstallMode);
 
 
   TUninstallLog = class
   TUninstallLog = class
   private
   private

+ 1 - 1
Projects/Uninstall.pas

@@ -559,7 +559,7 @@ begin
     ConstLeadBytes := @UninstLeadBytes;
     ConstLeadBytes := @UninstLeadBytes;
 {$ENDIF}
 {$ENDIF}
 
 
-    InitializeAdminInstallMode(ufAdminInstalled in UninstLog.Flags);
+    InitializeAdminInstallMode(ufAdminInstallMode in UninstLog.Flags);
 
 
     { Initialize install mode }
     { Initialize install mode }
     if UninstLog.InstallMode64Bit then begin
     if UninstLog.InstallMode64Bit then begin