Author: sginsberg Date: Sat Oct 25 12:15:23 2008 New Revision: 36953
URL: http://svn.reactos.org/svn/reactos?rev=36953&view=rev Log: - Fix AFD compilation for 64-bit (treat handles as ULONG_PTR-sized) - Also correct Winsock's SOCKET definition
Modified: branches/ros-amd64-bringup/reactos/drivers/network/afd/include/afd.h branches/ros-amd64-bringup/reactos/include/psdk/winsock2.h branches/ros-amd64-bringup/reactos/include/reactos/drivers/afd/shared.h
Modified: branches/ros-amd64-bringup/reactos/drivers/network/afd/include/afd.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/driver... ============================================================================== --- branches/ros-amd64-bringup/reactos/drivers/network/afd/include/afd.h [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/drivers/network/afd/include/afd.h [iso-8859-1] Sat Oct 25 12:15:23 2008 @@ -112,7 +112,7 @@ * We do this in order to get some storage for the locked handle table * Maybe I'll use some tail item in the irp instead */ #define AFD_HANDLES(x) ((PAFD_HANDLE)(x)->Exclusive) -#define SET_AFD_HANDLES(x,y) (((x)->Exclusive) = (ULONG)(y)) +#define SET_AFD_HANDLES(x,y) (((x)->Exclusive) = (ULONG_PTR)(y))
typedef struct _AFD_MAPBUF { PVOID BufferAddress;
Modified: branches/ros-amd64-bringup/reactos/include/psdk/winsock2.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/includ... ============================================================================== --- branches/ros-amd64-bringup/reactos/include/psdk/winsock2.h [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/include/psdk/winsock2.h [iso-8859-1] Sat Oct 25 12:15:23 2008 @@ -33,7 +33,7 @@ typedef unsigned long u_long; #define _BSDTYPES_DEFINED #endif /* ! def _BSDTYPES_DEFINED */ -typedef u_int SOCKET; +typedef UINT_PTR SOCKET; #ifndef FD_SETSIZE #define FD_SETSIZE 64 #endif
Modified: branches/ros-amd64-bringup/reactos/include/reactos/drivers/afd/shared.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/includ... ============================================================================== --- branches/ros-amd64-bringup/reactos/include/reactos/drivers/afd/shared.h [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/include/reactos/drivers/afd/shared.h [iso-8859-1] Sat Oct 25 12:15:23 2008 @@ -46,7 +46,7 @@ } AFD_LISTEN_DATA, *PAFD_LISTEN_DATA;
typedef struct _AFD_HANDLE_ { - SOCKET Handle; + HANDLE Handle; ULONG Events; NTSTATUS Status; } AFD_HANDLE, *PAFD_HANDLE; @@ -54,7 +54,7 @@ typedef struct _AFD_POLL_INFO { LARGE_INTEGER Timeout; ULONG HandleCount; - ULONG Exclusive; + ULONG_PTR Exclusive; AFD_HANDLE Handles[1]; } AFD_POLL_INFO, *PAFD_POLL_INFO;