Ros-diffs August 2012

ros-diffs@reactos.org

14 participants
198 discussions

[cgutman] 57188: [AFD] - Fix handling pending writes in the TDI_SEND completion routine
by cgutman＠svn.reactos.org 28 Aug '12

28 Aug '12

Author: cgutman Date: Tue Aug 28 00:26:26 2012 New Revision: 57188 URL: http://svn.reactos.org/svn/reactos?rev=57188&view=rev Log: [AFD] - Fix handling pending writes in the TDI_SEND completion routine Modified: trunk/reactos/drivers/network/afd/afd/write.c Modified: trunk/reactos/drivers/network/afd/afd/write.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/afd/afd/wr… ============================================================================== --- trunk/reactos/drivers/network/afd/afd/write.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/afd/afd/write.c [iso-8859-1] Tue Aug 28 00:26:26 2012 @@ -152,8 +152,8 @@ ASSERT(SendLength == 0); - while( !HaltSendQueue && !IsListEmpty( &FCB->PendingIrpList[FUNCTION_SEND] ) ) { - NextIrpEntry = RemoveHeadList(&FCB->PendingIrpList[FUNCTION_SEND]); + if ( !HaltSendQueue && !IsListEmpty( &FCB->PendingIrpList[FUNCTION_SEND] ) ) { + NextIrpEntry = FCB->PendingIrpList[FUNCTION_SEND].Flink; NextIrp = CONTAINING_RECORD(NextIrpEntry, IRP, Tail.Overlay.ListEntry); NextIrpSp = IoGetCurrentIrpStackLocation( NextIrp ); SendReq = GetLockedData(NextIrp, NextIrpSp); @@ -178,8 +178,7 @@ if (SendLength <= FCB->Send.Size && !((SendReq->AfdFlags & AFD_IMMEDIATE) || (FCB->NonBlocking))) { FCB->PollState &= ~AFD_EVENT_SEND; - InsertHeadList(&FCB->PendingIrpList[FUNCTION_SEND], - &NextIrp->Tail.Overlay.ListEntry); + NextIrp = NULL; } @@ -191,30 +190,31 @@ /* We should never be non-overlapped and get to this point */ ASSERT(SendReq->AfdFlags & AFD_OVERLAPPED); - InsertHeadList(&FCB->PendingIrpList[FUNCTION_SEND], - &NextIrp->Tail.Overlay.ListEntry); NextIrp = NULL; } } - if (NextIrp == NULL) - break; - - for( i = 0; i < SendReq->BufferCount; i++ ) { - BytesCopied = MIN(SendReq->BufferArray[i].len, SpaceAvail); - - Map[i].BufferAddress = - MmMapLockedPages( Map[i].Mdl, KernelMode ); - - RtlCopyMemory( FCB->Send.Window + FCB->Send.BytesUsed, - Map[i].BufferAddress, - BytesCopied ); - - MmUnmapLockedPages( Map[i].BufferAddress, Map[i].Mdl ); - - TotalBytesCopied += BytesCopied; - SpaceAvail -= BytesCopied; - FCB->Send.BytesUsed += BytesCopied; + if (NextIrp != NULL) + { + for( i = 0; i < SendReq->BufferCount; i++ ) { + BytesCopied = MIN(SendReq->BufferArray[i].len, SpaceAvail); + + Map[i].BufferAddress = + MmMapLockedPages( Map[i].Mdl, KernelMode ); + + RtlCopyMemory( FCB->Send.Window + FCB->Send.BytesUsed, + Map[i].BufferAddress, + BytesCopied ); + + MmUnmapLockedPages( Map[i].BufferAddress, Map[i].Mdl ); + + TotalBytesCopied += BytesCopied; + SpaceAvail -= BytesCopied; + FCB->Send.BytesUsed += BytesCopied; + } + + NextIrp->IoStatus.Information = TotalBytesCopied; + NextIrp->Tail.Overlay.DriverContext[3] = (PVOID)NextIrp->IoStatus.Information; } }

1 0

[cgutman] 57187: [AFD] - Rewrite a large portion of the send code to have proper support for overlapped and non-blocking sockets
by cgutman＠svn.reactos.org 28 Aug '12

28 Aug '12

Author: cgutman Date: Tue Aug 28 00:14:08 2012 New Revision: 57187 URL: http://svn.reactos.org/svn/reactos?rev=57187&view=rev Log: [AFD] - Rewrite a large portion of the send code to have proper support for overlapped and non-blocking sockets Modified: trunk/reactos/drivers/network/afd/afd/write.c Modified: trunk/reactos/drivers/network/afd/afd/write.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/afd/afd/wr… ============================================================================== --- trunk/reactos/drivers/network/afd/afd/write.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/afd/afd/write.c [iso-8859-1] Tue Aug 28 00:14:08 2012 @@ -21,6 +21,8 @@ PAFD_SEND_INFO SendReq = NULL; PAFD_MAPBUF Map; UINT TotalBytesCopied = 0, TotalBytesProcessed = 0, SpaceAvail, i; + UINT SendLength, BytesCopied; + BOOLEAN HaltSendQueue; /* * The Irp parameter passed in is the IRP of the stream between AFD and @@ -94,27 +96,48 @@ } RtlMoveMemory( FCB->Send.Window, - FCB->Send.Window + FCB->Send.BytesUsed, + FCB->Send.Window + Irp->IoStatus.Information, FCB->Send.BytesUsed - Irp->IoStatus.Information ); TotalBytesProcessed = 0; - while (!IsListEmpty(&FCB->PendingIrpList[FUNCTION_SEND]) && - TotalBytesProcessed != Irp->IoStatus.Information) { + SendLength = Irp->IoStatus.Information; + HaltSendQueue = FALSE; + while (!IsListEmpty(&FCB->PendingIrpList[FUNCTION_SEND]) && SendLength > 0) { NextIrpEntry = RemoveHeadList(&FCB->PendingIrpList[FUNCTION_SEND]); NextIrp = CONTAINING_RECORD(NextIrpEntry, IRP, Tail.Overlay.ListEntry); NextIrpSp = IoGetCurrentIrpStackLocation( NextIrp ); SendReq = GetLockedData(NextIrp, NextIrpSp); Map = (PAFD_MAPBUF)(SendReq->BufferArray + SendReq->BufferCount); - TotalBytesCopied = 0; - - for( i = 0; i < SendReq->BufferCount; i++ ) - TotalBytesCopied += SendReq->BufferArray[i].len; + TotalBytesCopied = (ULONG_PTR)NextIrp->Tail.Overlay.DriverContext[3]; + ASSERT(TotalBytesCopied != 0); + + /* If we didn't get enough, keep waiting */ + if (TotalBytesCopied > SendLength) + { + /* Update the bytes left to copy */ + TotalBytesCopied -= SendLength; + NextIrp->Tail.Overlay.DriverContext[3] = (PVOID)TotalBytesCopied; + + /* Update the state variables */ + FCB->Send.BytesUsed -= SendLength; + TotalBytesProcessed += SendLength; + SendLength = 0; + + /* Pend the IRP */ + InsertHeadList(&FCB->PendingIrpList[FUNCTION_SEND], + &NextIrp->Tail.Overlay.ListEntry); + HaltSendQueue = TRUE; + break; + } + + ASSERT(NextIrp->IoStatus.Information != 0); NextIrp->IoStatus.Status = Irp->IoStatus.Status; - NextIrp->IoStatus.Information = TotalBytesCopied; - + + FCB->Send.BytesUsed -= TotalBytesCopied; TotalBytesProcessed += TotalBytesCopied; + SendLength -= TotalBytesCopied; (void)IoSetCancelRoutine(NextIrp, NULL); @@ -127,11 +150,9 @@ IoCompleteRequest(NextIrp, IO_NETWORK_INCREMENT); } - ASSERT(TotalBytesProcessed == Irp->IoStatus.Information); - - FCB->Send.BytesUsed -= TotalBytesProcessed; - - while( !IsListEmpty( &FCB->PendingIrpList[FUNCTION_SEND] ) ) { + ASSERT(SendLength == 0); + + while( !HaltSendQueue && !IsListEmpty( &FCB->PendingIrpList[FUNCTION_SEND] ) ) { NextIrpEntry = RemoveHeadList(&FCB->PendingIrpList[FUNCTION_SEND]); NextIrp = CONTAINING_RECORD(NextIrpEntry, IRP, Tail.Overlay.ListEntry); NextIrpSp = IoGetCurrentIrpStackLocation( NextIrp ); @@ -143,37 +164,62 @@ SpaceAvail = FCB->Send.Size - FCB->Send.BytesUsed; TotalBytesCopied = 0; + /* Count the total transfer size */ + SendLength = 0; + for (i = 0; i < SendReq->BufferCount; i++) + { + SendLength += SendReq->BufferArray[i].len; + } + + /* Make sure we've got the space */ + if (SendLength > SpaceAvail) + { + /* Blocking sockets have to wait here */ + if (SendLength <= FCB->Send.Size && !((SendReq->AfdFlags & AFD_IMMEDIATE) || (FCB->NonBlocking))) + { + FCB->PollState &= ~AFD_EVENT_SEND; + InsertHeadList(&FCB->PendingIrpList[FUNCTION_SEND], + &NextIrp->Tail.Overlay.ListEntry); + NextIrp = NULL; + } + + /* Check if we can send anything */ + if (SpaceAvail == 0) + { + FCB->PollState &= ~AFD_EVENT_SEND; + + /* We should never be non-overlapped and get to this point */ + ASSERT(SendReq->AfdFlags & AFD_OVERLAPPED); + + InsertHeadList(&FCB->PendingIrpList[FUNCTION_SEND], + &NextIrp->Tail.Overlay.ListEntry); + NextIrp = NULL; + } + } + + if (NextIrp == NULL) + break; + for( i = 0; i < SendReq->BufferCount; i++ ) { - if (SpaceAvail < SendReq->BufferArray[i].len) - { - InsertHeadList(&FCB->PendingIrpList[FUNCTION_SEND], - &NextIrp->Tail.Overlay.ListEntry); - NextIrp = NULL; - break; - } + BytesCopied = MIN(SendReq->BufferArray[i].len, SpaceAvail); + Map[i].BufferAddress = MmMapLockedPages( Map[i].Mdl, KernelMode ); RtlCopyMemory( FCB->Send.Window + FCB->Send.BytesUsed, Map[i].BufferAddress, - SendReq->BufferArray[i].len ); + BytesCopied ); MmUnmapLockedPages( Map[i].BufferAddress, Map[i].Mdl ); - TotalBytesCopied += SendReq->BufferArray[i].len; - SpaceAvail -= SendReq->BufferArray[i].len; - } - - if (NextIrp != NULL) - { - FCB->Send.BytesUsed += TotalBytesCopied; - } - else - break; - } - - if (FCB->Send.Size - FCB->Send.BytesUsed != 0 && - !FCB->SendClosed) + TotalBytesCopied += BytesCopied; + SpaceAvail -= BytesCopied; + FCB->Send.BytesUsed += BytesCopied; + } + } + + if (FCB->Send.Size - FCB->Send.BytesUsed != 0 && !FCB->SendClosed && + IsListEmpty(&FCB->PendingIrpList[FUNCTION_SEND])) { FCB->PollState |= AFD_EVENT_SEND; FCB->PollStatus[FD_WRITE_BIT] = STATUS_SUCCESS; @@ -183,6 +229,7 @@ { FCB->PollState &= ~AFD_EVENT_SEND; } + /* Some data is still waiting */ if( FCB->Send.BytesUsed ) @@ -279,12 +326,13 @@ PFILE_OBJECT FileObject = IrpSp->FileObject; PAFD_FCB FCB = FileObject->FsContext; PAFD_SEND_INFO SendReq; - UINT TotalBytesCopied = 0, i, SpaceAvail = 0; - BOOLEAN NoSpace = FALSE; + UINT TotalBytesCopied = 0, i, SpaceAvail = 0, BytesCopied, SendLength; AFD_DbgPrint(MID_TRACE,("Called on %x\n", FCB)); if( !SocketAcquireStateLock( FCB ) ) return LostSocket( Irp ); + + FCB->EventSelectDisabled &= ~AFD_EVENT_SEND; if( FCB->Flags & AFD_ENDPOINT_CONNECTIONLESS ) { @@ -316,7 +364,6 @@ Status = TdiBuildConnectionInfo( &TargetAddress, FCB->RemoteAddress ); if( NT_SUCCESS(Status) ) { - FCB->EventSelectDisabled &= ~AFD_EVENT_SEND; FCB->PollState &= ~AFD_EVENT_SEND; Status = QueueUserModeIrp(FCB, Irp, FUNCTION_SEND); @@ -371,7 +418,7 @@ if( !(SendReq = LockRequest( Irp, IrpSp, FALSE )) ) return UnlockAndMaybeComplete - ( FCB, STATUS_NO_MEMORY, Irp, TotalBytesCopied ); + ( FCB, STATUS_NO_MEMORY, Irp, 0 ); SendReq->BufferArray = LockBuffers( SendReq->BufferArray, SendReq->BufferCount, @@ -405,37 +452,62 @@ AFD_DbgPrint(MID_TRACE,("We can accept %d bytes\n", SpaceAvail)); - for( i = 0; FCB->Send.BytesUsed < FCB->Send.Size && - i < SendReq->BufferCount; i++ ) { - - if (SpaceAvail < SendReq->BufferArray[i].len) - { - if (TotalBytesCopied + SendReq->BufferArray[i].len > FCB->Send.Size) + /* Count the total transfer size */ + SendLength = 0; + for (i = 0; i < SendReq->BufferCount; i++) + { + SendLength += SendReq->BufferArray[i].len; + } + + /* Make sure we've got the space */ + if (SendLength > SpaceAvail) + { + /* Blocking sockets have to wait here */ + if (SendLength <= FCB->Send.Size && !((SendReq->AfdFlags & AFD_IMMEDIATE) || (FCB->NonBlocking))) + { + FCB->PollState &= ~AFD_EVENT_SEND; + return LeaveIrpUntilLater(FCB, Irp, FUNCTION_SEND); + } + + /* Check if we can send anything */ + if (SpaceAvail == 0) + { + FCB->PollState &= ~AFD_EVENT_SEND; + + /* Non-overlapped sockets will fail if we can send nothing */ + if (!(SendReq->AfdFlags & AFD_OVERLAPPED)) { - UnlockBuffers(SendReq->BufferArray, SendReq->BufferCount, FALSE); - - return UnlockAndMaybeComplete(FCB, STATUS_BUFFER_OVERFLOW, Irp, 0); + UnlockBuffers( SendReq->BufferArray, SendReq->BufferCount, FALSE ); + return UnlockAndMaybeComplete( FCB, STATUS_CANT_WAIT, Irp, 0 ); } - SpaceAvail += TotalBytesCopied; - NoSpace = TRUE; - break; - } + else + { + /* Overlapped sockets just pend */ + return LeaveIrpUntilLater(FCB, Irp, FUNCTION_SEND); + } + } + } + + for ( i = 0; SpaceAvail > 0 && i < SendReq->BufferCount; i++ ) + { + BytesCopied = MIN(SendReq->BufferArray[i].len, SpaceAvail); AFD_DbgPrint(MID_TRACE,("Copying Buffer %d, %x:%d to %x\n", i, SendReq->BufferArray[i].buf, - SendReq->BufferArray[i].len, + BytesCopied, FCB->Send.Window + FCB->Send.BytesUsed)); - RtlCopyMemory( FCB->Send.Window + FCB->Send.BytesUsed, + RtlCopyMemory(FCB->Send.Window + FCB->Send.BytesUsed, SendReq->BufferArray[i].buf, - SendReq->BufferArray[i].len ); - - TotalBytesCopied += SendReq->BufferArray[i].len; - SpaceAvail -= SendReq->BufferArray[i].len; - } - - FCB->EventSelectDisabled &= ~AFD_EVENT_SEND; + BytesCopied); + + TotalBytesCopied += BytesCopied; + SpaceAvail -= BytesCopied; + FCB->Send.BytesUsed += BytesCopied; + } + + Irp->IoStatus.Information = TotalBytesCopied; if( TotalBytesCopied == 0 ) { AFD_DbgPrint(MID_TRACE,("Empty send\n")); @@ -455,40 +527,25 @@ FCB->PollState &= ~AFD_EVENT_SEND; } - if (!NoSpace) - { - FCB->Send.BytesUsed += TotalBytesCopied; - AFD_DbgPrint(MID_TRACE,("Copied %d bytes\n", TotalBytesCopied)); - - Status = QueueUserModeIrp(FCB, Irp, FUNCTION_SEND); - if (Status == STATUS_PENDING && !FCB->SendIrp.InFlightRequest) - { - TdiSend(&FCB->SendIrp.InFlightRequest, - FCB->Connection.Object, - 0, - FCB->Send.Window, - FCB->Send.BytesUsed, - &FCB->SendIrp.Iosb, - SendComplete, - FCB); - } - SocketStateUnlock(FCB); - - return STATUS_PENDING; - } - else - { - FCB->PollState &= ~AFD_EVENT_SEND; - if (!(SendReq->AfdFlags & AFD_OVERLAPPED) && - ((SendReq->AfdFlags & AFD_IMMEDIATE) || (FCB->NonBlocking))) { - AFD_DbgPrint(MID_TRACE,("Nonblocking\n")); - UnlockBuffers( SendReq->BufferArray, SendReq->BufferCount, FALSE ); - return UnlockAndMaybeComplete( FCB, STATUS_CANT_WAIT, Irp, 0 ); - } else { - AFD_DbgPrint(MID_TRACE,("Queuing request\n")); - return LeaveIrpUntilLater( FCB, Irp, FUNCTION_SEND ); - } - } + /* We use the IRP tail for some temporary storage here */ + Irp->Tail.Overlay.DriverContext[3] = (PVOID)Irp->IoStatus.Information; + + Status = QueueUserModeIrp(FCB, Irp, FUNCTION_SEND); + if (Status == STATUS_PENDING && !FCB->SendIrp.InFlightRequest) + { + TdiSend(&FCB->SendIrp.InFlightRequest, + FCB->Connection.Object, + 0, + FCB->Send.Window, + FCB->Send.BytesUsed, + &FCB->SendIrp.Iosb, + SendComplete, + FCB); + } + + SocketStateUnlock(FCB); + + return STATUS_PENDING; } NTSTATUS NTAPI @@ -504,6 +561,8 @@ if( !SocketAcquireStateLock( FCB ) ) return LostSocket( Irp ); + FCB->EventSelectDisabled &= ~AFD_EVENT_SEND; + /* Check that the socket is bound */ if( FCB->State != SOCKET_STATE_BOUND && FCB->State != SOCKET_STATE_CREATED) @@ -562,7 +621,6 @@ /* Check the size of the Address given ... */ if( NT_SUCCESS(Status) ) { - FCB->EventSelectDisabled &= ~AFD_EVENT_SEND; FCB->PollState &= ~AFD_EVENT_SEND; Status = QueueUserModeIrp(FCB, Irp, FUNCTION_SEND);

