Ros-diffs July 2010

ros-diffs@reactos.org

17 participants
467 discussions

[tkreuzer] 48308: [winnt.h] Remove definition of UNW_FLAG* constants. They don't belong here.
by tkreuzer＠svn.reactos.org 27 Jul '10

27 Jul '10

Author: tkreuzer Date: Tue Jul 27 15:58:53 2010 New Revision: 48308 URL: http://svn.reactos.org/svn/reactos?rev=48308&view=rev Log: [winnt.h] Remove definition of UNW_FLAG* constants. They don't belong here. Modified: trunk/reactos/include/psdk/winnt.h Modified: trunk/reactos/include/psdk/winnt.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winnt.h?rev=4… ============================================================================== --- trunk/reactos/include/psdk/winnt.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/winnt.h [iso-8859-1] Tue Jul 27 15:58:53 2010 @@ -2210,11 +2210,6 @@ } CONTEXT; #elif defined(__x86_64__) -#define UNW_FLAG_NHANDLER 0 -#define UNW_FLAG_EHANDLER 1 -#define UNW_FLAG_UHANDLER 2 -#define UNW_FLAG_CHAININFO 4 - #define CONTEXT_AMD64 0x100000 #if !defined(RC_INVOKED)

1 0

[tkreuzer] 48307: [UNICODE] include string.h, for memcpy
by tkreuzer＠svn.reactos.org 27 Jul '10

27 Jul '10

Author: tkreuzer Date: Tue Jul 27 15:47:04 2010 New Revision: 48307 URL: http://svn.reactos.org/svn/reactos?rev=48307&view=rev Log: [UNICODE] include string.h, for memcpy Modified: trunk/reactos/tools/unicode/string.c Modified: trunk/reactos/tools/unicode/string.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/unicode/string.c?rev… ============================================================================== --- trunk/reactos/tools/unicode/string.c [iso-8859-1] (original) +++ trunk/reactos/tools/unicode/string.c [iso-8859-1] Tue Jul 27 15:47:04 2010 @@ -21,6 +21,7 @@ #include <assert.h> #include <limits.h> #include <stdio.h> +#include <string.h> #define WINE_UNICODE_INLINE /* nothing */ #include "wine/unicode.h"

1 0

[tkreuzer] 48306: [dbghelp.h] / [imagehlp.h] - fix LOADED_IMAGE, UpdateDebugInfoFile, UpdateDebugInfoFileEx, ReBaseImage
by tkreuzer＠svn.reactos.org 27 Jul '10

27 Jul '10

