Ros-diffs March 2010

ros-diffs@reactos.org

19 participants
896 discussions

[akhaldi] 46590: [PSDK] - ws2bth.h and ws2def.h : Introduce pragma once and add several missing definitions. [DDK] - Improve csq.h
by akhaldi＠svn.reactos.org 30 Mar '10

30 Mar '10

Author: akhaldi Date: Tue Mar 30 11:52:11 2010 New Revision: 46590 URL: http://svn.reactos.org/svn/reactos?rev=46590&view=rev Log: [PSDK] - ws2bth.h and ws2def.h : Introduce pragma once and add several missing definitions. [DDK] - Improve csq.h Added: branches/header-work/include/psdk/ws2bth.h (with props) Modified: branches/header-work/include/ddk/csq.h branches/header-work/include/psdk/ws2def.h Modified: branches/header-work/include/ddk/csq.h URL: http://svn.reactos.org/svn/reactos/branches/header-work/include/ddk/csq.h?r… ============================================================================== --- branches/header-work/include/ddk/csq.h [iso-8859-1] (original) +++ branches/header-work/include/ddk/csq.h [iso-8859-1] Tue Mar 30 11:52:11 2010 @@ -52,8 +52,13 @@ * source if you're curious about the inner workings of these routines. */ -#ifndef _REACTOS_CSQ_H +#pragma once + #define _REACTOS_CSQ_H + +#ifdef __cplusplus +extern "C" { +#endif /* * Prevent including the CSQ definitions twice. They're present in NTDDK @@ -61,8 +66,26 @@ */ #ifndef IO_TYPE_CSQ_IRP_CONTEXT -struct _IO_CSQ; - +typedef struct _IO_CSQ IO_CSQ, *PIO_CSQ; + +/* + * STRUCTURES + * + * NOTE: Please do not use these directly. You will make incompatible code + * if you do. Always only use the documented IoCsqXxx() interfaces and you + * will amass much Good Karma. + */ +#define IO_TYPE_CSQ_IRP_CONTEXT 1 +#define IO_TYPE_CSQ 2 + +/* + * IO_CSQ_IRP_CONTEXT - Context used to track an IRP in the CSQ + */ +typedef struct _IO_CSQ_IRP_CONTEXT { + ULONG Type; + PIRP Irp; + PIO_CSQ Csq; +} IO_CSQ_IRP_CONTEXT, *PIO_CSQ_IRP_CONTEXT; /* * CSQ Callbacks @@ -80,54 +103,62 @@ * * Sample implementation: * - VOID NTAPI CsqInsertIrp(PIO_CSQ Csq, PIRP Irp) - { - KdPrint(("Inserting IRP 0x%x into CSQ\n", Irp)); - InsertTailList(&IrpQueue, &Irp->Tail.Overlay.ListEntry); - } - * - */ -typedef VOID (NTAPI *PIO_CSQ_INSERT_IRP) (struct _IO_CSQ *Csq, - PIRP Irp); - + VOID NTAPI CsqInsertIrp(PIO_CSQ Csq, PIRP Irp) + { + KdPrint(("Inserting IRP 0x%x into CSQ\n", Irp)); + InsertTailList(&IrpQueue, &Irp->Tail.Overlay.ListEntry); + } + * + */ +typedef VOID +(NTAPI IO_CSQ_INSERT_IRP)( + IN struct _IO_CSQ *Csq, + IN PIRP Irp); +typedef IO_CSQ_INSERT_IRP *PIO_CSQ_INSERT_IRP; /* * Function to remove an IRP from the queue. * * Sample: * - VOID NTAPI CsqRemoveIrp(PIO_CSQ Csq, PIRP Irp) - { - KdPrint(("Removing IRP 0x%x from CSQ\n", Irp)); - RemoveEntryList(&Irp->Tail.Overlay.ListEntry); - } - * - */ -typedef VOID (NTAPI *PIO_CSQ_REMOVE_IRP) (struct _IO_CSQ *Csq, - PIRP Irp); + VOID NTAPI CsqRemoveIrp(PIO_CSQ Csq, PIRP Irp) + { + KdPrint(("Removing IRP 0x%x from CSQ\n", Irp)); + RemoveEntryList(&Irp->Tail.Overlay.ListEntry); + } + * + */ +typedef VOID +(NTAPI IO_CSQ_REMOVE_IRP)( + IN struct _IO_CSQ *Csq, + IN PIRP Irp); +typedef IO_CSQ_REMOVE_IRP *PIO_CSQ_REMOVE_IRP; /* * Function to look for an IRP in the queue * * Sample: * - PIRP NTAPI CsqPeekNextIrp(PIO_CSQ Csq, PIRP Irp, PVOID PeekContext) - { - KdPrint(("Peeking for next IRP\n")); - - if(Irp) - return CONTAINING_RECORD(&Irp->Tail.Overlay.ListEntry.Flink, IRP, Tail.Overlay.ListEntry); - - if(IsListEmpty(&IrpQueue)) - return NULL; - - return CONTAINING_RECORD(IrpQueue.Flink, IRP, Tail.Overlay.ListEntry); - } - * - */ -typedef PIRP (NTAPI *PIO_CSQ_PEEK_NEXT_IRP) (struct _IO_CSQ *Csq, - PIRP Irp, - PVOID PeekContext); + PIRP NTAPI CsqPeekNextIrp(PIO_CSQ Csq, PIRP Irp, PVOID PeekContext) + { + KdPrint(("Peeking for next IRP\n")); + + if(Irp) + return CONTAINING_RECORD(&Irp->Tail.Overlay.ListEntry.Flink, IRP, Tail.Overlay.ListEntry); + + if(IsListEmpty(&IrpQueue)) + return NULL; + + return CONTAINING_RECORD(IrpQueue.Flink, IRP, Tail.Overlay.ListEntry); + } + * + */ +typedef PIRP +(NTAPI IO_CSQ_PEEK_NEXT_IRP)( + IN struct _IO_CSQ *Csq, + IN PIRP Irp, + IN PVOID PeekContext); +typedef IO_CSQ_PEEK_NEXT_IRP *PIO_CSQ_PEEK_NEXT_IRP; /* * Lock the queue. This can be a spinlock, a mutex, or whatever @@ -135,28 +166,34 @@ * * Sample: * - VOID NTAPI CsqAcquireLock(PIO_CSQ Csq, PKIRQL Irql) - { - KdPrint(("Acquiring spin lock\n")); - KeAcquireSpinLock(&IrpQueueLock, Irql); - } - * - */ -typedef VOID (NTAPI *PIO_CSQ_ACQUIRE_LOCK) (struct _IO_CSQ *Csq, - PKIRQL Irql); + VOID NTAPI CsqAcquireLock(PIO_CSQ Csq, PKIRQL Irql) + { + KdPrint(("Acquiring spin lock\n")); + KeAcquireSpinLock(&IrpQueueLock, Irql); + } + * + */ +typedef VOID +(NTAPI IO_CSQ_ACQUIRE_LOCK)( + IN struct _IO_CSQ *Csq, + OUT PKIRQL Irql); +typedef IO_CSQ_ACQUIRE_LOCK *PIO_CSQ_ACQUIRE_LOCK; /* * Unlock the queue: * - VOID NTAPI CsqReleaseLock(PIO_CSQ Csq, KIRQL Irql) - { - KdPrint(("Releasing spin lock\n")); - KeReleaseSpinLock(&IrpQueueLock, Irql); - } - * - */ -typedef VOID (NTAPI *PIO_CSQ_RELEASE_LOCK) (struct _IO_CSQ *Csq, - KIRQL Irql); + VOID NTAPI CsqReleaseLock(PIO_CSQ Csq, KIRQL Irql) + { + KdPrint(("Releasing spin lock\n")); + KeReleaseSpinLock(&IrpQueueLock, Irql); + } + * + */ +typedef VOID +(NTAPI IO_CSQ_RELEASE_LOCK)( + IN struct _IO_CSQ *Csq, + IN KIRQL Irql); +typedef IO_CSQ_RELEASE_LOCK *PIO_CSQ_RELEASE_LOCK; /* * Finally, this is called by the queue library when it wants to complete @@ -164,53 +201,38 @@ * * Sample: * - VOID NTAPI CsqCompleteCancelledIrp(PIO_CSQ Csq, PIRP Irp) - { - KdPrint(("cancelling irp 0x%x\n", Irp)); - Irp->IoStatus.Status = STATUS_CANCELLED; - Irp->IoStatus.Information = 0; - IoCompleteRequest(Irp, IO_NO_INCREMENT); - } - * - */ -typedef VOID (NTAPI *PIO_CSQ_COMPLETE_CANCELED_IRP) (struct _IO_CSQ *Csq, - PIRP Irp); - - -/* - * STRUCTURES - * - * NOTE: Please do not use these directly. You will make incompatible code - * if you do. Always only use the documented IoCsqXxx() interfaces and you - * will amass much Good Karma. - */ -#define IO_TYPE_CSQ_IRP_CONTEXT 1 -#define IO_TYPE_CSQ 2 + VOID NTAPI CsqCompleteCancelledIrp(PIO_CSQ Csq, PIRP Irp) + { + KdPrint(("cancelling irp 0x%x\n", Irp)); + Irp->IoStatus.Status = STATUS_CANCELLED; + Irp->IoStatus.Information = 0; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + } + * + */ +typedef VOID +(NTAPI IO_CSQ_COMPLETE_CANCELED_IRP)( + IN struct _IO_CSQ *Csq, + IN PIRP Irp); +typedef IO_CSQ_COMPLETE_CANCELED_IRP *PIO_CSQ_COMPLETE_CANCELED_IRP; /* * IO_CSQ - Queue control structure */ typedef struct _IO_CSQ { - ULONG Type; - PIO_CSQ_INSERT_IRP CsqInsertIrp; - PIO_CSQ_REMOVE_IRP CsqRemoveIrp; - PIO_CSQ_PEEK_NEXT_IRP CsqPeekNextIrp; - PIO_CSQ_ACQUIRE_LOCK CsqAcquireLock; - PIO_CSQ_RELEASE_LOCK CsqReleaseLock; - PIO_CSQ_COMPLETE_CANCELED_IRP CsqCompleteCanceledIrp; - PVOID ReservePointer; /* must be NULL */ + ULONG Type; + PIO_CSQ_INSERT_IRP CsqInsertIrp; + PIO_CSQ_REMOVE_IRP CsqRemoveIrp; + PIO_CSQ_PEEK_NEXT_IRP CsqPeekNextIrp; + PIO_CSQ_ACQUIRE_LOCK CsqAcquireLock; + PIO_CSQ_RELEASE_LOCK CsqReleaseLock; + PIO_CSQ_COMPLETE_CANCELED_IRP CsqCompleteCanceledIrp; + PVOID ReservePointer; /* must be NULL */ } IO_CSQ, *PIO_CSQ; -/* - * IO_CSQ_IRP_CONTEXT - Context used to track an IRP in the CSQ - */ -typedef struct _IO_CSQ_IRP_CONTEXT { - ULONG Type; - PIRP Irp; - PIO_CSQ Csq; -} IO_CSQ_IRP_CONTEXT, *PIO_CSQ_IRP_CONTEXT; - #endif /* IO_TYPE_CSQ_IRP_CONTEXT */ + +#ifndef IO_TYPE_CSQ_EX /* See IO_TYPE_CSQ_* above */ #define IO_TYPE_CSQ_EX 3 @@ -222,18 +244,21 @@ * * Same deal as above; sample implementation: * - NTSTATUS NTAPI CsqInsertIrpEx(PIO_CSQ Csq, PIRP Irp, PVOID InsertContext) - { - CsqInsertIrp(Csq, Irp); - return STATUS_PENDING; - } - * - */ -#ifndef IO_TYPE_CSQ_EX -typedef NTSTATUS (NTAPI *PIO_CSQ_INSERT_IRP_EX) (struct _IO_CSQ *Csq, - PIRP Irp, - PVOID InsertContext); -#endif + NTSTATUS NTAPI CsqInsertIrpEx(PIO_CSQ Csq, PIRP Irp, PVOID InsertContext) + { + CsqInsertIrp(Csq, Irp); + return STATUS_PENDING; + } + * + */ +typedef NTSTATUS +(NTAPI IO_CSQ_INSERT_IRP_EX)( + IN struct _IO_CSQ *Csq, + IN PIRP Irp, + IN PVOID InsertContext); +typedef IO_CSQ_INSERT_IRP_EX *PIO_CSQ_INSERT_IRP_EX; + +#endif /* IO_TYPE_CSQ_EX */ /* * CANCEL-SAFE QUEUE DDIs @@ -304,4 +329,6 @@ PIRP NTAPI IoCsqRemoveNextIrp(PIO_CSQ Csq, PVOID PeekContext); -#endif /* _REACTOS_CSQ_H */ +#ifdef __cplusplus +} +#endif Added: branches/header-work/include/psdk/ws2bth.h URL: http://svn.reactos.org/svn/reactos/branches/header-work/include/psdk/ws2bth… ============================================================================== --- branches/header-work/include/psdk/ws2bth.h (added) +++ branches/header-work/include/psdk/ws2bth.h [iso-8859-1] Tue Mar 30 11:52:11 2010 @@ -1,0 +1,227 @@ +#pragma once + +#if (NTDDI_VERSION >= NTDDI_WINXPSP2) + +#include <bthdef.h> + +#include <pshpack1.h> + +#define BT_PORT_ANY ((ULONG)-1) +#define BT_PORT_MIN 0x1 +#define BT_PORT_MAX 0xffff +#define BT_PORT_DYN_FIRST 0x1001 + +#ifndef AF_BTH +#define AF_BTH 32 +#endif +#ifndef PF_BTH +#define PF_BTH AF_BTH +#endif +#ifndef NS_BTH +#define NS_BTH 16 +#endif + +typedef struct _SOCKADDR_BTH { + USHORT addressFamily; + BTH_ADDR btAddr; + GUID serviceClassId; + ULONG port; +} SOCKADDR_BTH, *PSOCKADDR_BTH; + +DEFINE_GUID(SVCID_BTH_PROVIDER, 0x6aa63e0, 0x7d60, 0x41ff, 0xaf, 0xb2, 0x3e, 0xe6, 0xd2, 0xd9, 0x39, 0x2d); + +#define BTH_ADDR_STRING_SIZE 12 + +#define BTHPROTO_RFCOMM 0x0003 +#define BTHPROTO_L2CAP 0x0100 + +#define SOL_RFCOMM BTHPROTO_RFCOMM +#define SOL_L2CAP BTHPROTO_L2CAP +#define SOL_SDP 0x0101 + +#define SO_BTH_AUTHENTICATE 0x80000001 +#define SO_BTH_ENCRYPT 0x00000002 +#define SO_BTH_MTU 0x80000007 +#define SO_BTH_MTU_MAX 0x80000008 +#define SO_BTH_MTU_MIN 0x8000000a + +#define RFCOMM_MAX_MTU 0x000003F3 +#define RFCOMM_MIN_MTU 0x00000017 + +#define BTH_SDP_VERSION 1 + +typedef struct _BTH_SET_SERVICE { + PULONG pSdpVersion; + HANDLE *pRecordHandle; + ULONG fCodService; + ULONG Reserved[5]; + ULONG ulRecordLength; + UCHAR pRecord[1]; +} BTH_SET_SERVICE, *PBTH_SET_SERVICE; + +#define SDP_DEFAULT_INQUIRY_SECONDS 6 +#define SDP_MAX_INQUIRY_SECONDS 60 + +#define SDP_DEFAULT_INQUIRY_MAX_RESPONSES 255 + +#define SDP_SERVICE_SEARCH_REQUEST 1 +#define SDP_SERVICE_ATTRIBUTE_REQUEST 2 +#define SDP_SERVICE_SEARCH_ATTRIBUTE_REQUEST 3 + +typedef struct _BTH_QUERY_DEVICE { + ULONG LAP; + UCHAR length; +} BTH_QUERY_DEVICE, *PBTH_QUERY_DEVICE; + +typedef struct _BTH_QUERY_SERVICE { + ULONG type; + ULONG serviceHandle; + SdpQueryUuid uuids[MAX_UUIDS_IN_QUERY]; + ULONG numRange; + SdpAttributeRange pRange[1]; +} BTH_QUERY_SERVICE, *PBTH_QUERY_SERVICE; + +#define BTHNS_RESULT_DEVICE_CONNECTED 0x00010000 +#define BTHNS_RESULT_DEVICE_REMEMBERED 0x00020000 +#define BTHNS_RESULT_DEVICE_AUTHENTICATED 0x00040000 + +#define SIO_RFCOMM_SEND_COMMAND _WSAIORW (IOC_VENDOR, 101) +#define SIO_RFCOMM_WAIT_COMMAND _WSAIORW (IOC_VENDOR, 102) + +#define SIO_BTH_PING _WSAIORW (IOC_VENDOR, 8) +#define SIO_BTH_INFO _WSAIORW (IOC_VENDOR, 9) +#define SIO_RFCOMM_SESSION_FLOW_OFF _WSAIORW (IOC_VENDOR, 103) +#define SIO_RFCOMM_TEST _WSAIORW (IOC_VENDOR, 104) +#define SIO_RFCOMM_USECFC _WSAIORW (IOC_VENDOR, 105) + +#ifndef BIT +#define BIT(b) (1<<(b)) +#endif + +#define MSC_EA_BIT EA_BIT +#define MSC_FC_BIT BIT(1) +#define MSC_RTC_BIT BIT(2) +#define MSC_RTR_BIT BIT(3) +#define MSC_RESERVED (BIT(4)|BIT(5)) +#define MSC_IC_BIT BIT(6) +#define MSC_DV_BIT BIT(7) +#define MSC_BREAK_BIT BIT(1) +#define MSC_SET_BREAK_LENGTH(b, l) ((b) = ((b)&0x3) | (((l)&0xf) << 4)) + +typedef struct _RFCOMM_MSC_DATA { + UCHAR Signals; + UCHAR Break; +} RFCOMM_MSC_DATA, *PRFCOMM_MSC_DATA; + +#define RLS_ERROR 0x01 +#define RLS_OVERRUN 0x02 +#define RLS_PARITY 0x04 +#define RLS_FRAMING 0x08 + +typedef struct _RFCOMM_RLS_DATA { + UCHAR LineStatus; +} RFCOMM_RLS_DATA, *PRFCOMM_RLS_DATA; + +#define RPN_BAUD_2400 0 +#define RPN_BAUD_4800 1 +#define RPN_BAUD_7200 2 +#define RPN_BAUD_9600 3 +#define RPN_BAUD_19200 4 +#define RPN_BAUD_38400 5 +#define RPN_BAUD_57600 6 +#define RPN_BAUD_115200 7 +#define RPN_BAUD_230400 8 + +#define RPN_DATA_5 0x0 +#define RPN_DATA_6 0x1 +#define RPN_DATA_7 0x2 +#define RPN_DATA_8 0x3 + +#define RPN_STOP_1 0x0 +#define RPN_STOP_1_5 0x4 + +#define RPN_PARITY_NONE 0x00 +#define RPN_PARITY_ODD 0x08 +#define RPN_PARITY_EVEN 0x18 +#define RPN_PARITY_MARK 0x28 +#define RPN_PARITY_SPACE 0x38 + +#define RPN_FLOW_X_IN 0x01 +#define RPN_FLOW_X_OUT 0x02 +#define RPN_FLOW_RTR_IN 0x04 +#define RPN_FLOW_RTR_OUT 0x08 +#define RPN_FLOW_RTC_IN 0x10 +#define RPN_FLOW_RTC_OUT 0x20 + +#define RPN_PARAM_BAUD 0x01 +#define RPN_PARAM_DATA 0x02 +#define RPN_PARAM_STOP 0x04 +#define RPN_PARAM_PARITY 0x08 +#define RPN_PARAM_P_TYPE 0x10 +#define RPN_PARAM_XON 0x20 +#define RPN_PARAM_XOFF 0x40 +#define RPN_PARAM_X_IN 0x01 +#define RPN_PARAM_X_OUT 0x02 +#define RPN_PARAM_RTR_IN 0x04 +#define RPN_PARAM_RTR_OUT 0x08 +#define RPN_PARAM_RTC_IN 0x10 +#define RPN_PARAM_RTC_OUT 0x20 + +#define RFCOMM_CMD_NONE 0 +#define RFCOMM_CMD_MSC 1 +#define RFCOMM_CMD_RLS 2 +#define RFCOMM_CMD_RPN 3 +#define RFCOMM_CMD_RPN_REQUEST 4 +#define RFCOMM_CMD_RPN_RESPONSE 5 + +typedef struct _RFCOMM_RPN_DATA { + UCHAR Baud; + UCHAR Data; + UCHAR FlowControl; + UCHAR XonChar; + UCHAR XoffChar; + UCHAR ParameterMask1; + UCHAR ParameterMask2; +} RFCOMM_RPN_DATA, *PRFCOMM_RPN_DATA; + +typedef struct _RFCOMM_COMMAND { + ULONG CmdType; + union { + RFCOMM_MSC_DATA MSC; + RFCOMM_RLS_DATA RLS; + RFCOMM_RPN_DATA RPN; + } Data; +} RFCOMM_COMMAND, *PRFCOMM_COMMAND; + +typedef struct _BTH_PING_REQ { + BTH_ADDR btAddr; + UCHAR dataLen; + UCHAR data[MAX_L2CAP_PING_DATA_LENGTH]; +} BTH_PING_REQ, *PBTH_PING_REQ; + +typedef struct _BTH_PING_RSP { + UCHAR dataLen; + UCHAR data[MAX_L2CAP_PING_DATA_LENGTH]; +} BTH_PING_RSP, *PBTH_PING_RSP; + +typedef struct _BTH_INFO_REQ { + BTH_ADDR btAddr; + USHORT infoType; +} BTH_INFO_REQ, *PBTH_INFO_REQ; + +typedef struct _BTH_INFO_RSP { + USHORT result; + UCHAR dataLen; + union { + USHORT connectionlessMTU; + UCHAR data[MAX_L2CAP_INFO_DATA_LENGTH]; + }; +} BTH_INFO_RSP, *PBTH_INFO_RSP; + +typedef struct _BTH_SET_SERVICE BTHNS_SETBLOB, *PBTHNS_SETBLOB; +typedef struct _BTH_QUERY_DEVICE BTHNS_INQUIRYBLOB, *PBTHNS_INQUIRYBLOB; +typedef struct _BTH_QUERY_SERVICE BTHNS_RESTRICTIONBLOB, *PBTHNS_RESTRICTIONBLOB; + +#include <poppack.h> + +#endif /* (NTDDI_VERSION >= NTDDI_WINXPSP2) */ Propchange: branches/header-work/include/psdk/ws2bth.h ------------------------------------------------------------------------------ svn:eol-style = native Modified: branches/header-work/include/psdk/ws2def.h URL: http://svn.reactos.org/svn/reactos/branches/header-work/include/psdk/ws2def… ============================================================================== --- branches/header-work/include/psdk/ws2def.h [iso-8859-1] (original) +++ branches/header-work/include/psdk/ws2def.h [iso-8859-1] Tue Mar 30 11:52:11 2010 @@ -1,15 +1,718 @@ -#ifndef _WS2DEF_ +#pragma once + #define _WS2DEF_ #ifdef __cplusplus extern "C" { #endif - - +#if !defined(_WINSOCK2API_) && defined(_WINSOCKAPI_) +#error Include only winsock2.h, not both winsock.h and ws2def.h in the same module. +#endif + +#if (_WIN32_WINNT >= 0x0600) + +#ifdef _MSC_VER +#define WS2DEF_INLINE __inline +#else +#define WS2DEF_INLINE extern inline +#endif + +#endif/* (_WIN32_WINNT >= 0x0600) */ + +#include <inaddr.h> + +typedef USHORT ADDRESS_FAMILY; + +#define AF_UNSPEC 0 +#define AF_UNIX 1 +#define AF_INET 2 +#define AF_IMPLINK 3 +#define AF_PUP 4 +#define AF_CHAOS 5 +#define AF_NS 6 +#define AF_IPX AF_NS +#define AF_ISO 7 +#define AF_OSI AF_ISO +#define AF_ECMA 8 +#define AF_DATAKIT 9 +#define AF_CCITT 10 +#define AF_SNA 11 +#define AF_DECnet 12 +#define AF_DLI 13 +#define AF_LAT 14 +#define AF_HYLINK 15 +#define AF_APPLETALK 16 +#define AF_NETBIOS 17 +#define AF_VOICEVIEW 18 +#define AF_FIREFOX 19 +#define AF_UNKNOWN1 20 +#define AF_BAN 21 +#define AF_ATM 22 +#define AF_INET6 23 +#define AF_CLUSTER 24 +#define AF_12844 25 +#define AF_IRDA 26 +#define AF_NETDES 28 + +#if (_WIN32_WINNT < 0x0501) + +#define AF_MAX 29 + +#else + +#define AF_TCNPROCESS 29 +#define AF_TCNMESSAGE 30 +#define AF_ICLFXBM 31 + +#if(_WIN32_WINNT < 0x0600) + +#define AF_MAX 32 + +#else + +#define AF_BTH 32 +#if (_WIN32_WINNT < 0x0601) +#define AF_MAX 33 +#else +#define AF_LINK 33 +#define AF_MAX 34 +#endif /* (_WIN32_WINNT < 0x0601) */ + +#endif /* (_WIN32_WINNT < 0x0600) */ + +#endif /* (_WIN32_WINNT < 0x0501) */ + +#define SOCK_STREAM 1 +#define SOCK_DGRAM 2 +#define SOCK_RAW 3 +#define SOCK_RDM 4 +#define SOCK_SEQPACKET 5 + +#define SOL_SOCKET 0xffff + +#define SO_DEBUG 0x0001 +#define SO_ACCEPTCONN 0x0002 +#define SO_REUSEADDR 0x0004 +#define SO_KEEPALIVE 0x0008 +#define SO_DONTROUTE 0x0010 +#define SO_BROADCAST 0x0020 +#define SO_USELOOPBACK 0x0040 +#define SO_LINGER 0x0080 +#define SO_OOBINLINE 0x0100 + +#define SO_DONTLINGER (int)(~SO_LINGER) +#define SO_EXCLUSIVEADDRUSE ((int)(~SO_REUSEADDR)) + +#define SO_SNDBUF 0x1001 +#define SO_RCVBUF 0x1002 +#define SO_SNDLOWAT 0x1003 +#define SO_RCVLOWAT 0x1004 +#define SO_SNDTIMEO 0x1005 +#define SO_RCVTIMEO 0x1006 +#define SO_ERROR 0x1007 +#define SO_TYPE 0x1008 +#define SO_BSP_STATE 0x1009 + +#define SO_GROUP_ID 0x2001 +#define SO_GROUP_PRIORITY 0x2002 +#define SO_MAX_MSG_SIZE 0x2003 + +#define SO_CONDITIONAL_ACCEPT 0x3002 +#define SO_PAUSE_ACCEPT 0x3003 +#define SO_COMPARTMENT_ID 0x3004 +#if (_WIN32_WINNT >= 0x0600) +#define SO_RANDOMIZE_PORT 0x3005 +#define SO_PORT_SCALABILITY 0x3006 +#endif /* (_WIN32_WINNT >= 0x0600) */ + +#define WSK_SO_BASE 0x4000 + +#define TCP_NODELAY 0x0001 + +typedef struct sockaddr { +#if (_WIN32_WINNT < 0x0600) + u_short sa_family; +#else + ADDRESS_FAMILY sa_family; +#endif + CHAR sa_data[14]; +} SOCKADDR, *PSOCKADDR, FAR *LPSOCKADDR; + +#ifndef __CSADDR_DEFINED__ +#define __CSADDR_DEFINED__ + +typedef struct _SOCKET_ADDRESS { + LPSOCKADDR lpSockaddr; + INT iSockaddrLength; +} SOCKET_ADDRESS, *PSOCKET_ADDRESS, *LPSOCKET_ADDRESS; + +typedef struct _SOCKET_ADDRESS_LIST { + INT iAddressCount; + SOCKET_ADDRESS Address[1]; +} SOCKET_ADDRESS_LIST, *PSOCKET_ADDRESS_LIST, FAR *LPSOCKET_ADDRESS_LIST; + +#if (_WIN32_WINNT >= 0x0600) +#define SIZEOF_SOCKET_ADDRESS_LIST(AddressCount) \ + (FIELD_OFFSET(SOCKET_ADDRESS_LIST, Address) + \ + AddressCount * sizeof(SOCKET_ADDRESS)) +#endif + +typedef struct _CSADDR_INFO { + SOCKET_ADDRESS LocalAddr; + SOCKET_ADDRESS RemoteAddr; + INT iSocketType; + INT iProtocol; +} CSADDR_INFO, *PCSADDR_INFO, FAR *LPCSADDR_INFO ; + +#endif /* __CSADDR_DEFINED__ */ + +#define _SS_MAXSIZE 128 +#define _SS_ALIGNSIZE (sizeof(__int64)) + +#if (_WIN32_WINNT >= 0x0600) + +#define _SS_PAD1SIZE (_SS_ALIGNSIZE - sizeof(USHORT)) +#define _SS_PAD2SIZE (_SS_MAXSIZE - (sizeof(USHORT) + _SS_PAD1SIZE + _SS_ALIGNSIZE)) + +#else + +#define _SS_PAD1SIZE (_SS_ALIGNSIZE - sizeof (short)) +#define _SS_PAD2SIZE (_SS_MAXSIZE - (sizeof (short) + _SS_PAD1SIZE + _SS_ALIGNSIZE)) + +#endif /* (_WIN32_WINNT >= 0x0600) */ + +typedef struct sockaddr_storage { + ADDRESS_FAMILY ss_family; + CHAR __ss_pad1[_SS_PAD1SIZE]; + __int64 __ss_align; + CHAR __ss_pad2[_SS_PAD2SIZE]; +} SOCKADDR_STORAGE_LH, *PSOCKADDR_STORAGE_LH, FAR *LPSOCKADDR_STORAGE_LH; + +typedef struct sockaddr_storage_xp { + short ss_family; + CHAR __ss_pad1[_SS_PAD1SIZE]; + __int64 __ss_align; + CHAR __ss_pad2[_SS_PAD2SIZE]; +} SOCKADDR_STORAGE_XP, *PSOCKADDR_STORAGE_XP, FAR *LPSOCKADDR_STORAGE_XP; + +#if (_WIN32_WINNT >= 0x0600) + +typedef SOCKADDR_STORAGE_LH SOCKADDR_STORAGE; +typedef SOCKADDR_STORAGE *PSOCKADDR_STORAGE, FAR *LPSOCKADDR_STORAGE; + +#elif (_WIN32_WINNT >= 0x0501) + +typedef SOCKADDR_STORAGE_XP SOCKADDR_STORAGE; +typedef SOCKADDR_STORAGE *PSOCKADDR_STORAGE, FAR *LPSOCKADDR_STORAGE; + +#endif /* (_WIN32_WINNT >= 0x0600) */ + +#define IOC_UNIX 0x00000000 +#define IOC_WS2 0x08000000 +#define IOC_PROTOCOL 0x10000000 +#define IOC_VENDOR 0x18000000 + +#if (_WIN32_WINNT >= 0x0600) +#define IOC_WSK (IOC_WS2|0x07000000) +#endif + +#define _WSAIO(x,y) (IOC_VOID|(x)|(y)) +#define _WSAIOR(x,y) (IOC_OUT|(x)|(y)) +#define _WSAIOW(x,y) (IOC_IN|(x)|(y)) +#define _WSAIORW(x,y) (IOC_INOUT|(x)|(y)) + +#define SIO_ASSOCIATE_HANDLE _WSAIOW(IOC_WS2,1) +#define SIO_ENABLE_CIRCULAR_QUEUEING _WSAIO(IOC_WS2,2) +#define SIO_FIND_ROUTE _WSAIOR(IOC_WS2,3) +#define SIO_FLUSH _WSAIO(IOC_WS2,4) +#define SIO_GET_BROADCAST_ADDRESS _WSAIOR(IOC_WS2,5) +#define SIO_GET_EXTENSION_FUNCTION_POINTER _WSAIORW(IOC_WS2,6) +#define SIO_GET_QOS _WSAIORW(IOC_WS2,7) +#define SIO_GET_GROUP_QOS _WSAIORW(IOC_WS2,8) +#define SIO_MULTIPOINT_LOOPBACK _WSAIOW(IOC_WS2,9) +#define SIO_MULTICAST_SCOPE _WSAIOW(IOC_WS2,10) +#define SIO_SET_QOS _WSAIOW(IOC_WS2,11) +#define SIO_SET_GROUP_QOS _WSAIOW(IOC_WS2,12) +#define SIO_TRANSLATE_HANDLE _WSAIORW(IOC_WS2,13) +#define SIO_ROUTING_INTERFACE_QUERY _WSAIORW(IOC_WS2,20) +#define SIO_ROUTING_INTERFACE_CHANGE _WSAIOW(IOC_WS2,21) +#define SIO_ADDRESS_LIST_QUERY _WSAIOR(IOC_WS2,22) +#define SIO_ADDRESS_LIST_CHANGE _WSAIO(IOC_WS2,23) +#define SIO_QUERY_TARGET_PNP_HANDLE _WSAIOR(IOC_WS2,24) + +#if(_WIN32_WINNT >= 0x0501) +#define SIO_ADDRESS_LIST_SORT _WSAIORW(IOC_WS2,25) +#endif + +#if (_WIN32_WINNT >= 0x0600) +#define SIO_RESERVED_1 _WSAIOW(IOC_WS2,26) +#define SIO_RESERVED_2 _WSAIOW(IOC_WS2,33) +#endif + +#define IPPROTO_IP 0 + +typedef enum { +#if (_WIN32_WINNT >= 0x0501) + IPPROTO_HOPOPTS = 0, +#endif + IPPROTO_ICMP = 1, + IPPROTO_IGMP = 2, + IPPROTO_GGP = 3, +#if (_WIN32_WINNT >= 0x0501) + IPPROTO_IPV4 = 4, +#endif +#if (_WIN32_WINNT >= 0x0600) + IPPROTO_ST = 5, +#endif + IPPROTO_TCP = 6, +#if (_WIN32_WINNT >= 0x0600) + IPPROTO_CBT = 7, + IPPROTO_EGP = 8, + IPPROTO_IGP = 9, +#endif + IPPROTO_PUP = 12, + IPPROTO_UDP = 17, + IPPROTO_IDP = 22, +#if (_WIN32_WINNT >= 0x0600) + IPPROTO_RDP = 27, +#endif +#if (_WIN32_WINNT >= 0x0501) + IPPROTO_IPV6 = 41, + IPPROTO_ROUTING = 43, + IPPROTO_FRAGMENT = 44, + IPPROTO_ESP = 50, + IPPROTO_AH = 51, + IPPROTO_ICMPV6 = 58, + IPPROTO_NONE = 59, + IPPROTO_DSTOPTS = 60, +#endif /* (_WIN32_WINNT >= 0x0501) */ + IPPROTO_ND = 77, +#if(_WIN32_WINNT >= 0x0501) + IPPROTO_ICLFXBM = 78, +#endif +#if (_WIN32_WINNT >= 0x0600) + IPPROTO_PIM = 103, + IPPROTO_PGM = 113, + IPPROTO_L2TP = 115, + IPPROTO_SCTP = 132, +#endif /* (_WIN32_WINNT >= 0x0600) */ + IPPROTO_RAW = 255, + IPPROTO_MAX = 256, + IPPROTO_RESERVED_RAW = 257, + IPPROTO_RESERVED_IPSEC = 258, + IPPROTO_RESERVED_IPSECOFFLOAD = 259, + IPPROTO_RESERVED_MAX = 260 +} IPPROTO, *PIPROTO; + +#define IPPORT_TCPMUX 1 +#define IPPORT_ECHO 7 +#define IPPORT_DISCARD 9 +#define IPPORT_SYSTAT 11 +#define IPPORT_DAYTIME 13 +#define IPPORT_NETSTAT 15 +#define IPPORT_QOTD 17 +#define IPPORT_MSP 18 +#define IPPORT_CHARGEN 19 +#define IPPORT_FTP_DATA 20 +#define IPPORT_FTP 21 +#define IPPORT_TELNET 23 +#define IPPORT_SMTP 25 +#define IPPORT_TIMESERVER 37 +#define IPPORT_NAMESERVER 42 +#define IPPORT_WHOIS 43 +#define IPPORT_MTP 57 + +#define IPPORT_TFTP 69 +#define IPPORT_RJE 77 +#define IPPORT_FINGER 79 +#define IPPORT_TTYLINK 87 +#define IPPORT_SUPDUP 95 + +#define IPPORT_POP3 110 +#define IPPORT_NTP 123 +#define IPPORT_EPMAP 135 +#define IPPORT_NETBIOS_NS 137 +#define IPPORT_NETBIOS_DGM 138 +#define IPPORT_NETBIOS_SSN 139 +#define IPPORT_IMAP 143 +#define IPPORT_SNMP 161 +#define IPPORT_SNMP_TRAP 162 +#define IPPORT_IMAP3 220 +#define IPPORT_LDAP 389 +#define IPPORT_HTTPS 443 +#define IPPORT_MICROSOFT_DS 445 +#define IPPORT_EXECSERVER 512 +#define IPPORT_LOGINSERVER 513 +#define IPPORT_CMDSERVER 514 +#define IPPORT_EFSSERVER 520 + +#define IPPORT_BIFFUDP 512 +#define IPPORT_WHOSERVER 513 +#define IPPORT_ROUTESERVER 520 +#define IPPORT_RESERVED 1024 + +#if (_WIN32_WINNT >= 0x0600) + +#define IPPORT_REGISTERED_MIN IPPORT_RESERVED +#define IPPORT_REGISTERED_MAX 0xbfff +#define IPPORT_DYNAMIC_MIN 0xc000 +#define IPPORT_DYNAMIC_MAX 0xffff + +#endif /* (_WIN32_WINNT >= 0x0600) */ + +#define IN_CLASSA(i) (((LONG)(i) & 0x80000000) == 0) +#define IN_CLASSA_NET 0xff000000 +#define IN_CLASSA_NSHIFT 24 +#define IN_CLASSA_HOST 0x00ffffff +#define IN_CLASSA_MAX 128 + +#define IN_CLASSB(i) (((LONG)(i) & 0xc0000000) == 0x80000000) +#define IN_CLASSB_NET 0xffff0000 +#define IN_CLASSB_NSHIFT 16 +#define IN_CLASSB_HOST 0x0000ffff +#define IN_CLASSB_MAX 65536 + +#define IN_CLASSC(i) (((LONG)(i) & 0xe0000000) == 0xc0000000) +#define IN_CLASSC_NET 0xffffff00 +#define IN_CLASSC_NSHIFT 8 +#define IN_CLASSC_HOST 0x000000ff + +#define IN_CLASSD(i) (((long)(i) & 0xf0000000) == 0xe0000000) +#define IN_CLASSD_NET 0xf0000000 +#define IN_CLASSD_NSHIFT 28 +#define IN_CLASSD_HOST 0x0fffffff +#define IN_MULTICAST(i) IN_CLASSD(i) + +#define INADDR_ANY (ULONG)0x00000000 +#define INADDR_LOOPBACK 0x7f000001 +#define INADDR_BROADCAST (ULONG)0xffffffff +#define INADDR_NONE 0xffffffff + +typedef enum { + ScopeLevelInterface = 1, + ScopeLevelLink = 2, + ScopeLevelSubnet = 3, + ScopeLevelAdmin = 4, + ScopeLevelSite = 5, + ScopeLevelOrganization = 8, + ScopeLevelGlobal = 14, + ScopeLevelCount = 16 +} SCOPE_LEVEL; + +typedef struct { + union { + struct { + ULONG Zone:28; + ULONG Level:4; + }; + ULONG Value; + }; +} SCOPE_ID, *PSCOPE_ID; + +#define SCOPEID_UNSPECIFIED_INIT {0} + +typedef struct sockaddr_in { +#if(_WIN32_WINNT < 0x0600) + short sin_family; +#else + ADDRESS_FAMILY sin_family; +#endif + USHORT sin_port; + IN_ADDR sin_addr; + CHAR sin_zero[8]; +} SOCKADDR_IN, *PSOCKADDR_IN; + +#if(_WIN32_WINNT >= 0x0601) +typedef struct sockaddr_dl { + ADDRESS_FAMILY sdl_family; + UCHAR sdl_data[8]; + UCHAR sdl_zero[4]; +} SOCKADDR_DL, *PSOCKADDR_DL; +#endif + +#define IOCPARM_MASK 0x7f +#define IOC_VOID 0x20000000 +#define IOC_OUT 0x40000000 +#define IOC_IN 0x80000000 +#define IOC_INOUT (IOC_IN|IOC_OUT) + +#define _IO(x,y) (IOC_VOID|((x)<<8)|(y)) +#define _IOR(x,y,t) (IOC_OUT|(((long)sizeof(t)&IOCPARM_MASK)<<16)|((x)<<8)|(y)) +#define _IOW(x,y,t) (IOC_IN|(((long)sizeof(t)&IOCPARM_MASK)<<16)|((x)<<8)|(y)) + +typedef struct _WSABUF { + ULONG len; + CHAR FAR *buf; +} WSABUF, FAR * LPWSABUF; + +typedef struct _WSAMSG { + LPSOCKADDR name; + INT namelen; + LPWSABUF lpBuffers; +#if (_WIN32_WINNT >= 0x0600) + ULONG dwBufferCount; +#else + DWORD dwBufferCount; +#endif + WSABUF Control; +#if (_WIN32_WINNT >= 0x0600) + ULONG dwFlags; +#else + DWORD dwFlags; +#endif +} WSAMSG, *PWSAMSG, *FAR LPWSAMSG; + +#if (_WIN32_WINNT >= 0x0600) +#define _WSACMSGHDR cmsghdr +#endif + +typedef struct _WSACMSGHDR { + SIZE_T cmsg_len; + INT cmsg_level; + INT cmsg_type; +} WSACMSGHDR, *PWSACMSGHDR, FAR *LPWSACMSGHDR; + +#if (_WIN32_WINNT >= 0x0600) +typedef WSACMSGHDR CMSGHDR, *PCMSGHDR; +#endif + +#define WSA_CMSGHDR_ALIGN(length) (((length) + TYPE_ALIGNMENT(WSACMSGHDR)-1) & \ + (~(TYPE_ALIGNMENT(WSACMSGHDR)-1))) + +#define WSA_CMSGDATA_ALIGN(length) (((length) + MAX_NATURAL_ALIGNMENT-1) & \ + (~(MAX_NATURAL_ALIGNMENT-1))) + +#if(_WIN32_WINNT >= 0x0600) +#define CMSGHDR_ALIGN WSA_CMSGHDR_ALIGN +#define CMSGDATA_ALIGN WSA_CMSGDATA_ALIGN +#endif + +/* + * WSA_CMSG_FIRSTHDR + * + * Returns a pointer to the first ancillary data object, + * or a null pointer if there is no ancillary data in the + * control buffer of the WSAMSG structure. + * + * LPCMSGHDR + * WSA_CMSG_FIRSTHDR ( + * LPWSAMSG msg + * ); + */ +#define WSA_CMSG_FIRSTHDR(msg) (((msg)->Control.len >= sizeof(WSACMSGHDR)) \ + ? (LPWSACMSGHDR)(msg)->Control.buf \ + : (LPWSACMSGHDR)NULL) + +#if(_WIN32_WINNT >= 0x0600) +#define CMSG_FIRSTHDR WSA_CMSG_FIRSTHDR +#endif + +/* + * WSA_CMSG_NXTHDR + * + * Returns a pointer to the next ancillary data object, + * or a null if there are no more data objects. + * + * LPCMSGHDR + * WSA_CMSG_NEXTHDR ( + * LPWSAMSG msg, + * LPWSACMSGHDR cmsg + * ); + */ +#define WSA_CMSG_NXTHDR(msg, cmsg) \ + ( ((cmsg) == NULL) \ + ? WSA_CMSG_FIRSTHDR(msg) \ + : ( ( ((PUCHAR)(cmsg) + \ + WSA_CMSGHDR_ALIGN((cmsg)->cmsg_len) + \ + sizeof(WSACMSGHDR) ) > \ + (PUCHAR)((msg)->Control.buf) + \ + (msg)->Control.len ) \ + ? (LPWSACMSGHDR)NULL \ + : (LPWSACMSGHDR)((PUCHAR)(cmsg) + \ + WSA_CMSGHDR_ALIGN((cmsg)->cmsg_len)) ) ) + +#if(_WIN32_WINNT >= 0x0600) +#define CMSG_NXTHDR WSA_CMSG_NXTHDR +#endif + +/* + * WSA_CMSG_DATA + * + * Returns a pointer to the first byte of data (what is referred + * to as the cmsg_data member though it is not defined in + * the structure). + * + * Note that RFC 2292 defines this as CMSG_DATA, but that name + * is already used by wincrypt.h, and so Windows has used WSA_CMSG_DATA. + * + * PUCHAR + * WSA_CMSG_DATA ( + * LPWSACMSGHDR pcmsg + * ); + */ +#define WSA_CMSG_DATA(cmsg) ((PUCHAR)(cmsg) + WSA_CMSGDATA_ALIGN(sizeof(WSACMSGHDR))) + +/* + * WSA_CMSG_SPACE + * + * Returns total size of an ancillary data object given + * the amount of data. Used to allocate the correct amount + * of space. + * + * SIZE_T + * WSA_CMSG_SPACE ( + * SIZE_T length + * ); + */ +#define WSA_CMSG_SPACE(length) (WSA_CMSGDATA_ALIGN(sizeof(WSACMSGHDR) + WSA_CMSGHDR_ALIGN(length))) + +#if(_WIN32_WINNT >= 0x0600) +#define CMSG_SPACE WSA_CMSG_SPACE +#endif + +/* + * WSA_CMSG_LEN + * + * Returns the value to store in cmsg_len given the amount of data. + * + * SIZE_T + * WSA_CMSG_LEN ( + * SIZE_T length + * ); + */ +#define WSA_CMSG_LEN(length) (WSA_CMSGDATA_ALIGN(sizeof(WSACMSGHDR)) + length) + +#if(_WIN32_WINNT >= 0x0600) +#define CMSG_LEN WSA_CMSG_LEN +#endif + +#define MSG_TRUNC 0x0100 +#define MSG_CTRUNC 0x0200 +#define MSG_BCAST 0x0400 +#define MSG_MCAST 0x0800 + +#define AI_PASSIVE 0x00000001 +#define AI_CANONNAME 0x00000002 +#define AI_NUMERICHOST 0x00000004 +#define AI_NUMERICSERV 0x00000008 + +#define AI_ALL 0x00000100 +#define AI_ADDRCONFIG 0x00000400 +#define AI_V4MAPPED 0x00000800 + +#define AI_NON_AUTHORITATIVE 0x00004000 +#define AI_SECURE 0x00008000 +#define AI_RETURN_PREFERRED_NAMES 0x00010000 + +#define AI_FQDN 0x00020000 +#define AI_FILESERVER 0x00040000 + +typedef struct addrinfo { + int ai_flags; + int ai_family; + int ai_socktype; + int ai_protocol; + size_t ai_addrlen; + char *ai_canonname; + struct sockaddr *ai_addr; + struct addrinfo *ai_next; +} ADDRINFOA, *PADDRINFOA; + +typedef struct addrinfoW { + int ai_flags; + int ai_family; + int ai_socktype; + int ai_protocol; + size_t ai_addrlen; + PWSTR ai_canonname; + struct sockaddr *ai_addr; + struct addrinfoW *ai_next; +} ADDRINFOW, *PADDRINFOW; + +#if (_WIN32_WINNT >= 0x0600) + +typedef struct addrinfoexA { + int ai_flags; + int ai_family; + int ai_socktype; + int ai_protocol; + size_t ai_addrlen; + char *ai_canonname; + struct sockaddr *ai_addr; + void *ai_blob; + size_t ai_bloblen; + LPGUID ai_provider; + struct addrinfoexA *ai_next; +} ADDRINFOEXA, *PADDRINFOEXA, *LPADDRINFOEXA; + +typedef struct addrinfoexW { + int ai_flags; + int ai_family; + int ai_socktype; + int ai_protocol; + size_t ai_addrlen; + PWSTR ai_canonname; + struct sockaddr *ai_addr; + void *ai_blob; + size_t ai_bloblen; + LPGUID ai_provider; + struct addrinfoexW *ai_next; +} ADDRINFOEXW, *PADDRINFOEXW, *LPADDRINFOEXW; + +#endif /* (_WIN32_WINNT >= 0x0600) */ + +#define NS_ALL 0 + +#define NS_SAP 1 +#define NS_NDS 2 +#define NS_PEER_BROWSE 3 +#define NS_SLP 5 +#define NS_DHCP 6 + +#define NS_TCPIP_LOCAL 10 +#define NS_TCPIP_HOSTS 11 +#define NS_DNS 12 +#define NS_NETBT 13 +#define NS_WINS 14 + +#if(_WIN32_WINNT >= 0x0501) +#define NS_NLA 15 +#endif + +#if(_WIN32_WINNT >= 0x0600) +#define NS_BTH 16 +#endif + +#define NS_NBP 20 + +#define NS_MS 30 +#define NS_STDA 31 +#define NS_NTDS 32 + +#if(_WIN32_WINNT >= 0x0600) +#define NS_EMAIL 37 +#define NS_PNRPNAME 38 +#define NS_PNRPCLOUD 39 +#endif + +#define NS_X500 40 +#define NS_NIS 41 +#define NS_NISPLUS 42 + +#define NS_WRQ 50 + +#define NS_NETDES 60 + +#define NI_NOFQDN 0x01 +#define NI_NUMERICHOST 0x02 +#define NI_NAMEREQD 0x04 +#define NI_NUMERICSERV 0x08 +#define NI_DGRAM 0x10 + +#define NI_MAXHOST 1025 +#define NI_MAXSERV 32 #ifdef __cplusplus } #endif - -#endif