1 0

[cgutman] 57186: [TCPIP] - Implement proper support for partial sends on TCP sockets - This prevents a deadlock when a very very large packet is queued to be sent
by cgutman＠svn.reactos.org 27 Aug '12

27 Aug '12

Author: cgutman Date: Mon Aug 27 23:58:40 2012 New Revision: 57186 URL: http://svn.reactos.org/svn/reactos?rev=57186&view=rev Log: [TCPIP] - Implement proper support for partial sends on TCP sockets - This prevents a deadlock when a very very large packet is queued to be sent Modified: trunk/reactos/lib/drivers/ip/transport/tcp/event.c trunk/reactos/lib/drivers/ip/transport/tcp/tcp.c trunk/reactos/lib/drivers/lwip/src/include/rosip.h trunk/reactos/lib/drivers/lwip/src/rostcp.c Modified: trunk/reactos/lib/drivers/ip/transport/tcp/event.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/ip/transport/t… ============================================================================== --- trunk/reactos/lib/drivers/ip/transport/tcp/event.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/ip/transport/tcp/event.c [iso-8859-1] Mon Aug 27 23:58:40 2012 @@ -383,6 +383,7 @@ PIRP Irp; NTSTATUS Status; PMDL Mdl; + ULONG BytesSent; ReferenceObject(Connection); @@ -412,9 +413,9 @@ Status = TCPTranslateError(LibTCPSend(Connection, SendBuffer, - SendLen, TRUE)); - - TI_DbgPrint(DEBUG_TCP,("TCP Bytes: %d\n", SendLen)); + SendLen, &BytesSent, TRUE)); + + TI_DbgPrint(DEBUG_TCP,("TCP Bytes: %d\n", BytesSent)); if( Status == STATUS_PENDING ) { @@ -430,7 +431,7 @@ Bucket->Request, Status)); Bucket->Status = Status; - Bucket->Information = (Bucket->Status == STATUS_SUCCESS) ? SendLen : 0; + Bucket->Information = (Bucket->Status == STATUS_SUCCESS) ? BytesSent : 0; CompleteBucket(Connection, Bucket, FALSE); } Modified: trunk/reactos/lib/drivers/ip/transport/tcp/tcp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/ip/transport/t… ============================================================================== --- trunk/reactos/lib/drivers/ip/transport/tcp/tcp.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/ip/transport/tcp/tcp.c [iso-8859-1] Mon Aug 27 23:58:40 2012 @@ -544,6 +544,7 @@ Status = TCPTranslateError(LibTCPSend(Connection, BufferData, SendLength, + BytesSent, FALSE)); TI_DbgPrint(DEBUG_TCP,("[IP, TCPSendData] Send: %x, %d\n", Status, SendLength)); @@ -562,18 +563,9 @@ Bucket->Request.RequestNotifyObject = Complete; Bucket->Request.RequestContext = Context; - *BytesSent = 0; InsertTailList( &Connection->SendRequest, &Bucket->Entry ); TI_DbgPrint(DEBUG_TCP,("[IP, TCPSendData] Queued write irp\n")); - } - else if (Status == STATUS_SUCCESS) - { - *BytesSent = SendLength; - } - else - { - *BytesSent = 0; } UnlockObject(Connection, OldIrql); Modified: trunk/reactos/lib/drivers/lwip/src/include/rosip.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/lwip/src/inclu… ============================================================================== --- trunk/reactos/lib/drivers/lwip/src/include/rosip.h [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/lwip/src/include/rosip.h [iso-8859-1] Mon Aug 27 23:58:40 2012 @@ -72,6 +72,7 @@ } Listen; struct { err_t Error; + u32_t Information; } Send; struct { err_t Error; @@ -98,7 +99,7 @@ PTCP_PCB LibTCPSocket(void *arg); err_t LibTCPBind(PCONNECTION_ENDPOINT Connection, struct ip_addr *const ipaddr, const u16_t port); PTCP_PCB LibTCPListen(PCONNECTION_ENDPOINT Connection, const u8_t backlog); -err_t LibTCPSend(PCONNECTION_ENDPOINT Connection, void *const dataptr, const u16_t len, const int safe); +err_t LibTCPSend(PCONNECTION_ENDPOINT Connection, void *const dataptr, const u16_t len, u32_t *sent, const int safe); err_t LibTCPConnect(PCONNECTION_ENDPOINT Connection, struct ip_addr *const ipaddr, const u16_t port); err_t LibTCPShutdown(PCONNECTION_ENDPOINT Connection, const int shut_rx, const int shut_tx); err_t LibTCPClose(PCONNECTION_ENDPOINT Connection, const int safe, const int callback); Modified: trunk/reactos/lib/drivers/lwip/src/rostcp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/lwip/src/rostc… ============================================================================== --- trunk/reactos/lib/drivers/lwip/src/rostcp.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/lwip/src/rostcp.c [iso-8859-1] Mon Aug 27 23:58:40 2012 @@ -443,6 +443,9 @@ LibTCPSendCallback(void *arg) { struct lwip_callback_msg *msg = arg; + PTCP_PCB pcb = msg->Input.Send.Connection->SocketContext; + ULONG SendLength; + UCHAR SendFlags; ASSERT(msg); @@ -458,19 +461,37 @@ goto done; } - msg->Output.Send.Error = tcp_write((PTCP_PCB)msg->Input.Send.Connection->SocketContext, - msg->Input.Send.Data, - msg->Input.Send.DataLength, - TCP_WRITE_FLAG_COPY); - if (msg->Output.Send.Error == ERR_MEM) + SendFlags = TCP_WRITE_FLAG_COPY; + SendLength = msg->Input.Send.DataLength; + if (tcp_sndbuf(pcb) == 0) { /* No buffer space so return pending */ msg->Output.Send.Error = ERR_INPROGRESS; - } - else if (msg->Output.Send.Error == ERR_OK) + goto done; + } + else if (tcp_sndbuf(pcb) < SendLength) + { + /* We've got some room so let's send what we can */ + SendLength = tcp_sndbuf(pcb); + + /* Don't set the push flag */ + SendFlags |= TCP_WRITE_FLAG_MORE; + } + + msg->Output.Send.Error = tcp_write(pcb, + msg->Input.Send.Data, + SendLength, + SendFlags); + if (msg->Output.Send.Error == ERR_OK) { /* Queued successfully so try to send it */ tcp_output((PTCP_PCB)msg->Input.Send.Connection->SocketContext); + msg->Output.Send.Information = SendLength; + } + else if (msg->Output.Send.Error == ERR_MEM) + { + /* The queue is too long */ + msg->Output.Send.Error = ERR_INPROGRESS; } done: @@ -478,7 +499,7 @@ } err_t -LibTCPSend(PCONNECTION_ENDPOINT Connection, void *const dataptr, const u16_t len, const int safe) +LibTCPSend(PCONNECTION_ENDPOINT Connection, void *const dataptr, const u16_t len, u32_t *sent, const int safe) { err_t ret; struct lwip_callback_msg *msg; @@ -500,6 +521,11 @@ ret = msg->Output.Send.Error; else ret = ERR_CLSD; + + if (ret == ERR_OK) + *sent = msg->Output.Send.Information; + else + *sent = 0; ExFreeToNPagedLookasideList(&MessageLookasideList, msg);

