Changeset 404 for UpdateChecker

Timestamp:

Aug 13, 2012, 10:03:31 AM (12 years ago)

Author:

chronos

Message:

• Modified: Linux support for PinConnection SerialPort, Common OpenURL, UpdateChecker.
• Modified: ModularSystem show module name if required dependency not found.

File:

• UpdateChecker/UUpdateChecker.pas (modified) (8 diffs)

UpdateChecker/UUpdateChecker.pas

@@ -6 +6 @@
 
 uses
-  Windows, ShellApi, Forms, Classes, SysUtils, httpsend, DOM, XMLWrite, XMLRead, UXMLUtils,
+  {$IFDEF Windows}Windows, ShellApi, {$ENDIF}Forms, Classes, SysUtils, httpsend, DOM, XMLWrite, XMLRead, UXMLUtils,
   FileUtil, Dialogs, Process, Blcksock, UFormDownloadProgress;
 
@@ -29 +29 @@
     function DownloadHTTP(URL, TargetFile: string): Boolean;
     function InstallerFileName: string;
-    function IsWindowsAdmin: Boolean;
+    function IsSystemAdmin: Boolean;
     procedure SockStatus(Sender: TObject; Reason: THookSocketReason;
     const Value: String);
@@ -58 +58 @@
 implementation
 
+{$IFDEF Windows}
 const
   SECURITY_NT_AUTHORITY: TSIDIdentifierAuthority = (Value: (0, 0, 0, 0, 0, 5)) ;
@@ -64 +65 @@
   SECURITY_BUILTIN_DOMAIN_RID = $00000020;
   DOMAIN_ALIAS_RID_ADMINS = $00000220;
+{$ENDIF}
 
 procedure Register;
@@ -145 +147 @@
 begin
   if FileExistsUTF8(InstallerFileName) then begin
-    if not IsWindowsAdmin then
-      ShellExecute(0, PChar('runas'), PChar(InstallerFileName),
-        0, 0, SW_SHOWNORMAL)
+    if not IsSystemAdmin then
+      try
+        Process := TProcess.Create(nil);
+        Process.CommandLine := 'runas ' + InstallerFileName;
+        Process.Options := Process.Options + [];
+        Process.Execute;
+      finally
+        Process.Free;
+      end
+      //ShellExecute(0, PChar('runas'), PChar(InstallerFileName),
+      //  0, 0, SW_SHOWNORMAL)
     else
     try
@@ -232 +242 @@
 end;
 
-function TUpdateChecker.IsWindowsAdmin: Boolean;
+{$IFDEF Windows}
+function TUpdateChecker.IsSystemAdmin: Boolean;
 var
   hAccessToken: THandle;
@@ -242 +253 @@
 begin
   Result := False;
-
   bSuccess := OpenThreadToken(GetCurrentThread, TOKEN_QUERY, True, hAccessToken) ;
   if not bSuccess then
@@ -276 +286 @@
   end;
 end;
+{$ELSE}
+function TUpdateChecker.IsSystemAdmin: Boolean;
+begin
+  Result := False;
+end;
+
+{$ENDIF}
 
 procedure TUpdateChecker.SockStatus(Sender: TObject; Reason: THookSocketReason;