1 0

[tkreuzer] 46589: [OLDNAMES] Add a proper oldnames lib, instead of implicitly including it with mingw.
by tkreuzer＠svn.reactos.org 30 Mar '10

30 Mar '10

Author: tkreuzer Date: Tue Mar 30 11:34:28 2010 New Revision: 46589 URL: http://svn.reactos.org/svn/reactos?rev=46589&view=rev Log: [OLDNAMES] Add a proper oldnames lib, instead of implicitly including it with mingw. Modified: branches/ros-amd64-bringup/reactos/base/applications/network/ftp/ftp.rbuild branches/ros-amd64-bringup/reactos/base/services/dhcp/dhcp.rbuild branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/mingw.rbuild Modified: branches/ros-amd64-bringup/reactos/base/applications/network/ftp/ftp.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/base/… ============================================================================== --- branches/ros-amd64-bringup/reactos/base/applications/network/ftp/ftp.rbuild [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/base/applications/network/ftp/ftp.rbuild [iso-8859-1] Tue Mar 30 11:34:28 2010 @@ -6,6 +6,7 @@ <library>ws2_32</library> <library>iphlpapi</library> + <library>oldnames</library> <file>cmds.c</file> <file>cmdtab.c</file> <file>domacro.c</file> Modified: branches/ros-amd64-bringup/reactos/base/services/dhcp/dhcp.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/base/… ============================================================================== --- branches/ros-amd64-bringup/reactos/base/services/dhcp/dhcp.rbuild [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/base/services/dhcp/dhcp.rbuild [iso-8859-1] Tue Mar 30 11:34:28 2010 @@ -8,6 +8,7 @@ <library>ws2_32</library> <library>iphlpapi</library> <library>advapi32</library> + <library>oldnames</library> <file>adapter.c</file> <file>alloc.c</file> <file>api.c</file> Modified: branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/mingw.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/3… ============================================================================== --- branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/mingw.rbuild [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/mingw.rbuild [iso-8859-1] Tue Mar 30 11:34:28 2010 @@ -7,7 +7,6 @@  <define name="_M_CEE_PURE" /> - <importlibrary definition="moldname-msvcrt.def" dllname="msvcrt.dll" /> <include base="ReactOS">include/reactos/mingw-w64</include> <if property="USERMODE" value="1"> <library>kernel32</library> @@ -63,4 +62,8 @@ <file>crtdll.c</file> <file>dllargv.c</file> </module> +<module name="oldnames" type="staticlibrary"> + <define name="_CRTBLD" /> + <importlibrary definition="moldname-msvcrt.def" dllname="msvcrt.dll" /> +</module> </group>