1 0

[cgutman] 57185: [AFD] - Fix enabling of some event select triggers
by cgutman＠svn.reactos.org 27 Aug '12

27 Aug '12

Author: cgutman Date: Mon Aug 27 22:18:29 2012 New Revision: 57185 URL: http://svn.reactos.org/svn/reactos?rev=57185&view=rev Log: [AFD] - Fix enabling of some event select triggers Modified: trunk/reactos/drivers/network/afd/afd/listen.c trunk/reactos/drivers/network/afd/afd/read.c Modified: trunk/reactos/drivers/network/afd/afd/listen.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/afd/afd/li… ============================================================================== --- trunk/reactos/drivers/network/afd/afd/listen.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/afd/afd/listen.c [iso-8859-1] Mon Aug 27 22:18:29 2012 @@ -327,6 +327,8 @@ if( !SocketAcquireStateLock( FCB ) ) return LostSocket( Irp ); + FCB->EventSelectDisabled &= ~AFD_EVENT_ACCEPT; + for( PendingConn = FCB->PendingConnections.Flink; PendingConn != &FCB->PendingConnections; PendingConn = PendingConn->Flink ) { @@ -364,8 +366,6 @@ ExFreePool( PendingConnObj ); - FCB->EventSelectDisabled &= ~AFD_EVENT_ACCEPT; - if( !IsListEmpty( &FCB->PendingConnections ) ) { FCB->PollState |= AFD_EVENT_ACCEPT; Modified: trunk/reactos/drivers/network/afd/afd/read.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/afd/afd/re… ============================================================================== --- trunk/reactos/drivers/network/afd/afd/read.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/afd/afd/read.c [iso-8859-1] Mon Aug 27 22:18:29 2012 @@ -436,6 +436,8 @@ if( !SocketAcquireStateLock( FCB ) ) return LostSocket( Irp ); + FCB->EventSelectDisabled &= ~AFD_EVENT_RECEIVE; + if( !(FCB->Flags & AFD_ENDPOINT_CONNECTIONLESS) && FCB->State != SOCKET_STATE_CONNECTED && FCB->State != SOCKET_STATE_CONNECTING ) { @@ -460,8 +462,6 @@ return UnlockAndMaybeComplete( FCB, STATUS_ACCESS_VIOLATION, Irp, 0 ); } - - FCB->EventSelectDisabled &= ~AFD_EVENT_RECEIVE; if( FCB->Flags & AFD_ENDPOINT_CONNECTIONLESS ) { @@ -704,6 +704,8 @@ if( !SocketAcquireStateLock( FCB ) ) return LostSocket( Irp ); + FCB->EventSelectDisabled &= ~AFD_EVENT_RECEIVE; + /* Check that the socket is bound */ if( FCB->State != SOCKET_STATE_BOUND ) { @@ -732,8 +734,6 @@ return UnlockAndMaybeComplete(FCB, STATUS_ACCESS_VIOLATION, Irp, 0); } - FCB->EventSelectDisabled &= ~AFD_EVENT_RECEIVE; - if (!IsListEmpty(&FCB->DatagramList)) { ListEntry = RemoveHeadList(&FCB->DatagramList);

1 0

[cgutman] 57184: [AFD] - Mask out disabled events properly
by cgutman＠svn.reactos.org 27 Aug '12

27 Aug '12

Author: cgutman Date: Mon Aug 27 21:53:09 2012 New Revision: 57184 URL: http://svn.reactos.org/svn/reactos?rev=57184&view=rev Log: [AFD] - Mask out disabled events properly Modified: trunk/reactos/drivers/network/afd/afd/select.c Modified: trunk/reactos/drivers/network/afd/afd/select.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/afd/afd/se… ============================================================================== --- trunk/reactos/drivers/network/afd/afd/select.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/afd/afd/select.c [iso-8859-1] Mon Aug 27 21:53:09 2012 @@ -1,4 +1,4 @@ -/* $Id$ +/* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel * FILE: drivers/net/afd/afd/select.c @@ -304,9 +304,6 @@ { AFD_DbgPrint(MID_TRACE,("Setting event %x\n", FCB->EventSelect)); - /* Disable the events that triggered the select until the reenabling function is called */ - FCB->EventSelectDisabled |= (FCB->PollState & (FCB->EventSelectTriggers & ~FCB->EventSelectDisabled)); - /* Set the application's event */ KeSetEvent( FCB->EventSelect, IO_NETWORK_INCREMENT, FALSE ); } @@ -353,11 +350,14 @@ KeClearEvent(UserEvent); ObDereferenceObject(UserEvent); - /* Copy the poll state */ - EnumReq->PollEvents = FCB->PollState; + /* Copy the poll state, masking out disabled events */ + EnumReq->PollEvents = (FCB->PollState & ~FCB->EventSelectDisabled); RtlCopyMemory( EnumReq->EventStatus, FCB->PollStatus, sizeof(EnumReq->EventStatus) ); + + /* Disable the events that triggered the select until the reenabling function is called */ + FCB->EventSelectDisabled |= (FCB->PollState & FCB->EventSelectTriggers); return UnlockAndMaybeComplete( FCB, STATUS_SUCCESS, Irp, 0 ); } @@ -431,9 +431,6 @@ { AFD_DbgPrint(MID_TRACE,("Setting event %x\n", FCB->EventSelect)); - /* Disable the events that triggered the select until the reenabling function is called */ - FCB->EventSelectDisabled |= (FCB->PollState & (FCB->EventSelectTriggers & ~FCB->EventSelectDisabled)); - /* Set the application's event */ KeSetEvent( FCB->EventSelect, IO_NETWORK_INCREMENT, FALSE ); }

1 0

[jgardou] 57183: [MSVCRTEX] - Better fix for DLLs not providing a DllMain function, as per Timo's remarks.
by jgardou＠svn.reactos.org 27 Aug '12

27 Aug '12

Author: jgardou Date: Mon Aug 27 21:34:42 2012 New Revision: 57183 URL: http://svn.reactos.org/svn/reactos?rev=57183&view=rev Log: [MSVCRTEX] - Better fix for DLLs not providing a DllMain function, as per Timo's remarks. Added: trunk/reactos/lib/sdk/crt/startup/dllmain.c - copied unchanged from r57179, trunk/reactos/lib/sdk/crt/startup/mscdllmain.c Removed: trunk/reactos/lib/sdk/crt/startup/mscdllmain.c Modified: trunk/reactos/lib/sdk/crt/msvcrtex.cmake trunk/reactos/lib/sdk/crt/startup/crtdll.c Modified: trunk/reactos/lib/sdk/crt/msvcrtex.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/msvcrtex.cmake… ============================================================================== --- trunk/reactos/lib/sdk/crt/msvcrtex.cmake [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/msvcrtex.cmake [iso-8859-1] Mon Aug 27 21:34:42 2012 @@ -21,6 +21,7 @@ startup/charmax.c startup/merr.c startup/atonexit.c + startup/dllmain.c startup/txtmode.c startup/pesect.c startup/tlsmcrt.c @@ -66,9 +67,7 @@ endif() if(MSVC) - list(APPEND MSVCRTEX_SOURCE - startup/mscmain.c - startup/mscdllmain.c) + list(APPEND MSVCRTEX_SOURCE startup/mscmain.c) else() list(APPEND MSVCRTEX_SOURCE startup/gccmain.c) endif() Modified: trunk/reactos/lib/sdk/crt/startup/crtdll.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/startup/crtdll… ============================================================================== --- trunk/reactos/lib/sdk/crt/startup/crtdll.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/startup/crtdll.c [iso-8859-1] Mon Aug 27 21:34:42 2012 @@ -50,19 +50,7 @@ extern int mingw_app_type; -/* - * It is possible that a DLL provides no DllMain entry point. - * Mark it as a weak symbol for GCC. - * Tests show that at link time, MSVC looks for a function first in the object files provided, and then - * in the libraries. This means that we must provide a basic implementation in msvcrtex, which will be used - * if none is found in the object files provided to link.exe. - * This also means that we can't rely on a DllMain function implemented in a static library when linking a DLL. - */ -#ifdef __GNUC__ -extern WINBOOL WINAPI DllMain (HANDLE hDllHandle, DWORD dwReason, LPVOID lpreserved) __attribute__((weak)); -#else extern WINBOOL WINAPI DllMain (HANDLE hDllHandle, DWORD dwReason, LPVOID lpreserved); -#endif extern WINBOOL WINAPI DllEntryPoint (HANDLE, DWORD, LPVOID); @@ -210,12 +198,10 @@ } if (dwReason == DLL_PROCESS_ATTACH) __main (); - if(DllMain) - retcode = DllMain(hDllHandle,dwReason,lpreserved); + retcode = DllMain(hDllHandle,dwReason,lpreserved); if (dwReason == DLL_PROCESS_ATTACH && ! retcode) { - if(DllMain) - DllMain (hDllHandle, DLL_PROCESS_DETACH, lpreserved); + DllMain (hDllHandle, DLL_PROCESS_DETACH, lpreserved); DllEntryPoint (hDllHandle, DLL_PROCESS_DETACH, lpreserved); _CRT_INIT (hDllHandle, DLL_PROCESS_DETACH, lpreserved); } Removed: trunk/reactos/lib/sdk/crt/startup/mscdllmain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/startup/mscdll… ============================================================================== --- trunk/reactos/lib/sdk/crt/startup/mscdllmain.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/startup/mscdllmain.c (removed) @@ -1,11 +1,0 @@ -#include <oscalls.h> -#define _DECL_DLLMAIN -#include <process.h> - -WINBOOL WINAPI DllMain (HANDLE hDllHandle, DWORD dwReason, LPVOID lpreserved) -{ - /* If the DLL provides no DllMain, then chances are that it doesn't bother with thread initialization */ - if(dwReason == DLL_PROCESS_ATTACH) - DisableThreadLibraryCalls(hDllHandle); - return TRUE; -}

1 0

