Kaynağa Gözat

* fixed accept, connect, recvfrom and sentto in windows sockets to use the right arguments for winsock2 calls

git-svn-id: trunk@3895 -
Almindor 19 yıl önce
ebeveyn
işleme
0dba7730b4
1 değiştirilmiş dosya ile 4 ekleme ve 4 silme
  1. 4 4
      rtl/win/sockets.pp

+ 4 - 4
rtl/win/sockets.pp

@@ -71,7 +71,7 @@ end;
 function fpsendto (s:cint; msg:pointer; len:size_t; flags:cint; tox :psockaddr; tolen: tsocklen):ssize_t;
 function fpsendto (s:cint; msg:pointer; len:size_t; flags:cint; tox :psockaddr; tolen: tsocklen):ssize_t;
 begin
 begin
   // Dubious construct, this should be checked. (IPV6 fails ?)
   // Dubious construct, this should be checked. (IPV6 fails ?)
-  fpSendTo:=WinSock2.SendTo(S,msg,Len,Flags,Winsock2.TSockAddr(tox^),toLen);
+  fpSendTo:=WinSock2.SendTo(S,msg,Len,Flags,Winsock2.PSockAddr(tox),toLen);
   if fpSendTo<0 then
   if fpSendTo<0 then
     SocketError:=WSAGetLastError
     SocketError:=WSAGetLastError
   else
   else
@@ -90,7 +90,7 @@ end;
 function fprecvfrom    (s:cint; buf: pointer; len: size_t; flags: cint; from : psockaddr; fromlen : psocklen):ssize_t;
 function fprecvfrom    (s:cint; buf: pointer; len: size_t; flags: cint; from : psockaddr; fromlen : psocklen):ssize_t;
 
 
 begin
 begin
-  fpRecvFrom:=WinSock2.RecvFrom(S,Buf,Len,Flags,Winsock2.TSockAddr(from^),FromLen^);
+  fpRecvFrom:=WinSock2.RecvFrom(S,Buf,Len,Flags,WinSock2.PSockAddr(From),FromLen);
   if fpRecvFrom<0 then
   if fpRecvFrom<0 then
     SocketError:=WSAGetLastError
     SocketError:=WSAGetLastError
   else
   else
@@ -100,7 +100,7 @@ end;
 function fpconnect     (s:cint; name  : psockaddr; namelen : tsocklen):cint;
 function fpconnect     (s:cint; name  : psockaddr; namelen : tsocklen):cint;
 
 
 begin
 begin
-  fpConnect:=Winsock2.Connect(S,Winsock2.TSockAddr(name^),nameLen);
+  fpConnect:=Winsock2.Connect(S,WinSock2.PSockAddr(name),nameLen);
   if fpConnect<0 then
   if fpConnect<0 then
     SocketError:=WSAGetLastError
     SocketError:=WSAGetLastError
   else
   else
@@ -165,7 +165,7 @@ end;
 
 
 function fpaccept      (s:cint; addrx : psockaddr; addrlen : psocklen):cint;
 function fpaccept      (s:cint; addrx : psockaddr; addrlen : psocklen):cint;
 begin
 begin
-  fpAccept:=Winsock2.Accept(S,Winsock2.PSockAddr(Addrx),plongint(@AddrLen));
+  fpAccept:=Winsock2.Accept(S,Winsock2.PSockAddr(Addrx), AddrLen);
   if fpAccept<0 then
   if fpAccept<0 then
     SocketError:=WSAGetLastError
     SocketError:=WSAGetLastError
   else
   else