Ros-diffs

ros-diffs@reactos.org

81390 discussions

[gvg] 13024: Fix compilation with DBG := 1 and KDBG := 0
by gvg＠svn.reactos.com 13 Jan '05

13 Jan '05

Fix compilation with DBG := 1 and KDBG := 0 Modified: trunk/reactos/ntoskrnl/dbg/kdb_symbols.c _____ Modified: trunk/reactos/ntoskrnl/dbg/kdb_symbols.c --- trunk/reactos/ntoskrnl/dbg/kdb_symbols.c 2005-01-13 07:29:12 UTC (rev 13023) +++ trunk/reactos/ntoskrnl/dbg/kdb_symbols.c 2005-01-13 08:45:23 UTC (rev 13024) @@ -816,8 +816,10 @@ PSYMBOLFILE_HEADER SymbolFileHeader; PIMAGE_SYMBOL_INFO_CACHE CachedSymbolFile; +#ifdef KDBG /* Allow KDB to break on module load */ KdbModuleLoaded(FileName); +#endif /* Get the path to the symbol store */ wcscpy(TmpFileName, L"\\SystemRoot\\symbols\\");

1 0

[arty] 13023: Conditionalized possibly unused variable.
by arty＠svn.reactos.com 13 Jan '05

13 Jan '05

Conditionalized possibly unused variable. Modified: trunk/reactos/lib/ws2_32/misc/dllmain.c _____ Modified: trunk/reactos/lib/ws2_32/misc/dllmain.c --- trunk/reactos/lib/ws2_32/misc/dllmain.c 2005-01-13 06:55:44 UTC (rev 13022) +++ trunk/reactos/lib/ws2_32/misc/dllmain.c 2005-01-13 07:29:12 UTC (rev 13023) @@ -553,12 +553,14 @@ } if( addr ) { +#ifdef DBG LPSOCKADDR_IN sa = (LPSOCKADDR_IN)addr; WS_DbgPrint(MAX_TRACE,("Returned address: %d %s:%d (len %d)\n", sa->sin_family, inet_ntoa(sa->sin_addr), ntohs(sa->sin_port), *addrlen)); +#endif } return Socket;

1 0

[arty] 13022: Correct handling of zero address and zero address length in accept.
by arty＠svn.reactos.com 13 Jan '05

13 Jan '05

Correct handling of zero address and zero address length in accept. Modified: trunk/reactos/lib/msafd/misc/dllmain.c _____ Modified: trunk/reactos/lib/msafd/misc/dllmain.c --- trunk/reactos/lib/msafd/misc/dllmain.c 2005-01-13 06:46:22 UTC (rev 13021) +++ trunk/reactos/lib/msafd/misc/dllmain.c 2005-01-13 06:55:44 UTC (rev 13022) @@ -973,9 +973,14 @@ } /* Return Address in SOCKADDR FORMAT */ - RtlCopyMemory (SocketAddress, - &ListenReceiveData->Address.Address[0].AddressType, - sizeof(RemoteAddress)); + if( SocketAddress ) { + RtlCopyMemory (SocketAddress, + &ListenReceiveData->Address.Address[0].AddressType, + sizeof(RemoteAddress)); + if( *SocketAddressLength ) + *SocketAddressLength = + ListenReceiveData->Address.Address[0].AddressLength; + } NtClose( SockEvent );

1 0

[arty] 13021: Initial accept commit. Accept sockets now work although there are still
by arty＠svn.reactos.com 13 Jan '05

13 Jan '05