[akhaldi] 57182: [HAL] * Don't compile lib_hal_pic for x64. Brought to you by Hermès Bélusca. See issue #7309 for more details.
by akhaldi＠svn.reactos.org 27 Aug '12

27 Aug '12

Author: akhaldi Date: Mon Aug 27 21:24:22 2012 New Revision: 57182 URL: http://svn.reactos.org/svn/reactos?rev=57182&view=rev Log: [HAL] * Don't compile lib_hal_pic for x64. Brought to you by Hermès Bélusca. See issue #7309 for more details. Modified: trunk/reactos/hal/halx86/CMakeLists.txt Modified: trunk/reactos/hal/halx86/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/CMakeLists.txt?… ============================================================================== --- trunk/reactos/hal/halx86/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/CMakeLists.txt [iso-8859-1] Mon Aug 27 21:24:22 2012 @@ -83,18 +83,6 @@ add_library(lib_hal_up OBJECT ${HAL_UP_SOURCE}) endif() -list(APPEND HAL_PIC_SOURCE - generic/profil.c - generic/timer.c - generic/systimer.S - generic/trap.S - up/halinit_up.c - up/pic.c) - -if(CMAKE_VERSION VERSION_GREATER 2.8.7) - add_library(lib_hal_pic OBJECT ${HAL_PIC_SOURCE}) -endif() - list(APPEND HAL_APIC_SOURCE apic/apic.c apic/apictimer.c @@ -105,6 +93,18 @@ apic/tsccal.S) if(ARCH STREQUAL "i386") + list(APPEND HAL_PIC_SOURCE + generic/profil.c + generic/timer.c + generic/systimer.S + generic/trap.S + up/halinit_up.c + up/pic.c) + + if(CMAKE_VERSION VERSION_GREATER 2.8.7) + add_library(lib_hal_pic OBJECT ${HAL_PIC_SOURCE}) + endif() + list(APPEND MINI_HAL_SOURCE generic/portio.c generic/systimer.S

1 0

[akhaldi] 57181: [CMAKE] * Prefer STREQUAL over MATCHES since we're comparing with strings here. Brought to you by Hermès Bélusca. See issue #7306 for more details.
by akhaldi＠svn.reactos.org 27 Aug '12

27 Aug '12