Author: tkreuzer Date: Tue Jul 27 14:08:36 2010 New Revision: 48306 URL: http://svn.reactos.org/svn/reactos?rev=48306&view=rev Log: [dbghelp.h] / [imagehlp.h] - fix LOADED_IMAGE, UpdateDebugInfoFile, UpdateDebugInfoFileEx, ReBaseImage Modified: trunk/reactos/include/psdk/dbghelp.h trunk/reactos/include/psdk/imagehlp.h Modified: trunk/reactos/include/psdk/dbghelp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/dbghelp.h?rev… ============================================================================== --- trunk/reactos/include/psdk/dbghelp.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/dbghelp.h [iso-8859-1] Tue Jul 27 14:08:36 2010 @@ -33,7 +33,11 @@ PSTR ModuleName; HANDLE hFile; PUCHAR MappedAddress; - PIMAGE_NT_HEADERS FileHeader; +#ifdef _IMAGEHLP64 + PIMAGE_NT_HEADERS64 FileHeader; +#else + PIMAGE_NT_HEADERS32 FileHeader; +#endif PIMAGE_SECTION_HEADER LastRvaSection; ULONG NumberOfSections; PIMAGE_SECTION_HEADER Sections; Modified: trunk/reactos/include/psdk/imagehlp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/imagehlp.h?re… ============================================================================== --- trunk/reactos/include/psdk/imagehlp.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/imagehlp.h [iso-8859-1] Tue Jul 27 14:08:36 2010 @@ -108,16 +108,22 @@ } IMAGEHLP_STATUS_REASON; typedef BOOL(WINAPI*PIMAGEHLP_STATUS_ROUTINE)(IMAGEHLP_STATUS_REASON,LPSTR,LPSTR,ULONG,ULONG); typedef struct _LOADED_IMAGE { - LPSTR ModuleName; + PSTR ModuleName; HANDLE hFile; PUCHAR MappedAddress; - PIMAGE_NT_HEADERS FileHeader; +#ifdef _IMAGEHLP64 + PIMAGE_NT_HEADERS64 FileHeader; +#else + PIMAGE_NT_HEADERS32 FileHeader; +#endif PIMAGE_SECTION_HEADER LastRvaSection; ULONG NumberOfSections; PIMAGE_SECTION_HEADER Sections; ULONG Characteristics; BOOLEAN fSystemImage; BOOLEAN fDOSImage; + BOOLEAN fReadOnly; + UCHAR Version; LIST_ENTRY Links; ULONG SizeOfImage; } LOADED_IMAGE,*PLOADED_IMAGE; @@ -259,11 +265,11 @@ BOOL IMAGEAPI SplitSymbols(LPSTR,LPSTR,LPSTR,DWORD); HANDLE IMAGEAPI FindDebugInfoFile(LPSTR,LPSTR,LPSTR); HANDLE IMAGEAPI FindExecutableImage(LPSTR,LPSTR,LPSTR); -BOOL IMAGEAPI UpdateDebugInfoFile(LPSTR,LPSTR,LPSTR,PIMAGE_NT_HEADERS); -BOOL IMAGEAPI UpdateDebugInfoFileEx(LPSTR,LPSTR,LPSTR,PIMAGE_NT_HEADERS,DWORD); +BOOL IMAGEAPI UpdateDebugInfoFile(LPSTR,LPSTR,LPSTR,PIMAGE_NT_HEADERS32); +BOOL IMAGEAPI UpdateDebugInfoFileEx(LPSTR,LPSTR,LPSTR,PIMAGE_NT_HEADERS32,DWORD); BOOL IMAGEAPI BindImage(IN LPSTR,IN LPSTR,IN LPSTR); BOOL IMAGEAPI BindImageEx(IN DWORD,IN LPSTR,IN LPSTR,IN LPSTR,IN PIMAGEHLP_STATUS_ROUTINE); -BOOL IMAGEAPI ReBaseImage(IN LPSTR,IN LPSTR,IN BOOL, IN BOOL,IN BOOL, IN ULONG, OUT ULONG*, OUT ULONG*, OUT ULONG*, IN OUT ULONG*, IN ULONG); +BOOL IMAGEAPI ReBaseImage(IN LPSTR,IN LPSTR,IN BOOL, IN BOOL,IN BOOL, IN ULONG, OUT ULONG*, OUT ULONG_PTR*, OUT ULONG*, IN OUT ULONG_PTR*, IN ULONG); PLOADED_IMAGE IMAGEAPI ImageLoad(LPSTR,LPSTR); BOOL IMAGEAPI ImageUnload(PLOADED_IMAGE);

1 0

[tkreuzer] 48305: reduce diff to trunk
by tkreuzer＠svn.reactos.org 27 Jul '10

27 Jul '10

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/3… ============================================================================== --- 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"> -  - <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/3… ============================================================================== --- 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"> -  - <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/3… ============================================================================== --- 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"> -  - <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/drive… ============================================================================== --- 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> <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/drive… ============================================================================== --- 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> <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/h… ============================================================================== --- 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/h… ============================================================================== --- branches/ros-amd64-bringup/reactos/hal/halx86/hal_generic_up.rbuild [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/hal/halx86/hal_generic_up.rbuild [iso-8859-1] Tue 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/h… ============================================================================== --- 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/d… ============================================================================== --- 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/ntosk… ============================================================================== --- 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

1 0

[akhaldi] 48304: [CMAKE] - Add ext2lib, ntfslib, vfatlib and vfatxlib to build.
by akhaldi＠svn.reactos.org 27 Jul '10

27 Jul '10