Initial accept commit. Accept sockets now work although there are still problems related to shutting down the listener itself at process close time. I've tried a simple server with it and it looks good. Modified: trunk/reactos/drivers/lib/ip/network/ports.c Modified: trunk/reactos/drivers/lib/ip/transport/tcp/accept.c Modified: trunk/reactos/drivers/lib/ip/transport/tcp/tcp.c Modified: trunk/reactos/drivers/lib/oskittcp/oskittcp/interface.c Modified: trunk/reactos/drivers/net/afd/afd/info.c Modified: trunk/reactos/drivers/net/afd/afd/listen.c Modified: trunk/reactos/drivers/net/afd/afd/main.c Modified: trunk/reactos/drivers/net/afd/afd/read.c Modified: trunk/reactos/drivers/net/afd/afd/tdiconn.c Modified: trunk/reactos/drivers/net/afd/include/afd.h Modified: trunk/reactos/drivers/net/tcpip/include/tcp.h Modified: trunk/reactos/drivers/net/tcpip/tcpip/dispatch.c Modified: trunk/reactos/drivers/net/tcpip/tcpip/fileobjs.c Modified: trunk/reactos/drivers/net/tcpip/tcpip/main.c Modified: trunk/reactos/include/afd/shared.h Modified: trunk/reactos/lib/msafd/misc/dllmain.c Modified: trunk/reactos/lib/msafd/misc/sndrcv.c Modified: trunk/reactos/lib/ws2_32/misc/catalog.c Modified: trunk/reactos/lib/ws2_32/misc/dllmain.c _____ Modified: trunk/reactos/drivers/lib/ip/network/ports.c --- trunk/reactos/drivers/lib/ip/network/ports.c 2005-01-13 05:10:33 UTC (rev 13020) +++ trunk/reactos/drivers/lib/ip/network/ports.c 2005-01-13 06:46:22 UTC (rev 13021) @@ -20,6 +20,8 @@ RtlInitializeBitMap( &PortSet->ProtoBitmap, PortSet->ProtoBitBuffer, PortSet->PortsToOversee ); + RtlClearBits( &PortSet->ProtoBitmap, + PortSet->StartingPort, PortsToManage ); ExInitializeFastMutex( &PortSet->Mutex ); } _____ Modified: trunk/reactos/drivers/lib/ip/transport/tcp/accept.c --- trunk/reactos/drivers/lib/ip/transport/tcp/accept.c 2005-01-13 05:10:33 UTC (rev 13020) +++ trunk/reactos/drivers/lib/ip/transport/tcp/accept.c 2005-01-13 06:46:22 UTC (rev 13021) @@ -1,7 +1,7 @@ /* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS TCP/IP protocol driver - * FILE: transport/tcp/tcp.c + * FILE: transport/tcp/accept.c * PURPOSE: Transmission Control Protocol Listen/Accept code * PROGRAMMERS: Art Yerkes (arty(a)users.sf.net) * REVISIONS: @@ -16,8 +16,7 @@ NTSTATUS Status; SOCKADDR_IN OutAddr; OSK_UINT OutAddrLen; - PTA_ADDRESS RequestAddressReturn; - SOCKADDR_IN AddressConnecting; + PTA_IP_ADDRESS RequestAddressReturn; PTDI_CONNECTION_INFORMATION WhoIsConnecting; /* Unpack TDI info -- We need the return connection information @@ -38,22 +37,23 @@ TI_DbgPrint(DEBUG_TCP,("Status %x\n", Status)); if( NT_SUCCESS(Status) && Status != STATUS_PENDING ) { + RequestAddressReturn = WhoIsConnecting->RemoteAddress; + TI_DbgPrint(DEBUG_TCP,("Copying address to %x (Who %x)\n", RequestAddressReturn, WhoIsConnecting)); - RequestAddressReturn = (PTA_ADDRESS)WhoIsConnecting->RemoteAddress; - RequestAddressReturn->AddressLength = OutAddrLen; - RequestAddressReturn->AddressType = - AddressConnecting.sin_family; - TI_DbgPrint(DEBUG_TCP,("Copying address proper: from %x to %x,%x\n", - ((PCHAR)&AddressConnecting) + - sizeof(AddressConnecting.sin_family), - RequestAddressReturn->Address, - RequestAddressReturn->AddressLength)); - RtlCopyMemory( RequestAddressReturn->Address, - ((PCHAR)&AddressConnecting) + - sizeof(AddressConnecting.sin_family), - RequestAddressReturn->AddressLength ); + RequestAddressReturn->TAAddressCount = 1; + RequestAddressReturn->Address[0].AddressLength = OutAddrLen; + + /* BSD uses the first byte of the sockaddr struct as a length. + * Since windows doesn't do that we strip it */ + RequestAddressReturn->Address[0].AddressType = + (OutAddr.sin_family >> 8) & 0xff; + + RtlCopyMemory( &RequestAddressReturn->Address[0].Address, + ((PCHAR)&OutAddr) + sizeof(USHORT), + sizeof(RequestAddressReturn->Address[0].Address[0]) ); + TI_DbgPrint(DEBUG_TCP,("Done copying\n")); } @@ -151,7 +151,7 @@ } TcpipRecursiveMutexLeave( &TCPLock ); - + TI_DbgPrint(DEBUG_TCP,("TCPAccept finished %x\n", Status)); return Status; } _____ Modified: trunk/reactos/drivers/lib/ip/transport/tcp/tcp.c --- trunk/reactos/drivers/lib/ip/transport/tcp/tcp.c 2005-01-13 05:10:33 UTC (rev 13020) +++ trunk/reactos/drivers/lib/ip/transport/tcp/tcp.c 2005-01-13 06:46:22 UTC (rev 13021) @@ -30,9 +30,13 @@ PIRP Irp; PMDL Mdl; + TI_DbgPrint(MID_TRACE,("Handling signalled state on %x (%x)\n", + Connection, Connection->SocketContext)); + /* Things that can happen when we try the initial connection */ if( ((NewState & SEL_CONNECT) || (NewState & SEL_FIN)) && !(Connection->State & (SEL_CONNECT | SEL_FIN)) ) { + while( !IsListEmpty( &Connection->ConnectRequest ) ) { Connection->State |= NewState & (SEL_CONNECT | SEL_FIN); Entry = RemoveHeadList( &Connection->ConnectRequest ); @@ -529,7 +533,8 @@ NTSTATUS Status; PTDI_BUCKET Bucket; - TI_DbgPrint(DEBUG_TCP,("Called for %d bytes\n", ReceiveLength)); + TI_DbgPrint(DEBUG_TCP,("Called for %d bytes (on socket %x)\n", + ReceiveLength, Connection->SocketContext)); ASSERT_KM_POINTER(Connection->SocketContext); @@ -616,7 +621,11 @@ UINT TCPAllocatePort( UINT HintPort ) { if( HintPort ) { if( AllocatePort( &TCPPorts, HintPort ) ) return HintPort; - else return (UINT)-1; + else { + TI_DbgPrint + (MID_TRACE,("We got a hint port but couldn't allocate it\n")); + return (UINT)-1; + } } else return AllocatePortFromRange( &TCPPorts, 1024, 5000 ); } @@ -624,4 +633,25 @@ DeallocatePort( &TCPPorts, Port ); } +NTSTATUS TCPGetPeerAddress +( PCONNECTION_ENDPOINT Connection, + PTRANSPORT_ADDRESS Address ) { + OSK_UINT LocalAddress, RemoteAddress; + OSK_UI16 LocalPort, RemotePort; + PTA_IP_ADDRESS AddressIP = (PTA_IP_ADDRESS)Address; + + OskitTCPGetAddress + ( Connection->SocketContext, + &LocalAddress, &LocalPort, + &RemoteAddress, &RemotePort ); + + AddressIP->TAAddressCount = 1; + AddressIP->Address[0].AddressLength = TDI_ADDRESS_LENGTH_IP; + AddressIP->Address[0].AddressType = TDI_ADDRESS_TYPE_IP; + AddressIP->Address[0].Address[0].sin_port = RemotePort; + AddressIP->Address[0].Address[0].in_addr = RemoteAddress; + + return STATUS_SUCCESS; +} + /* EOF */ _____ Modified: trunk/reactos/drivers/lib/oskittcp/oskittcp/interface.c --- trunk/reactos/drivers/lib/oskittcp/oskittcp/interface.c 2005-01-13 05:10:33 UTC (rev 13020) +++ trunk/reactos/drivers/lib/oskittcp/oskittcp/interface.c 2005-01-13 06:46:22 UTC (rev 13021) @@ -22,8 +22,8 @@ OSKITTCP_EVENT_HANDLERS OtcpEvent = { 0 }; -OSK_UINT OskitDebugTraceLevel = OSK_DEBUG_ULTRA; -//OSK_UINT OskitDebugTraceLevel = 0; +//OSK_UINT OskitDebugTraceLevel = OSK_DEBUG_ULTRA; +OSK_UINT OskitDebugTraceLevel = 0; /* SPL */ unsigned cpl; @@ -295,6 +295,7 @@ struct socket *so = socket; struct sockaddr_in sa; struct mbuf mnam; + struct inpcb *inp; int namelen = 0, error = 0, s; OS_DbgPrint(OSK_MID_TRACE,("OSKITTCP: Doing accept (Finish %d)\n", @@ -308,8 +309,6 @@ s = splnet(); - OskitDumpBuffer( so, sizeof(*so) ); - #if 0 if ((head->so_options & SO_ACCEPTCONN) == 0) { splx(s); @@ -363,6 +362,13 @@ */ so = head->so_q; + inp = so ? so->so_pcb : 0; + if( inp ) { + ((struct sockaddr_in *)AddrOut)->sin_addr.s_addr = + inp->inp_faddr.s_addr; + ((struct sockaddr_in *)AddrOut)->sin_port = inp->inp_fport; + } + OS_DbgPrint(OSK_MID_TRACE,("error = %d\n", error)); if( FinishAccepting ) { head->so_q = so->so_q; @@ -380,8 +386,6 @@ so->so_state = SS_NBIO | SS_ISCONNECTED; - OskitDumpBuffer( so, sizeof(*so) ); - OS_DbgPrint(OSK_MID_TRACE,("error = %d\n", error)); if (name) { /* check sa_len before it is destroyed */ _____ Modified: trunk/reactos/drivers/net/afd/afd/info.c --- trunk/reactos/drivers/net/afd/afd/info.c 2005-01-13 05:10:33 UTC (rev 13020) +++ trunk/reactos/drivers/net/afd/afd/info.c 2005-01-13 06:46:22 UTC (rev 13021) @@ -62,12 +62,14 @@ } NTSTATUS STDCALL -AfdGetSockName( PDEVICE_OBJECT DeviceObject, PIRP Irp, - PIO_STACK_LOCATION IrpSp ) { +AfdGetSockOrPeerName( PDEVICE_OBJECT DeviceObject, PIRP Irp, + PIO_STACK_LOCATION IrpSp, BOOLEAN Local ) { NTSTATUS Status = STATUS_SUCCESS; PFILE_OBJECT FileObject = IrpSp->FileObject; PAFD_FCB FCB = FileObject->FsContext; - PMDL Mdl; + PMDL Mdl = NULL, SysMdl = NULL; + PTDI_CONNECTION_INFORMATION ConnInfo = NULL; + PTRANSPORT_ADDRESS TransAddr = NULL; AFD_DbgPrint(MID_TRACE,("Called on %x\n", FCB)); @@ -94,12 +96,50 @@ } _SEH_END; if( NT_SUCCESS(Status) ) { - Status = TdiQueryInformation - ( FCB->AddressFile.Object, - TDI_QUERY_ADDRESS_INFO, - Mdl ); + if( Local ) { + Status = TdiQueryInformation + ( FCB->AddressFile.Object, + TDI_QUERY_ADDRESS_INFO, + Mdl ); + } else { + if( !NT_SUCCESS + ( Status = TdiBuildNullConnectionInfo + ( &ConnInfo, + FCB->LocalAddress->Address[0].AddressType ) ) ) { + SysMdl = IoAllocateMdl + ( ConnInfo, + sizeof( TDI_CONNECTION_INFORMATION ) + + TaLengthOfTransportAddress + ( ConnInfo->RemoteAddress ), + FALSE, + FALSE, + NULL ); + } + + if( SysMdl ) { + MmBuildMdlForNonPagedPool( SysMdl ); + Status = TdiQueryInformation + ( FCB->AddressFile.Object, + TDI_QUERY_CONNECTION_INFO, + SysMdl ); + } else Status = STATUS_NO_MEMORY; + + if( NT_SUCCESS(Status) ) { + TransAddr = + (PTRANSPORT_ADDRESS)MmMapLockedPages + ( Mdl, IoModifyAccess ); + } + + if( TransAddr ) + RtlCopyMemory( TransAddr, ConnInfo->RemoteAddress, + TaLengthOfTransportAddress + ( ConnInfo->RemoteAddress ) ); + + if( ConnInfo ) ExFreePool( ConnInfo ); + if( SysMdl ) IoFreeMdl( SysMdl ); + } } - + /* MmUnlockPages( Mdl ); */ IoFreeMdl( Mdl ); } else { _____ Modified: trunk/reactos/drivers/net/afd/afd/listen.c --- trunk/reactos/drivers/net/afd/afd/listen.c 2005-01-13 05:10:33 UTC (rev 13020) +++ trunk/reactos/drivers/net/afd/afd/listen.c 2005-01-13 06:46:22 UTC (rev 13021) @@ -23,10 +23,8 @@ FCB->State = SOCKET_STATE_CONNECTED; FCB->Connection = Qelt->Object; -#if 0 FCB->RemoteAddress = TaCopyTransportAddress( Qelt->ConnInfo->RemoteAddress ); -#endif Irp->IoStatus.Information = 0; Irp->IoStatus.Status = STATUS_SUCCESS; @@ -40,15 +38,32 @@ VOID SatisfyPreAccept( PIRP Irp, PAFD_TDI_OBJECT_QELT Qelt ) { PAFD_RECEIVED_ACCEPT_DATA ListenReceive = (PAFD_RECEIVED_ACCEPT_DATA)Irp->AssociatedIrp.SystemBuffer; + PTA_IP_ADDRESS IPAddr; ListenReceive->SequenceNumber = Qelt->Seq; + AFD_DbgPrint(MID_TRACE,("Giving SEQ %d to userland\n", Qelt->Seq)); -#if 0 + AFD_DbgPrint(MID_TRACE,("Socket Address (K) %x (U) %x\n", + &ListenReceive->Address, + Qelt->ConnInfo->RemoteAddress)); + TaCopyTransportAddressInPlace( &ListenReceive->Address, Qelt->ConnInfo->RemoteAddress ); -#endif - Irp->IoStatus.Information = sizeof(*ListenReceive); + IPAddr = (PTA_IP_ADDRESS)&ListenReceive->Address; + + AFD_DbgPrint(MID_TRACE,("IPAddr->TAAddressCount %d\n", + IPAddr->TAAddressCount)); + AFD_DbgPrint(MID_TRACE,("IPAddr->Address[0].AddressType %d\n", + IPAddr->Address[0].AddressType)); + AFD_DbgPrint(MID_TRACE,("IPAddr->Address[0].AddressLength %d\n", + IPAddr->Address[0].AddressLength)); + AFD_DbgPrint(MID_TRACE,("IPAddr->Address[0].Address[0].sin_port %x\n", + IPAddr->Address[0].Address[0].sin_port)); + AFD_DbgPrint(MID_TRACE,("IPAddr->Address[0].Address[0].sin_addr %x\n", + IPAddr->Address[0].Address[0].in_addr)); + + Irp->IoStatus.Information = ((PCHAR)&IPAddr[1]) - ((PCHAR)ListenReceive); Irp->IoStatus.Status = STATUS_SUCCESS; IoCompleteRequest( Irp, IO_NETWORK_INCREMENT ); } @@ -79,8 +94,21 @@ TdiCloseDevice( FCB->Connection.Handle, FCB->Connection.Object ); } else { + UINT AddressType = + FCB->LocalAddress->Address[0].AddressType; + Qelt->Object = FCB->Connection; Qelt->Seq = FCB->ConnSeq++; + AFD_DbgPrint(MID_TRACE,("Address Type: %d (RA %x)\n", + AddressType, + FCB->ListenIrp. + ConnectionReturnInfo->RemoteAddress)); + + TdiBuildNullConnectionInfo( &Qelt->ConnInfo, AddressType ); + TaCopyTransportAddressInPlace + ( Qelt->ConnInfo->RemoteAddress, + FCB->ListenIrp.ConnectionReturnInfo->RemoteAddress ); + InsertTailList( &FCB->PendingConnections, &Qelt->ListEntry ); } @@ -119,7 +147,7 @@ PAFD_FCB FCB = FileObject->FsContext; PAFD_LISTEN_DATA ListenReq; - AFD_DbgPrint(MID_TRACE,("Called\n")); + AFD_DbgPrint(MID_TRACE,("Called on %x\n", FCB)); if( !SocketAcquireStateLock( FCB ) ) return LostSocket( Irp, TRUE ); @@ -240,7 +268,7 @@ PendingConnObj->Seq)); if( PendingConnObj->Seq == AcceptData->SequenceNumber ) { - PFILE_OBJECT NewFileObject; + PFILE_OBJECT NewFileObject = NULL; RemoveEntryList( PendingConn ); @@ -252,6 +280,9 @@ (PVOID *)&NewFileObject, NULL ); + ASSERT(NewFileObject != FileObject); + ASSERT(NewFileObject->FsContext != FCB); + /* We have a pending connection ... complete this irp right away */ SatisfyAccept( Irp, NewFileObject, PendingConnObj ); _____ Modified: trunk/reactos/drivers/net/afd/afd/main.c --- trunk/reactos/drivers/net/afd/afd/main.c 2005-01-13 05:10:33 UTC (rev 13020) +++ trunk/reactos/drivers/net/afd/afd/main.c 2005-01-13 06:46:22 UTC (rev 13021) @@ -367,8 +367,11 @@ return AfdDisconnect( DeviceObject, Irp, IrpSp ); case IOCTL_AFD_GET_SOCK_NAME: - return AfdGetSockName( DeviceObject, Irp, IrpSp ); + return AfdGetSockOrPeerName( DeviceObject, Irp, IrpSp, TRUE ); + case IOCTL_AFD_GET_PEER_NAME: + return AfdGetSockOrPeerName( DeviceObject, Irp, IrpSp, FALSE ); + case IOCTL_AFD_GET_TDI_HANDLES: AFD_DbgPrint(MIN_TRACE, ("IOCTL_AFD_GET_TDI_HANDLES\n")); break; _____ Modified: trunk/reactos/drivers/net/afd/afd/read.c --- trunk/reactos/drivers/net/afd/afd/read.c 2005-01-13 05:10:33 UTC (rev 13020) +++ trunk/reactos/drivers/net/afd/afd/read.c 2005-01-13 06:46:22 UTC (rev 13021) @@ -159,9 +159,14 @@ FCB->Recv.BytesUsed = 0; if( FCB->State == SOCKET_STATE_CLOSED ) { + AFD_DbgPrint(MIN_TRACE,("!!! CLOSED SOCK GOT A RECEIVE COMPLETE !!!\n")); SocketStateUnlock( FCB ); DestroySocket( FCB ); return STATUS_SUCCESS; + } else if( FCB->State == SOCKET_STATE_LISTENING ) { + AFD_DbgPrint(MIN_TRACE,("!!! LISTENER GOT A RECEIVE COMPLETE !!!\n")); + SocketStateUnlock( FCB ); + return STATUS_UNSUCCESSFUL; } if( NT_SUCCESS(Irp->IoStatus.Status) && @@ -240,6 +245,12 @@ if( !SocketAcquireStateLock( FCB ) ) return LostSocket( Irp, FALSE ); + if( FCB->State != SOCKET_STATE_CONNECTED ) { + AFD_DbgPrint(MID_TRACE,("Called recv on wrong kind of socket (s%x)\n", + FCB->State)); + return STATUS_UNSUCCESSFUL; + } + if( FCB->Flags & AFD_ENDPOINT_CONNECTIONLESS ) { AFD_DbgPrint(MID_TRACE,("Receive on connection-less sockets not implemented\n")); @@ -295,6 +306,7 @@ return UnlockAndMaybeComplete( FCB, Status, Irp, TotalBytesCopied, NULL, TRUE ); } else { + AFD_DbgPrint(MID_TRACE,("Leaving read irp\n")); return LeaveIrpUntilLater( FCB, Irp, FUNCTION_RECV ); } } _____ Modified: trunk/reactos/drivers/net/afd/afd/tdiconn.c --- trunk/reactos/drivers/net/afd/afd/tdiconn.c 2005-01-13 05:10:33 UTC (rev 13020) +++ trunk/reactos/drivers/net/afd/afd/tdiconn.c 2005-01-13 06:46:22 UTC (rev 13021) @@ -80,7 +80,8 @@ */ { ULONG TdiAddressSize; - + PTRANSPORT_ADDRESS TransportAddress; + TdiAddressSize = TdiAddressSizeFromType(Type); RtlZeroMemory(ConnInfo, @@ -88,8 +89,11 @@ TdiAddressSize); ConnInfo->OptionsLength = sizeof(ULONG); - ConnInfo->RemoteAddressLength = 0; - ConnInfo->RemoteAddress = NULL; + ConnInfo->RemoteAddressLength = TdiAddressSize; + ConnInfo->RemoteAddress = TransportAddress = + (PTRANSPORT_ADDRESS)&ConnInfo[1]; + TransportAddress->TAAddressCount = 1; + TransportAddress->Address[0].AddressType = Type; return STATUS_SUCCESS; } _____ Modified: trunk/reactos/drivers/net/afd/include/afd.h --- trunk/reactos/drivers/net/afd/include/afd.h 2005-01-13 05:10:33 UTC (rev 13020) +++ trunk/reactos/drivers/net/afd/include/afd.h 2005-01-13 06:46:22 UTC (rev 13021) @@ -191,8 +191,8 @@ PIO_STACK_LOCATION IrpSp ); NTSTATUS STDCALL -AfdGetSockName( PDEVICE_OBJECT DeviceObject, PIRP Irp, - PIO_STACK_LOCATION IrpSp ); +AfdGetSockOrPeerName( PDEVICE_OBJECT DeviceObject, PIRP Irp, + PIO_STACK_LOCATION IrpSp, BOOLEAN Local ); /* listen.c */ NTSTATUS AfdWaitForListen( PDEVICE_OBJECT DeviceObject, PIRP Irp, _____ Modified: trunk/reactos/drivers/net/tcpip/include/tcp.h --- trunk/reactos/drivers/net/tcpip/include/tcp.h 2005-01-13 05:10:33 UTC (rev 13020) +++ trunk/reactos/drivers/net/tcpip/include/tcp.h 2005-01-13 06:46:22 UTC (rev 13021) @@ -164,6 +164,10 @@ VOID TCPFreePort( UINT Port ); +NTSTATUS TCPGetPeerAddress +( PCONNECTION_ENDPOINT Connection, + PTRANSPORT_ADDRESS TransportAddress ); + NTSTATUS TCPStartup( VOID); _____ Modified: trunk/reactos/drivers/net/tcpip/tcpip/dispatch.c --- trunk/reactos/drivers/net/tcpip/tcpip/dispatch.c 2005-01-13 05:10:33 UTC (rev 13020) +++ trunk/reactos/drivers/net/tcpip/tcpip/dispatch.c 2005-01-13 06:46:22 UTC (rev 13021) @@ -580,7 +580,9 @@ break; case TDI_CONNECTION_FILE: - AddrFile = ((PCONNECTION_ENDPOINT)TranContext->Handle.ConnectionContext)->AddressFi le; + AddrFile = + ((PCONNECTION_ENDPOINT)TranContext->Handle.ConnectionContext)-> + AddressFile; break; default: @@ -605,13 +607,53 @@ Address->Address[0].AddressLength = TDI_ADDRESS_LENGTH_IP; Address->Address[0].AddressType = TDI_ADDRESS_TYPE_IP; Address->Address[0].Address[0].sin_port = AddrFile->Port; - Address->Address[0].Address[0].in_addr = AddrFile->Address.Address.IPv4Address; + Address->Address[0].Address[0].in_addr = + AddrFile->Address.Address.IPv4Address; RtlZeroMemory( &Address->Address[0].Address[0].sin_zero, sizeof(Address->Address[0].Address[0].sin_zero)); return STATUS_SUCCESS; } + + case TDI_QUERY_CONNECTION_INFO: + { + PTDI_CONNECTION_INFORMATION AddressInfo; + PADDRESS_FILE AddrFile; + PCONNECTION_ENDPOINT Endpoint = NULL; + + AddressInfo = (PTDI_CONNECTION_INFORMATION) + MmGetSystemAddressForMdl(Irp->MdlAddress); + + switch ((ULONG)IrpSp->FileObject->FsContext2) { + case TDI_TRANSPORT_ADDRESS_FILE: + AddrFile = (PADDRESS_FILE)TranContext->Handle.AddressHandle; + break; + + case TDI_CONNECTION_FILE: + Endpoint = + (PCONNECTION_ENDPOINT)TranContext->Handle.ConnectionContext; + break; + + default: + TI_DbgPrint(MIN_TRACE, ("Invalid transport context\n")); + return STATUS_INVALID_PARAMETER; + } + + if (!Endpoint) { + TI_DbgPrint(MID_TRACE, ("No connection object.\n")); + return STATUS_INVALID_PARAMETER; + } + + if (MmGetMdlByteCount(Irp->MdlAddress) < + (FIELD_OFFSET(TDI_CONNECTION_INFORMATION, RemoteAddress) + + sizeof(PVOID))) { + TI_DbgPrint(MID_TRACE, ("MDL buffer too small (ptr).\n")); + return STATUS_BUFFER_OVERFLOW; + } + + return TCPGetPeerAddress( Endpoint, AddressInfo->RemoteAddress ); + } } return STATUS_NOT_IMPLEMENTED; _____ Modified: trunk/reactos/drivers/net/tcpip/tcpip/fileobjs.c --- trunk/reactos/drivers/net/tcpip/tcpip/fileobjs.c 2005-01-13 05:10:33 UTC (rev 13020) +++ trunk/reactos/drivers/net/tcpip/tcpip/fileobjs.c 2005-01-13 06:46:22 UTC (rev 13021) @@ -268,10 +268,10 @@ /* Protocol specific handling */ switch (Protocol) { case IPPROTO_TCP: - /* FIXME: If specified port is 0, a port is chosen dynamically */ - AddrFile->Port = TCPAllocatePort(Address->Address[0].Address[0].sin_port); - AddrFile->Send = NULL; /* TCPSendData */ - break; + AddrFile->Port = + TCPAllocatePort(Address->Address[0].Address[0].sin_port); + AddrFile->Send = NULL; /* TCPSendData */ + break; case IPPROTO_UDP: TI_DbgPrint(MID_TRACE,("Allocating udp port\n")); _____ Modified: trunk/reactos/drivers/net/tcpip/tcpip/main.c --- trunk/reactos/drivers/net/tcpip/tcpip/main.c 2005-01-13 05:10:33 UTC (rev 13020) +++ trunk/reactos/drivers/net/tcpip/tcpip/main.c 2005-01-13 06:46:22 UTC (rev 13021) @@ -9,10 +9,10 @@ */ #include "precomp.h" -//#define NDEBUG +#define NDEBUG #ifndef NDEBUG -DWORD DebugTraceLevel = MAX_TRACE | DEBUG_TCP; +DWORD DebugTraceLevel = DEBUG_ULTRA & ~(DEBUG_LOCK | DEBUG_PBUFFER); #else DWORD DebugTraceLevel = 0; #endif /* NDEBUG */ _____ Modified: trunk/reactos/include/afd/shared.h --- trunk/reactos/include/afd/shared.h 2005-01-13 05:10:33 UTC (rev 13020) +++ trunk/reactos/include/afd/shared.h 2005-01-13 06:46:22 UTC (rev 13021) @@ -197,6 +197,7 @@ #define AFD_SELECT 9 #define AFD_DISCONNECT 10 #define AFD_GET_SOCK_NAME 11 +#define AFD_GET_PEER_NAME 12 #define AFD_GET_TDI_HANDLES 13 #define AFD_SET_INFO 14 #define AFD_GET_CONTEXT 16 @@ -245,6 +246,8 @@ _AFD_CONTROL_CODE(AFD_DISCONNECT, METHOD_NEITHER) #define IOCTL_AFD_GET_SOCK_NAME \ _AFD_CONTROL_CODE(AFD_GET_SOCK_NAME, METHOD_NEITHER) +#define IOCTL_AFD_GET_PEER_NAME \ + _AFD_CONTROL_CODE(AFD_GET_PEER_NAME, METHOD_NEITHER) #define IOCTL_AFD_GET_TDI_HANDLES \ _AFD_CONTROL_CODE(AFD_GET_TDI_HANDLES, METHOD_NEITHER) #define IOCTL_AFD_SET_INFO \ _____ Modified: trunk/reactos/lib/msafd/misc/dllmain.c --- trunk/reactos/lib/msafd/misc/dllmain.c 2005-01-13 05:10:33 UTC (rev 13020) +++ trunk/reactos/lib/msafd/misc/dllmain.c 2005-01-13 06:46:22 UTC (rev 13021) @@ -248,10 +248,11 @@ Upcalls.lpWPUModifyIFSHandle(1, (SOCKET)Sock, lpErrno); /* Return Socket Handle */ + AFD_DbgPrint(MID_TRACE,("Success %x\n", Sock)); return (SOCKET)Sock; error: - AFD_DbgPrint(MID_TRACE,("Ending\n")); + AFD_DbgPrint(MID_TRACE,("Ending %x\n", Status)); if( lpErrno ) *lpErrno = Status; @@ -981,10 +982,12 @@ /* Re-enable Async Event */ SockReenableAsyncSelectEvent(Socket, FD_ACCEPT); - AFD_DbgPrint(MID_TRACE,("Socket %x\n", AcceptSocket)); - - /* Return Socket */ - return AcceptSocket; + AFD_DbgPrint(MID_TRACE,("Socket %x\n", AcceptSocket)); + + *lpErrno = 0; + + /* Return Socket */ + return AcceptSocket; } int @@ -1286,12 +1289,77 @@ WSPAPI WSPGetPeerName( IN SOCKET s, - OUT LPSOCKADDR name, - IN OUT LPINT namelen, + OUT LPSOCKADDR Name, + IN OUT LPINT NameLength, OUT LPINT lpErrno) { - - return 0; + IO_STATUS_BLOCK IOSB; + ULONG TdiAddressSize; + PTDI_ADDRESS_INFO TdiAddress; + PTRANSPORT_ADDRESS SocketAddress; + PSOCKET_INFORMATION Socket = NULL; + NTSTATUS Status; + HANDLE SockEvent; + + Status = NtCreateEvent( &SockEvent, GENERIC_READ | GENERIC_WRITE, + NULL, 1, FALSE ); + + if( !NT_SUCCESS(Status) ) return SOCKET_ERROR; + + /* Get the Socket Structure associate to this Socket*/ + Socket = GetSocketStructure(s); + + /* Allocate a buffer for the address */ + TdiAddressSize = FIELD_OFFSET(TDI_ADDRESS_INFO, + Address.Address[0].Address) + + Socket->SharedData.SizeOfLocalAddress; + TdiAddress = HeapAlloc(GlobalHeap, 0, TdiAddressSize); + + if ( TdiAddress == NULL ) { + NtClose( SockEvent ); + *lpErrno = WSAENOBUFS; + return SOCKET_ERROR; + } + + SocketAddress = &TdiAddress->Address; + + /* Send IOCTL */ + Status = NtDeviceIoControlFile( (HANDLE)Socket->Handle, + SockEvent, + NULL, + NULL, + &IOSB, + IOCTL_AFD_GET_PEER_NAME, + NULL, + 0, + TdiAddress, + TdiAddressSize); + + /* Wait for return */ + if (Status == STATUS_PENDING) { + WaitForSingleObject(SockEvent, INFINITE); + Status = IOSB.Status; + } + + NtClose( SockEvent ); + + if (NT_SUCCESS(Status)) { + if (*NameLength >= SocketAddress->Address[0].AddressLength) { + Name->sa_family = SocketAddress->Address[0].AddressType; + RtlCopyMemory (Name->sa_data, + SocketAddress->Address[0].Address, + SocketAddress->Address[0].AddressLength); + HeapFree(GlobalHeap, 0, TdiAddress); + return 0; + } else { + HeapFree(GlobalHeap, 0, TdiAddress); + *lpErrno = WSAEFAULT; + return SOCKET_ERROR; + } + } + + return MsafdReturnWithErrno + ( IOSB.Status, lpErrno, 0, NULL ); } INT _____ Modified: trunk/reactos/lib/msafd/misc/sndrcv.c --- trunk/reactos/lib/msafd/misc/sndrcv.c 2005-01-13 05:10:33 UTC (rev 13020) +++ trunk/reactos/lib/msafd/misc/sndrcv.c 2005-01-13 06:46:22 UTC (rev 13021) @@ -103,7 +103,7 @@ HANDLE SockEvent; PSOCKET_INFORMATION Socket; - AFD_DbgPrint(MID_TRACE,("Called\n")); + AFD_DbgPrint(MID_TRACE,("Called (%x)\n", Handle)); /* Get the Socket Structure associate to this Socket*/ Socket = GetSocketStructure(Handle); _____ Modified: trunk/reactos/lib/ws2_32/misc/catalog.c --- trunk/reactos/lib/ws2_32/misc/catalog.c 2005-01-13 05:10:33 UTC (rev 13020) +++ trunk/reactos/lib/ws2_32/misc/catalog.c 2005-01-13 06:46:22 UTC (rev 13021) @@ -282,11 +282,11 @@ Provider->Mapping = HeapAlloc(GlobalHeap, 0, - 5 * sizeof(WINSOCK_MAPPING) + 3 * sizeof(DWORD)); + 6 * sizeof(WINSOCK_MAPPING) + 3 * sizeof(DWORD)); if (!Provider->Mapping) return; - Provider->Mapping->Rows = 5; + Provider->Mapping->Rows = 6; Provider->Mapping->Columns = 3; Provider->Mapping->Mapping[0].AddressFamily = AF_INET; @@ -307,7 +307,11 @@ Provider->Mapping->Mapping[4].AddressFamily = AF_INET; Provider->Mapping->Mapping[4].SocketType = SOCK_RAW; - Provider->Mapping->Mapping[4].Protocol = 0; + Provider->Mapping->Mapping[4].Protocol = IPPROTO_ICMP; + + Provider->Mapping->Mapping[5].AddressFamily = AF_INET; + Provider->Mapping->Mapping[5].SocketType = SOCK_RAW; + Provider->Mapping->Mapping[5].Protocol = 0; #endif } _____ Modified: trunk/reactos/lib/ws2_32/misc/dllmain.c --- trunk/reactos/lib/ws2_32/misc/dllmain.c 2005-01-13 05:10:33 UTC (rev 13020) +++ trunk/reactos/lib/ws2_32/misc/dllmain.c 2005-01-13 06:46:22 UTC (rev 13021) @@ -552,6 +552,15 @@ WSASetLastError(Errno); } + if( addr ) { + LPSOCKADDR_IN sa = (LPSOCKADDR_IN)addr; + WS_DbgPrint(MAX_TRACE,("Returned address: %d %s:%d (len %d)\n", + sa->sin_family, + inet_ntoa(sa->sin_addr), + ntohs(sa->sin_port), + *addrlen)); + } + return Socket; }

1 0

[ros-diffs] [royce] 13020: kill the output exe files in a clean, too
by royce＠svn.reactos.com 13 Jan '05

13 Jan '05

kill the output exe files in a clean, too Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .cpp _____ Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .cpp --- branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .cpp 2005-01-13 05:01:22 UTC (rev 13019) +++ branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .cpp 2005-01-13 05:10:33 UTC (rev 13020) @@ -551,6 +551,7 @@ GenerateObjectFileTargets ( module, cc, cflagsMacro, nasmflagsMacro ); vector<string> clean_files; + clean_files.push_back ( FixupTargetFilename(module.GetPath()) ); clean_files.push_back ( ar_target ); GetCleanTargets ( clean_files, module.files, module.ifs );

1 0

[royce] 13019: generate clean rules
by royce＠svn.reactos.com 13 Jan '05

13 Jan '05

generate clean rules Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/mingw.cpp Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .cpp Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .h _____ Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/mingw.cpp --- branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/mingw.cpp 2005-01-13 04:17:53 UTC (rev 13018) +++ branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/mingw.cpp 2005-01-13 05:01:22 UTC (rev 13019) @@ -147,6 +147,9 @@ ProjectNode.defines, ProjectNode.ifs ); fprintf ( fMakefile, "\n" ); + + fprintf ( fMakefile, ".PHONY: clean\n\n" ); + //fprintf ( fMakefile, "clean:\n\t-@${rm} $(PROJECT_CLEAN)\n\n" ); } void _____ Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .cpp --- branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .cpp 2005-01-13 04:17:53 UTC (rev 13018) +++ branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .cpp 2005-01-13 05:01:22 UTC (rev 13019) @@ -139,15 +139,20 @@ string MingwModuleHandler::GetSourceFilenames ( const Module& module ) const { - if ( module.files.size () == 0 ) - return ""; - + size_t i; + string sourceFilenames ( "" ); - for ( size_t i = 0; i < module.files.size (); i++ ) + for ( i = 0; i < module.files.size (); i++ ) + sourceFilenames += " " + module.files[i]->name; + vector<If*> ifs = module.ifs; + for ( i = 0; i < ifs.size(); i++ ) { - if ( sourceFilenames.size () > 0 ) - sourceFilenames += " "; - sourceFilenames += module.files[i]->name; + size_t j; + If& rIf = *ifs[i]; + for ( j = 0; j < rIf.ifs.size(); j++ ) + ifs.push_back ( rIf.ifs[j] ); + for ( j = 0; j < rIf.files.size(); j++ ) + sourceFilenames += " " + rIf.files[j]->name; } return sourceFilenames; } @@ -484,12 +489,25 @@ } void +MingwModuleHandler::GetCleanTargets ( vector<string>& out, + const vector<File*>& files, + const vector<If*>& ifs ) const +{ + size_t i; + + for ( i = 0; i < files.size(); i++ ) + out.push_back ( GetObjectFilename(files[i]->name) ); + + for ( i = 0; i < ifs.size(); i++ ) + GetCleanTargets ( out, ifs[i]->files, ifs[i]->ifs ); +} + +string MingwModuleHandler::GenerateArchiveTarget ( const Module& module, const string& ar, const string& objs_macro ) const { string archiveFilename = GetModuleArchiveFilename ( module ); - string sourceFilenames = GetSourceFilenames ( module ); fprintf ( fMakefile, "%s: %s\n", @@ -501,6 +519,8 @@ ar.c_str (), archiveFilename.c_str (), objs_macro.c_str ()); + + return archiveFilename; } void @@ -527,8 +547,21 @@ nasmflagsMacro = ssprintf("$(%s)",nasmflagsMacro.c_str()); objectsMacro = ssprintf("$(%s)",objectsMacro.c_str()); - GenerateArchiveTarget ( module, ar, objectsMacro ); + string ar_target = GenerateArchiveTarget ( module, ar, objectsMacro ); GenerateObjectFileTargets ( module, cc, cflagsMacro, nasmflagsMacro ); + + vector<string> clean_files; + clean_files.push_back ( ar_target ); + GetCleanTargets ( clean_files, module.files, module.ifs ); + + fprintf ( fMakefile, "clean::\n\t-@$(rm)" ); + for ( size_t i = 0; i < clean_files.size(); i++ ) + { + if ( 9==(i%10) ) + fprintf ( fMakefile, " 2>NUL\n\t-@$(rm)" ); + fprintf ( fMakefile, " %s", clean_files[i].c_str() ); + } + fprintf ( fMakefile, " 2>NUL\n\n" ); } void _____ Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .h --- branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .h 2005-01-13 04:17:53 UTC (rev 13018) +++ branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .h 2005-01-13 05:01:22 UTC (rev 13019) @@ -88,9 +88,12 @@ const std::string& cc, const std::string& cflagsMacro, const std::string& nasmflagsMacro ) const; - void GenerateArchiveTarget ( const Module& module, - const std::string& ar, - const std::string& objs_macro ) const; + void GetCleanTargets ( std::vector<std::string>& out, + const std::vector<File*>& files, + const std::vector<If*>& ifs ) const; + std::string GenerateArchiveTarget ( const Module& module, + const std::string& ar, + const std::string& objs_macro ) const; void GenerateMacrosAndTargets ( const Module& module, const std::string& cc, const std::string& ar ) const;

