Changeset 11 for trunk/SunriseChatNetworkCoreUnit.pas

Timestamp:

Feb 11, 2008, 11:18:05 AM (17 years ago)

Author:

george

Message:

Opraveno: Načítání seznamu síťových adaptérů přes API funkce.
Opraveno: Uvolňění paměti AppUserEventsOptions.
Přidáno: Textová identifikace Windows Vista.

File:

• trunk/SunriseChatNetworkCoreUnit.pas (modified) (4 diffs)

trunk/SunriseChatNetworkCoreUnit.pas

@@ -7 +7 @@
   Forms, StdCtrls, ExtCtrls, SunriseChatCoreUtils, DateUtils, SunriseChatCoreUnit,
   cWindows, cSockets, cSocketsUDP, cTCPClient, cTCPServer, cUtils, WinSock,
-  cWinSock, Registry;
+  cWinSock, Registry, UEthernetAddress;
 
 const
@@ -192 +192 @@
 var
   I, II: Integer;
-  PnpInstanceID: string;
-  Buf: string;
+  Status: Cardinal;
+  AdaptersList : array of IP_ADAPTER_INFO;
+  BufSize: Cardinal;
   IPParts: TArrayOfString;
   SubnetParts: TArrayOfString;
   NewNetworkInterface: TNetworkInterface;
-  Status: Cardinal;
-  AdaptersList : array of IP_ADAPTER_INFO;
-  BufSize: Cardinal;
-begin
-  // Clear list
-  for I := 0 to NetworkInterfaces.Count-1 do
+
+function IpListToStr(pIpAddr : PIP_ADDR_STRING) : String;
+begin
+  Result := '';
+  repeat
+    Result := Result + ', ' + Pchar(Addr(pIpAddr^.IpAddress));
+    pIpAddr := pIpAddr.Next;
+  until pIpAddr = nil;
+  Delete(Result, 1, 2);
+  if Result = '' then Result := 'none';
+end;
+
+begin
+  for I := 0 to NetworkInterfaces.Count - 1 do
     TNetworkInterface(NetworkInterfaces[I]).Free;
   NetworkInterfaces.Clear;
+
   if Win32Platform > 1 then begin
+    // Windows NT/2000/XP/Vista
     BufSize := 0;
     Status := GetAdaptersInfo(@AdaptersList[0], BufSize);
@@ -213 +224 @@
       NewNetworkInterface := TNetworkInterface.Create(Self);
       with NewNetworkInterface do begin
-//      IPAddress := CurrentIpAddress^.IpAddress.s;
-//      SubNetMask := CurrentIpAddress^.IpMask.s;
         IPAddress := IpAddressList.IPAddress.S;
         SubNetMask := IpAddressList.IPMask.s;
         GUID := AdapterName;
-(*
-      II := MAX_ADAPTER_DESCRIPTION_LENGTH;
-      while Description[II] = #0 do Dec(II);
-      SetLength(Name, II);
-      Move(Description[0], Name[1], Length(Name));
-*)
         Name := Description;
         SubnetParts := Explode('.', SubNetMask);
@@ -233 +236 @@
       NetworkInterfaces.Add(NewNetworkInterface);
     end;
- end else begin
-    // For Windows 9x compatibility
+  end else begin
+    // Windows 95/98/Me
     for I := 0 to High(LocalIPAddressesStr) do begin
       NewNetworkInterface := TNetworkInterface.Create(Self);