Changeset 113 for tags/1.3.0/Packages/Common/UCommon.pas

Timestamp:

Feb 15, 2022, 10:11:54 AM (2 years ago)

Author:

chronos

Message:

• Modified: Version 1.3.0 release releated changes.

Merged revision(s) 112 from trunk:

• Fixed: Contact photo was not saved correctly.
• Fixed: URL contact photo was incorrectly encoded with BASE64 encoding.
• Fixed: Disabled not correctly working autodetection of max. line length.
• Fixed: Tab order in Contact name details window.

Location:

tags/1.3.0

Files:

• . (modified) (1 prop)
• Packages/Common/UCommon.pas (modified) (7 diffs)

tags/1.3.0/Packages/Common/UCommon.pas

@@ -310 +310 @@
 end;
 
-{$IFDEF Windows}
+{$IFDEF WINDOWS}
 function GetUserName: string;
 const
@@ -318 +318 @@
 begin
   L := MAX_USERNAME_LENGTH + 2;
+  Result := Default(string);
   SetLength(Result, L);
   if Windows.GetUserName(PChar(Result), L) and (L > 0) then begin
@@ -331 +332 @@
   end;
 end;
-{$endif}
+{$ENDIF}
 
 function ComputerName: string;
-{$ifdef mswindows}
+{$IFDEF WINDOWS}
 const
  INFO_BUFFER_SIZE = 32767;
@@ -349 +350 @@
   end;
 end;
-{$endif}
-{$ifdef unix}
+{$ENDIF}
+{$IFDEF UNIX}
 var
   Name: UtsName;
@@ -358 +359 @@
   Result := Name.Nodename;
 end;
-{$endif}
-
-{$ifdef windows}
+{$ENDIF}
+
+{$IFDEF WINDOWS}
 function LoggedOnUserNameEx(Format: TUserNameFormat): string;
 const
@@ -438 +439 @@
 procedure LoadLibraries;
 begin
-  {$IFDEF Windows}
+  {$IFDEF WINDOWS}
   DLLHandle1 := LoadLibrary('secur32.dll');
   if DLLHandle1 <> 0 then
@@ -449 +450 @@
 procedure FreeLibraries;
 begin
-  {$IFDEF Windows}
+  {$IFDEF WINDOWS}
   if DLLHandle1 <> 0 then FreeLibrary(DLLHandle1);
   {$ENDIF}