Author: akhaldi Date: Tue Jul 27 13:09:55 2010 New Revision: 48304 URL: http://svn.reactos.org/svn/reactos?rev=48304&view=rev Log: [CMAKE] - Add ext2lib, ntfslib, vfatlib and vfatxlib to build. Added: branches/cmake-bringup/lib/fslib/CMakeLists.txt (with props) branches/cmake-bringup/lib/fslib/ext2lib/CMakeLists.txt (with props) branches/cmake-bringup/lib/fslib/ntfslib/CMakeLists.txt (with props) branches/cmake-bringup/lib/fslib/vfatlib/CMakeLists.txt (with props) branches/cmake-bringup/lib/fslib/vfatxlib/CMakeLists.txt (with props) Modified: branches/cmake-bringup/lib/CMakeLists.txt Modified: branches/cmake-bringup/lib/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/CMakeLists.tx… ============================================================================== --- branches/cmake-bringup/lib/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/lib/CMakeLists.txt [iso-8859-1] Tue Jul 27 13:09:55 2010 @@ -10,7 +10,7 @@ add_subdirectory(dnslib) add_subdirectory(drivers) add_subdirectory(epsapi) -#add_subdirectory(fslib) +add_subdirectory(fslib) add_subdirectory(lsalib) add_subdirectory(nls) #add_subdirectory(pseh) Added: branches/cmake-bringup/lib/fslib/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/fslib/CMakeLi… ============================================================================== --- branches/cmake-bringup/lib/fslib/CMakeLists.txt (added) +++ branches/cmake-bringup/lib/fslib/CMakeLists.txt [iso-8859-1] Tue Jul 27 13:09:55 2010 @@ -1,0 +1,5 @@ + +add_subdirectory(ext2lib) +add_subdirectory(ntfslib) +add_subdirectory(vfatlib) +add_subdirectory(vfatxlib) Propchange: branches/cmake-bringup/lib/fslib/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/lib/fslib/ext2lib/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/fslib/ext2lib… ============================================================================== --- branches/cmake-bringup/lib/fslib/ext2lib/CMakeLists.txt (added) +++ branches/cmake-bringup/lib/fslib/ext2lib/CMakeLists.txt [iso-8859-1] Tue Jul 27 13:09:55 2010 @@ -1,0 +1,4 @@ + +include_directories(.) +file(GLOB_RECURSE SOURCE "*.c") +add_library(ext2lib ${SOURCE}) Propchange: branches/cmake-bringup/lib/fslib/ext2lib/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/lib/fslib/ntfslib/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/fslib/ntfslib… ============================================================================== --- branches/cmake-bringup/lib/fslib/ntfslib/CMakeLists.txt (added) +++ branches/cmake-bringup/lib/fslib/ntfslib/CMakeLists.txt [iso-8859-1] Tue Jul 27 13:09:55 2010 @@ -1,0 +1,4 @@ + +include_directories(.) +file(GLOB_RECURSE SOURCE "*.c") +add_library(ntfslib ${SOURCE}) Propchange: branches/cmake-bringup/lib/fslib/ntfslib/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/lib/fslib/vfatlib/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/fslib/vfatlib… ============================================================================== --- branches/cmake-bringup/lib/fslib/vfatlib/CMakeLists.txt (added) +++ branches/cmake-bringup/lib/fslib/vfatlib/CMakeLists.txt [iso-8859-1] Tue Jul 27 13:09:55 2010 @@ -1,0 +1,5 @@ + +include_directories(.) +file(GLOB_RECURSE SOURCE "*.c") +add_library(vfatlib ${SOURCE}) +add_dependencies(vfatlib psdk) Propchange: branches/cmake-bringup/lib/fslib/vfatlib/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/lib/fslib/vfatxlib/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/fslib/vfatxli… ============================================================================== --- branches/cmake-bringup/lib/fslib/vfatxlib/CMakeLists.txt (added) +++ branches/cmake-bringup/lib/fslib/vfatxlib/CMakeLists.txt [iso-8859-1] Tue Jul 27 13:09:55 2010 @@ -1,0 +1,4 @@ + +include_directories(.) +file(GLOB_RECURSE SOURCE "*.c") +add_library(vfatxlib ${SOURCE}) Propchange: branches/cmake-bringup/lib/fslib/vfatxlib/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[akhaldi] 48303: [CMAKE] - Add proper dependencies on psdk. - Parallel build works now.
by akhaldi＠svn.reactos.org 27 Jul '10

27 Jul '10

