Changeset 89 for trunk/Packages/Common/UCommon.pas

Timestamp:

Sep 6, 2012, 8:29:27 PM (12 years ago)

Author:

chronos

Message:

• Přidáno: Balíček ModularSystem namísto vlastní implementace.
• Upraveno: Aktualizace balíčku Common.

File:

• trunk/Packages/Common/UCommon.pas (modified) (8 diffs)

trunk/Packages/Common/UCommon.pas

@@ -7 +7 @@
 uses
   {$IFDEF Windows}Windows,{$ENDIF}
-  Classes, SysUtils, StrUtils, Dialogs, Process,
+  Classes, SysUtils, StrUtils, Dialogs, Process, LCLIntf,
   FileUtil; //, ShFolder, ShellAPI;
 
@@ -45 +45 @@
 function BCDToInt(Value: Byte): Byte;
 function CompareByteArray(Data1, Data2: TArrayOfByte): Boolean;
-{$IFDEF Windows}
 function GetUserName: string;
 function LoggedOnUserNameEx(Format: TUserNameFormat): string;
-{$ENDIF}
 function SplitString(var Text: string; Count: Word): string;
 function GetBit(Variable: QWord; Index: Byte): Boolean;
-procedure SetBit(var Variable: QWord; Index: Byte; State: Boolean);
-procedure SetBit(var Variable: Cardinal; Index: Byte; State: Boolean);
-procedure SetBit(var Variable: Word; Index: Byte; State: Boolean);
+procedure SetBit(var Variable: QWord; Index: Byte; State: Boolean); overload;
+procedure SetBit(var Variable: Cardinal; Index: Byte; State: Boolean); overload;
+procedure SetBit(var Variable: Word; Index: Byte; State: Boolean); overload;
 function AddLeadingZeroes(const aNumber, Length : integer) : string;
 function LastPos(const SubStr: String; const S: String): Integer;
@@ -61 +59 @@
 procedure DeleteFiles(APath, AFileSpec: string);
 procedure OpenWebPage(URL: string);
+procedure OpenFileInShell(FileName: string);
+procedure ExecuteProgram(CommandLine: string);
+procedure FreeThenNil(var Obj);
 
 
@@ -283 +284 @@
   L: LongWord;
 begin
+
   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;
 
@@ -314 +317 @@
   end else Result := GetUserName;
 end;
+{$ELSE}
+function GetUserName: string;
+begin
+  Result := '';
+end;
+
+function LoggedOnUserNameEx(Format: TUserNameFormat): string;
+begin
+  Result := '';
+end;
+
 {$ENDIF}
 
@@ -365 +379 @@
 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 FreeThenNil(var Obj);
+begin
+  TObject(Obj).Free;
+  TObject(Obj) := nil;
+end;
+
 procedure OpenWebPage(URL: string);
 var
@@ -370 +404 @@
   Browser, Params: string;
 begin
-  try
+  OpenURL(URL);
+  {try
     Process := TProcess.Create(nil);
     Browser := '';
@@ -381 +416 @@
   finally
     Process.Free;
-  end;
-end;
-
+  end;}
+end;
+
+procedure OpenFileInShell(FileName: string);
+begin
+  ExecuteProgram('cmd.exe /c start "' + FileName + '"');
+end;
 
 initialization