Author: tkreuzer Date: Tue Jul 27 13:42:36 2010 New Revision: 48305
URL: http://svn.reactos.org/svn/reactos?rev=48305&view=rev Log: reduce diff to trunk
Modified: branches/ros-amd64-bringup/reactos/dll/3rdparty/dxtn/dxtn.rbuild branches/ros-amd64-bringup/reactos/dll/3rdparty/libjpeg/libjpeg.rbuild branches/ros-amd64-bringup/reactos/dll/3rdparty/libxslt/libxslt.rbuild branches/ros-amd64-bringup/reactos/drivers/usb/directory.rbuild branches/ros-amd64-bringup/reactos/drivers/wdm/audio/backpln/directory.rbuild branches/ros-amd64-bringup/reactos/hal/hal.rbuild branches/ros-amd64-bringup/reactos/hal/halx86/hal_generic_up.rbuild branches/ros-amd64-bringup/reactos/hal/halx86/hal_mini.rbuild branches/ros-amd64-bringup/reactos/lib/drivers/ip/transport/tcp/tcp.c branches/ros-amd64-bringup/reactos/ntoskrnl/include/internal/i386/mm.h
Modified: branches/ros-amd64-bringup/reactos/dll/3rdparty/dxtn/dxtn.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/3r... ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/3rdparty/dxtn/dxtn.rbuild [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/3rdparty/dxtn/dxtn.rbuild [iso-8859-1] Tue Jul 27 13:42:36 2010 @@ -1,9 +1,5 @@ <module name="dxtn" type="win32dll" entrypoint="0" installbase="system32" installname="dxtn.dll" allowwarnings="true" crt="msvcrt"> <importlibrary definition="dxtn.spec" /> - <if property="ARCH" value="amd64"> - <!-- Gross hack to work around broken autoexport --> - <define name="dllexport">aligned(1)</define> - </if> <include base="dxtn">.</include> <file>fxt1.c</file> <file>dxtn.c</file>
Modified: branches/ros-amd64-bringup/reactos/dll/3rdparty/libjpeg/libjpeg.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/3r... ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/3rdparty/libjpeg/libjpeg.rbuild [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/3rdparty/libjpeg/libjpeg.rbuild [iso-8859-1] Tue Jul 27 13:42:36 2010 @@ -6,10 +6,6 @@ <define name="_MBCS" /> <define name="JPEG_DLL" /> <define name="main">mainptr</define> - <if property="ARCH" value="amd64"> - <!-- Gross hack to work around broken autoexport --> - <define name="dllexport">aligned(1)</define> - </if> <include base="libjpeg">.</include> <include base="ReactOS">include/reactos/libs/libjpeg</include> <include base="ReactOS">include/reactos/libs/zlib</include>
Modified: branches/ros-amd64-bringup/reactos/dll/3rdparty/libxslt/libxslt.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/3r... ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/3rdparty/libxslt/libxslt.rbuild [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/3rdparty/libxslt/libxslt.rbuild [iso-8859-1] Tue Jul 27 13:42:36 2010 @@ -1,13 +1,6 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> <module name="libxslt" type="win32dll" entrypoint="0" installbase="system32" installname="libxslt.dll" allowwarnings="true" crt="msvcrt"> - - <if property="ARCH" value="amd64"> - <!-- Gross hack to work around broken autoexport --> - <define name="dllexport">aligned(1)</define> - <importlibrary definition="libxslt.spec" /> - </if> - <define name="HAVE_CONFIG_H" /> <define name="WIN32" /> <define name="_WINDOWS" />
Modified: branches/ros-amd64-bringup/reactos/drivers/usb/directory.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/driver... ============================================================================== --- branches/ros-amd64-bringup/reactos/drivers/usb/directory.rbuild [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/drivers/usb/directory.rbuild [iso-8859-1] Tue Jul 27 13:42:36 2010 @@ -1,9 +1,9 @@ <?xml version="1.0"?> <!DOCTYPE group SYSTEM "../../tools/rbuild/project.dtd"> <group xmlns:xi="http://www.w3.org/2001/XInclude"> - <!--directory name="nt4compat"> + <directory name="nt4compat"> <xi:include href="nt4compat/directory.rbuild" /> - </directory--> + </directory> <directory name="usbd"> <xi:include href="usbd/usbd.rbuild" /> </directory>
Modified: branches/ros-amd64-bringup/reactos/drivers/wdm/audio/backpln/directory.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/driver... ============================================================================== --- branches/ros-amd64-bringup/reactos/drivers/wdm/audio/backpln/directory.rbuild [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/drivers/wdm/audio/backpln/directory.rbuild [iso-8859-1] Tue Jul 27 13:42:36 2010 @@ -1,9 +1,9 @@ <?xml version="1.0"?> <!DOCTYPE group SYSTEM "../../../../tools/rbuild/project.dtd"> <group xmlns:xi="http://www.w3.org/2001/XInclude"> - <!-- directory name="audio_test"> + <directory name="audio_test"> <xi:include href="audio_test/audio_test.rbuild" /> - </directory --> + </directory> <directory name="portcls"> <xi:include href="portcls/portcls.rbuild" /> </directory>
Modified: branches/ros-amd64-bringup/reactos/hal/hal.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/hal/ha... ============================================================================== --- branches/ros-amd64-bringup/reactos/hal/hal.rbuild [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/hal/hal.rbuild [iso-8859-1] Tue Jul 27 13:42:36 2010 @@ -4,7 +4,6 @@
<if property="ARCH" value="i386"> <directory name="halx86"> - <xi:include href="halx86/hal_mini.rbuild" /> <xi:include href="halx86/directory.rbuild" /> </directory> </if>
Modified: branches/ros-amd64-bringup/reactos/hal/halx86/hal_generic_up.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/hal/ha... ============================================================================== --- branches/ros-amd64-bringup/reactos/hal/halx86/hal_generic_up.rbuild [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/hal/halx86/hal_generic_up.rbuild [iso-8859-1] Tue Jul 27 13:42:36 2010 @@ -1,7 +1,6 @@ <?xml version="1.0"?> <!DOCTYPE group SYSTEM "../../tools/rbuild/project.dtd"> <group> -<if property="ARCH" value="i386"> <module name="hal_generic_up" type="objectlibrary"> <include>include</include> <include base="ntoskrnl">include</include> @@ -15,5 +14,4 @@ <file>processor.c</file> </directory> </module> -</if> </group>
Modified: branches/ros-amd64-bringup/reactos/hal/halx86/hal_mini.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/hal/ha... ============================================================================== --- branches/ros-amd64-bringup/reactos/hal/halx86/hal_mini.rbuild [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/hal/halx86/hal_mini.rbuild [iso-8859-1] Tue Jul 27 13:42:36 2010 @@ -33,17 +33,15 @@ <file>sysinfo.c</file> <file>timer.c</file> <file>usage.c</file> - <if property="ARCH" value="i386"> - <directory name="i386"> - <file>portio.c</file> - <file>systimer.S</file> - </directory> - </if> - </directory> + <directory name="i386"> + <file>portio.c</file> + <file>systimer.S</file> + </directory> + </directory> <directory name="up"> <file>halinit_up.c</file> <file>pic.c</file> <file>processor.c</file> </directory> </module> -</group> +</group>
Modified: branches/ros-amd64-bringup/reactos/lib/drivers/ip/transport/tcp/tcp.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/dr... ============================================================================== --- branches/ros-amd64-bringup/reactos/lib/drivers/ip/transport/tcp/tcp.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/lib/drivers/ip/transport/tcp/tcp.c [iso-8859-1] Tue Jul 27 13:42:36 2010 @@ -20,192 +20,192 @@
VOID HandleSignalledConnection(PCONNECTION_ENDPOINT Connection) { - PTDI_BUCKET Bucket; - PLIST_ENTRY Entry; + PTDI_BUCKET Bucket; + PLIST_ENTRY Entry; NTSTATUS Status; - PIRP Irp; - PMDL Mdl; + PIRP Irp; + PMDL Mdl; KIRQL OldIrql; PTCP_COMPLETION_ROUTINE Complete;
if (ClientInfo.Unlocked) LockObjectAtDpcLevel(Connection);
- 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( Connection->SignalState & SEL_CONNECT ) { + 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( Connection->SignalState & SEL_CONNECT ) { while (!IsListEmpty(&Connection->ConnectRequest)) { Entry = RemoveHeadList( &Connection->ConnectRequest ); - - Bucket = CONTAINING_RECORD( Entry, TDI_BUCKET, Entry ); + + Bucket = CONTAINING_RECORD( Entry, TDI_BUCKET, Entry );
Bucket->Status = STATUS_SUCCESS; Bucket->Information = 0;
InsertTailList(&Connection->CompletionQueue, &Bucket->Entry); - } - } - - if( Connection->SignalState & SEL_ACCEPT ) { - /* Handle readable on a listening socket -- - * TODO: Implement filtering - */ - TI_DbgPrint(DEBUG_TCP,("Accepting new connection on %x (Queue: %s)\n", - Connection, - IsListEmpty(&Connection->ListenRequest) ? - "empty" : "nonempty")); + } + } + + if( Connection->SignalState & SEL_ACCEPT ) { + /* Handle readable on a listening socket -- + * TODO: Implement filtering + */ + TI_DbgPrint(DEBUG_TCP,("Accepting new connection on %x (Queue: %s)\n", + Connection, + IsListEmpty(&Connection->ListenRequest) ? + "empty" : "nonempty"));
while (!IsListEmpty(&Connection->ListenRequest)) { - PIO_STACK_LOCATION IrpSp; + PIO_STACK_LOCATION IrpSp;
Entry = RemoveHeadList( &Connection->ListenRequest );
- Bucket = CONTAINING_RECORD( Entry, TDI_BUCKET, Entry ); - - Irp = Bucket->Request.RequestContext; - IrpSp = IoGetCurrentIrpStackLocation( Irp ); - - TI_DbgPrint(DEBUG_TCP,("Getting the socket\n")); - - Status = TCPServiceListeningSocket - ( Connection->AddressFile->Listener, - Bucket->AssociatedEndpoint, - (PTDI_REQUEST_KERNEL)&IrpSp->Parameters ); - - TI_DbgPrint(DEBUG_TCP,("Socket: Status: %x\n")); + Bucket = CONTAINING_RECORD( Entry, TDI_BUCKET, Entry ); + + Irp = Bucket->Request.RequestContext; + IrpSp = IoGetCurrentIrpStackLocation( Irp ); + + TI_DbgPrint(DEBUG_TCP,("Getting the socket\n")); + + Status = TCPServiceListeningSocket + ( Connection->AddressFile->Listener, + Bucket->AssociatedEndpoint, + (PTDI_REQUEST_KERNEL)&IrpSp->Parameters ); + + TI_DbgPrint(DEBUG_TCP,("Socket: Status: %x\n"));
if( Status == STATUS_PENDING && !(Connection->SignalState & SEL_FIN) ) { InsertHeadList( &Connection->ListenRequest, &Bucket->Entry ); - break; - } else { + break; + } else { Bucket->Status = (Status == STATUS_PENDING) ? STATUS_CANCELLED : Status; Bucket->Information = 0; DereferenceObject(Bucket->AssociatedEndpoint);
InsertTailList(&Connection->CompletionQueue, &Bucket->Entry); - } - } - } - - /* Things that happen after we're connected */ - if( Connection->SignalState & SEL_READ ) { - TI_DbgPrint(DEBUG_TCP,("Readable: irp list %s\n", - IsListEmpty(&Connection->ReceiveRequest) ? - "empty" : "nonempty")); + } + } + } + + /* Things that happen after we're connected */ + if( Connection->SignalState & SEL_READ ) { + TI_DbgPrint(DEBUG_TCP,("Readable: irp list %s\n", + IsListEmpty(&Connection->ReceiveRequest) ? + "empty" : "nonempty"));
while (!IsListEmpty(&Connection->ReceiveRequest)) { - OSK_UINT RecvLen = 0, Received = 0; - PVOID RecvBuffer = 0; + OSK_UINT RecvLen = 0, Received = 0; + PVOID RecvBuffer = 0;
Entry = RemoveHeadList( &Connection->ReceiveRequest );
- Bucket = CONTAINING_RECORD( Entry, TDI_BUCKET, Entry ); - - Irp = Bucket->Request.RequestContext; - Mdl = Irp->MdlAddress; - - TI_DbgPrint(DEBUG_TCP, - ("Getting the user buffer from %x\n", Mdl)); - - NdisQueryBuffer( Mdl, &RecvBuffer, &RecvLen ); - - TI_DbgPrint(DEBUG_TCP, - ("Reading %d bytes to %x\n", RecvLen, RecvBuffer)); - - TI_DbgPrint(DEBUG_TCP, ("Connection: %x\n", Connection)); - TI_DbgPrint + Bucket = CONTAINING_RECORD( Entry, TDI_BUCKET, Entry ); + + Irp = Bucket->Request.RequestContext; + Mdl = Irp->MdlAddress; + + TI_DbgPrint(DEBUG_TCP, + ("Getting the user buffer from %x\n", Mdl)); + + NdisQueryBuffer( Mdl, &RecvBuffer, &RecvLen ); + + TI_DbgPrint(DEBUG_TCP, + ("Reading %d bytes to %x\n", RecvLen, RecvBuffer)); + + TI_DbgPrint(DEBUG_TCP, ("Connection: %x\n", Connection)); + TI_DbgPrint + (DEBUG_TCP, + ("Connection->SocketContext: %x\n", + Connection->SocketContext)); + TI_DbgPrint(DEBUG_TCP, ("RecvBuffer: %x\n", RecvBuffer)); + + Status = TCPTranslateError + ( OskitTCPRecv( Connection->SocketContext, + RecvBuffer, + RecvLen, + &Received, + 0 ) ); + + TI_DbgPrint(DEBUG_TCP,("TCP Bytes: %d\n", Received)); + + if( Status == STATUS_PENDING && !(Connection->SignalState & SEL_FIN) ) { + InsertHeadList( &Connection->ReceiveRequest, &Bucket->Entry ); + break; + } else { + TI_DbgPrint(DEBUG_TCP, + ("Completing Receive request: %x %x\n", + Bucket->Request, Status)); + + Bucket->Status = (Status == STATUS_PENDING) ? STATUS_CANCELLED : Status; + Bucket->Information = (Bucket->Status == STATUS_SUCCESS) ? Received : 0; + + InsertTailList(&Connection->CompletionQueue, &Bucket->Entry); + } + } + } + if( Connection->SignalState & SEL_WRITE ) { + TI_DbgPrint(DEBUG_TCP,("Writeable: irp list %s\n", + IsListEmpty(&Connection->SendRequest) ? + "empty" : "nonempty")); + + while (!IsListEmpty(&Connection->SendRequest)) { + OSK_UINT SendLen = 0, Sent = 0; + PVOID SendBuffer = 0; + + Entry = RemoveHeadList( &Connection->SendRequest ); + + Bucket = CONTAINING_RECORD( Entry, TDI_BUCKET, Entry ); + + Irp = Bucket->Request.RequestContext; + Mdl = Irp->MdlAddress; + + TI_DbgPrint(DEBUG_TCP, + ("Getting the user buffer from %x\n", Mdl)); + + NdisQueryBuffer( Mdl, &SendBuffer, &SendLen ); + + TI_DbgPrint(DEBUG_TCP, + ("Writing %d bytes to %x\n", SendLen, SendBuffer)); + + TI_DbgPrint(DEBUG_TCP, ("Connection: %x\n", Connection)); + TI_DbgPrint (DEBUG_TCP, ("Connection->SocketContext: %x\n", Connection->SocketContext)); - TI_DbgPrint(DEBUG_TCP, ("RecvBuffer: %x\n", RecvBuffer)); - - Status = TCPTranslateError - ( OskitTCPRecv( Connection->SocketContext, - RecvBuffer, - RecvLen, - &Received, - 0 ) ); - - TI_DbgPrint(DEBUG_TCP,("TCP Bytes: %d\n", Received)); - - if( Status == STATUS_PENDING && !(Connection->SignalState & SEL_FIN) ) { - InsertHeadList( &Connection->ReceiveRequest, &Bucket->Entry ); - break; - } else { - TI_DbgPrint(DEBUG_TCP, - ("Completing Receive request: %x %x\n", - Bucket->Request, Status)); - - Bucket->Status = (Status == STATUS_PENDING) ? STATUS_CANCELLED : Status; - Bucket->Information = (Bucket->Status == STATUS_SUCCESS) ? Received : 0; - - InsertTailList(&Connection->CompletionQueue, &Bucket->Entry); - } - } - } - if( Connection->SignalState & SEL_WRITE ) { - TI_DbgPrint(DEBUG_TCP,("Writeable: irp list %s\n", - IsListEmpty(&Connection->SendRequest) ? - "empty" : "nonempty")); - - while (!IsListEmpty(&Connection->SendRequest)) { - OSK_UINT SendLen = 0, Sent = 0; - PVOID SendBuffer = 0; - - Entry = RemoveHeadList( &Connection->SendRequest ); - - Bucket = CONTAINING_RECORD( Entry, TDI_BUCKET, Entry ); - - Irp = Bucket->Request.RequestContext; - Mdl = Irp->MdlAddress; - - TI_DbgPrint(DEBUG_TCP, - ("Getting the user buffer from %x\n", Mdl)); - - NdisQueryBuffer( Mdl, &SendBuffer, &SendLen ); - - TI_DbgPrint(DEBUG_TCP, - ("Writing %d bytes to %x\n", SendLen, SendBuffer)); - - TI_DbgPrint(DEBUG_TCP, ("Connection: %x\n", Connection)); - TI_DbgPrint - (DEBUG_TCP, - ("Connection->SocketContext: %x\n", - Connection->SocketContext)); - - Status = TCPTranslateError - ( OskitTCPSend( Connection->SocketContext, - SendBuffer, - SendLen, - &Sent, - 0 ) ); - - TI_DbgPrint(DEBUG_TCP,("TCP Bytes: %d\n", Sent)); + + Status = TCPTranslateError + ( OskitTCPSend( Connection->SocketContext, + SendBuffer, + SendLen, + &Sent, + 0 ) ); + + TI_DbgPrint(DEBUG_TCP,("TCP Bytes: %d\n", Sent));
if( Status == STATUS_PENDING && !(Connection->SignalState & SEL_FIN) ) { InsertHeadList( &Connection->SendRequest, &Bucket->Entry ); - break; - } else { - TI_DbgPrint(DEBUG_TCP, - ("Completing Send request: %x %x\n", - Bucket->Request, Status)); + break; + } else { + TI_DbgPrint(DEBUG_TCP, + ("Completing Send request: %x %x\n", + Bucket->Request, Status));
Bucket->Status = (Status == STATUS_PENDING) ? STATUS_CANCELLED : Status; Bucket->Information = (Bucket->Status == STATUS_SUCCESS) ? Sent : 0;
InsertTailList(&Connection->CompletionQueue, &Bucket->Entry); - } - } - } + } + } + }
ReferenceObject(Connection); if (ClientInfo.Unlocked) { UnlockObjectFromDpcLevel(Connection); KeReleaseSpinLock(&ClientInfo.Lock, ClientInfo.OldIrql); -} + } else { UnlockObject(Connection, Connection->OldIrql); @@ -394,7 +394,7 @@ while ( 1 ) { if (Next == NextFast) { NextFast += 2; - } + } if (Next == NextSlow) { NextSlow += 5; } @@ -586,7 +586,7 @@ return STATUS_NETWORK_UNREACHABLE; }
- AddressToBind.sin_addr.s_addr = NCE->Interface->Unicast.Address.IPv4Address; + AddressToBind.sin_addr.s_addr = NCE->Interface->Unicast.Address.IPv4Address; } else { @@ -620,7 +620,7 @@
Bucket->Request.RequestNotifyObject = (PVOID)Complete; Bucket->Request.RequestContext = Context; - + InsertTailList( &Connection->ConnectRequest, &Bucket->Entry ); } } @@ -805,14 +805,14 @@ Bucket->Request.RequestNotifyObject = Complete; Bucket->Request.RequestContext = Context; *BytesSent = 0; - + InsertTailList( &Connection->SendRequest, &Bucket->Entry ); TI_DbgPrint(DEBUG_TCP,("Queued write irp\n")); } else { TI_DbgPrint(DEBUG_TCP,("Got status %x, bytes %d\n", Status, Sent)); *BytesSent = Sent; } - + UnlockObject(Connection, OldIrql);
TI_DbgPrint(DEBUG_TCP,("Status %x\n", Status));
Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/include/internal/i386/mm.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntoskr... ============================================================================== --- branches/ros-amd64-bringup/reactos/ntoskrnl/include/internal/i386/mm.h [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/ntoskrnl/include/internal/i386/mm.h [iso-8859-1] Tue Jul 27 13:42:36 2010 @@ -25,7 +25,6 @@ #define PDE_BASE 0xC0300000 #define PDE_TOP 0xC0300FFF #define PTE_TOP 0xC03FFFFF -#define PDE_TOP 0xC0300FFF #define PTE_PER_PAGE 1024 #define HYPER_SPACE 0xC0400000 #define HYPER_SPACE_END 0xC07FFFFF
-
tkreuzer＠svn.reactos.org