Author: akhaldi Date: Tue Jul 27 12:53:24 2010 New Revision: 48303 URL: http://svn.reactos.org/svn/reactos?rev=48303&view=rev Log: [CMAKE] - Add proper dependencies on psdk. - Parallel build works now. Modified: branches/cmake-bringup/lib/3rdparty/adns/CMakeLists.txt branches/cmake-bringup/lib/3rdparty/cardlib/CMakeLists.txt branches/cmake-bringup/lib/inflib/CMakeLists.txt branches/cmake-bringup/lib/newinflib/CMakeLists.txt Modified: branches/cmake-bringup/lib/3rdparty/adns/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/3rdparty/adns… ============================================================================== --- branches/cmake-bringup/lib/3rdparty/adns/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/lib/3rdparty/adns/CMakeLists.txt [iso-8859-1] Tue Jul 27 12:53:24 2010 @@ -5,4 +5,5 @@ file(GLOB_RECURSE SOURCE "/src/*.c" "./adns_win32/*.c") -add_library(adns ${SOURCE}) +add_library(adns ${SOURCE}) +add_dependencies(adns psdk) Modified: branches/cmake-bringup/lib/3rdparty/cardlib/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/3rdparty/card… ============================================================================== --- branches/cmake-bringup/lib/3rdparty/cardlib/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/lib/3rdparty/cardlib/CMakeLists.txt [iso-8859-1] Tue Jul 27 12:53:24 2010 @@ -1,3 +1,4 @@ file(GLOB_RECURSE SOURCE "*.cpp") -add_library(cardlib ${SOURCE}) +add_library(cardlib ${SOURCE}) +add_dependencies(cardlib psdk) Modified: branches/cmake-bringup/lib/inflib/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/inflib/CMakeL… ============================================================================== --- branches/cmake-bringup/lib/inflib/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/lib/inflib/CMakeLists.txt [iso-8859-1] Tue Jul 27 12:53:24 2010 @@ -6,6 +6,7 @@ file(GLOB_RECURSE SOURCE "infros*.c") add_library(inflib ${GLOBAL_FILES} ${SOURCE}) +add_dependencies(inflib psdk) else() Modified: branches/cmake-bringup/lib/newinflib/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/newinflib/CMa… ============================================================================== --- branches/cmake-bringup/lib/newinflib/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/lib/newinflib/CMakeLists.txt [iso-8859-1] Tue Jul 27 12:53:24 2010 @@ -6,6 +6,7 @@ file(GLOB_RECURSE SOURCE "infros*.c") add_library(newinflib ${GLOBAL_FILES} ${SOURCE}) +add_dependencies(newinflib psdk) else()

1 0

[akhaldi] 48302: [CMAKE] - cmlib depends on bugcodes.
by akhaldi＠svn.reactos.org 27 Jul '10

27 Jul '10

Author: akhaldi Date: Tue Jul 27 11:12:09 2010 New Revision: 48302 URL: http://svn.reactos.org/svn/reactos?rev=48302&view=rev Log: [CMAKE] - cmlib depends on bugcodes. Modified: branches/cmake-bringup/lib/cmlib/CMakeLists.txt Modified: branches/cmake-bringup/lib/cmlib/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/cmlib/CMakeLi… ============================================================================== --- branches/cmake-bringup/lib/cmlib/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/lib/cmlib/CMakeLists.txt [iso-8859-1] Tue Jul 27 11:12:09 2010 @@ -6,6 +6,7 @@ if(CMAKE_CROSSCOMPILING) add_library(cmlib ${SOURCE}) +add_dependencies(cmlib bugcodes) else()

1 0

[akhaldi] 48301: [CMAKE] - Add idna, normalize and scripts to build.
by akhaldi＠svn.reactos.org 27 Jul '10

27 Jul '10

Author: akhaldi Date: Tue Jul 27 11:01:39 2010 New Revision: 48301 URL: http://svn.reactos.org/svn/reactos?rev=48301&view=rev Log: [CMAKE] - Add idna, normalize and scripts to build. Added: branches/cmake-bringup/lib/nls/CMakeLists.txt (with props) branches/cmake-bringup/lib/nls/idna/CMakeLists.txt (with props) branches/cmake-bringup/lib/nls/normalize/CMakeLists.txt (with props) branches/cmake-bringup/lib/nls/scripts/CMakeLists.txt (with props) Modified: branches/cmake-bringup/lib/CMakeLists.txt Modified: branches/cmake-bringup/lib/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/CMakeLists.tx… ============================================================================== --- branches/cmake-bringup/lib/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/lib/CMakeLists.txt [iso-8859-1] Tue Jul 27 11:01:39 2010 @@ -12,7 +12,7 @@ add_subdirectory(epsapi) #add_subdirectory(fslib) add_subdirectory(lsalib) -#add_subdirectory(nls) +add_subdirectory(nls) #add_subdirectory(pseh) add_subdirectory(recyclebin) add_subdirectory(rossym) Added: branches/cmake-bringup/lib/nls/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/nls/CMakeList… ============================================================================== --- branches/cmake-bringup/lib/nls/CMakeLists.txt (added) +++ branches/cmake-bringup/lib/nls/CMakeLists.txt [iso-8859-1] Tue Jul 27 11:01:39 2010 @@ -1,0 +1,4 @@ + +add_subdirectory(idna) +add_subdirectory(normalize) +add_subdirectory(scripts) Propchange: branches/cmake-bringup/lib/nls/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/lib/nls/idna/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/nls/idna/CMak… ============================================================================== --- branches/cmake-bringup/lib/nls/idna/CMakeLists.txt (added) +++ branches/cmake-bringup/lib/nls/idna/CMakeLists.txt [iso-8859-1] Tue Jul 27 11:01:39 2010 @@ -1,0 +1,8 @@ + +include_directories(${REACTOS_SOURCE_DIR}/lib/3rdparty/icu4ros/icu/source/common) + +set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -UWINVER -DWINVER=0x600 -fno-exceptions -fno-rtti") + +file(GLOB_RECURSE SOURCE "*.cpp") + +add_library(idna ${SOURCE}) Propchange: branches/cmake-bringup/lib/nls/idna/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/lib/nls/normalize/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/nls/normalize… ============================================================================== --- branches/cmake-bringup/lib/nls/normalize/CMakeLists.txt (added) +++ branches/cmake-bringup/lib/nls/normalize/CMakeLists.txt [iso-8859-1] Tue Jul 27 11:01:39 2010 @@ -1,0 +1,8 @@ + +include_directories(${REACTOS_SOURCE_DIR}/lib/3rdparty/icu4ros/icu/source/common) + +set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -UWINVER -DWINVER=0x600 -fno-exceptions -fno-rtti") + +file(GLOB_RECURSE SOURCE "*.cpp") + +add_library(normalize ${SOURCE}) Propchange: branches/cmake-bringup/lib/nls/normalize/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/lib/nls/scripts/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/nls/scripts/C… ============================================================================== --- branches/cmake-bringup/lib/nls/scripts/CMakeLists.txt (added) +++ branches/cmake-bringup/lib/nls/scripts/CMakeLists.txt [iso-8859-1] Tue Jul 27 11:01:39 2010 @@ -1,0 +1,8 @@ + +include_directories(${REACTOS_SOURCE_DIR}/lib/3rdparty/icu4ros/icu/source/common) + +set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -UWINVER -DWINVER=0x600 -fno-exceptions -fno-rtti") + +file(GLOB_RECURSE SOURCE "*.cpp") + +add_library(scripts ${SOURCE}) Propchange: branches/cmake-bringup/lib/nls/scripts/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[akhaldi] 48300: [PSDK] - Mark TraceMessageVa as WMIAPI.
by akhaldi＠svn.reactos.org 27 Jul '10

