Changeset 245

Timestamp:

May 23, 2011, 10:59:04 AM (13 years ago)

Author:

george

Message:

• Added: Thread safe global thread list management.
• Added: DeleteFiles routine.
• Modified: GetUserNameEx use dynamic loaded library.

Location:

Common

Files:

• UCommon.pas (modified) (5 diffs)
• UThreading.pas (modified) (7 diffs)

Common/UCommon.pas

@@ -1 +1 @@
 unit UCommon;
 
+{$mode delphi}
+
 interface
 
 uses
-  Windows, Classes, SysUtils, SpecializedList, StrUtils, Dialogs; //, ShFolder, ShellAPI;
+  Windows, Classes, SysUtils, SpecializedList, StrUtils, Dialogs,
+  FileUtil; //, ShFolder, ShellAPI;
 
 type
@@ -25 +28 @@
 var
   ExceptionHandler: TExceptionEvent;
+  DLLHandle1: HModule;
+  GetUserNameEx: procedure (NameFormat: DWORD;
+    lpNameBuffer: LPSTR; nSize: PULONG); stdcall;
+
 
 function IntToBin(Data: Cardinal; Count: Byte): string;
@@ -45 +52 @@
 function GetFileFilterItemExt(Filter: string; Index: Integer): string;
 procedure FileDialogUpdateFilterFileType(FileDialog: TOpenDialog);
+procedure DeleteFiles(APath, AFileSpec: string);
 
 
 implementation
+
+procedure DeleteFiles(APath, AFileSpec: string);
+var
+  SearchRec: TSearchRec;
+  Find: Integer;
+  Path: string;
+begin
+  Path := IncludeTrailingPathDelimiter(APath);
+
+  Find := FindFirst(Path + AFileSpec, faAnyFile xor faDirectory, SearchRec);
+  while Find = 0 do begin
+    DeleteFile(Path + SearchRec.Name);
+
+    Find := SysUtils.FindNext(SearchRec);
+  end;
+  FindClose(SearchRec);
+end;
+
 
 function GetFileFilterItemExt(Filter: string; Index: Integer): string;
@@ -226 +252 @@
 end;
 
-procedure GetUserNameEx(NameFormat: DWORD;
-  lpNameBuffer: LPSTR; nSize: PULONG); stdcall;
-  external 'secur32.dll' Name 'GetUserNameExA';
-
+function GetVersionInfo: TOSVersionInfo;
+begin
+  Result.dwOSVersionInfoSize := SizeOf(Result);
+  if GetVersionEx(Result) then begin
+  end;
+end;
 
 function LoggedOnUserNameEx(Format: TUserNameFormat): string;
 var
   UserName: array[0..250] of Char;
+  VersionInfo: TOSVersionInfo;
   Size: DWORD;
 begin
-  Size := 250;
-  GetUserNameEx(Integer(Format), @UserName, @Size);
-  Result := UTF8Encode(UserName);
+  VersionInfo := GetVersionInfo;
+  if VersionInfo.dwPlatformId = VER_PLATFORM_WIN32_NT then begin
+    Size := 250;
+    GetUserNameEx(Integer(Format), @UserName, @Size);
+    Result := UTF8Encode(UserName);
+  end else Result := GetUserName;
 end;
 
@@ -272 +304 @@
 end;
 
+procedure LoadLibraries;
+begin
+  DLLHandle1 := LoadLibrary('secur32.dll');
+  if DLLHandle1 <> 0 then
+  begin
+    @GetUserNameEx := GetProcAddress(DLLHandle1, 'GetUserNameExA');
+  end;
+end;
+
+procedure FreeLibraries;
+begin
+  if DLLHandle1 <> 0 then FreeLibrary(DLLHandle1);
+end;
+
+
+initialization
+
+LoadLibraries;
+
+
+finalization
+
+FreeLibraries;
+
 end.

Common/UThreading.pas

@@ -6 +6 @@
 
 uses
-  Classes, SysUtils, Forms, Contnrs;
+  Classes, SysUtils, Forms, Contnrs, SyncObjs;
 
 type
-
+  TExceptionEvent = procedure (Sender: TObject; E: Exception) of object;
   TMethodCall = procedure of object;
-
-  { TTermThread }
-
-  TTermThread = class(TThread)
-    Finished: Boolean;
-    Method: TMethodCall;
-    procedure Execute; override;
-  end;
 
   { TListedThread }
@@ -28 +20 @@
     destructor Destroy; override;
     procedure Sleep(Delay: Integer);
+    property Terminated;
+  end;
+
+  { TTermThread }
+
+  TTermThread = class(TListedThread)
+  private
+  public
+    Finished: Boolean;
+    Method: TMethodCall;
+    procedure Execute; override;
   end;
 
 var
-  ThreadList: TObjectList; // TListedThread
+  ThreadList: TObjectList; // TList<TListedThread>
+  ThreadListLock: TCriticalSection;
+  OnException: TExceptionEvent;
 
 procedure RunInThread(Method: TMethodCall);
 procedure Synchronize(Method: TMethodCall);
+
+resourcestring
+  SCurrentThreadNotFound = 'Current thread ID %d not found in list.';
 
 
@@ -49 +57 @@
     Thread.Method := Method;
     while not Thread.Finished do begin
-      Application.ProcessMessages;
+      if MainThreadID = ThreadID then Application.ProcessMessages;
       Sleep(1);
     end;
@@ -70 +78 @@
       Thread := TListedThread(ThreadList[I]);
       TThread.Synchronize(Thread, Method);
-    end else raise Exception.Create(Format('Current thread ID %d not found in list.', [ThreadID]));
+    end else raise Exception.Create(Format(SCurrentThreadNotFound, [ThreadID]));
   end;
 end;
@@ -80 +88 @@
 begin
   inherited;
-  ThreadList.Add(Self);
+  try
+    ThreadListLock.Acquire;
+    ThreadList.Add(Self);
+  finally
+    ThreadListLock.Release;
+  end;
 end;
 
 destructor TListedThread.Destroy;
 begin
-  ThreadList.Delete(ThreadList.IndexOf(Self));
+  if not Suspended then
+  begin
+    Terminate;
+    WaitFor;
+  end;
+  try
+    ThreadListLock.Acquire;
+    ThreadList.Delete(ThreadList.IndexOf(Self));
+  finally
+    ThreadListLock.Release;
+  end;
   inherited Destroy;
 end;
@@ -106 +129 @@
 procedure TTermThread.Execute;
 begin
-  Method;
-  Finished := True;
+  try
+    Method;
+    Finished := True;
+  except
+    on E: Exception do
+      if Assigned(OnException) then
+        OnException(Self, E);
+  end;
 end;
 
 initialization
 
+ThreadListLock := TCriticalSection.Create;
 ThreadList := TObjectList.Create;
 ThreadList.OwnsObjects := False;
@@ -118 +148 @@
 
 ThreadList.Free;
+ThreadListLock.Free;
 
 end.