Author: akhaldi Date: Mon Aug 27 18:58:27 2012 New Revision: 57181 URL: http://svn.reactos.org/svn/reactos?rev=57181&view=rev Log: [CMAKE] * Prefer STREQUAL over MATCHES since we're comparing with strings here. Brought to you by Hermès Bélusca. See issue #7306 for more details. Modified: trunk/reactos/CMakeLists.txt trunk/reactos/boot/freeldr/bootsect/CMakeLists.txt trunk/reactos/boot/freeldr/freeldr/CMakeLists.txt trunk/reactos/cmake/CMakeMacros.cmake trunk/reactos/cmake/config.cmake trunk/reactos/cmake/gcc.cmake trunk/reactos/cmake/midl-support.cmake trunk/reactos/cmake/msvc.cmake trunk/reactos/cmake/widl-support.cmake trunk/reactos/dll/ntdll/CMakeLists.txt trunk/reactos/dll/opengl/mesa/src/gallium/targets/libgl-gdi/CMakeLists.txt trunk/reactos/dll/win32/CMakeLists.txt trunk/reactos/dll/win32/dbghelp/CMakeLists.txt trunk/reactos/dll/win32/kernel32/CMakeLists.txt trunk/reactos/dll/win32/riched20/CMakeLists.txt trunk/reactos/drivers/base/bootvid/CMakeLists.txt trunk/reactos/drivers/base/kdcom/CMakeLists.txt trunk/reactos/drivers/bus/acpi/CMakeLists.txt trunk/reactos/drivers/storage/class/cdrom_new/CMakeLists.txt trunk/reactos/drivers/storage/class/disk_new/CMakeLists.txt trunk/reactos/drivers/storage/classpnp/CMakeLists.txt trunk/reactos/hal/CMakeLists.txt trunk/reactos/hal/halx86/CMakeLists.txt trunk/reactos/include/asm/CMakeLists.txt trunk/reactos/include/ndk/tests/CMakeLists.txt trunk/reactos/include/reactos/version.cmake trunk/reactos/lib/drivers/ip/CMakeLists.txt trunk/reactos/lib/ppcmmu/CMakeLists.txt trunk/reactos/lib/pseh/CMakeLists.txt trunk/reactos/lib/rtl/CMakeLists.txt trunk/reactos/lib/sdk/crt/CMakeLists.txt trunk/reactos/lib/sdk/crt/crt.cmake trunk/reactos/lib/sdk/crt/libcntpr.cmake trunk/reactos/lib/sdk/crt/msvcrtex.cmake trunk/reactos/ntoskrnl/CMakeLists.txt trunk/reactos/subsystems/CMakeLists.txt trunk/reactos/toolchain-gcc.cmake trunk/reactos/toolchain-msvc.cmake trunk/reactos/tools/rsym/CMakeLists.txt trunk/reactos/win32ss/CMakeLists.txt trunk/reactos/win32ss/drivers/displays/framebuf_new/CMakeLists.txt trunk/reactos/win32ss/gdi/gdi32/CMakeLists.txt Modified: trunk/reactos/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/CMakeLists.txt?rev=57181&r… ============================================================================== --- trunk/reactos/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/CMakeLists.txt [iso-8859-1] Mon Aug 27 18:58:27 2012 @@ -29,14 +29,19 @@ if(NOT ARCH) set(ARCH i386) endif() +# Now the ARCH variable will be in lowercase. +# It is needed because STREQUAL comparison +# is case-sensitive. +# See http://cmake.3232098.n2.nabble.com/Case-insensitive-string-compare-td758026… +# for more information. string(TOLOWER ${ARCH} ARCH) # Compile options -if(ARCH MATCHES i386) +if(ARCH STREQUAL "i386") include(cmake/config.cmake) -elseif(ARCH MATCHES amd64) +elseif(ARCH STREQUAL "amd64") include(cmake/config-amd64.cmake) -elseif(ARCH MATCHES arm) +elseif(ARCH STREQUAL "arm") include(cmake/config-arm.cmake) endif() @@ -50,7 +55,7 @@ add_definitions(-DTARGET_${ARCH}) if(MSVC) - if(ARCH MATCHES i386) + if(ARCH STREQUAL "i386") add_definitions(/D_X86_ /DWIN32 /D_WINDOWS) endif() add_definitions(/Dinline=__inline) @@ -128,21 +133,21 @@ -D_SETUPAPI_VER=0x502) # Arch Options - if(ARCH MATCHES i386) + if(ARCH STREQUAL "i386") add_definitions(-D_M_IX86 -D_X86_ -D__i386__) - elseif(ARCH MATCHES amd64) + elseif(ARCH STREQUAL "amd64") add_definitions(-D_M_AMD64 -D_AMD64_ -D__x86_64__ -D_WIN64) - elseif(ARCH MATCHES arm) + elseif(ARCH STREQUAL "arm") # _M_ARM is already defined by toolchain add_definitions(-D_ARM_ -D__arm__) endif() # Other - if(ARCH MATCHES i386) + if(ARCH STREQUAL "i386") add_definitions(-DUSE_COMPILER_EXCEPTIONS -D_USE_32BIT_TIME_T) - elseif(ARCH MATCHES amd64) + elseif(ARCH STREQUAL "amd64") add_definitions(-DUSE_COMPILER_EXCEPTIONS -DNO_UNDERSCORE_PREFIX) - elseif(ARCH MATCHES arm) + elseif(ARCH STREQUAL "arm") add_definitions(-DUSE_COMPILER_EXCEPTIONS) endif() @@ -203,7 +208,7 @@ endif() - if(ARCH MATCHES arm) + if(ARCH STREQUAL "arm") include_directories(${REACTOS_SOURCE_DIR}/include/reactos/arm) endif() Modified: trunk/reactos/boot/freeldr/bootsect/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/bootsect/CMak… ============================================================================== --- trunk/reactos/boot/freeldr/bootsect/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/bootsect/CMakeLists.txt [iso-8859-1] Mon Aug 27 18:58:27 2012 @@ -1,5 +1,5 @@ -if(ARCH MATCHES i386 OR ARCH MATCHES amd64) +if(ARCH STREQUAL "i386" OR ARCH STREQUAL "amd64") CreateBootSectorTarget(dosmbr ${CMAKE_CURRENT_SOURCE_DIR}/dosmbr.S ${CMAKE_CURRENT_BINARY_DIR}/dosmbr.bin 7c00) CreateBootSectorTarget(ext2 ${CMAKE_CURRENT_SOURCE_DIR}/ext2.S ${CMAKE_CURRENT_BINARY_DIR}/ext2.bin 0) Modified: trunk/reactos/boot/freeldr/freeldr/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/CMake… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/CMakeLists.txt [iso-8859-1] Mon Aug 27 18:58:27 2012 @@ -6,12 +6,12 @@ spec2def(freeldr.sys freeldr.spec) -if(ARCH MATCHES i386) +if(ARCH STREQUAL "i386") CreateBootSectorTarget(frldr16 ${CMAKE_CURRENT_SOURCE_DIR}/arch/realmode/i386.S ${CMAKE_CURRENT_BINARY_DIR}/frldr16.bin F800) -elseif(ARCH MATCHES amd64) +elseif(ARCH STREQUAL "amd64") CreateBootSectorTarget(frldr16 ${CMAKE_CURRENT_SOURCE_DIR}/arch/realmode/amd64.S ${CMAKE_CURRENT_BINARY_DIR}/frldr16.bin @@ -26,10 +26,8 @@ add_definitions(-D_NTHAL_ -D_BLDR_ -D_NTSYSTEM_) -if(ARCH MATCHES arm) - if(SARCH MATCHES omap-zoom2) - add_definitions(-D_ZOOM2_) - endif() +if((ARCH STREQUAL "arm") AND (SARCH STREQUAL "omap-zoom2")) + add_definitions(-D_ZOOM2_) endif() list(APPEND FREELDR_COMMON_SOURCE @@ -80,7 +78,7 @@ windows/wlmemory.c windows/wlregistry.c) -if(ARCH MATCHES i386) +if(ARCH STREQUAL "i386") list(APPEND FREELDR_COMMON_SOURCE arch/i386/archmach.c arch/i386/custom.c @@ -125,7 +123,7 @@ list(APPEND FREELDR_COMMON_SOURCE arch/i386/drvmap.S) endif() -elseif(ARCH MATCHES amd64) +elseif(ARCH STREQUAL "amd64") list(APPEND FREELDR_COMMON_SOURCE arch/amd64/entry.S arch/amd64/int386.S @@ -157,7 +155,7 @@ add_dependencies(freeldr_common bugcodes) endif() -if(ARCH MATCHES i386 AND NOT MSVC) +if(ARCH STREQUAL "i386" AND NOT MSVC) list(APPEND FREELDR_BASE_SOURCE arch/i386/multiboot.S) endif() @@ -197,7 +195,7 @@ set_subsystem(freeldr_pe_dbg native) set_entrypoint(freeldr_pe_dbg RealEntryPoint) -if(ARCH MATCHES i386) +if(ARCH STREQUAL "i386") target_link_libraries(freeldr_pe mini_hal) target_link_libraries(freeldr_pe_dbg mini_hal) endif() @@ -229,7 +227,7 @@ list(APPEND SETUPLDR_SOURCE inffile/inffile.c) -if(ARCH MATCHES i386 OR ARCH MATCHES amd64) +if(ARCH STREQUAL "i386" OR ARCH STREQUAL "amd64") list(APPEND SETUPLDR_SOURCE windows/setupldr.c) endif() @@ -262,7 +260,7 @@ set_subsystem(setupldr_pe_dbg native) set_entrypoint(setupldr_pe_dbg RealEntryPoint) -if(ARCH MATCHES i386) +if(ARCH STREQUAL "i386") target_link_libraries(setupldr_pe mini_hal) target_link_libraries(setupldr_pe_dbg mini_hal) endif() Modified: trunk/reactos/cmake/CMakeMacros.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/cmake/CMakeMacros.cmake?re… ============================================================================== --- trunk/reactos/cmake/CMakeMacros.cmake [iso-8859-1] (original) +++ trunk/reactos/cmake/CMakeMacros.cmake [iso-8859-1] Mon Aug 27 18:58:27 2012 @@ -247,7 +247,7 @@ endfunction() endif() -if(CMAKE_HOST_SYSTEM_NAME MATCHES Windows) +if(CMAKE_HOST_SYSTEM_NAME STREQUAL "Windows") macro(to_win_path _cmake_path _native_path) string(REPLACE "/" "\\" ${_native_path} "${_cmake_path}") endmacro() Modified: trunk/reactos/cmake/config.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/cmake/config.cmake?rev=571… ============================================================================== --- trunk/reactos/cmake/config.cmake [iso-8859-1] (original) +++ trunk/reactos/cmake/config.cmake [iso-8859-1] Mon Aug 27 18:58:27 2012 @@ -28,7 +28,7 @@ "Whether to compile for debugging with GDB. If you don't use GDB, don't enable this.") -if(${CMAKE_BUILD_TYPE} MATCHES Release) +if(CMAKE_BUILD_TYPE STREQUAL "Release") set(DBG FALSE CACHE BOOL "Whether to compile for debugging.") else() @@ -39,7 +39,7 @@ if(MSVC) set(KDBG FALSE CACHE BOOL "Whether to compile in the integrated kernel debugger.") - if(${CMAKE_BUILD_TYPE} MATCHES Release) + if(CMAKE_BUILD_TYPE STREQUAL "Release") set(_WINKD_ FALSE CACHE BOOL "Whether to compile with the KD protocol.") else() set(_WINKD_ TRUE CACHE BOOL "Whether to compile with the KD protocol.") Modified: trunk/reactos/cmake/gcc.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/cmake/gcc.cmake?rev=57181&… ============================================================================== --- trunk/reactos/cmake/gcc.cmake [iso-8859-1] (original) +++ trunk/reactos/cmake/gcc.cmake [iso-8859-1] Mon Aug 27 18:58:27 2012 @@ -16,7 +16,7 @@ #file(TO_NATIVE_PATH ${REACTOS_SOURCE_DIR} REACTOS_SOURCE_DIR_NATIVE) #workaround set(REACTOS_SOURCE_DIR_NATIVE ${REACTOS_SOURCE_DIR}) - if(CMAKE_HOST_SYSTEM_NAME MATCHES Windows) + if(CMAKE_HOST_SYSTEM_NAME STREQUAL "Windows") string(REPLACE "/" "\\" REACTOS_SOURCE_DIR_NATIVE ${REACTOS_SOURCE_DIR}) endif() add_compile_flags("-fdebug-prefix-map=\"${REACTOS_SOURCE_DIR_NATIVE}\"=ReactOS") @@ -37,7 +37,7 @@ endif() # Tuning -if(ARCH MATCHES i386) +if(ARCH STREQUAL "i386") add_compile_flags("-march=${OARCH} -mtune=${TUNE}") else() add_compile_flags("-march=${OARCH}") @@ -54,9 +54,9 @@ add_compile_flags("-Wno-error=unused-but-set-variable -Wno-error=maybe-uninitialized -Wno-error=delete-non-virtual-dtor -Wno-error=narrowing") endif() -if(ARCH MATCHES amd64) +if(ARCH STREQUAL "amd64") add_compile_flags("-Wno-format") -elseif(ARCH MATCHES arm) +elseif(ARCH STREQUAL "arm") add_compile_flags("-Wno-attributes") endif() @@ -80,26 +80,26 @@ add_compile_flags("-fno-strict-aliasing") -if(ARCH MATCHES i386) +if(ARCH STREQUAL "i386") add_compile_flags("-mpreferred-stack-boundary=3 -fno-set-stack-executable -fno-optimize-sibling-calls -fno-omit-frame-pointer") if(OPTIMIZE STREQUAL "1") add_compile_flags("-ftracer -momit-leaf-frame-pointer") endif() -elseif(ARCH MATCHES amd64) +elseif(ARCH STREQUAL "amd64") add_compile_flags("-mpreferred-stack-boundary=4") if(OPTIMIZE STREQUAL "1") add_compile_flags("-ftracer -momit-leaf-frame-pointer") endif() -elseif(ARCH MATCHES arm) +elseif(ARCH STREQUAL "arm") if(OPTIMIZE STREQUAL "1") add_compile_flags("-ftracer") endif() endif() # Other -if(ARCH MATCHES amd64) +if(ARCH STREQUAL "amd64") add_definitions(-U_X86_ -UWIN32) -elseif(ARCH MATCHES arm) +elseif(ARCH STREQUAL "arm") add_definitions(-U_UNICODE -UUNICODE) add_definitions(-D__MSVCRT__) # DUBIOUS endif() @@ -107,7 +107,7 @@ add_definitions(-D_inline=__inline) # alternative arch name -if(ARCH MATCHES amd64) +if(ARCH STREQUAL "amd64") set(ARCH2 x86_64) else() set(ARCH2 ${ARCH}) @@ -117,7 +117,7 @@ # PDB style debug puts all dwarf debug info in a separate dbg file message(STATUS "Building separate debug symbols") file(MAKE_DIRECTORY ${REACTOS_BINARY_DIR}/symbols) - if(CMAKE_GENERATOR MATCHES "Ninja") + if(CMAKE_GENERATOR STREQUAL "Ninja") set(SYMBOL_FILE <TARGET_PDB>) else() set(SYMBOL_FILE <TARGET>.gdb) @@ -177,7 +177,7 @@ function(set_entrypoint MODULE ENTRYPOINT) if(${ENTRYPOINT} STREQUAL "0") add_target_link_flags(${MODULE} "-Wl,-entry,0") - elseif(ARCH MATCHES i386) + elseif(ARCH STREQUAL "i386") set(_entrysymbol _${ENTRYPOINT}) if(${ARGC} GREATER 2) set(_entrysymbol ${_entrysymbol}@${ARGV2}) @@ -201,7 +201,7 @@ target_link_libraries(${MODULE} -lstdc++ -lsupc++ -lgcc -lmingwex) endif() - if(${TYPE} STREQUAL kernelmodedriver) + if(${TYPE} STREQUAL "kernelmodedriver") add_target_link_flags(${MODULE} "-Wl,--exclude-all-symbols,-file-alignment=0x1000,-section-alignment=0x1000") endif() endfunction() @@ -216,7 +216,7 @@ target_link_libraries(${MODULE} delayimp) endfunction() -if(NOT ARCH MATCHES i386) +if(NOT ARCH STREQUAL "i386") set(DECO_OPTION "-@") endif() Modified: trunk/reactos/cmake/midl-support.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/cmake/midl-support.cmake?r… ============================================================================== --- trunk/reactos/cmake/midl-support.cmake [iso-8859-1] (original) +++ trunk/reactos/cmake/midl-support.cmake [iso-8859-1] Mon Aug 27 18:58:27 2012 @@ -1,8 +1,8 @@ #idl files support -if(ARCH MATCHES i386) +if(ARCH STREQUAL "i386") set(IDL_FLAGS /nologo /win32 /no_def_idir) -elseif(ARCH MATCHES amd64) +elseif(ARCH STREQUAL "amd64") set(IDL_FLAGS /nologo /amd64 /no_def_idir) else() set(IDL_FLAGS /nologo /no_def_idir) @@ -55,11 +55,11 @@ get_includes(_includes) get_defines(_defines) # Is it a client or server module? - if(_type STREQUAL server) + if(_type STREQUAL "server") set(_server_client /sstub) set(_suffix _s) set(_prevent_second_type /client none) - elseif(_type STREQUAL client) + elseif(_type STREQUAL "client") set(_server_client /cstub) set(_suffix _c) set(_prevent_second_type /server none) Modified: trunk/reactos/cmake/msvc.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/cmake/msvc.cmake?rev=57181… ============================================================================== --- trunk/reactos/cmake/msvc.cmake [iso-8859-1] (original) +++ trunk/reactos/cmake/msvc.cmake [iso-8859-1] Mon Aug 27 18:58:27 2012 @@ -1,5 +1,6 @@ -if(${CMAKE_BUILD_TYPE} MATCHES Debug) +#if(${CMAKE_BUILD_TYPE} STREQUAL "Debug") +if(CMAKE_BUILD_TYPE STREQUAL "Debug") # no optimization elseif(OPTIMIZE STREQUAL "1") add_definitions(/O1) @@ -13,7 +14,7 @@ add_definitions(/GF /Gy /Ob2 /Os /Ox /GS-) endif() -if(ARCH MATCHES i386) +if(ARCH STREQUAL "i386") add_definitions(/DWIN32 /D_WINDOWS) endif() @@ -23,7 +24,7 @@ # HACK: for VS 11+ we need to explicitly disable SSE, which is off by # default for older compilers. See bug #7174 -if (MSVC_VERSION GREATER 1699 AND ARCH MATCHES i386) +if (MSVC_VERSION GREATER 1699 AND ARCH STREQUAL "i386") add_compile_flags("/arch:IA32") endif () @@ -31,12 +32,14 @@ add_compile_flags("/we4700") # Debugging -if(${CMAKE_BUILD_TYPE} MATCHES Debug) +#if(${CMAKE_BUILD_TYPE} STREQUAL "Debug") +if(CMAKE_BUILD_TYPE STREQUAL "Debug") if(NOT (_PREFAST_ OR _VS_ANALYZE_)) add_compile_flags("/Zi") endif() add_compile_flags("/Ob0 /Od") -elseif(${CMAKE_BUILD_TYPE} MATCHES Release) +#elseif(${CMAKE_BUILD_TYPE} STREQUAL "Release") +elseif(CMAKE_BUILD_TYPE STREQUAL "Release") add_compile_flags("/Ob2 /D NDEBUG") endif() @@ -87,7 +90,7 @@ function(set_entrypoint _module _entrypoint) if(${_entrypoint} STREQUAL "0") add_target_link_flags(${_module} "/NOENTRY") - elseif(ARCH MATCHES i386) + elseif(ARCH STREQUAL "i386") set(_entrysymbol ${_entrypoint}) if(${ARGC} GREATER 2) set(_entrysymbol ${_entrysymbol}@${ARGV2}) @@ -107,9 +110,9 @@ endfunction() function(set_module_type_toolchain MODULE TYPE) - if((${TYPE} STREQUAL win32dll) OR (${TYPE} STREQUAL win32ocx) OR (${TYPE} STREQUAL cpl)) + if((${TYPE} STREQUAL "win32dll") OR (${TYPE} STREQUAL "win32ocx") OR (${TYPE} STREQUAL "cpl")) add_target_link_flags(${MODULE} "/DLL") - elseif(${TYPE} STREQUAL kernelmodedriver) + elseif(${TYPE} STREQUAL "kernelmodedriver") add_target_link_flags(${MODULE} "/DRIVER") endif() endfunction() @@ -166,7 +169,7 @@ set_target_properties(${_libname} PROPERTIES STATIC_LIBRARY_FLAGS "/DEF:${_def_file}") endfunction() -if(${ARCH} MATCHES amd64) +if(ARCH STREQUAL "amd64") add_definitions(/D__x86_64) set(SPEC2DEF_ARCH x86_64) else() @@ -211,7 +214,7 @@ # Use a full path for the x86 version of ml when using x64 VS. # It's not a problem when using the DDK/WDK because, in x64 mode, # both the x86 and x64 versions of ml are available. -if((ARCH MATCHES amd64) AND (DEFINED ENV{VCINSTALLDIR})) +if((ARCH STREQUAL "amd64") AND (DEFINED ENV{VCINSTALLDIR})) set(CMAKE_ASM16_COMPILER $ENV{VCINSTALLDIR}/bin/ml.exe) else() set(CMAKE_ASM16_COMPILER ml.exe) Modified: trunk/reactos/cmake/widl-support.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/cmake/widl-support.cmake?r… ============================================================================== --- trunk/reactos/cmake/widl-support.cmake [iso-8859-1] (original) +++ trunk/reactos/cmake/widl-support.cmake [iso-8859-1] Mon Aug 27 18:58:27 2012 @@ -1,8 +1,8 @@ #idl files support -if(ARCH MATCHES i386) +if(ARCH STREQUAL "i386") set(IDL_FLAGS -m32 --win32) -elseif(ARCH MATCHES amd64) +elseif(ARCH STREQUAL "amd64") set(IDL_FLAGS -m64 --win64) else() set(IDL_FLAGS "") @@ -60,10 +60,10 @@ get_includes(INCLUDES) get_defines(DEFINES) # Is it a client or server module? - if(__type STREQUAL server) + if(__type STREQUAL "server") set(__server_client -Oif -s -o) set(__suffix _s) - elseif(__type STREQUAL client) + elseif(__type STREQUAL "client") set(__server_client -Oif -c -o) set(__suffix _c) else() Modified: trunk/reactos/dll/ntdll/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/ntdll/CMakeLists.txt?r… ============================================================================== --- trunk/reactos/dll/ntdll/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/ntdll/CMakeLists.txt [iso-8859-1] Mon Aug 27 18:58:27 2012 @@ -25,15 +25,15 @@ def/ntdll.rc ${CMAKE_CURRENT_BINARY_DIR}/ntdll.def) -if(ARCH MATCHES i386) +if(ARCH STREQUAL "i386") list(APPEND SOURCE dispatch/i386/dispatch.S) -elseif(ARCH MATCHES amd64) +elseif(ARCH STREQUAL "amd64") list(APPEND SOURCE dispatch/amd64/dispatch.S) -elseif(ARCH MATCHES arm) +elseif(ARCH STREQUAL "arm") list(APPEND SOURCE dispatch/arm/stubs_asm.s) else() list(APPEND SOURCE dispatch/dispatch.c) -endif(ARCH MATCHES i386) +endif(ARCH STREQUAL "i386") add_library(ntdll SHARED ${SOURCE}) Modified: trunk/reactos/dll/opengl/mesa/src/gallium/targets/libgl-gdi/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/galliu… ============================================================================== --- trunk/reactos/dll/opengl/mesa/src/gallium/targets/libgl-gdi/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/opengl/mesa/src/gallium/targets/libgl-gdi/CMakeLists.txt [iso-8859-1] Mon Aug 27 18:58:27 2012 @@ -14,7 +14,7 @@ # We don't need a specfile here, as opengl application link against opengl32 # and gallium is kind enough to provide good def files for both MSVC/mingw-w64 and mingw32 -if(MSVC OR (ARCH MATCHES amd64)) +if(MSVC OR (ARCH STREQUAL "amd64")) list(APPEND SOURCE ../../state_trackers/wgl/opengl32.def) else() list(APPEND SOURCE ../../state_trackers/wgl/opengl32.mingw.def) Modified: trunk/reactos/dll/win32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/CMakeLists.txt?r… ============================================================================== --- trunk/reactos/dll/win32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/CMakeLists.txt [iso-8859-1] Mon Aug 27 18:58:27 2012 @@ -22,7 +22,7 @@ add_subdirectory(comdlg32) add_subdirectory(compstui) add_subdirectory(credui) -if(ARCH MATCHES i386) +if(ARCH STREQUAL "i386") add_subdirectory(crtdll) # only built on x86 endif() add_subdirectory(crypt32) @@ -200,7 +200,7 @@ add_subdirectory(uxtheme) add_subdirectory(vdmdbg) add_subdirectory(version) -if(ARCH MATCHES i386) +if(ARCH STREQUAL "i386") add_subdirectory(wdmaud.drv) endif() add_subdirectory(windowscodecs) Modified: trunk/reactos/dll/win32/dbghelp/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/dbghelp/CMakeLis… ============================================================================== --- trunk/reactos/dll/win32/dbghelp/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/dbghelp/CMakeLists.txt [iso-8859-1] Mon Aug 27 18:58:27 2012 @@ -6,7 +6,7 @@ -DHAVE_ALLOCA_H -D_IMAGEHLP_SOURCE_) -if(ARCH MATCHES amd64) +if(ARCH STREQUAL "amd64") add_definitions(-DUNW_FLAG_NHANDLER=0 -DUNW_FLAG_EHANDLER=1 -DUNW_FLAG_UHANDLER=2 -DUNW_FLAG_CHAININFO=3) endif() Modified: trunk/reactos/dll/win32/kernel32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/CMakeLi… ============================================================================== --- trunk/reactos/dll/win32/kernel32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/CMakeLists.txt [iso-8859-1] Mon Aug 27 18:58:27 2012 @@ -79,15 +79,15 @@ kernel32.rc ${CMAKE_CURRENT_BINARY_DIR}/kernel32.def) -if(ARCH MATCHES i386) +if(ARCH STREQUAL "i386") list(APPEND SOURCE client/i386/fiber.S client/i386/thread.S) -elseif(ARCH MATCHES amd64) +elseif(ARCH STREQUAL "amd64") list(APPEND SOURCE client/amd64/fiber.S client/amd64/thread.S) -endif(ARCH MATCHES i386) +endif(ARCH STREQUAL "i386") add_library(kernel32 SHARED ${SOURCE}) Modified: trunk/reactos/dll/win32/riched20/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/riched20/CMakeLi… ============================================================================== --- trunk/reactos/dll/win32/riched20/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/riched20/CMakeLists.txt [iso-8859-1] Mon Aug 27 18:58:27 2012 @@ -28,7 +28,7 @@ ${CMAKE_CURRENT_BINARY_DIR}/riched20.def) if(MSVC) - if (ARCH MATCHES i386) + if(ARCH STREQUAL "i386") list(APPEND SOURCE msvc-thiscall.c) endif() set_source_files_properties(txthost.c txtsrv.c PROPERTIES COMPILE_FLAGS "/FImsvc.h") Modified: trunk/reactos/drivers/base/bootvid/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/base/bootvid/CMake… ============================================================================== --- trunk/reactos/drivers/base/bootvid/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/drivers/base/bootvid/CMakeLists.txt [iso-8859-1] Mon Aug 27 18:58:27 2012 @@ -5,16 +5,16 @@ bootvid.rc ${CMAKE_CURRENT_BINARY_DIR}/bootvid.def) -if(ARCH MATCHES i386 OR ARCH MATCHES amd64) +if(ARCH STREQUAL "i386" OR ARCH STREQUAL "amd64") list(APPEND SOURCE i386/bootvid.c i386/bootdata.c i386/vga.c) -elseif(ARCH MATCHES arm) +elseif(ARCH STREQUAL "arm") list(APPEND SOURCE arm/bootvid.c arm/bootdata.c) -endif(ARCH MATCHES i386 OR ARCH MATCHES amd64) +endif(ARCH STREQUAL "i386" OR ARCH STREQUAL "amd64") add_library(bootvid SHARED ${SOURCE}) Modified: trunk/reactos/drivers/base/kdcom/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/base/kdcom/CMakeLi… ============================================================================== --- trunk/reactos/drivers/base/kdcom/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/drivers/base/kdcom/CMakeLists.txt [iso-8859-1] Mon Aug 27 18:58:27 2012 @@ -1,13 +1,13 @@ spec2def(kdcom.dll kdcom.spec ADD_IMPORTLIB) -if(ARCH MATCHES i386) +if(ARCH STREQUAL "i386") list(APPEND SOURCE i386/kdbg.c) -elseif(ARCH MATCHES amd64) +elseif(ARCH STREQUAL "amd64") list(APPEND SOURCE i386/kdbg.c) -elseif(ARCH MATCHES arm) +elseif(ARCH STREQUAL "arm") list(APPEND SOURCE arm/kdbg.c) -endif(ARCH MATCHES i386) +endif(ARCH STREQUAL "i386") list(APPEND SOURCE ${CMAKE_CURRENT_BINARY_DIR}/kdcom.def) add_library(kdcom SHARED ${SOURCE}) Modified: trunk/reactos/drivers/bus/acpi/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/CMakeList… ============================================================================== --- trunk/reactos/drivers/bus/acpi/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/acpi/CMakeLists.txt [iso-8859-1] Mon Aug 27 18:58:27 2012 @@ -3,7 +3,7 @@ include acpica/include) -if(ARCH MATCHES amd64) +if(ARCH STREQUAL "amd64") add_definitions(-DWIN64) endif() Modified: trunk/reactos/drivers/storage/class/cdrom_new/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/class/cdro… ============================================================================== --- trunk/reactos/drivers/storage/class/cdrom_new/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/class/cdrom_new/CMakeLists.txt [iso-8859-1] Mon Aug 27 18:58:27 2012 @@ -11,7 +11,7 @@ target_link_libraries(cdrom_new libcntpr wdmguid) -if(ARCH MATCHES i386) +if(ARCH STREQUAL "i386") # FIXME: http://www.cmake.org/Bug/view.php?id=12998 if(MSVC) #add_target_compile_flags(cdrom_new "/Gz") Modified: trunk/reactos/drivers/storage/class/disk_new/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/class/disk… ============================================================================== --- trunk/reactos/drivers/storage/class/disk_new/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/class/disk_new/CMakeLists.txt [iso-8859-1] Mon Aug 27 18:58:27 2012 @@ -14,7 +14,7 @@ disk.rc) target_link_libraries(disk_new libcntpr wdmguid) -if(ARCH MATCHES i386) +if(ARCH STREQUAL "i386") # FIXME: http://www.cmake.org/Bug/view.php?id=12998 if(NOT MSVC) #add_target_compile_flags(disk_new "-Wno-error -Wno-format -Wno-pointer-sign") Modified: trunk/reactos/drivers/storage/classpnp/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/classpnp/C… ============================================================================== --- trunk/reactos/drivers/storage/classpnp/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/classpnp/CMakeLists.txt [iso-8859-1] Mon Aug 27 18:58:27 2012 @@ -32,7 +32,7 @@ ${SOURCE} class.rc) -if(ARCH MATCHES i386) +if(ARCH STREQUAL "i386") # FIXME: http://www.cmake.org/Bug/view.php?id=12998 if(MSVC) #add_target_compile_flags(classpnp "/Gz") Modified: trunk/reactos/hal/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/CMakeLists.txt?rev=571… ============================================================================== --- trunk/reactos/hal/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/hal/CMakeLists.txt [iso-8859-1] Mon Aug 27 18:58:27 2012 @@ -1,8 +1,8 @@ -if((ARCH MATCHES i386) OR (ARCH MATCHES amd64)) +if((ARCH STREQUAL "i386") OR (ARCH STREQUAL "amd64")) add_subdirectory(halx86) -elseif(ARCH MATCHES arm) +elseif(ARCH STREQUAL "arm") # add_subdirectory(halarm) -elseif(ARCH MATCHES powerpc) +elseif(ARCH STREQUAL "powerpc") # add_subdirectory(halppc) endif() Modified: trunk/reactos/hal/halx86/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/CMakeLists.txt?… ============================================================================== --- trunk/reactos/hal/halx86/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/CMakeLists.txt [iso-8859-1] Mon Aug 27 18:58:27 2012 @@ -20,7 +20,7 @@ generic/sysinfo.c generic/usage.c) -if(ARCH STREQUAL i386) +if(ARCH STREQUAL "i386") list(APPEND HAL_GENERIC_SOURCE generic/bios.c generic/portio.c) @@ -104,7 +104,7 @@ apic/tsc.c apic/tsccal.S) -if(ARCH STREQUAL i386) +if(ARCH STREQUAL "i386") list(APPEND MINI_HAL_SOURCE generic/portio.c generic/systimer.S @@ -207,7 +207,7 @@ add_target_compile_definitions(mini_hal _BLDR_ _MINIHAL_) add_dependencies(mini_hal psdk bugcodes asm) -elseif(ARCH STREQUAL amd64) +elseif(ARCH STREQUAL "amd64") spec2def(hal.dll ../hal.spec ADD_IMPORTLIB) Modified: trunk/reactos/include/asm/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/asm/CMakeLists.txt… ============================================================================== --- trunk/reactos/include/asm/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/include/asm/CMakeLists.txt [iso-8859-1] Mon Aug 27 18:58:27 2012 @@ -10,9 +10,9 @@ set(OPT_MS "") endif() -if(ARCH MATCHES i386) +if(ARCH STREQUAL "i386") set(_filename ks386) -elseif(ARCH MATCHES amd64) +elseif(ARCH STREQUAL "amd64") set(_filename ksamd64) endif() Modified: trunk/reactos/include/ndk/tests/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/tests/CMakeLis… ============================================================================== --- trunk/reactos/include/ndk/tests/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/include/ndk/tests/CMakeLists.txt [iso-8859-1] Mon Aug 27 18:58:27 2012 @@ -1,5 +1,5 @@ -if(ARCH MATCHES amd64) +if(ARCH STREQUAL "amd64") add_library(ndk_tests win2003_x64.c winvista_x64.c Modified: trunk/reactos/include/reactos/version.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/version.cm… ============================================================================== --- trunk/reactos/include/reactos/version.cmake [iso-8859-1] (original) +++ trunk/reactos/include/reactos/version.cmake [iso-8859-1] Mon Aug 27 18:58:27 2012 @@ -4,7 +4,7 @@ string(STRIP ${${RESULT}} ${RESULT}) elseif(CMAKE_HOST_UNIX) execute_process(COMMAND "date" "+%Y%m%d" OUTPUT_VARIABLE ${RESULT}) - string(STRIP ${${RESULT}} ${RESULT}) + string(STRIP ${${RESULT}} ${RESULT}) else() message(SEND_ERROR "date not implemented") set(${RESULT} 00000000) Modified: trunk/reactos/lib/drivers/ip/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/ip/CMakeLists.… ============================================================================== --- trunk/reactos/lib/drivers/ip/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/ip/CMakeLists.txt [iso-8859-1] Mon Aug 27 18:58:27 2012 @@ -6,7 +6,7 @@ ${REACTOS_SOURCE_DIR}/lib/drivers/lwip/src/include ${REACTOS_SOURCE_DIR}/lib/drivers/lwip/src/include/ipv4) -if(ARCH MATCHES i386) +if(ARCH STREQUAL "i386") list(APPEND SOURCE network/i386/checksum.S) endif() Modified: trunk/reactos/lib/ppcmmu/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/ppcmmu/CMakeLists.txt?… ============================================================================== --- trunk/reactos/lib/ppcmmu/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/lib/ppcmmu/CMakeLists.txt [iso-8859-1] Mon Aug 27 18:58:27 2012 @@ -1,7 +1,7 @@ list(APPEND SOURCE dummy.c) -if(ARCH MATCHES powerpc) +if(ARCH STREQUAL "powerpc") list(APPEND SOURCE mmuutil.c) endif() Modified: trunk/reactos/lib/pseh/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/pseh/CMakeLists.txt?re… ============================================================================== --- trunk/reactos/lib/pseh/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/lib/pseh/CMakeLists.txt [iso-8859-1] Mon Aug 27 18:58:27 2012 @@ -2,14 +2,14 @@ if(NOT MSVC) list(APPEND SOURCE framebased.c) - if(ARCH MATCHES i386) + if(ARCH STREQUAL "i386") list(APPEND SOURCE i386/framebased.S i386/framebased-gcchack.c i386/framebased-gcchack-asm.S) - elseif(ARCH MATCHES amd64) + elseif(ARCH STREQUAL "amd64") list(APPEND SOURCE amd64/framebased.S) - elseif(ARCH MATCHES powerpc) + elseif(ARCH STREQUAL "powerpc") list(APPEND SOURCE powerpc/framebased.S) endif() @@ -20,12 +20,12 @@ else() - if(ARCH MATCHES i386) + if(ARCH STREQUAL "i386") list(APPEND SOURCE dummy.c i386/seh.s i386/seh_prolog.s) - elseif(ARCH MATCHES amd64) + elseif(ARCH STREQUAL "amd64") list(APPEND SOURCE dummy.c amd64/seh.s Modified: trunk/reactos/lib/rtl/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/CMakeLists.txt?rev… ============================================================================== --- trunk/reactos/lib/rtl/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/CMakeLists.txt [iso-8859-1] Mon Aug 27 18:58:27 2012 @@ -63,7 +63,7 @@ wait.c workitem.c) -if(ARCH MATCHES i386) +if(ARCH STREQUAL "i386") list(APPEND SOURCE i386/debug_asm.S i386/except_asm.s @@ -73,7 +73,7 @@ i386/rtlswap.S i386/res_asm.s i386/thread.c) -elseif(ARCH MATCHES amd64) +elseif(ARCH STREQUAL "amd64") list(APPEND SOURCE byteswap.c amd64/debug_asm.S @@ -82,12 +82,12 @@ amd64/unwind.c amd64/stubs.c mem.c) -elseif(ARCH MATCHES arm) +elseif(ARCH STREQUAL "arm") list(APPEND SOURCE byteswap.c arm/debug_asm.S mem.c) -elseif(ARCH MATCHES powerpc) +elseif(ARCH STREQUAL "powerpc") list(APPEND SOURCE byteswap.c powerpc/debug.c Modified: trunk/reactos/lib/sdk/crt/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/CMakeLists.txt… ============================================================================== --- trunk/reactos/lib/sdk/crt/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/CMakeLists.txt [iso-8859-1] Mon Aug 27 18:58:27 2012 @@ -3,17 +3,17 @@ add_definitions(-D_CRTBLD) -if(ARCH MATCHES i386) +if(ARCH STREQUAL "i386") list(APPEND CHKSTK_SOURCE except/i386/chkstk_asm.s) if(NOT MSVC) list(APPEND CHKSTK_SOURCE except/i386/chkstk_ms.s) endif() -elseif(ARCH MATCHES amd64) +elseif(ARCH STREQUAL "amd64") list(APPEND CHKSTK_SOURCE except/amd64/chkstk_asm.s) if(NOT MSVC) list(APPEND CHKSTK_SOURCE except/amd64/chkstk_ms.s) endif() -elseif(ARCH MATCHES powerpc) +elseif(ARCH STREQUAL "powerpc") list(APPEND CHKSTK_SOURCE except/powerpc/chkstk_asm.s) endif() Modified: trunk/reactos/lib/sdk/crt/crt.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/crt.cmake?rev=… ============================================================================== --- trunk/reactos/lib/sdk/crt/crt.cmake [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/crt.cmake [iso-8859-1] Mon Aug 27 18:58:27 2012 @@ -339,7 +339,7 @@ wine/heap.c wine/undname.c) -if(ARCH MATCHES i386) +if(ARCH STREQUAL "i386") list(APPEND CRT_SOURCE except/i386/chkesp.s except/i386/prolog.s @@ -416,7 +416,7 @@ list(APPEND CRT_SOURCE except/i386/cpp.s) endif() -elseif(ARCH MATCHES amd64) +elseif(ARCH STREQUAL "amd64") list(APPEND CRT_SOURCE except/amd64/seh.s except/amd64/ehandler.c @@ -452,7 +452,7 @@ endif() endif() -if(NOT ARCH MATCHES i386) +if(NOT ARCH STREQUAL "i386") list(APPEND CRT_SOURCE math/cos.c math/sin.c Modified: trunk/reactos/lib/sdk/crt/libcntpr.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/libcntpr.cmake… ============================================================================== --- trunk/reactos/lib/sdk/crt/libcntpr.cmake [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/libcntpr.cmake [iso-8859-1] Mon Aug 27 18:58:27 2012 @@ -65,7 +65,7 @@ wstring/wcsspn.c wstring/wcsstr.c) -if(ARCH MATCHES i386) +if(ARCH STREQUAL "i386") list(APPEND LIBCNTPR_SOURCE except/i386/chkstk_asm.s except/i386/seh.s @@ -104,7 +104,7 @@ if(NOT MSVC) list(APPEND LIBCNTPR_SOURCE except/i386/chkstk_ms.s) endif() -elseif(ARCH MATCHES amd64) +elseif(ARCH STREQUAL "amd64") list(APPEND LIBCNTPR_SOURCE except/amd64/ehandler.c except/amd64/chkstk_asm.s @@ -128,7 +128,7 @@ math/amd64/tan.S) endif() -if(ARCH MATCHES i386) +if(ARCH STREQUAL "i386") list(APPEND LIBCNTPR_SOURCE mem/i386/memchr_asm.s mem/i386/memmove_asm.s Modified: trunk/reactos/lib/sdk/crt/msvcrtex.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/msvcrtex.cmake… ============================================================================== --- trunk/reactos/lib/sdk/crt/msvcrtex.cmake [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/msvcrtex.cmake [iso-8859-1] Mon Aug 27 18:58:27 2012 @@ -47,7 +47,7 @@ startup/pseudo-reloc-list.c) endif() -if(ARCH MATCHES i386) +if(ARCH STREQUAL "i386") list(APPEND MSVCRTEX_SOURCE except/i386/chkstk_asm.s except/i386/chkstk_ms.s @@ -59,7 +59,7 @@ math/i386/cisqrt.c math/i386/ftol2_asm.s math/i386/alldiv_asm.s) -elseif(ARCH MATCHES amd64) +elseif(ARCH STREQUAL "amd64") list(APPEND MSVCRTEX_SOURCE except/amd64/chkstk_asm.s except/amd64/chkstk_ms.s) Modified: trunk/reactos/ntoskrnl/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/CMakeLists.txt?re… ============================================================================== --- trunk/reactos/ntoskrnl/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/CMakeLists.txt [iso-8859-1] Mon Aug 27 18:58:27 2012 @@ -276,7 +276,7 @@ wmi/wmi.c ntoskrnl.rc) -if(ARCH MATCHES i386) +if(ARCH STREQUAL "i386") list(APPEND SOURCE config/i386/cmhardwr.c ex/i386/fastinterlck_asm.S @@ -304,7 +304,7 @@ rtl/i386/stack.S vdm/vdmmain.c vdm/vdmexec.c) -elseif(ARCH MATCHES amd64) +elseif(ARCH STREQUAL "amd64") list(APPEND SOURCE config/i386/cmhardwr.c ke/amd64/boot.S @@ -323,7 +323,7 @@ mm/amd64/init.c mm/amd64/page.c ps/amd64/psctx.c) -elseif(ARCH MATCHES arm) +elseif(ARCH STREQUAL "arm") list(APPEND SOURCE config/arm/cmhardwr.c ke/arm/boot.s @@ -340,7 +340,7 @@ mm/ARM3/arm/init.c ps/arm/psctx.c rtl/arm/rtlexcpt.c) -elseif(ARCH MATCHES powerpc) +elseif(ARCH STREQUAL "powerpc") list(APPEND SOURCE config/powerpc/cmhardwr.c ke/powerpc/main_asm.S @@ -358,7 +358,7 @@ endif() if(NOT _WINKD_) - if(ARCH MATCHES i386) + if(ARCH STREQUAL "i386") list(APPEND SOURCE kd/i386/kdmemsup.c kd/wrappers/gdbstub.c) @@ -367,7 +367,7 @@ kdbg/i386/i386-dis.c kdbg/i386/kdb_help.S) endif() - elseif(ARCH MATCHES amd64) + elseif(ARCH STREQUAL "amd64") list(APPEND SOURCE kd/amd64/kd.c kd/amd64/kdmemsup.c) @@ -377,7 +377,7 @@ kdbg/amd64/kdb_help.S kdbg/amd64/kdb.c) endif() - elseif(ARCH MATCHES powerpc) + elseif(ARCH STREQUAL "powerpc") list(APPEND SOURCE kd/wrappers/gdbstub_powerpc.c) endif() @@ -413,11 +413,11 @@ kd64/kdprint.c kd64/kdtrap.c) - if(ARCH MATCHES i386) + if(ARCH STREQUAL "i386") list(APPEND SOURCE kd64/i386/kdx86.c) - elseif(ARCH MATCHES amd64) + elseif(ARCH STREQUAL "amd64") list(APPEND SOURCE kd64/amd64/kdx64.c) - elseif(ARCH MATCHES arm) + elseif(ARCH STREQUAL "arm") list(APPEND SOURCE kd64/arm/kdarm.c) endif() @@ -427,7 +427,7 @@ ${SOURCE} ${CMAKE_CURRENT_BINARY_DIR}/ntoskrnl.def) -if (ARCH MATCHES i386) +if(ARCH STREQUAL "i386") set_entrypoint(ntoskrnl KiSystemStartup 4) else() set_entrypoint(ntoskrnl KiSystemStartup) @@ -472,7 +472,7 @@ add_target_compile_definitions(ntkrnlmp CONFIG_SMP) - if(ARCH MATCHES i386) + if(ARCH STREQUAL "i386") set_entrypoint(ntkrnlmp KiSystemStartup 4) else() set_entrypoint(ntkrnlmp KiSystemStartup) Modified: trunk/reactos/subsystems/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/CMakeLists.txt?… ============================================================================== --- trunk/reactos/subsystems/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/subsystems/CMakeLists.txt [iso-8859-1] Mon Aug 27 18:58:27 2012 @@ -1,4 +1,4 @@ -if(ARCH MATCHES i386) +if(ARCH STREQUAL "i386") add_subdirectory(ntvdm) endif() add_subdirectory(csr) Modified: trunk/reactos/toolchain-gcc.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/toolchain-gcc.cmake?rev=57… ============================================================================== --- trunk/reactos/toolchain-gcc.cmake [iso-8859-1] (original) +++ trunk/reactos/toolchain-gcc.cmake [iso-8859-1] Mon Aug 27 18:58:27 2012 @@ -5,17 +5,17 @@ # Choose the right MinGW toolchain prefix if (NOT DEFINED MINGW_TOOLCHAIN_PREFIX) - if(ARCH MATCHES i386) + if(ARCH STREQUAL "i386") - if(CMAKE_HOST_SYSTEM_NAME MATCHES Windows) + if(CMAKE_HOST_SYSTEM_NAME STREQUAL "Windows") set(MINGW_TOOLCHAIN_PREFIX "" CACHE STRING "MinGW Toolchain Prefix") else() set(MINGW_TOOLCHAIN_PREFIX "mingw32-" CACHE STRING "MinGW Toolchain Prefix") - endif(CMAKE_HOST_SYSTEM_NAME MATCHES Windows) + endif(CMAKE_HOST_SYSTEM_NAME STREQUAL "Windows") - elseif(ARCH MATCHES amd64) + elseif(ARCH STREQUAL "amd64") set(MINGW_TOOLCHAIN_PREFIX "x86_64-w64-mingw32-" CACHE STRING "MinGW Toolchain Prefix") - elseif(ARCH MATCHES arm) + elseif(ARCH STREQUAL "arm") set(MINGW_TOOLCHAIN_PREFIX "arm-mingw32ce-" CACHE STRING "MinGW Toolchain Prefix") endif() endif() @@ -43,7 +43,7 @@ set(CMAKE_RC_COMPILER ${MINGW_TOOLCHAIN_PREFIX}windres) set(CMAKE_DLLTOOL ${MINGW_TOOLCHAIN_PREFIX}dlltool) -if(NOT CMAKE_HOST_SYSTEM_NAME MATCHES Windows) +if(NOT CMAKE_HOST_SYSTEM_NAME STREQUAL "Windows") set(CMAKE_C_CREATE_STATIC_LIBRARY "<CMAKE_AR> crs <TARGET> <LINK_FLAGS> <OBJECTS>") set(CMAKE_CXX_CREATE_STATIC_LIBRARY ${CMAKE_C_CREATE_STATIC_LIBRARY}) set(CMAKE_ASM_CREATE_STATIC_LIBRARY ${CMAKE_C_CREATE_STATIC_LIBRARY}) Modified: trunk/reactos/toolchain-msvc.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/toolchain-msvc.cmake?rev=5… ============================================================================== --- trunk/reactos/toolchain-msvc.cmake [iso-8859-1] (original) +++ trunk/reactos/toolchain-msvc.cmake [iso-8859-1] Mon Aug 27 18:58:27 2012 @@ -1,3 +1,7 @@ + +if(NOT ARCH) + set(ARCH i386) +endif() # the name of the target operating system set(CMAKE_SYSTEM_NAME Windows) @@ -8,7 +12,7 @@ set(CMAKE_CXX_COMPILER cl) set(CMAKE_MC_COMPILER mc) set(CMAKE_RC_COMPILER rc) -if(${ARCH} MATCHES amd64) +if(ARCH STREQUAL "amd64") set(CMAKE_ASM_COMPILER ml64) else() set(CMAKE_ASM_COMPILER ml) @@ -17,6 +21,6 @@ set(CMAKE_C_STANDARD_LIBRARIES "" CACHE INTERNAL "") -if(CMAKE_SYSTEM_PROCESSOR MATCHES "x86") +if(CMAKE_SYSTEM_PROCESSOR STREQUAL "x86") add_definitions(-D__i386__) endif() Modified: trunk/reactos/tools/rsym/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rsym/CMakeLists.txt?… ============================================================================== --- trunk/reactos/tools/rsym/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/tools/rsym/CMakeLists.txt [iso-8859-1] Mon Aug 27 18:58:27 2012 @@ -1,7 +1,7 @@ -if(ARCH MATCHES i386) +if(ARCH STREQUAL "i386") add_executable(rsym rsym_common.c rsym.c) -elseif(ARCH MATCHES amd64) +elseif(ARCH STREQUAL "amd64") add_executable(rsym rsym_common.c rsym64.c) endif() add_executable(raddr2line rsym_common.c raddr2line.c) Modified: trunk/reactos/win32ss/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/CMakeLists.txt?rev… ============================================================================== --- trunk/reactos/win32ss/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/win32ss/CMakeLists.txt [iso-8859-1] Mon Aug 27 18:58:27 2012 @@ -189,7 +189,7 @@ ${GENDIB_FILES}) endif() -if(ARCH MATCHES i386) +if(ARCH STREQUAL "i386") list(APPEND SOURCE gdi/dib/i386/dib24bpp_hline.s gdi/dib/i386/dib32bpp_hline.s Modified: trunk/reactos/win32ss/drivers/displays/framebuf_new/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/drivers/displays/f… ============================================================================== --- trunk/reactos/win32ss/drivers/displays/framebuf_new/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/win32ss/drivers/displays/framebuf_new/CMakeLists.txt [iso-8859-1] Mon Aug 27 18:58:27 2012 @@ -13,7 +13,7 @@ ${SOURCE} framebuf_new.rc) -if(ARCH MATCHES i386) +if(ARCH STREQUAL "i386") # FIXME: http://www.cmake.org/Bug/view.php?id=12998 if(MSVC) #add_target_compile_flags(framebuf_new "/Gz") Modified: trunk/reactos/win32ss/gdi/gdi32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/gdi32/CMakeLis… ============================================================================== --- trunk/reactos/win32ss/gdi/gdi32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/gdi32/CMakeLists.txt [iso-8859-1] Mon Aug 27 18:58:27 2012 @@ -8,7 +8,7 @@ spec2def(gdi32.dll gdi32.spec ADD_IMPORTLIB) -if(ARCH MATCHES i386) +if(ARCH STREQUAL "i386") list(APPEND SOURCE objects/efloat.c) endif()