27 Jul '10

Author: akhaldi Date: Tue Jul 27 09:56:21 2010 New Revision: 48300 URL: http://svn.reactos.org/svn/reactos?rev=48300&view=rev Log: [PSDK] - Mark TraceMessageVa as WMIAPI. Modified: trunk/reactos/include/psdk/evntrace.h Modified: trunk/reactos/include/psdk/evntrace.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/evntrace.h?re… ============================================================================== --- trunk/reactos/include/psdk/evntrace.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/evntrace.h [iso-8859-1] Tue Jul 27 09:56:21 2010 @@ -1002,6 +1002,7 @@ EXTERN_C ULONG +WMIAPI TraceMessageVa( IN TRACEHANDLE LoggerHandle, IN ULONG MessageFlags,

1 0

[akhaldi] 48299: [XDK] - WmiTraceMessageVa is NTAPI, not __cdecl. [DDK] - Update wdm.h to reflect XDK changes.
by akhaldi＠svn.reactos.org 27 Jul '10

27 Jul '10

Author: akhaldi Date: Tue Jul 27 09:14:13 2010 New Revision: 48299 URL: http://svn.reactos.org/svn/reactos?rev=48299&view=rev Log: [XDK] - WmiTraceMessageVa is NTAPI, not __cdecl. [DDK] - Update wdm.h to reflect XDK changes. Modified: trunk/reactos/include/ddk/wdm.h trunk/reactos/include/xdk/wmifuncs.h Modified: trunk/reactos/include/ddk/wdm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/wdm.h?rev=4829… ============================================================================== --- trunk/reactos/include/ddk/wdm.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/wdm.h [iso-8859-1] Tue Jul 27 09:14:13 2010 @@ -14241,7 +14241,7 @@ /* FIXME: Get va_list from where? */ NTKERNELAPI NTSTATUS -__cdecl +NTAPI WmiTraceMessageVa( IN TRACEHANDLE LoggerHandle, IN ULONG MessageFlags, Modified: trunk/reactos/include/xdk/wmifuncs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/xdk/wmifuncs.h?rev… ============================================================================== --- trunk/reactos/include/xdk/wmifuncs.h [iso-8859-1] (original) +++ trunk/reactos/include/xdk/wmifuncs.h [iso-8859-1] Tue Jul 27 09:14:13 2010 @@ -32,7 +32,7 @@ /* FIXME: Get va_list from where? */ NTKERNELAPI NTSTATUS -__cdecl +NTAPI WmiTraceMessageVa( IN TRACEHANDLE LoggerHandle, IN ULONG MessageFlags,

1 0

← Newer
1
...
6
7
8
9
10
11
12
...
47
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs July 2010