1 0

[tkreuzer] 46588: Don't add underscore prefix to amd64 symbols
by tkreuzer＠svn.reactos.org 30 Mar '10

30 Mar '10

Author: tkreuzer Date: Tue Mar 30 09:56:58 2010 New Revision: 46588 URL: http://svn.reactos.org/svn/reactos?rev=46588&view=rev Log: Don't add underscore prefix to amd64 symbols Modified: trunk/reactos/tools/rbuild/backend/mingw/linkers/ld.mak trunk/reactos/tools/rbuild/module.cpp Modified: trunk/reactos/tools/rbuild/backend/mingw/linkers/ld.mak URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/mingw… ============================================================================== --- trunk/reactos/tools/rbuild/backend/mingw/linkers/ld.mak [iso-8859-1] (original) +++ trunk/reactos/tools/rbuild/backend/mingw/linkers/ld.mak [iso-8859-1] Tue Mar 30 09:56:58 2010 @@ -6,6 +6,12 @@ LDFLAG_WINDOWS:=--subsystem=windows LDFLAG_NATIVE:=--subsystem=native +LDFLAG_EXCLUDE_ALL_SYMBOLS=-exclude-all-symbols +DLLTOOL_FLAGS=--kill-at +ifeq ($(ARCH),amd64) + DLLTOOL_FLAGS= --no-leading-underscore +endif + #~ #(module, objs, deps, ldflags, output, def, libs, entry, base) #(module, objs, deps, ldflags, output, def, libs, entry, base, extralibs) define RBUILD_LINK @@ -13,15 +19,15 @@ ifneq ($(6),) ${call RBUILD_intermediate_dir,$(5)}$$(SEP)lib${call RBUILD_name,$(5)}.a: $(6) | ${call RBUILD_intermediate_path,$(5)} $$(ECHO_IMPLIB) - $${dlltool} --def $(6) --kill-at --output-lib=$$@ + $${dlltool} --def $(6) $(DLLTOOL_FLAGS) --output-lib=$$@ ${call RBUILD_intermediate_dir,$(5)}$$(SEP)lib${call RBUILD_name,$(5)}.delayimp.a: $(6) | ${call RBUILD_intermediate_path,$(5)} $$(ECHO_IMPLIB) - $${dlltool} --def $(6) --kill-at --output-delaylib=$$@ + $${dlltool} --def $(6) $(DLLTOOL_FLAGS) --output-delaylib=$$@ ${call RBUILD_intermediate_path_noext,$(5)}.exp: $(6) | ${call RBUILD_intermediate_path,$(5)} $$(ECHO_IMPLIB) - $${dlltool} --def $(6) --kill-at --output-exp=$$@ + $${dlltool} --def $(6) $(DLLTOOL_FLAGS) --output-exp=$$@ $(1)_CLEANFILES+=\ ${call RBUILD_intermediate_dir,$(5)}$$(SEP)lib$(notdir $(5)).a \ @@ -81,4 +87,4 @@ #~ #(module, def, deps, ldflags, libs, entry, base) #~ RBUILD_LINK_RULE=${call RBUILD_LINK,$(1),$(value $(1)_OBJS),$(3),$(4),$(value $(1)_TARGET),$(2),$(5) $(value $(1)_LIBS) $(5),$(6),$(7)} #(module, def, deps, ldflags, libs, entry, base, extralibs) -RBUILD_LINK_RULE=${call RBUILD_LINK,$(1),$(value $(1)_OBJS),$(3),$(4),$(value $(1)_TARGET),$(2),$(value $(1)_LIBS),$(6),$(7),$(5)} +RBUILD_LINK_RULE=${call RBUILD_LINK,$(1),$(value $(1)_OBJS),$(3),$(4),$(value $(1)_TARGET),$(2),$(value $(1)_LIBS),$(6),$(7),$(5)} Modified: trunk/reactos/tools/rbuild/module.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/module.cpp?re… ============================================================================== --- trunk/reactos/tools/rbuild/module.cpp [iso-8859-1] (original) +++ trunk/reactos/tools/rbuild/module.cpp [iso-8859-1] Tue Mar 30 09:56:58 2010 @@ -1358,7 +1358,7 @@ if (entrypoint == "0" || entrypoint == "0x0") return "0"; - if (Environment::GetArch() != "arm") + if (Environment::GetArch() != "arm" && Environment::GetArch() != "amd64") result = "_"; result += entrypoint;