1 0

[akhaldi] 57180: [PSEH2] * Make _SEH_DontInline() static inline.
by akhaldi＠svn.reactos.org 27 Aug '12

27 Aug '12

Author: akhaldi Date: Mon Aug 27 18:55:37 2012 New Revision: 57180 URL: http://svn.reactos.org/svn/reactos?rev=57180&view=rev Log: [PSEH2] * Make _SEH_DontInline() static inline. Modified: trunk/reactos/include/reactos/libs/pseh/pseh2.h Modified: trunk/reactos/include/reactos/libs/pseh/pseh2.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/libs/pseh/… ============================================================================== --- trunk/reactos/include/reactos/libs/pseh/pseh2.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/libs/pseh/pseh2.h [iso-8859-1] Mon Aug 27 18:55:37 2012 @@ -112,7 +112,7 @@ /* Prevent gcc from inlining functions that use SEH. */ #if ((__GNUC__ >= 4) && (__GNUC_MINOR__ >= 7)) -extern inline __attribute__((always_inline)) __attribute__((returns_twice)) void _SEH_DontInline() {} +static inline __attribute__((always_inline)) __attribute__((returns_twice)) void _SEH_DontInline() {} #define __PREVENT_GCC_FROM_INLINING_SEH_FUNCTIONS() _SEH_DontInline(); #else #define __PREVENT_GCC_FROM_INLINING_SEH_FUNCTIONS()

