Changeset 404

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.

Files:

• Common/UCommon.pas (modified) (3 diffs)
• Common/URegistry.pas (modified) (2 diffs)
• ModularSystem/UModularSystem.pas (modified) (5 diffs)
• PinConnection/USerialPort.pas (modified) (3 diffs)
• UpdateChecker/UUpdateChecker.pas (modified) (8 diffs)

Common/UCommon.pas

@@ -7 +7 @@
 uses
   {$IFDEF Windows}Windows,{$ENDIF}
-  Classes, SysUtils, StrUtils, Dialogs, Process,
+  Classes, SysUtils, StrUtils, Dialogs, Process, LCLIntf,
   FileUtil; //, ShFolder, ShellAPI;
 
@@ -404 +404 @@
   Browser, Params: string;
 begin
-  try
+  OpenURL(URL);
+  {try
     Process := TProcess.Create(nil);
     Browser := '';
@@ -415 +416 @@
   finally
     Process.Free;
-  end;
+  end;}
 end;
 

Common/URegistry.pas

@@ -34 +34 @@
       DefaultValue: Double): Double;
     function DeleteKeyRecursive(const Key: string): Boolean;
+    function OpenKey(const Key: string; CanCreate: Boolean): Boolean;
   end;
 
@@ -97 +98 @@
 end;
 
+function TRegistryEx.OpenKey(const Key: string; CanCreate: Boolean): Boolean;
+begin
+  {$IFDEF Linux}
+  CloseKey;
+  {$ENDIF}
+  Result := inherited OpenKey(Key, CanCreate);
+end;
+
 function TRegistryEx.ReadBoolWithDefault(const Name: string;
   DefaultValue: Boolean): Boolean;

ModularSystem/UModularSystem.pas

@@ -59 +59 @@
     Modules: TObjectList; // TObjectList<TModule>
     function FindModuleByName(Name: string): TModule;
-    procedure InstallDependencies(Dependencies: TStringList);
+    procedure InstallDependencies(ModuleName: string; Dependencies: TStringList);
     procedure UninstallDependencies(ModuleName: string);
     procedure EnumModulesInstall(Dependencies, ModuleList: TStringList);
@@ -78 +78 @@
 
 resourcestring
-  SModuleNotFound = 'Module %s not found';
+  SModuleNotFound = 'Module "%1:s" not found as dependency for module "%0:s"';
 
 procedure Register;
@@ -107 +107 @@
 end;
 
-procedure TModuleManager.InstallDependencies(Dependencies: TStringList);
+procedure TModuleManager.InstallDependencies(ModuleName: string; Dependencies: TStringList);
 var
   Module: TModule;
@@ -116 +116 @@
     if Assigned(Module) then begin
       if not Module.Installed then Module.Install;
-    end else raise Exception.CreateFmt(SModuleNotFound, [Dependencies[I]]);
+    end else raise Exception.CreateFmt(SModuleNotFound, [ModuleName, Dependencies[I]]);
   end;
 end;
@@ -218 +218 @@
 begin
   if Installed then Exit;
-  Manager.InstallDependencies(Dependencies);
+  Manager.InstallDependencies(Identification, Dependencies);
   FInstalled := True;
 end;

PinConnection/USerialPort.pas

@@ -7 +7 @@
 uses
   Classes, SysUtils, SynaSer, StdCtrls, Dialogs, UCommon, UThreading,
-  DateUtils;
+  DateUtils, FileUtil;
 
 type
@@ -74 +74 @@
     property BaudRateNumeric: Integer read GetBaudRateNumeric write SetBaudRateNumeric;
     property OnReceiveData: TReceiveDataEvent read FOnReceiveData write FOnReceiveData;
+    procedure LoadAvailableToStrings(Strings: TStrings; Check: Boolean = False);
     constructor Create;
     destructor Destroy; override;
@@ -169 +170 @@
   FreeAndNil(FReceiveThread);
   CloseSocket;
+end;
+
+procedure TSerialPort.LoadAvailableToStrings(Strings: TStrings; Check: Boolean = False);
+var
+  I: Integer;
+  TestPort: TSerialPort;
+  Files: TStringList;
+begin
+  Strings.Clear;
+  {$IFDEF Windows}
+  if Check then
+  try
+    TestPort := TSerialPort.Create;
+    for I := 0 to Strings.Count - 1 do
+    with TestPort do begin
+      Name := Strings[I];
+      Active := True;
+      if Active then begin
+        Strings.AddObject(Name, TObject(I));
+      end;
+      Active := False;
+    end;
+  finally
+    TestPort.Free;
+  end else begin
+    for I := 1 to 255 do
+      Strings.AddObject('COM' + IntToStr(I), nil);
+  end;
+  {$ENDIF}
+  {$IFDEF Linux}
+  if Check then begin
+    Files := FindAllFiles('/dev', 'tty*', False);
+    Strings.Assign(Files);
+    Files.Free;
+  end else begin
+    for I := 1 to 63 do
+      Strings.AddObject('/dev/ttyS' + IntToStr(I), nil);
+  end;
+  {$ENDIF}
 end;
 

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;