1 0

[tkreuzer] 46587: revert accidental changes to rbuild file
by tkreuzer＠svn.reactos.org 30 Mar '10

30 Mar '10

Author: tkreuzer Date: Tue Mar 30 09:21:16 2010 New Revision: 46587 URL: http://svn.reactos.org/svn/reactos?rev=46587&view=rev Log: revert accidental changes to rbuild file Modified: branches/ros-amd64-bringup/reactos/ReactOS-amd64.rbuild Modified: branches/ros-amd64-bringup/reactos/ReactOS-amd64.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/React… ============================================================================== --- branches/ros-amd64-bringup/reactos/ReactOS-amd64.rbuild [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/ReactOS-amd64.rbuild [iso-8859-1] Tue Mar 30 09:21:16 2010 @@ -1,6 +1,6 @@ <?xml version="1.0"?> <!DOCTYPE project SYSTEM "tools/rbuild/project.dtd"> -<project name="ReactOS" makefile="makefile-amd64.auto" xmlns:xi="http://www.w3.org/2001/XInclude"> +<project name="ReactOS" makefile="makefile-amd64.auto" xmlns:xi="http://www.w3.org/2001/XInclude" allowwarnings="true"> <xi:include href="config-amd64.rbuild"> <xi:fallback> <xi:include href="config-amd64.template.rbuild" /> @@ -35,6 +35,7 @@  <compilerflag>-U_X86_</compilerflag> <compilerflag>-Wno-format</compilerflag> + <compilerflag>-fno-leading-underscore</compilerflag> </group> <group linkerset="ld">