1 0

[royce] 13018: create phony targets for each module name, so you can type 'make ntoskrnl' instead of having to type 'make ./ntoskrnl/ntoskrnl.exe'
by royce＠svn.reactos.com 13 Jan '05

13 Jan '05

create phony targets for each module name, so you can type 'make ntoskrnl' instead of having to type 'make ./ntoskrnl/ntoskrnl.exe' Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .cpp _____ Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .cpp --- branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .cpp 2005-01-13 04:13:20 UTC (rev 13017) +++ branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .cpp 2005-01-13 04:17:53 UTC (rev 13018) @@ -515,6 +515,13 @@ GenerateMacros ( module, cflagsMacro, nasmflagsMacro, objectsMacro ); + // generate phony target for module name + fprintf ( fMakefile, ".PHONY: %s\n", + module.name.c_str() ); + fprintf ( fMakefile, "%s: %s\n\n", + module.name.c_str(), + module.GetPath().c_str() ); + // future references to the macros will be to get their values cflagsMacro = ssprintf("$(%s)",cflagsMacro.c_str()); nasmflagsMacro = ssprintf("$(%s)",nasmflagsMacro.c_str());

1 0

[royce] 13017: generate output rules for files under <if>
by royce＠svn.reactos.com 13 Jan '05

13 Jan '05

