Changeset 305 for Common

Timestamp:

Jan 3, 2012, 10:31:59 AM (13 years ago)

Author:

chronos

Message:

• Added: Property Finished of TListedThread.

Location:

Common

Files:

• Languages/UDebugLog.cs.po (added)
• Languages/UDebugLog.po (added)
• UCommon.pas (modified) (5 diffs)
• UDebugLog.pas (modified) (3 diffs)
• UThreading.pas (modified) (6 diffs)

Common/UCommon.pas

@@ -61 +61 @@
 procedure DeleteFiles(APath, AFileSpec: string);
 procedure OpenWebPage(URL: string);
+procedure OpenFileInShell(FileName: string);
+procedure ExecuteProgram(CommandLine: string);
 
 
@@ -285 +287 @@
   L := MAX_USERNAME_LENGTH + 2;
   SetLength(Result, L);
-  if Windows.GetUserName(PChar(Result), L) and (L > 0) then
-    SetLength(Result, StrLen(PChar(Result))) else
-    Result := '';
+  if Windows.GetUserName(PChar(Result), L) and (L > 0) then begin
+    SetLength(Result, StrLen(PChar(Result)));
+    Result := UTF8Encode(Result);
+  end else Result := '';
 end;
 
@@ -365 +368 @@
 end;
 
+procedure ExecuteProgram(CommandLine: string);
+var
+  Process: TProcess;
+begin
+  try
+    Process := TProcess.Create(nil);
+    Process.CommandLine := CommandLine;
+    Process.Options := [poNoConsole];
+    Process.Execute;
+  finally
+    Process.Free;
+  end;
+end;
+
 procedure OpenWebPage(URL: string);
 var
@@ -376 +393 @@
     //Process.Executable := Browser;
     //Process.Parameters.Add(Format(Params, [ApplicationInfo.HomePage]);
-    Process.Executable := 'cmd.exe';
-    Process.Parameters.Add('/c');
-    Process.Parameters.Add('start');
-    Process.Parameters.Add(URL);
+    Process.CommandLine := 'cmd.exe /c start ' + URL;
     Process.Options := [poNoConsole];
     Process.Execute;
@@ -387 +401 @@
 end;
 
+procedure OpenFileInShell(FileName: string);
+begin
+  ExecuteProgram('cmd.exe /c start ' + FileName);
+end;
 
 initialization

Common/UDebugLog.pas

@@ -45 +45 @@
 
 implementation
+
+resourcestring
+  SFileNameNotDefined = 'Filename not defined';
 
 procedure Register;
@@ -100 +103 @@
   LogFile: TFileStream;
 begin
+  if FileName = '' then raise Exception.Create(SFileNameNotDefined);
   try
     if ExtractFileDir(FileName) <> '' then
@@ -131 +135 @@
     TDebugLogItem(List[I]).Free;
   Items.Free;
-  inherited Destroy;
+  inherited;
 end;
 

Common/UThreading.pas

@@ -17 +17 @@
   TVirtualThread = class
   private
+    function GetFinished: Boolean; virtual; abstract;
     function GetFreeOnTerminate: Boolean; virtual; abstract;
     function GetPriority: TThreadPriority; virtual; abstract;
@@ -42 +43 @@
     property Priority: TThreadPriority read GetPriority write SetPriority;
     property Terminated: Boolean read GetTerminated write SetTerminated;
+    property Finished: Boolean read GetFinished;
     property ThreadId: Integer read GetThreadId;
   end;
@@ -61 +63 @@
   private
     FTerminated: Boolean;
+    FFinished: Boolean;
     FThread: TListedThreadExecute;
+    function GetFinished: Boolean; override;
     function GetFreeOnTerminate: Boolean; override;
     function GetPriority: TThreadPriority; override;
@@ -172 +176 @@
 end;
 
-
 { TThreadList }
 
@@ -196 +199 @@
 begin
   try
-    Parent.Execute;
-  except
-    on E: Exception do
-      if Assigned(OnException) then
-        OnException(Parent.FThread, E);
+    try
+      Parent.Execute;
+    except
+      on E: Exception do
+        if Assigned(OnException) then
+          OnException(Parent.FThread, E);
+    end;
+  finally
+    Parent.FFinished := True;
   end;
 end;
 
 { TListedThread }
+
+function TListedThread.GetFinished: Boolean;
+begin
+  Result := FFinished;
+end;
 
 function TListedThread.GetFreeOnTerminate: Boolean;
@@ -255 +267 @@
   const StackSize: SizeUInt);
 begin
+  FFinished := False;
+  FTerminated := False;
+
   FThread := TListedThreadExecute.Create(True, StackSize);
   FThread.Parent := Self;