1 0

[tkreuzer] 46586: Enable ms extensions
by tkreuzer＠svn.reactos.org 30 Mar '10

30 Mar '10

Author: tkreuzer Date: Tue Mar 30 08:56:45 2010 New Revision: 46586 URL: http://svn.reactos.org/svn/reactos?rev=46586&view=rev Log: Enable ms extensions Modified: branches/ros-amd64-bringup/reactos/ReactOS-amd64.rbuild Modified: branches/ros-amd64-bringup/reactos/ReactOS-amd64.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/React… ============================================================================== --- branches/ros-amd64-bringup/reactos/ReactOS-amd64.rbuild [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/ReactOS-amd64.rbuild [iso-8859-1] Tue Mar 30 08:56:45 2010 @@ -28,6 +28,7 @@ <compilerflag>-ftracer</compilerflag> <compilerflag>-momit-leaf-frame-pointer</compilerflag> </if> + <compilerflag>-fms-extensions</compilerflag> <compilerflag>-mpreferred-stack-boundary=4</compilerflag> <compilerflag compiler="midl">-m64 --win64</compilerflag>

1 0

[tkreuzer] 46585: Merge trunk head (r46584)
by tkreuzer＠svn.reactos.org 30 Mar '10

30 Mar '10

Author: tkreuzer Date: Tue Mar 30 08:20:38 2010 New Revision: 46585 URL: http://svn.reactos.org/svn/reactos?rev=46585&view=rev Log: Merge trunk head (r46584) Added: branches/ros-amd64-bringup/reactos/boot/bootdata/packages/ (props changed) - copied from r46584, trunk/reactos/boot/bootdata/packages/ branches/ros-amd64-bringup/reactos/dll/directx/msdvbnp/ethernetfilter.cpp - copied unchanged from r46584, trunk/reactos/dll/directx/msdvbnp/ethernetfilter.cpp branches/ros-amd64-bringup/reactos/dll/directx/msdvbnp/ipv4.cpp - copied unchanged from r46584, trunk/reactos/dll/directx/msdvbnp/ipv4.cpp branches/ros-amd64-bringup/reactos/dll/directx/msdvbnp/ipv6.cpp - copied unchanged from r46584, trunk/reactos/dll/directx/msdvbnp/ipv6.cpp branches/ros-amd64-bringup/reactos/hal/halx86/generic/acpi/ - copied from r46584, trunk/reactos/hal/halx86/generic/acpi/ branches/ros-amd64-bringup/reactos/hal/halx86/generic/legacy/ - copied from r46584, trunk/reactos/hal/halx86/generic/legacy/ branches/ros-amd64-bringup/reactos/hal/halx86/halacpi.rbuild - copied unchanged from r46584, trunk/reactos/hal/halx86/halacpi.rbuild branches/ros-amd64-bringup/reactos/media/inf/bda.inf - copied unchanged from r46584, trunk/reactos/media/inf/bda.inf branches/ros-amd64-bringup/reactos/media/inf/kscaptur.inf - copied unchanged from r46584, trunk/reactos/media/inf/kscaptur.inf Removed: branches/ros-amd64-bringup/reactos/boot/bootdata/hiveinst_amd64.inf Modified: branches/ros-amd64-bringup/reactos/ (props changed) branches/ros-amd64-bringup/reactos/ReactOS-amd64.rbuild branches/ros-amd64-bringup/reactos/base/applications/downloader/ (props changed) branches/ros-amd64-bringup/reactos/base/applications/fontview/ (props changed) branches/ros-amd64-bringup/reactos/base/applications/magnify/ (props changed) branches/ros-amd64-bringup/reactos/base/applications/winver/ (props changed) branches/ros-amd64-bringup/reactos/base/applications/write/ (props changed) branches/ros-amd64-bringup/reactos/base/services/tcpsvcs/tcpsvcs.rbuild branches/ros-amd64-bringup/reactos/base/services/telnetd/ (props changed) branches/ros-amd64-bringup/reactos/base/shell/explorer/explorer.rbuild branches/ros-amd64-bringup/reactos/baseaddress.rbuild branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/arch/amd64/ (props changed) branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/include/arch/amd64/ (props changed) branches/ros-amd64-bringup/reactos/config-amd64.template.rbuild branches/ros-amd64-bringup/reactos/dll/cpl/sysdm/general.c branches/ros-amd64-bringup/reactos/dll/cpl/usrmgr/lang/de-DE.rc branches/ros-amd64-bringup/reactos/dll/directx/bdaplgin/bdaplgin.cpp branches/ros-amd64-bringup/reactos/dll/directx/bdaplgin/classfactory.cpp (props changed) branches/ros-amd64-bringup/reactos/dll/directx/bdaplgin/devicecontrol.cpp branches/ros-amd64-bringup/reactos/dll/directx/bdaplgin/digitaldemo.cpp branches/ros-amd64-bringup/reactos/dll/directx/bdaplgin/frequencyfilter.cpp branches/ros-amd64-bringup/reactos/dll/directx/bdaplgin/lnbinfo.cpp branches/ros-amd64-bringup/reactos/dll/directx/d3d8/d3d8.spec (props changed) branches/ros-amd64-bringup/reactos/dll/directx/directx.rbuild branches/ros-amd64-bringup/reactos/dll/directx/dsound_new/ (props changed) branches/ros-amd64-bringup/reactos/dll/directx/dsound_new/classfactory.c (props changed) branches/ros-amd64-bringup/reactos/dll/directx/dsound_new/dsound.spec (props changed) branches/ros-amd64-bringup/reactos/dll/directx/dsound_new/dsound_convert.c (props changed) branches/ros-amd64-bringup/reactos/dll/directx/dsound_new/regsvr.c (props changed) branches/ros-amd64-bringup/reactos/dll/directx/ksproxy/enumpins.cpp branches/ros-amd64-bringup/reactos/dll/directx/ksproxy/input_pin.cpp branches/ros-amd64-bringup/reactos/dll/directx/ksproxy/ksproxy.cpp branches/ros-amd64-bringup/reactos/dll/directx/ksproxy/output_pin.cpp branches/ros-amd64-bringup/reactos/dll/directx/msdvbnp/msdvbnp.cpp branches/ros-amd64-bringup/reactos/dll/directx/msdvbnp/msdvbnp.rbuild branches/ros-amd64-bringup/reactos/dll/directx/msdvbnp/networkprovider.cpp branches/ros-amd64-bringup/reactos/dll/directx/msdvbnp/pin.cpp branches/ros-amd64-bringup/reactos/dll/directx/msdvbnp/precomp.h branches/ros-amd64-bringup/reactos/dll/directx/msdvbnp/scanningtuner.cpp branches/ros-amd64-bringup/reactos/dll/directx/msvidctl/msvidctl.cpp branches/ros-amd64-bringup/reactos/dll/keyboard/kbdlt1/kbdlt1.c (props changed) branches/ros-amd64-bringup/reactos/dll/keyboard/kbdlt1/kbdlt1.rbuild (props changed) branches/ros-amd64-bringup/reactos/dll/keyboard/kbdlt1/kbdlt1.rc (props changed) branches/ros-amd64-bringup/reactos/dll/keyboard/kbdlt1/kbdlt1.spec (props changed) branches/ros-amd64-bringup/reactos/dll/shellext/devcpux/devcpux.spec (props changed) branches/ros-amd64-bringup/reactos/dll/shellext/slayer/slayer.spec (props changed) branches/ros-amd64-bringup/reactos/dll/win32/gdi32/objects/dc.c branches/ros-amd64-bringup/reactos/dll/win32/gdi32/objects/font.c branches/ros-amd64-bringup/reactos/dll/win32/user32/controls/scrollbar.c branches/ros-amd64-bringup/reactos/dll/win32/user32/misc/desktop.c branches/ros-amd64-bringup/reactos/dll/win32/user32/misc/winsta.c branches/ros-amd64-bringup/reactos/dll/win32/user32/windows/defwnd.c branches/ros-amd64-bringup/reactos/dll/win32/user32/windows/draw.c branches/ros-amd64-bringup/reactos/drivers/bus/acpi/cmbatt/cmbpnp.c branches/ros-amd64-bringup/reactos/drivers/bus/acpi/compbatt/compbatt.c branches/ros-amd64-bringup/reactos/drivers/bus/acpi/compbatt/compbatt.h branches/ros-amd64-bringup/reactos/drivers/bus/acpi/compbatt/compmisc.c branches/ros-amd64-bringup/reactos/drivers/bus/acpi/compbatt/comppnp.c branches/ros-amd64-bringup/reactos/drivers/bus/acpi/main.c branches/ros-amd64-bringup/reactos/drivers/multimedia/audio/sb16_nt4.old/ (props changed) branches/ros-amd64-bringup/reactos/drivers/multimedia/audio/sndblst.old/ (props changed) branches/ros-amd64-bringup/reactos/drivers/network/afd/afd/connect.c branches/ros-amd64-bringup/reactos/drivers/network/afd/afd/write.c branches/ros-amd64-bringup/reactos/drivers/video/font/bmfd/ (props changed) branches/ros-amd64-bringup/reactos/drivers/video/font/ftfd/ (props changed) branches/ros-amd64-bringup/reactos/hal/halx86/directory.rbuild branches/ros-amd64-bringup/reactos/hal/halx86/hal.rbuild branches/ros-amd64-bringup/reactos/hal/halx86/hal_generic.rbuild branches/ros-amd64-bringup/reactos/hal/halx86/halamd64.rbuild branches/ros-amd64-bringup/reactos/hal/halx86/halmps.rbuild branches/ros-amd64-bringup/reactos/hal/halx86/halxbox.rbuild branches/ros-amd64-bringup/reactos/include/crt/mingw32/intrin_x86.h (props changed) branches/ros-amd64-bringup/reactos/include/ddk/ntddk.h branches/ros-amd64-bringup/reactos/include/ddk/ntifs.h branches/ros-amd64-bringup/reactos/include/ddk/wdm.h branches/ros-amd64-bringup/reactos/include/ndk/amd64/ (props changed) branches/ros-amd64-bringup/reactos/include/ndk/amd64/asmmacro.S (props changed) branches/ros-amd64-bringup/reactos/include/psdk/wingdi.h branches/ros-amd64-bringup/reactos/include/psdk/winuser.h branches/ros-amd64-bringup/reactos/lib/rtl/registry.c branches/ros-amd64-bringup/reactos/lib/sdk/crt/stdio/file.c (props changed) branches/ros-amd64-bringup/reactos/lib/sdk/crt/time/ (props changed) branches/ros-amd64-bringup/reactos/media/inf/inf.rbuild branches/ros-amd64-bringup/reactos/media/inf/machine.inf branches/ros-amd64-bringup/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c branches/ros-amd64-bringup/reactos/ntoskrnl/kdbg/ (props changed) branches/ros-amd64-bringup/reactos/ntoskrnl/se/semgr.c branches/ros-amd64-bringup/reactos/subsystems/win32/win32k/include/engobjects.h (props changed) branches/ros-amd64-bringup/reactos/subsystems/win32/win32k/include/timer.h branches/ros-amd64-bringup/reactos/subsystems/win32/win32k/include/winpos.h branches/ros-amd64-bringup/reactos/subsystems/win32/win32k/ntuser/timer.c branches/ros-amd64-bringup/reactos/subsystems/win32/win32k/ntuser/windc.c branches/ros-amd64-bringup/reactos/tools/ (props changed) branches/ros-amd64-bringup/reactos/tools/hpp/ (props changed) branches/ros-amd64-bringup/reactos/tools/rbuild/backend/mingw/mingw.cpp branches/ros-amd64-bringup/reactos/tools/rbuild/backend/mingw/mingw.h branches/ros-amd64-bringup/reactos/tools/rbuild/backend/mingw/modulehandler.cpp branches/ros-amd64-bringup/reactos/tools/rbuild/installfile.cpp branches/ros-amd64-bringup/reactos/tools/rbuild/module.cpp branches/ros-amd64-bringup/reactos/tools/rbuild/project.cpp branches/ros-amd64-bringup/reactos/tools/rbuild/rbuild.h branches/ros-amd64-bringup/reactos/tools/rbuild_helper/ (props changed) branches/ros-amd64-bringup/reactos/tools/rsym/rsym.c (props changed) branches/ros-amd64-bringup/reactos/tools/rsym/rsym.h (props changed) branches/ros-amd64-bringup/reactos/tools/rsym/rsym.mak (props changed) branches/ros-amd64-bringup/reactos/tools/rsym/rsym_common.c (props changed) [This mail would be too long, it was shortened to contain the URLs only.] Modified: branches/ros-amd64-bringup/reactos/ReactOS-amd64.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/React… Modified: branches/ros-amd64-bringup/reactos/base/services/tcpsvcs/tcpsvcs.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/base/… Modified: branches/ros-amd64-bringup/reactos/base/shell/explorer/explorer.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/base/… Modified: branches/ros-amd64-bringup/reactos/baseaddress.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/basea… Removed: branches/ros-amd64-bringup/reactos/boot/bootdata/hiveinst_amd64.inf URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/boot/… Modified: branches/ros-amd64-bringup/reactos/config-amd64.template.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/confi… Modified: branches/ros-amd64-bringup/reactos/dll/cpl/sysdm/general.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/c… Modified: branches/ros-amd64-bringup/reactos/dll/cpl/usrmgr/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/c… Modified: branches/ros-amd64-bringup/reactos/dll/directx/bdaplgin/bdaplgin.cpp URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/d… Modified: branches/ros-amd64-bringup/reactos/dll/directx/bdaplgin/devicecontrol.cpp URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/d… Modified: branches/ros-amd64-bringup/reactos/dll/directx/bdaplgin/digitaldemo.cpp URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/d… Modified: branches/ros-amd64-bringup/reactos/dll/directx/bdaplgin/frequencyfilter.cpp URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/d… Modified: branches/ros-amd64-bringup/reactos/dll/directx/bdaplgin/lnbinfo.cpp URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/d… Modified: branches/ros-amd64-bringup/reactos/dll/directx/directx.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/d… Modified: branches/ros-amd64-bringup/reactos/dll/directx/ksproxy/enumpins.cpp URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/d… Modified: branches/ros-amd64-bringup/reactos/dll/directx/ksproxy/input_pin.cpp URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/d… Modified: branches/ros-amd64-bringup/reactos/dll/directx/ksproxy/ksproxy.cpp URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/d… Modified: branches/ros-amd64-bringup/reactos/dll/directx/ksproxy/output_pin.cpp URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/d… Modified: branches/ros-amd64-bringup/reactos/dll/directx/msdvbnp/msdvbnp.cpp URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/d… Modified: branches/ros-amd64-bringup/reactos/dll/directx/msdvbnp/msdvbnp.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/d… Modified: branches/ros-amd64-bringup/reactos/dll/directx/msdvbnp/networkprovider.cpp URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/d… Modified: branches/ros-amd64-bringup/reactos/dll/directx/msdvbnp/pin.cpp URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/d… Modified: branches/ros-amd64-bringup/reactos/dll/directx/msdvbnp/precomp.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/d… Modified: branches/ros-amd64-bringup/reactos/dll/directx/msdvbnp/scanningtuner.cpp URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/d… Modified: branches/ros-amd64-bringup/reactos/dll/directx/msvidctl/msvidctl.cpp URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/d… Modified: branches/ros-amd64-bringup/reactos/dll/win32/gdi32/objects/dc.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… Modified: branches/ros-amd64-bringup/reactos/dll/win32/gdi32/objects/font.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… Modified: branches/ros-amd64-bringup/reactos/dll/win32/user32/controls/scrollbar.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… Modified: branches/ros-amd64-bringup/reactos/dll/win32/user32/misc/desktop.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… Modified: branches/ros-amd64-bringup/reactos/dll/win32/user32/misc/winsta.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… Modified: branches/ros-amd64-bringup/reactos/dll/win32/user32/windows/defwnd.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… Modified: branches/ros-amd64-bringup/reactos/dll/win32/user32/windows/draw.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… Modified: branches/ros-amd64-bringup/reactos/drivers/bus/acpi/cmbatt/cmbpnp.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/drive… Modified: branches/ros-amd64-bringup/reactos/drivers/bus/acpi/compbatt/compbatt.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/drive… Modified: branches/ros-amd64-bringup/reactos/drivers/bus/acpi/compbatt/compbatt.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/drive… Modified: branches/ros-amd64-bringup/reactos/drivers/bus/acpi/compbatt/compmisc.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/drive… Modified: branches/ros-amd64-bringup/reactos/drivers/bus/acpi/compbatt/comppnp.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/drive… Modified: branches/ros-amd64-bringup/reactos/drivers/bus/acpi/main.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/drive… Modified: branches/ros-amd64-bringup/reactos/drivers/network/afd/afd/connect.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/drive… Modified: branches/ros-amd64-bringup/reactos/drivers/network/afd/afd/write.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/drive… Modified: branches/ros-amd64-bringup/reactos/hal/halx86/directory.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/hal/h… Modified: branches/ros-amd64-bringup/reactos/hal/halx86/hal.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/hal/h… Modified: branches/ros-amd64-bringup/reactos/hal/halx86/hal_generic.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/hal/h… Modified: branches/ros-amd64-bringup/reactos/hal/halx86/halamd64.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/hal/h… Modified: branches/ros-amd64-bringup/reactos/hal/halx86/halmps.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/hal/h… Modified: branches/ros-amd64-bringup/reactos/hal/halx86/halxbox.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/hal/h… Modified: branches/ros-amd64-bringup/reactos/include/ddk/ntddk.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/inclu… Modified: branches/ros-amd64-bringup/reactos/include/ddk/ntifs.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/inclu… Modified: branches/ros-amd64-bringup/reactos/include/ddk/wdm.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/inclu… Modified: branches/ros-amd64-bringup/reactos/include/psdk/wingdi.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/inclu… Modified: branches/ros-amd64-bringup/reactos/include/psdk/winuser.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/inclu… Modified: branches/ros-amd64-bringup/reactos/lib/rtl/registry.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/r… Modified: branches/ros-amd64-bringup/reactos/media/inf/inf.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/media… Modified: branches/ros-amd64-bringup/reactos/media/inf/machine.inf URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/media… Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/se/semgr.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… Modified: branches/ros-amd64-bringup/reactos/subsystems/win32/win32k/include/timer.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/subsy… Modified: branches/ros-amd64-bringup/reactos/subsystems/win32/win32k/include/winpos.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/subsy… Modified: branches/ros-amd64-bringup/reactos/subsystems/win32/win32k/ntuser/timer.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/subsy… Modified: branches/ros-amd64-bringup/reactos/subsystems/win32/win32k/ntuser/windc.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/subsy… Modified: branches/ros-amd64-bringup/reactos/tools/rbuild/backend/mingw/mingw.cpp URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/tools… Modified: branches/ros-amd64-bringup/reactos/tools/rbuild/backend/mingw/mingw.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/tools… Modified: branches/ros-amd64-bringup/reactos/tools/rbuild/backend/mingw/modulehandler.cpp URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/tools… Modified: branches/ros-amd64-bringup/reactos/tools/rbuild/installfile.cpp URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/tools… Modified: branches/ros-amd64-bringup/reactos/tools/rbuild/module.cpp URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/tools… Modified: branches/ros-amd64-bringup/reactos/tools/rbuild/project.cpp URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/tools… Modified: branches/ros-amd64-bringup/reactos/tools/rbuild/rbuild.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/tools…

