瀏覽代碼

Fix typo & missing newline + cleanup.

Martijn Laan 7 年之前
父節點
當前提交
fc05f1ae41
共有 3 個文件被更改,包括 4 次插入4 次删除
  1. 1 1
      Examples/Example3.iss
  2. 2 2
      Projects/CompWizard.pas
  3. 1 1
      Projects/Uninstall.pas

+ 1 - 1
Examples/Example3.iss

@@ -40,7 +40,7 @@ Root: HKA; Subkey: "Software\My Company\My Program"; Flags: uninsdeletekey
 Root: HKA; Subkey: "Software\My Company\My Program\Settings"; ValueType: string; ValueName: "Language"; ValueData: "{language}"
 ; Associate .myp files with My Program (requires ChangesAssociations=yes)
 Root: HKA; Subkey: "Software\Classes\.myp"; ValueType: string; ValueName: ""; ValueData: "MyProgramFile.myp"; Flags: uninsdeletevalue
-Root: HKA; Subkey: "Software\Classes\.myp\OpenWithProgids"; ValueType: string; ValueName: "MyProgamFile.myp"; ValueData: ""; Flags: uninsdeletevalue
+Root: HKA; Subkey: "Software\Classes\.myp\OpenWithProgids"; ValueType: string; ValueName: "MyProgramFile.myp"; ValueData: ""; Flags: uninsdeletevalue
 Root: HKA; Subkey: "Software\Classes\MyProgramFile.myp"; ValueType: string; ValueName: ""; ValueData: "My Program File"; Flags: uninsdeletekey
 Root: HKA; Subkey: "Software\Classes\MyProgramFile.myp\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\MyProg.exe,0"
 Root: HKA; Subkey: "Software\Classes\MyProgramFile.myp\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\MyProg.exe"" ""%1"""

+ 2 - 2
Projects/CompWizard.pas

@@ -976,8 +976,8 @@ begin
         Icons := Icons + 'Name: "{autodesktop}\' + AppNameEdit.Text + '"; Filename: "{app}\' + AppExeName + '"; Tasks: desktopicon' + SNewLine;
       end;
       if QuickLaunchIconCheck.Enabled and QuickLaunchIconCheck.Checked then begin
-        Setup := Setup + '; The [Icons] "quicklaunchicon" entry uses {userappdata} but its [Tasks] entry has a proper IsAdminInstallMode Check' + SNewLine + 
-                         'UsedUserAreasWarning=no';  
+        Setup := Setup + '; The [Icons] "quicklaunchicon" entry uses {userappdata} but its [Tasks] entry has a proper IsAdminInstallMode Check' + SNewLine +
+                         'UsedUserAreasWarning=no' + SNewLine;
         Tasks := Tasks + 'Name: "quicklaunchicon"; Description: "{cm:CreateQuickLaunchIcon}"; GroupDescription: "{cm:AdditionalIcons}"; Flags: unchecked; OnlyBelowVersion: 0,6.1; Check: not IsAdminInstallMode' + SNewLine;
         Icons := Icons + 'Name: "{userappdata}\Microsoft\Internet Explorer\Quick Launch\' + AppNameEdit.Text + '"; Filename: "{app}\' + AppExeName + '"; Tasks: quicklaunchicon' + SNewLine;
       end;

+ 1 - 1
Projects/Uninstall.pas

@@ -531,7 +531,7 @@ begin
     end;
 
     { Check if admin privileges are needed to uninstall }
-    if (ufAdminInstalled in UninstLog.Flags) and not IsAdminLoggedOn then begin
+    if (ufAdminInstalled in UninstLog.Flags) and not IsAdmin then begin
       LoggedAppMessageBox(PChar(SetupMessages[msgOnlyAdminCanUninstall]), PChar(Title),
         MB_OK or MB_ICONEXCLAMATION, True, IDOK);
       Abort;