1 0

[jgardou] 57179: [KERNEL32_APITESTS] - Add some tests for lstrncpyW - This function is fine, I wrote that when chasing some bug thinking this function was at fault.
by jgardou＠svn.reactos.org 27 Aug '12

27 Aug '12

Author: jgardou Date: Mon Aug 27 16:34:17 2012 New Revision: 57179 URL: http://svn.reactos.org/svn/reactos?rev=57179&view=rev Log: [KERNEL32_APITESTS] - Add some tests for lstrncpyW - This function is fine, I wrote that when chasing some bug thinking this function was at fault. Added: trunk/rostests/apitests/kernel32/lstrcpynW.c (with props) Modified: trunk/rostests/apitests/kernel32/CMakeLists.txt trunk/rostests/apitests/kernel32/testlist.c Modified: trunk/rostests/apitests/kernel32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/kernel32/CMakeLi… ============================================================================== --- trunk/rostests/apitests/kernel32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/apitests/kernel32/CMakeLists.txt [iso-8859-1] Mon Aug 27 16:34:17 2012 @@ -5,6 +5,7 @@ GetCurrentDirectory.c GetDriveType.c GetModuleFileName.c + lstrcpynW.c SetCurrentDirectory.c testlist.c) Added: trunk/rostests/apitests/kernel32/lstrcpynW.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/kernel32/lstrcpy… ============================================================================== --- trunk/rostests/apitests/kernel32/lstrcpynW.c (added) +++ trunk/rostests/apitests/kernel32/lstrcpynW.c [iso-8859-1] Mon Aug 27 16:34:17 2012 @@ -1,0 +1,27 @@ +/* + * PROJECT: ReactOS api tests + * LICENSE: GPLv2+ - See COPYING in the top level directory + * PURPOSE: Test for lstrcpynW + */ + +#define WIN32_NO_STATUS +#include <stdio.h> +#include <wine/test.h> +#include <windows.h> + +START_TEST(lstrcpynW) +{ + WCHAR buffer[256]; + + /* Test basic functionality */ + ok(lstrcpynW(buffer, L"Copy this string", 256) == buffer, "lstrncpyW failed!\n"); + ok(!lstrcmpW(buffer, L"Copy this string"), "Copy went wrong.\n"); + + /* Test for buffer too small */ + ok(lstrcpynW(buffer, L"Copy this string", 10) == buffer, "lstrncpyW failed!\n"); + ok(buffer[9] == 0, "lstrncpyW should have NULL-terminated the string"); + ok(!lstrcmpW(buffer, L"Copy this"), "Copy went wrong.\n"); + + /* Test some invalid buffer */ + ok(lstrcpynW((LPWSTR)0xbaadf00d, L"Copy this string", 256) == NULL, "lstrncpyW should have returned NULL.\n"); +} Propchange: trunk/rostests/apitests/kernel32/lstrcpynW.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/rostests/apitests/kernel32/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/kernel32/testlis… ============================================================================== --- trunk/rostests/apitests/kernel32/testlist.c [iso-8859-1] (original) +++ trunk/rostests/apitests/kernel32/testlist.c [iso-8859-1] Mon Aug 27 16:34:17 2012 @@ -8,6 +8,7 @@ extern void func_GetCurrentDirectory(void); extern void func_GetDriveType(void); extern void func_GetModuleFileName(void); +extern void func_lstrcpynW(void); extern void func_SetCurrentDirectory(void); const struct test winetest_testlist[] = @@ -15,6 +16,7 @@ { "GetCurrentDirectory", func_GetCurrentDirectory }, { "GetDriveType", func_GetDriveType }, { "GetModuleFileName", func_GetModuleFileName }, + { "lstrcpynW", func_lstrcpynW }, { "SetCurrentDirectory", func_SetCurrentDirectory }, { 0, 0 }

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 August 2012