1 0

[tkreuzer] 46584: [HAL] Fix rbuild files a bit.
by tkreuzer＠svn.reactos.org 30 Mar '10

30 Mar '10

Author: tkreuzer Date: Tue Mar 30 08:10:51 2010 New Revision: 46584 URL: http://svn.reactos.org/svn/reactos?rev=46584&view=rev Log: [HAL] Fix rbuild files a bit. Modified: branches/ros-amd64-bringup/reactos/hal/halx86/hal_generic.rbuild branches/ros-amd64-bringup/reactos/hal/halx86/hal_generic_up.rbuild branches/ros-amd64-bringup/reactos/hal/halx86/halamd64.rbuild Modified: branches/ros-amd64-bringup/reactos/hal/halx86/hal_generic.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/hal/h… ============================================================================== --- branches/ros-amd64-bringup/reactos/hal/halx86/hal_generic.rbuild [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/hal/halx86/hal_generic.rbuild [iso-8859-1] Tue Mar 30 08:10:51 2010 @@ -36,6 +36,7 @@ </directory> </if> <if property="ARCH" value="amd64"> + <include base="x86emu">.</include> <directory name="amd64"> <file>x86bios.c</file> <file>halinit.c</file> Modified: branches/ros-amd64-bringup/reactos/hal/halx86/hal_generic_up.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/hal/h… ============================================================================== --- branches/ros-amd64-bringup/reactos/hal/halx86/hal_generic_up.rbuild [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/hal/halx86/hal_generic_up.rbuild [iso-8859-1] Tue Mar 30 08:10:51 2010 @@ -1,6 +1,7 @@ <?xml version="1.0"?> <!DOCTYPE group SYSTEM "../../tools/rbuild/project.dtd"> <group> +<if property="ARCH" value="i386"> <module name="hal_generic_up" type="objectlibrary"> <include>include</include> <include base="ntoskrnl">include</include> @@ -14,4 +15,5 @@ <file>processor.c</file> </directory> </module> +</if> </group> Modified: branches/ros-amd64-bringup/reactos/hal/halx86/halamd64.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/hal/h… ============================================================================== --- branches/ros-amd64-bringup/reactos/hal/halx86/halamd64.rbuild [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/hal/halx86/halamd64.rbuild [iso-8859-1] Tue Mar 30 08:10:51 2010 @@ -11,15 +11,15 @@ <define name="_NTHAL_" /> <define name="_X86BIOS_" /> <library>hal_generic</library> - <library>hal_generic_up</library> + <library>hal_generic_mp</library> <library>ntoskrnl</library> -  + <library>x86emu</library> <directory name="mp"> <file>halinit_mp.c</file> <file>halmp.rc</file> <directory name="amd64"> -  + <file>mps.S</file> </directory> </directory> </module>