generate output rules for files under <if> Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .cpp Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .h _____ Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .cpp --- branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .cpp 2005-01-13 03:43:10 UTC (rev 13016) +++ branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .cpp 2005-01-13 04:13:20 UTC (rev 13017) @@ -328,7 +328,7 @@ { fprintf ( fMakefile, - "ifeq ($(%s),\"%s\")\n", + "ifeq (\"$(%s)\",\"%s\")\n", rIf.property.c_str(), rIf.value.c_str() ); GenerateMacros ( @@ -445,14 +445,14 @@ void MingwModuleHandler::GenerateObjectFileTargets ( const Module& module, const vector<File*>& files, + const vector<If*>& ifs, const string& cc, const string& cflagsMacro, const string& nasmflagsMacro ) const { - if ( files.size () == 0 ) - return; + size_t i; - for ( size_t i = 0; i < files.size (); i++ ) + for ( i = 0; i < files.size (); i++ ) { string sourceFilename = files[i]->name; string objectFilename = GetObjectFilename ( sourceFilename ); @@ -468,8 +468,9 @@ cflagsMacro, nasmflagsMacro ).c_str () ); } - - fprintf ( fMakefile, "\n" ); + + for ( i = 0; i < ifs.size(); i++ ) + GenerateObjectFileTargets ( module, ifs[i]->files, ifs[i]->ifs, cc, cflagsMacro, nasmflagsMacro ); } void @@ -478,9 +479,8 @@ const string& cflagsMacro, const string& nasmflagsMacro ) const { - GenerateObjectFileTargets ( module, module.files, cc, cflagsMacro, nasmflagsMacro ); - for ( size_t i = 0; i < module.ifs.size(); i++ ) - GenerateObjectFileTargets ( module, module.ifs[i]->files, cc, cflagsMacro, nasmflagsMacro ); + GenerateObjectFileTargets ( module, module.files, module.ifs, cc, cflagsMacro, nasmflagsMacro ); + fprintf ( fMakefile, "\n" ); } void @@ -695,6 +695,9 @@ { string target ( FixupTargetFilename ( module.GetPath () ) ); string archiveFilename = GetModuleArchiveFilename ( module ); + + GenerateMacrosAndTargetsHost ( module ); + fprintf ( fMakefile, "%s: %s\n", target.c_str (), archiveFilename.c_str () ); @@ -702,7 +705,6 @@ "\t${host_gcc} -o %s %s\n\n", target.c_str (), archiveFilename.c_str () ); - GenerateMacrosAndTargetsHost ( module ); } static MingwKernelModuleHandler kernelmodule_handler; @@ -734,6 +736,9 @@ string temp_exp = ros_junk + module.name + ".temp.exp"; string gccOptions = ssprintf ("-Wl,-T,%s" SSEP "ntoskrnl.lnk -Wl,--subsystem,native -Wl,--entry,_NtProcessStartup -Wl,--image-base,0xC0000000 -Wl,--file-alignment,0x1000 -Wl,--section-alignment,0x1000 -nostartfiles -mdll", module.GetBasePath ().c_str () ); + + GenerateMacrosAndTargetsTarget ( module ); + fprintf ( fMakefile, "%s: %s %s\n", target.c_str (), archiveFilename.c_str (), @@ -766,8 +771,6 @@ fprintf ( fMakefile, "\t${rm} %s\n\n", temp_exp.c_str () ); - - GenerateMacrosAndTargetsTarget ( module ); } @@ -831,6 +834,8 @@ if (module.files.size () > 0) { + GenerateMacrosAndTargetsTarget ( module ); + fprintf ( fMakefile, "%s: %s %s\n", target.c_str (), archiveFilename.c_str (), @@ -841,8 +846,6 @@ target.c_str (), archiveFilename.c_str (), importLibraryDependencies.c_str () ); - - GenerateMacrosAndTargetsTarget ( module ); } else { @@ -892,6 +895,8 @@ if (module.files.size () > 0) { + GenerateMacrosAndTargetsTarget ( module ); + fprintf ( fMakefile, "%s: %s %s\n", target.c_str (), archiveFilename.c_str (), @@ -902,8 +907,6 @@ target.c_str (), archiveFilename.c_str (), importLibraryDependencies.c_str () ); - - GenerateMacrosAndTargetsTarget ( module ); } else { @@ -953,6 +956,8 @@ if (module.files.size () > 0) { + GenerateMacrosAndTargetsTarget ( module ); + fprintf ( fMakefile, "%s: %s %s\n", target.c_str (), archiveFilename.c_str (), @@ -963,8 +968,6 @@ target.c_str (), archiveFilename.c_str (), importLibraryDependencies.c_str () ); - - GenerateMacrosAndTargetsTarget ( module ); } else { _____ Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .h --- branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .h 2005-01-13 03:43:10 UTC (rev 13016) +++ branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .h 2005-01-13 04:13:20 UTC (rev 13017) @@ -80,6 +80,7 @@ const std::string& nasmflagsMacro ) const; void GenerateObjectFileTargets ( const Module& module, const std::vector<File*>& files, + const std::vector<If*>& ifs, const std::string& cc, const std::string& cflagsMacro, const std::string& nasmflagsMacro ) const;

1 0

[royce] 13016: bugfixes to new <if> and related code
by royce＠svn.reactos.com 13 Jan '05

13 Jan '05

bugfixes to new <if> and related code Modified: branches/xmlbuildsystem/reactos/ReactOS.xml Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/mingw.cpp Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/mingw.h Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .cpp Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .h Modified: branches/xmlbuildsystem/reactos/tools/rbuild/module.cpp Modified: branches/xmlbuildsystem/reactos/tools/rbuild/project.cpp Modified: branches/xmlbuildsystem/reactos/tools/rbuild/rbuild.h _____ Modified: branches/xmlbuildsystem/reactos/ReactOS.xml --- branches/xmlbuildsystem/reactos/ReactOS.xml 2005-01-13 02:46:46 UTC (rev 13015) +++ branches/xmlbuildsystem/reactos/ReactOS.xml 2005-01-13 03:43:10 UTC (rev 13016) @@ -8,11 +8,13 @@ </xi:include> <define name="_M_IX86" /> - <if property="dbg" value="true"> - <define name="dbg_or_kdbg" value="true" /> + <if property="DBG" value="1"> + <define name="DBG" value="1" /> + <property name="DBG_OR_KDBG" value="true" /> </if> - <if property="kdbg" value="true"> - <define name="dbg_or_kdbg" value="true" /> + <if property="KDBG" value="1"> + <define name="KDBG" value="1" /> + <property name="DBG_OR_KDBG" value="true" /> </if> <include>include</include> _____ Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/mingw.cpp --- branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/mingw.cpp 2005-01-13 02:46:46 UTC (rev 13015) +++ branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/mingw.cpp 2005-01-13 03:43:10 UTC (rev 13016) @@ -59,39 +59,79 @@ fprintf ( fMakefile, "# THIS FILE IS AUTOMATICALLY GENERATED, EDIT 'ReactOS.xml' INSTEAD\n\n" ); } -string -MingwBackend::GenerateProjectCFLAGS () +void +MingwBackend::GenerateGlobalCFlagsAndProperties ( + const char* op, + const vector<Property*>& properties, + const vector<Include*>& includes, + const vector<Define*>& defines, + const vector<If*>& ifs ) { size_t i; - string clags; - for ( i = 0; i < ProjectNode.includes.size (); i++ ) + + for ( i = 0; i < properties.size(); i++ ) { - Include& include = *ProjectNode.includes[i]; - if (clags.length () > 0) - clags += " "; - clags += "-I" + include.directory; + Property& prop = *properties[i]; + fprintf ( fMakefile, "%s := %s\n", + prop.name.c_str(), + prop.value.c_str() ); } - - for ( i = 0; i < ProjectNode.defines.size (); i++ ) + + if ( includes.size() || defines.size() ) { - Define& define = *ProjectNode.defines[i]; - if ( clags.length () > 0 ) - clags += " "; - clags += "-D" + define.name; - if ( define.value.size() > 0 ) + fprintf ( + fMakefile, + "PROJECT_CFLAGS %s", + op ); + for ( i = 0; i < includes.size(); i++ ) { - clags += "="; - clags += define.value; + fprintf ( + fMakefile, + " -I%s", + includes[i]->directory.c_str() ); } + for ( i = 0; i < defines.size(); i++ ) + { + Define& d = *defines[i]; + fprintf ( + fMakefile, + " -D%s", + d.name.c_str() ); + if ( d.value.size() ) + fprintf ( + fMakefile, + "=%s", + d.value.c_str() ); + } + fprintf ( fMakefile, "\n" ); } - return clags; + + for ( i = 0; i < ifs.size(); i++ ) + { + If& rIf = *ifs[i]; + if ( rIf.defines.size() || rIf.includes.size() || rIf.ifs.size() ) + { + fprintf ( + fMakefile, + "ifeq (\"$(%s)\",\"%s\")\n", + rIf.property.c_str(), + rIf.value.c_str() ); + GenerateGlobalCFlagsAndProperties ( + "+=", + rIf.properties, + rIf.includes, + rIf.defines, + rIf.ifs ); + fprintf ( + fMakefile, + "endif\n\n" ); + } + } } void MingwBackend::GenerateGlobalVariables () { - size_t i; - fprintf ( fMakefile, "host_gcc = gcc\n" ); fprintf ( fMakefile, "host_ar = ar\n" ); fprintf ( fMakefile, "host_ld = ld\n" ); @@ -99,15 +139,13 @@ fprintf ( fMakefile, "gcc = gcc\n" ); fprintf ( fMakefile, "ld = ld\n" ); fprintf ( fMakefile, "ar = ar\n" ); - fprintf ( fMakefile, "dlltool = dlltool\n" ); - fprintf ( fMakefile, "PROJECT_CFLAGS = %s\n", GenerateProjectCFLAGS ().c_str () ); - for ( i = 0; i < ProjectNode.properties.size(); i++ ) - { - Property& prop = *ProjectNode.properties[i]; - fprintf ( fMakefile, "%s := %s\n", - prop.name.c_str(), - prop.value.c_str() ); - } + fprintf ( fMakefile, "dlltool = dlltool\n\n" ); + GenerateGlobalCFlagsAndProperties ( + "=", + ProjectNode.properties, + ProjectNode.includes, + ProjectNode.defines, + ProjectNode.ifs ); fprintf ( fMakefile, "\n" ); } _____ Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/mingw.h --- branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/mingw.h 2005-01-13 02:46:46 UTC (rev 13015) +++ branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/mingw.h 2005-01-13 03:43:10 UTC (rev 13016) @@ -14,7 +14,13 @@ void CreateMakefile (); void CloseMakefile (); void GenerateHeader (); - std::string GenerateProjectCFLAGS (); + void + MingwBackend::GenerateGlobalCFlagsAndProperties ( + const char* op, + const std::vector<Property*>& properties, + const std::vector<Include*>& includes, + const std::vector<Define*>& defines, + const std::vector<If*>& ifs ); void GenerateGlobalVariables (); void GenerateAllTarget (); FILE* fMakefile; _____ Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .cpp --- branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .cpp 2005-01-13 02:46:46 UTC (rev 13015) +++ branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .cpp 2005-01-13 03:43:10 UTC (rev 13016) @@ -262,36 +262,36 @@ void MingwModuleHandler::GenerateMacros ( - const Module& module, const char* op, const vector<File*>& files, - const vector<Include*>* includes, + const vector<Include*>& includes, const vector<Define*>& defines, - const vector<If*>* ifs, + const vector<If*>& ifs, const string& cflags_macro, const string& nasmflags_macro, const string& objs_macro) const { size_t i; - if ( (includes && includes->size()) || defines.size() ) + if ( includes.size() || defines.size() ) { fprintf ( fMakefile, "%s %s", cflags_macro.c_str(), op ); - if ( includes ) - for ( i = 0; i < includes->size(); i++ ) - fprintf ( - fMakefile, - " -I%s", - (*includes)[i]->directory.c_str() ); - for ( i = 0; i < module.defines.size(); i++ ) + for ( i = 0; i < includes.size(); i++ ) { - Define& d = *module.defines[i]; fprintf ( fMakefile, + " -I%s", + includes[i]->directory.c_str() ); + } + for ( i = 0; i < defines.size(); i++ ) + { + Define& d = *defines[i]; + fprintf ( + fMakefile, " -D%s", d.name.c_str() ); if ( d.value.size() ) @@ -321,32 +321,28 @@ fprintf ( fMakefile, "\n" ); } - if ( ifs && ifs->size() ) + for ( i = 0; i < ifs.size(); i++ ) { - for ( size_t i = 0; i < ifs->size(); i++ ) + If& rIf = *ifs[i]; + if ( rIf.defines.size() || rIf.includes.size() || rIf.files.size() || rIf.ifs.size() ) { - If& rIf = *(*ifs)[i]; - if ( rIf.defines.size() || rIf.files.size() || rIf.ifs.size() ) - { - fprintf ( - fMakefile, - "ifeq ($(%s),\"%s\")\n", - rIf.property.c_str(), - rIf.value.c_str() ); - GenerateMacros ( - module, - "+=", - rIf.files, - NULL, - rIf.defines, - &rIf.ifs, - cflags_macro, - nasmflags_macro, - objs_macro ); - fprintf ( - fMakefile, - "endif\n\n" ); - } + fprintf ( + fMakefile, + "ifeq ($(%s),\"%s\")\n", + rIf.property.c_str(), + rIf.value.c_str() ); + GenerateMacros ( + "+=", + rIf.files, + rIf.includes, + rIf.defines, + rIf.ifs, + cflags_macro, + nasmflags_macro, + objs_macro ); + fprintf ( + fMakefile, + "endif\n\n" ); } } } @@ -359,42 +355,16 @@ const string& objs_macro) const { GenerateMacros ( - module, "=", module.files, - &module.includes, + module.includes, module.defines, - NULL, + module.ifs, cflags_macro, nasmflags_macro, objs_macro ); fprintf ( fMakefile, "\n" ); - for ( size_t i = 0; i < module.ifs.size(); i++ ) - { - If& rIf = *module.ifs[i]; - if ( rIf.defines.size() || rIf.files.size() || rIf.ifs.size() ) - { - fprintf ( - fMakefile, - "ifeq (\"$(%s)\",\"%s\")\n", - rIf.property.c_str(), - rIf.value.c_str() ); - GenerateMacros ( - module, - "+=", - rIf.files, - NULL, - rIf.defines, - &rIf.ifs, - cflags_macro, - nasmflags_macro, - objs_macro ); - fprintf ( - fMakefile, - "endif\n\n" ); - } - } fprintf ( fMakefile, "%s += $(PROJECT_CFLAGS)\n\n", _____ Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .h --- branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .h 2005-01-13 02:46:46 UTC (rev 13015) +++ branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .h 2005-01-13 03:43:10 UTC (rev 13016) @@ -46,12 +46,11 @@ std::string GenerateGccDefineParametersFromVector ( const std::vector<Define*>& defines ) const; std::string GenerateGccDefineParameters ( const Module& module ) const; std::string GenerateGccIncludeParametersFromVector ( const std::vector<Include*>& includes ) const; - void GenerateMacros ( const Module& module, - const char* op, + void GenerateMacros ( const char* op, const std::vector<File*>& files, - const std::vector<Include*>* includes, + const std::vector<Include*>& includes, const std::vector<Define*>& defines, - const std::vector<If*>* ifs, + const std::vector<If*>& ifs, const std::string& cflags_macro, const std::string& nasmflags_macro, const std::string& objs_macro) const; _____ Modified: branches/xmlbuildsystem/reactos/tools/rbuild/module.cpp --- branches/xmlbuildsystem/reactos/tools/rbuild/module.cpp 2005-01-13 02:46:46 UTC (rev 13015) +++ branches/xmlbuildsystem/reactos/tools/rbuild/module.cpp 2005-01-13 03:43:10 UTC (rev 13016) @@ -122,11 +122,11 @@ } else if ( e.name == "include" ) { + Include* include = new Include ( project, this, e ); if ( pIf ) - throw InvalidBuildFileException ( - e.location, - "<include> is not a valid sub-element of <if>" ); - includes.push_back ( new Include ( project, this, e ) ); + pIf->includes.push_back ( include ); + else + includes.push_back ( include ); subs_invalid = true; } else if ( e.name == "define" ) @@ -513,6 +513,8 @@ size_t i; for ( i = 0; i < files.size(); i++ ) delete files[i]; + for ( i = 0; i < includes.size(); i++ ) + delete includes[i]; for ( i = 0; i < defines.size(); i++ ) delete defines[i]; for ( i = 0; i < ifs.size(); i++ ) _____ Modified: branches/xmlbuildsystem/reactos/tools/rbuild/project.cpp --- branches/xmlbuildsystem/reactos/tools/rbuild/project.cpp 2005-01-13 02:46:46 UTC (rev 13015) +++ branches/xmlbuildsystem/reactos/tools/rbuild/project.cpp 2005-01-13 03:43:10 UTC (rev 13016) @@ -96,6 +96,10 @@ string subpath(path); if ( e.name == "module" ) { + if ( pIf ) + throw InvalidBuildFileException ( + e.location, + "<module> is not a valid sub-element of <if>" ); Module* module = new Module ( *this, e, path ); if ( LocateModule ( module->name ) ) throw InvalidBuildFileException ( @@ -114,7 +118,11 @@ } else if ( e.name == "include" ) { - includes.push_back ( new Include ( *this, e ) ); + Include* include = new Include ( *this, e ); + if ( pIf ) + pIf->includes.push_back ( include ); + else + includes.push_back ( include ); subs_invalid = true; } else if ( e.name == "define" ) _____ Modified: branches/xmlbuildsystem/reactos/tools/rbuild/rbuild.h --- branches/xmlbuildsystem/reactos/tools/rbuild/rbuild.h 2005-01-13 02:46:46 UTC (rev 13015) +++ branches/xmlbuildsystem/reactos/tools/rbuild/rbuild.h 2005-01-13 03:43:10 UTC (rev 13016) @@ -256,6 +256,7 @@ const Module* module; std::string property, value; std::vector<File*> files; + std::vector<Include*> includes; std::vector<Define*> defines; std::vector<Property*> properties; std::vector<If*> ifs;

1 0

[royce] 13015: add support for <if> and <property>
by royce＠svn.reactos.com 13 Jan '05

13 Jan '05

add support for <if> and <property> Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/mingw.cpp Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .cpp Modified: branches/xmlbuildsystem/reactos/tools/rbuild/module.cpp Modified: branches/xmlbuildsystem/reactos/tools/rbuild/project.cpp Modified: branches/xmlbuildsystem/reactos/tools/rbuild/rbuild.h _____ Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/mingw.cpp --- branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/mingw.cpp 2005-01-13 02:46:38 UTC (rev 13014) +++ branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/mingw.cpp 2005-01-13 02:46:46 UTC (rev 13015) @@ -62,8 +62,9 @@ string MingwBackend::GenerateProjectCFLAGS () { + size_t i; string clags; - for ( size_t i = 0; i < ProjectNode.includes.size (); i++ ) + for ( i = 0; i < ProjectNode.includes.size (); i++ ) { Include& include = *ProjectNode.includes[i]; if (clags.length () > 0) @@ -71,7 +72,7 @@ clags += "-I" + include.directory; } - for ( size_t i = 0; i < ProjectNode.defines.size (); i++ ) + for ( i = 0; i < ProjectNode.defines.size (); i++ ) { Define& define = *ProjectNode.defines[i]; if ( clags.length () > 0 ) @@ -89,6 +90,8 @@ void MingwBackend::GenerateGlobalVariables () { + size_t i; + fprintf ( fMakefile, "host_gcc = gcc\n" ); fprintf ( fMakefile, "host_ar = ar\n" ); fprintf ( fMakefile, "host_ld = ld\n" ); @@ -98,6 +101,13 @@ fprintf ( fMakefile, "ar = ar\n" ); fprintf ( fMakefile, "dlltool = dlltool\n" ); fprintf ( fMakefile, "PROJECT_CFLAGS = %s\n", GenerateProjectCFLAGS ().c_str () ); + for ( i = 0; i < ProjectNode.properties.size(); i++ ) + { + Property& prop = *ProjectNode.properties[i]; + fprintf ( fMakefile, "%s := %s\n", + prop.name.c_str(), + prop.value.c_str() ); + } fprintf ( fMakefile, "\n" ); } _____ Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .cpp --- branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .cpp 2005-01-13 02:46:38 UTC (rev 13014) +++ branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .cpp 2005-01-13 02:46:46 UTC (rev 13015) @@ -323,7 +323,7 @@ if ( ifs && ifs->size() ) { - for ( size_t i = 0; i < module.ifs.size(); i++ ) + for ( size_t i = 0; i < ifs->size(); i++ ) { If& rIf = *(*ifs)[i]; if ( rIf.defines.size() || rIf.files.size() || rIf.ifs.size() ) @@ -377,7 +377,7 @@ { fprintf ( fMakefile, - "ifeq ($(%s),\"%s\")\n", + "ifeq (\"$(%s)\",\"%s\")\n", rIf.property.c_str(), rIf.value.c_str() ); GenerateMacros ( @@ -395,11 +395,10 @@ "endif\n\n" ); } } - fprintf ( fMakefile, - "%s_CFLAGS += $(PROJECT_CFLAGS)\n\n", - module.name.c_str () ); + "%s += $(PROJECT_CFLAGS)\n\n", + cflags_macro.c_str () ); } string _____ Modified: branches/xmlbuildsystem/reactos/tools/rbuild/module.cpp --- branches/xmlbuildsystem/reactos/tools/rbuild/module.cpp 2005-01-13 02:46:38 UTC (rev 13014) +++ branches/xmlbuildsystem/reactos/tools/rbuild/module.cpp 2005-01-13 02:46:46 UTC (rev 13015) @@ -171,10 +171,20 @@ } else if ( e.name == "if" ) { - pIf = new If ( e, *this ); - ifs.push_back ( pIf ); + If* pOldIf = pIf; + pIf = new If ( e, project, this ); + if ( pOldIf ) + pOldIf->ifs.push_back ( pIf ); + else + ifs.push_back ( pIf ); subs_invalid = false; } + else if ( e.name == "property" ) + { + throw InvalidBuildFileException ( + e.location, + "<property> is not a valid sub-element of <module>" ); + } if ( subs_invalid && e.subElements.size() > 0 ) throw InvalidBuildFileException ( e.location, @@ -482,8 +492,10 @@ } -If::If ( const XMLElement& node_, const Module& module_ ) - : node(node_), module(module_) +If::If ( const XMLElement& node_, + const Project& project_, + const Module* module_ ) + : node(node_), project(project_), module(module_) { const XMLAttribute* att; @@ -511,3 +523,25 @@ If::ProcessXML() { } + + +Property::Property ( const XMLElement& node_, + const Project& project_, + const Module* module_ ) + : node(node_), project(project_), module(module_) +{ + const XMLAttribute* att; + + att = node.GetAttribute ( "name", true ); + assert(att); + name = att->value; + + att = node.GetAttribute ( "value", true ); + assert(att); + value = att->value; +} + +void +Property::ProcessXML() +{ +} _____ Modified: branches/xmlbuildsystem/reactos/tools/rbuild/project.cpp --- branches/xmlbuildsystem/reactos/tools/rbuild/project.cpp 2005-01-13 02:46:38 UTC (rev 13014) +++ branches/xmlbuildsystem/reactos/tools/rbuild/project.cpp 2005-01-13 02:46:46 UTC (rev 13015) @@ -27,6 +27,10 @@ delete includes[i]; for ( i = 0; i < defines.size(); i++ ) delete defines[i]; + for ( i = 0; i < properties.size(); i++ ) + delete properties[i]; + for ( i = 0; i < ifs.size(); i++ ) + delete ifs[i]; delete head; } @@ -77,10 +81,16 @@ includes[i]->ProcessXML(); for ( i = 0; i < defines.size(); i++ ) defines[i]->ProcessXML(); + for ( i = 0; i < properties.size(); i++ ) + properties[i]->ProcessXML(); + for ( i = 0; i < ifs.size(); i++ ) + ifs[i]->ProcessXML(); } void -Project::ProcessXMLSubElement ( const XMLElement& e, const string& path ) +Project::ProcessXMLSubElement ( const XMLElement& e, + const string& path, + If* pIf /*= NULL*/ ) { bool subs_invalid = false; string subpath(path); @@ -109,16 +119,38 @@ } else if ( e.name == "define" ) { - defines.push_back ( new Define ( *this, e ) ); + Define* define = new Define ( *this, e ); + if ( pIf ) + pIf->defines.push_back ( define ); + else + defines.push_back ( define ); subs_invalid = true; } + else if ( e.name == "if" ) + { + If* pOldIf = pIf; + pIf = new If ( e, *this, NULL ); + if ( pOldIf ) + pOldIf->ifs.push_back ( pIf ); + else + ifs.push_back ( pIf ); + subs_invalid = false; + } + else if ( e.name == "property" ) + { + Property* property = new Property ( e, *this, NULL ); + if ( pIf ) + pIf->properties.push_back ( property ); + else + properties.push_back ( property ); + } if ( subs_invalid && e.subElements.size() ) throw InvalidBuildFileException ( e.location, "<%s> cannot have sub-elements", e.name.c_str() ); for ( size_t i = 0; i < e.subElements.size (); i++ ) - ProcessXMLSubElement ( *e.subElements[i], subpath ); + ProcessXMLSubElement ( *e.subElements[i], subpath, pIf ); } Module* _____ Modified: branches/xmlbuildsystem/reactos/tools/rbuild/rbuild.h --- branches/xmlbuildsystem/reactos/tools/rbuild/rbuild.h 2005-01-13 02:46:38 UTC (rev 13014) +++ branches/xmlbuildsystem/reactos/tools/rbuild/rbuild.h 2005-01-13 02:46:46 UTC (rev 13015) @@ -32,6 +32,7 @@ class Dependency; class ImportLibrary; class If; +class Property; class Project { @@ -43,6 +44,8 @@ std::vector<Module*> modules; std::vector<Include*> includes; std::vector<Define*> defines; + std::vector<Property*> properties; + std::vector<If*> ifs; //Project (); Project ( const std::string& filename ); @@ -53,7 +56,8 @@ private: void ReadXml (); void ProcessXMLSubElement ( const XMLElement& e, - const std::string& path ); + const std::string& path, + If* pIf = NULL ); // disable copy semantics Project ( const Project& ); @@ -248,19 +252,37 @@ { public: const XMLElement& node; - const Module& module; + const Project& project; + const Module* module; std::string property, value; std::vector<File*> files; std::vector<Define*> defines; + std::vector<Property*> properties; std::vector<If*> ifs; If ( const XMLElement& node_, - const Module& module_ ); + const Project& project_, + const Module* module_ ); ~If(); void ProcessXML(); }; +class Property +{ +public: + const XMLElement& node; + const Project& project; + const Module* module; + std::string name, value; + + Property ( const XMLElement& node_, + const Project& project_, + const Module* module_ ); + + void ProcessXML(); +}; + extern std::string FixSeparator ( const std::string& s );

1 0

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