1 0

[tkreuzer] 46583: [FASTFAT] include ctype.h, instead of wctype.h (the latter is not present in ms headers)
by tkreuzer＠svn.reactos.org 30 Mar '10

30 Mar '10

Author: tkreuzer Date: Tue Mar 30 08:10:11 2010 New Revision: 46583 URL: http://svn.reactos.org/svn/reactos?rev=46583&view=rev Log: [FASTFAT] include ctype.h, instead of wctype.h (the latter is not present in ms headers) Modified: branches/ros-amd64-bringup/reactos/drivers/filesystems/fastfat/fcb.c Modified: branches/ros-amd64-bringup/reactos/drivers/filesystems/fastfat/fcb.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/drive… ============================================================================== --- branches/ros-amd64-bringup/reactos/drivers/filesystems/fastfat/fcb.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/drivers/filesystems/fastfat/fcb.c [iso-8859-1] Tue Mar 30 08:10:11 2010 @@ -11,7 +11,7 @@ /* ------------------------------------------------------- INCLUDES */ #ifdef __GNUC__ -#include <wctype.h> /* towlower prototype */ +#include <ctype.h> /* towlower prototype */ #endif #define NDEBUG

1 0

[tkreuzer] 46582: Merge the rest from header branch.
by tkreuzer＠svn.reactos.org 30 Mar '10

30 Mar '10

Author: tkreuzer Date: Tue Mar 30 07:34:20 2010 New Revision: 46582 URL: http://svn.reactos.org/svn/reactos?rev=46582&view=rev Log: Merge the rest from header branch. Modified: trunk/reactos/include/ddk/ntddk.h trunk/reactos/include/ddk/ntifs.h trunk/reactos/include/ddk/ntimage.h trunk/reactos/include/ddk/wdm.h trunk/reactos/include/ndk/ketypes.h [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/include/ddk/ntddk.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/ntddk.h?rev=46… Modified: trunk/reactos/include/ddk/ntifs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/ntifs.h?rev=46… Modified: trunk/reactos/include/ddk/ntimage.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/ntimage.h?rev=… Modified: trunk/reactos/include/ddk/wdm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/wdm.h?rev=4658… Modified: trunk/reactos/include/ndk/ketypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/ketypes.h?rev=…

1 0

[tkreuzer] 46581: Simplify definition of PIMAGE_NT_HEADERS
by tkreuzer＠svn.reactos.org 30 Mar '10

30 Mar '10

Author: tkreuzer Date: Tue Mar 30 07:22:15 2010 New Revision: 46581 URL: http://svn.reactos.org/svn/reactos?rev=46581&view=rev Log: Simplify definition of PIMAGE_NT_HEADERS Modified: branches/header-work/include/ddk/ntimage.h Modified: branches/header-work/include/ddk/ntimage.h URL: http://svn.reactos.org/svn/reactos/branches/header-work/include/ddk/ntimage… ============================================================================== --- branches/header-work/include/ddk/ntimage.h [iso-8859-1] (original) +++ branches/header-work/include/ddk/ntimage.h [iso-8859-1] Tue Mar 30 07:22:15 2010 @@ -403,22 +403,15 @@ } IMAGE_NT_HEADERS32; #ifdef _WIN64 -typedef IMAGE_NT_HEADERS64 IMAGE_NT_HEADERS; +typedef IMAGE_NT_HEADERS64 IMAGE_NT_HEADERS; #else -typedef IMAGE_NT_HEADERS32 IMAGE_NT_HEADERS; +typedef IMAGE_NT_HEADERS32 IMAGE_NT_HEADERS; #endif #ifndef _NTDDK_ - -typedef struct _IMAGE_NT_HEADERS *PIMAGE_NT_HEADERS32; -typedef struct _IMAGE_NT_HEADERS64 *PIMAGE_NT_HEADERS64; - -#ifdef _WIN64 -typedef PIMAGE_NT_HEADERS64 PIMAGE_NT_HEADERS; -#else -typedef PIMAGE_NT_HEADERS32 PIMAGE_NT_HEADERS; -#endif - +typedef IMAGE_NT_HEADERS32 *PIMAGE_NT_HEADERS32; +typedef IMAGE_NT_HEADERS64 *PIMAGE_NT_HEADERS64; +typedef IMAGE_NT_HEADERS *PIMAGE_NT_HEADERS; #endif /* _NTDDK_ */ //

1 0

← Newer
1
2
3
4
5
6
7
8
...
90
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs March 2010