Ros-diffs

ros-diffs@reactos.org

81390 discussions

[gvg] 20537: Silence some debug messages
by gvg＠svn.reactos.org 02 Jan '06

02 Jan '06

Silence some debug messages Modified: trunk/reactos/drivers/lib/ip/transport/tcp/tcp.c Modified: trunk/reactos/drivers/net/afd/afd/connect.c _____ Modified: trunk/reactos/drivers/lib/ip/transport/tcp/tcp.c --- trunk/reactos/drivers/lib/ip/transport/tcp/tcp.c 2006-01-02 20:26:03 UTC (rev 20536) +++ trunk/reactos/drivers/lib/ip/transport/tcp/tcp.c 2006-01-02 20:51:54 UTC (rev 20537) @@ -476,7 +476,7 @@ USHORT RemotePort; PTDI_BUCKET Bucket; - DbgPrint("TCPConnect: Called\n"); + TI_DbgPrint(DEBUG_TCP,("TCPConnect: Called\n")); Bucket = ExAllocatePool( NonPagedPool, sizeof(*Bucket) ); if( !Bucket ) return STATUS_NO_MEMORY; @@ -494,9 +494,10 @@ &RemoteAddress, &RemotePort); - DbgPrint("Connecting to address %x:%x\n", - RemoteAddress.Address.IPv4Address, - RemotePort); + TI_DbgPrint(DEBUG_TCP, + ("Connecting to address %x:%x\n", + RemoteAddress.Address.IPv4Address, + RemotePort)); if (!NT_SUCCESS(Status)) { TI_DbgPrint(DEBUG_TCP, ("Could not AddrBuildAddress in TCPConnect\n")); _____ Modified: trunk/reactos/drivers/net/afd/afd/connect.c --- trunk/reactos/drivers/net/afd/afd/connect.c 2006-01-02 20:26:03 UTC (rev 20536) +++ trunk/reactos/drivers/net/afd/afd/connect.c 2006-01-02 20:51:54 UTC (rev 20537) @@ -151,9 +151,11 @@ 0, NULL, TRUE ); AFD_DbgPrint(MID_TRACE,("Connect request:\n")); +#if 0 OskitDumpBuffer ( (PCHAR)ConnectReq, IrpSp->Parameters.DeviceIoControl.InputBufferLength ); +#endif switch( FCB->State ) { case SOCKET_STATE_CONNECTED:

1 0

[gvg] 20536: Use lookaside lists for two most common allocation sizes (mbuf and data buffer)
by gvg＠svn.reactos.org 02 Jan '06

02 Jan '06

Use lookaside lists for two most common allocation sizes (mbuf and data buffer) Modified: trunk/reactos/drivers/lib/ip/transport/tcp/event.c Modified: trunk/reactos/drivers/lib/ip/transport/tcp/tcp.c _____ Modified: trunk/reactos/drivers/lib/ip/transport/tcp/event.c --- trunk/reactos/drivers/lib/ip/transport/tcp/event.c 2006-01-02 20:04:19 UTC (rev 20535) +++ trunk/reactos/drivers/lib/ip/transport/tcp/event.c 2006-01-02 20:26:03 UTC (rev 20536) @@ -108,19 +108,6 @@ else return 0; } -void *TCPMalloc( void *ClientData, - OSK_UINT Bytes, OSK_PCHAR File, OSK_UINT Line ) { - void *v = PoolAllocateBuffer( Bytes ); - if( v ) TrackWithTag( FOURCC('f','b','s','d'), v, (PCHAR)File, Line ); - return v; -} - -void TCPFree( void *ClientData, - void *data, OSK_PCHAR File, OSK_UINT Line ) { - UntrackFL( (PCHAR)File, Line, data ); - PoolFreeBuffer( data ); -} - int TCPSleep( void *ClientData, void *token, int priority, char *msg, int tmio ) { PSLEEPING_THREAD SleepingThread; @@ -172,3 +159,149 @@ } TcpipReleaseFastMutex( &SleepingThreadsLock ); } + +/* Memory management routines + * + * By far the most requests for memory are either for 128 or 2048 byte blocks, + * so we want to satisfy those from lookaside lists. Unfortunately, the + * TCPFree() function doesn't pass the size of the block to be freed, so we + * need to keep track of it ourselves. We do it by prepending each block with + * 4 bytes, indicating if this is a 'L'arge (2048), 'S'mall (128) or 'O'ther + * block. + */ + +/* Set to some non-zero value to get a profile of memory allocation sizes */ +#define MEM_PROFILE 0 + +#define SMALL_SIZE 128 +#define LARGE_SIZE 2048 + +#define SIGNATURE_LARGE TAG('L','L','L','L') +#define SIGNATURE_SMALL TAG('S','S','S','S') +#define SIGNATURE_OTHER TAG('O','O','O','O') +#define TCP_TAG TAG('T','C','P',' ') + +static NPAGED_LOOKASIDE_LIST LargeLookasideList; +static NPAGED_LOOKASIDE_LIST SmallLookasideList; + +NTSTATUS +TCPMemStartup( void ) +{ + ExInitializeNPagedLookasideList( &LargeLookasideList, + NULL, + NULL, + 0, + LARGE_SIZE + sizeof( ULONG ), + TCP_TAG, + 0 ); + ExInitializeNPagedLookasideList( &SmallLookasideList, + NULL, + NULL, + 0, + SMALL_SIZE + sizeof( ULONG ), + TCP_TAG, + 0 ); + + return STATUS_SUCCESS; +} + +void *TCPMalloc( void *ClientData, + OSK_UINT Bytes, OSK_PCHAR File, OSK_UINT Line ) { + void *v; + ULONG Signature; + +#if 0 != MEM_PROFILE + static OSK_UINT *Sizes = NULL, *Counts = NULL, ArrayAllocated = 0; + static OSK_UINT ArrayUsed = 0, AllocationCount = 0; + OSK_UINT i, NewSize, *NewArray; + int Found; + + Found = 0; + for ( i = 0; i < ArrayUsed && ! Found; i++ ) { + Found = ( Sizes[i] == Bytes ); + if ( Found ) { + Counts[i]++; + } + } + if ( ! Found ) { + if ( ArrayAllocated <= ArrayUsed ) { + NewSize = ( 0 == ArrayAllocated ? 16 : 2 * ArrayAllocated ); + NewArray = PoolAllocateBuffer( 2 * NewSize * sizeof( OSK_UINT ) ); + if ( NULL != NewArray ) { + if ( 0 != ArrayAllocated ) { + memcpy( NewArray, Sizes, + ArrayAllocated * sizeof( OSK_UINT ) ); + PoolFreeBuffer( Sizes ); + memcpy( NewArray + NewSize, Counts, + ArrayAllocated * sizeof( OSK_UINT ) ); + PoolFreeBuffer( Counts ); + } + Sizes = NewArray; + Counts = NewArray + NewSize; + ArrayAllocated = NewSize; + } else if ( 0 != ArrayAllocated ) { + PoolFreeBuffer( Sizes ); + PoolFreeBuffer( Counts ); + ArrayAllocated = 0; + } + } + if ( ArrayUsed < ArrayAllocated ) { + Sizes[ArrayUsed] = Bytes; + Counts[ArrayUsed] = 1; + ArrayUsed++; + } + } + + if ( 0 == (++AllocationCount % MEM_PROFILE) ) { + TI_DbgPrint(DEBUG_TCP, ("Memory allocation size profile:\n")); + for ( i = 0; i < ArrayUsed; i++ ) { + TI_DbgPrint(DEBUG_TCP, + ("Size %4u Count %5u\n", Sizes[i], Counts[i])); + } + TI_DbgPrint(DEBUG_TCP, ("End of memory allocation size profile\n")); + } +#endif /* MEM_PROFILE */ + + if ( SMALL_SIZE == Bytes ) { + v = ExAllocateFromNPagedLookasideList( &SmallLookasideList ); + Signature = SIGNATURE_SMALL; + } else if ( LARGE_SIZE == Bytes ) { + v = ExAllocateFromNPagedLookasideList( &LargeLookasideList ); + Signature = SIGNATURE_LARGE; + } else { + v = PoolAllocateBuffer( Bytes + sizeof(ULONG) ); + Signature = SIGNATURE_OTHER; + } + if( v ) { + *((ULONG *) v) = Signature; + v = (void *)((char *) v + sizeof(ULONG)); + TrackWithTag( FOURCC('f','b','s','d'), v, (PCHAR)File, Line ); + } + + return v; +} + +void TCPFree( void *ClientData, + void *data, OSK_PCHAR File, OSK_UINT Line ) { + ULONG Signature; + + UntrackFL( (PCHAR)File, Line, data ); + data = (void *)((char *) data - sizeof(ULONG)); + Signature = *((ULONG *) data); + if ( SIGNATURE_SMALL == Signature ) { + ExFreeToNPagedLookasideList( &SmallLookasideList, data ); + } else if ( SIGNATURE_LARGE == Signature ) { + ExFreeToNPagedLookasideList( &LargeLookasideList, data ); + } else if ( SIGNATURE_OTHER == Signature ) { + PoolFreeBuffer( data ); + } else { + ASSERT( FALSE ); + } +} + +void +TCPMemShutdown( void ) +{ + ExDeleteNPagedLookasideList( &SmallLookasideList ); + ExDeleteNPagedLookasideList( &LargeLookasideList ); +} _____ Modified: trunk/reactos/drivers/lib/ip/transport/tcp/tcp.c --- trunk/reactos/drivers/lib/ip/transport/tcp/tcp.c 2006-01-02 20:04:19 UTC (rev 20535) +++ trunk/reactos/drivers/lib/ip/transport/tcp/tcp.c 2006-01-02 20:26:03 UTC (rev 20536) @@ -286,10 +286,12 @@ OSK_UINT FindType, OSK_SOCKADDR *ReqAddr ); +NTSTATUS TCPMemStartup( void ); void *TCPMalloc( void *ClientData, OSK_UINT bytes, OSK_PCHAR file, OSK_UINT line ); void TCPFree( void *ClientData, void *data, OSK_PCHAR file, OSK_UINT line ); +void TCPMemShutdown( void ); int TCPSleep( void *ClientData, void *token, int priority, char *msg, int tmio ); @@ -376,10 +378,16 @@ * Status of operation */ { + NTSTATUS Status; + TcpipRecursiveMutexInit( &TCPLock ); ExInitializeFastMutex( &SleepingThreadsLock ); InitializeListHead( &SleepingThreadsList ); InitializeListHead( &SignalledConnections ); + Status = TCPMemStartup(); + if ( ! NT_SUCCESS(Status) ) { + return Status; + } PortsStartup( &TCPPorts, 1, 0xfffe ); @@ -433,6 +441,8 @@ PortsShutdown( &TCPPorts ); + TCPMemShutdown(); + return STATUS_SUCCESS; }

1 0

[gvg] 20535: Use a lookaside list for tracking
by gvg＠svn.reactos.org 02 Jan '06

02 Jan '06

Use a lookaside list for tracking Modified: trunk/reactos/drivers/lib/ip/network/memtrack.c _____ Modified: trunk/reactos/drivers/lib/ip/network/memtrack.c --- trunk/reactos/drivers/lib/ip/network/memtrack.c 2006-01-02 19:00:47 UTC (rev 20534) +++ trunk/reactos/drivers/lib/ip/network/memtrack.c 2006-01-02 20:04:19 UTC (rev 20535) @@ -3,8 +3,11 @@ #ifdef MEMTRACK -LIST_ENTRY AllocatedObjectsList; -KSPIN_LOCK AllocatedObjectsLock; +#define TRACK_TAG TAG('T','r','C','K') + +static LIST_ENTRY AllocatedObjectsList; +static KSPIN_LOCK AllocatedObjectsLock; +static NPAGED_LOOKASIDE_LIST AllocatedObjectsLookasideList; DWORD TagsToShow[MEMTRACK_MAX_TAGS_TO_TRACK] = { 0 }; VOID TrackTag( DWORD Tag ) { @@ -17,6 +20,13 @@ VOID TrackingInit() { TcpipInitializeSpinLock( &AllocatedObjectsLock ); InitializeListHead( &AllocatedObjectsList ); + ExInitializeNPagedLookasideList(&AllocatedObjectsLookasideList, + NULL, + NULL, + 0, + sizeof(ALLOCATION_TRACKER), + TRACK_TAG, + 0 ); } VOID ShowTrackedThing( PCHAR What, PALLOCATION_TRACKER Thing, @@ -50,7 +60,7 @@ VOID TrackWithTag( DWORD Tag, PVOID Thing, PCHAR FileName, DWORD LineNo ) { PALLOCATION_TRACKER TrackedThing = - PoolAllocateBuffer( sizeof(*TrackedThing) ); + ExAllocateFromNPagedLookasideList( &AllocatedObjectsLookasideList ); KIRQL OldIrql; PLIST_ENTRY Entry; @@ -80,7 +90,7 @@ TrackedThing->LineNo = LineNo; - InsertTailList( &AllocatedObjectsList, &TrackedThing->Entry ); + InsertHeadList( &AllocatedObjectsList, &TrackedThing->Entry ); ShowTrackedThing( "Alloc", TrackedThing, FileName, LineNo ); } @@ -111,7 +121,9 @@ ShowTrackedThing( "Free ", ThingInList, File, Line ); - PoolFreeBuffer( ThingInList ); + ExFreeToNPagedLookasideList( &AllocatedObjectsLookasideList, + ThingInList ); + TcpipReleaseSpinLock( &AllocatedObjectsLock, OldIrql ); /* TrackDumpFL( File, Line ); */ return;

1 0

[greatlrd] 20534: Correct Streachblt in windows mode, it take accunt org and offset now. this need to be implement in dib1, dib4, dib8, dib24, dib32
by greatlrd＠svn.reactos.org 02 Jan '06

02 Jan '06

Correct Streachblt in windows mode, it take accunt org and offset now. this need to be implement in dib1, dib4, dib8,dib24, dib32 Modified: trunk/reactos/subsys/win32k/dib/dib16bpp.c _____ Modified: trunk/reactos/subsys/win32k/dib/dib16bpp.c --- trunk/reactos/subsys/win32k/dib/dib16bpp.c 2006-01-02 18:45:52 UTC (rev 20533) +++ trunk/reactos/subsys/win32k/dib/dib16bpp.c 2006-01-02 19:00:47 UTC (rev 20534) @@ -621,9 +621,9 @@ int color; int zoomX; int zoomY; - int count; - int saveX; - int saveY; + // int count; + // int saveX; + // int saveY; BOOLEAN DesIsBiggerY=FALSE; DPRINT("DIB_16BPP_StretchBlt: Source BPP: %u, srcRect: (%d,%d)-(%d,%d), dstRect: (%d,%d)-(%d,%d)\n", @@ -633,9 +633,15 @@ SrcSizeY = SourceRect->bottom - SourceRect->top; SrcSizeX = SourceRect->right - SourceRect->left; - DesSizeY = DestRect->bottom ; - DesSizeX = DestRect->right; - + DesSizeY = DestRect->bottom - DestRect->top; + DesSizeX = DestRect->right - DestRect->left; + /* + SrcSizeY = SourceRect->bottom; + SrcSizeX = SourceRect->right; + + DesSizeY = DestRect->bottom; + DesSizeX = DestRect->right; + */ zoomX = DesSizeX / SrcSizeX; if (zoomX==0) zoomX=1; @@ -650,648 +656,167 @@ switch(SourceSurf->iBitmapFormat) { - case BMF_1BPP: - /* FIXME : MaskOrigin, BrushOrigin, ClipRegion, Mode ? */ - /* This is a reference implementation, it hasn't been optimized for speed */ - if (zoomX>1) - { - /* Draw one Hline on X - Led to the Des Zoom In*/ - if (DesSizeX>SrcSizeX) - { - for (DesY=DestRect->bottom-zoomY; DesY>=DestRect->top; DesY-=zoomY) - { - if (DesIsBiggerY) - sy = (int) ((ULONG) SrcSizeY * (ULONG) DesY) / ((ULONG) DesSizeY); - else - sy = (int) ((ULONG) DesSizeY * (ULONG) DesY) / ((ULONG) SrcSizeY); - - if (sy > SourceRect->bottom) break; + /* FIXME : MaskOrigin, BrushOrigin, ClipRegion, Mode ? */ + /* This is a reference implementation, it hasn't been optimized for speed */ + + for (DesY=DestRect->top; DesY<DestRect->bottom; DesY++) + { + if (DesSizeY>SrcSizeY) + sy = SourceRect->top + ((DesY - DestRect->top) / zoomY); + else + sy = SourceRect->top + ((DesY - DestRect->top) * zoomY); + + if (sy > SourceRect->bottom) + sy = SourceRect->bottom; + + for (DesX=DestRect->left; DesX<DestRect->right; DesX++) + { + if (DesSizeX>SrcSizeX) + sx = SourceRect->left + ((DesX - DestRect->left) / zoomX); + else + sx = SourceRect->left + ((DesX - DestRect->left) * zoomX); + + if (sx > SourceRect->right) + sx = SourceRect->right; + + if(DIB_1BPP_GetPixel(SourceSurf, sx, sy) == 0) + { + DIB_16BPP_PutPixel(DestSurf, DesX, DesY, XLATEOBJ_iXlate(ColorTranslation, 0)); + } + else + { + DIB_16BPP_PutPixel(DestSurf, DesX, DesY, XLATEOBJ_iXlate(ColorTranslation, 1)); + } + } + } + break; - saveY = DesY+zoomY; - - for (DesX=DestRect->right-zoomX; DesX>=DestRect->left; DesX-=zoomX) - { - sx = (int) ((ULONG) SrcSizeX * (ULONG) DesX) / ((ULONG) DesSizeX); - - if (sx > SourceRect->right) break; - - saveX = DesX + zoomX; - - if (DIB_1BPP_GetPixel(SourceSurf, sx, sy) == 0) - for (count=DesY;count<saveY;count++) - DIB_16BPP_HLine(DestSurf, DesX, saveX, count, 0); - else - for (count=DesY;count<saveY;count++) - DIB_16BPP_HLine(DestSurf, DesX, saveX, count, 1); - - } - } - } - else - { - /* Draw one Hline on X - Led to the Des Zoom Out*/ - - for (DesY=DestRect->bottom-zoomY; DesY>=DestRect->top; DesY-=zoomY) - { - if (DesIsBiggerY) - sy = (int) ((ULONG) SrcSizeY * (ULONG) DesY) / ((ULONG) DesSizeY); - else - sy = (int) ((ULONG) DesSizeY * (ULONG) DesY) / ((ULONG) SrcSizeY); - - if (sy > SourceRect->bottom) break; - - saveY = DesY+zoomY; - - for (DesX=DestRect->right-zoomX; DesX>=DestRect->left; DesX-=zoomX) - { - sx = (int) ((ULONG) DesSizeX * (ULONG) DesX) / ((ULONG) SrcSizeX); - - if (sx > SourceRect->right) break; - - saveX = DesX + zoomX; - - if (DIB_1BPP_GetPixel(SourceSurf, sx, sy) == 0) - for (count=DesY;count<saveY;count++) - DIB_16BPP_HLine(DestSurf, DesX, saveX, count, 0); - else - for (count=DesY;count<saveY;count++) - DIB_16BPP_HLine(DestSurf, DesX, saveX, count, 1); - - } - } - } - } - else - { - - if (DesSizeX>SrcSizeX) - { - /* Draw one pixel on X - Led to the Des Zoom In*/ - for (DesY=DestRect->bottom-zoomY; DesY>=DestRect->top; DesY-=zoomY) - { - if (DesIsBiggerY) - sy = (int) ((ULONG) SrcSizeY * (ULONG) DesY) / ((ULONG) DesSizeY); - else - sy = (int) ((ULONG) DesSizeY * (ULONG) DesY) / ((ULONG) SrcSizeY); - - if (sy > SourceRect->bottom) break; - - saveY = DesY+zoomY; - - for (DesX=DestRect->right-zoomX; DesX>=DestRect->left; DesX-=zoomX) - { - sx = (int) ((ULONG) SrcSizeX * (ULONG) DesX) / ((ULONG) DesSizeX); - - if (sx > SourceRect->right) break; - - if (DIB_1BPP_GetPixel(SourceSurf, sx, sy) == 0) - for (count=DesY;count<saveY;count++) - DIB_16BPP_PutPixel(DestSurf, DesX, count, 0); - else - for (count=DesY;count<saveY;count++) - DIB_16BPP_PutPixel(DestSurf, DesX, count, 1); - - - } - } - } - else - { - /* Draw one pixel on X - Led to the Des Zoom Out*/ - for (DesY=DestRect->bottom-zoomY; DesY>=DestRect->top; DesY-=zoomY) - { - if (DesIsBiggerY) - sy = (int) ((ULONG) SrcSizeY * (ULONG) DesY) / ((ULONG) DesSizeY); - else - sy = (int) ((ULONG) DesSizeY * (ULONG) DesY) / ((ULONG) SrcSizeY); - - if (sy > SourceRect->bottom) break; - - saveY = DesY+zoomY; - - for (DesX=DestRect->right-zoomX; DesX>=DestRect->left; DesX-=zoomX) - { - sx = (int) ((ULONG) DesSizeX * (ULONG) DesX) / ((ULONG) SrcSizeX); - - if (sx > SourceRect->right) break; - - if (DIB_1BPP_GetPixel(SourceSurf, sx, sy) == 0) - for (count=DesY;count<saveY;count++) - DIB_16BPP_PutPixel(DestSurf, DesX, count, 0); - else - for (count=DesY;count<saveY;count++) - DIB_16BPP_PutPixel(DestSurf, DesX, count, 1); - - } - } - } - } - break; - case BMF_4BPP: - /* FIXME : MaskOrigin, BrushOrigin, ClipRegion, Mode ? */ - /* This is a reference implementation, it hasn't been optimized for speed */ - if (zoomX>1) - { - /* Draw one Hline on X - Led to the Des Zoom In*/ - if (DesSizeX>SrcSizeX) - { - for (DesY=DestRect->bottom-zoomY; DesY>=DestRect->top; DesY-=zoomY) - { - if (DesIsBiggerY) - sy = (int) ((ULONG) SrcSizeY * (ULONG) DesY) / ((ULONG) DesSizeY); - else - sy = (int) ((ULONG) DesSizeY * (ULONG) DesY) / ((ULONG) SrcSizeY); - - if (sy > SourceRect->bottom) break; - - saveY = DesY+zoomY; - - for (DesX=DestRect->right-zoomX; DesX>=DestRect->left; DesX-=zoomX) - { - sx = (int) ((ULONG) SrcSizeX * (ULONG) DesX) / ((ULONG) DesSizeX); - - if (sx > SourceRect->right) break; - - color = XLATEOBJ_iXlate(ColorTranslation, DIB_4BPP_GetPixel(SourceSurf, sx, sy)); - - saveX = DesX + zoomX; - for (count=DesY;count<saveY;count++) - DIB_16BPP_HLine(DestSurf, DesX, saveX, count, color); - } - } - } - else - { - /* Draw one Hline on X - Led to the Des Zoom Out*/ - - for (DesY=DestRect->bottom-zoomY; DesY>=DestRect->top; DesY-=zoomY) - { - if (DesIsBiggerY) - sy = (int) ((ULONG) SrcSizeY * (ULONG) DesY) / ((ULONG) DesSizeY); - else - sy = (int) ((ULONG) DesSizeY * (ULONG) DesY) / ((ULONG) SrcSizeY); - - if (sy > SourceRect->bottom) break; - - saveY = DesY+zoomY; - - for (DesX=DestRect->right-zoomX; DesX>=DestRect->left; DesX-=zoomX) - { - sx = (int) ((ULONG) DesSizeX * (ULONG) DesX) / ((ULONG) SrcSizeX); - - if (sx > SourceRect->right) break; - - color = XLATEOBJ_iXlate(ColorTranslation, DIB_4BPP_GetPixel(SourceSurf, sx, sy)); - - saveX = DesX + zoomX; - for (count=DesY;count<saveY;count++) - DIB_16BPP_HLine(DestSurf, DesX, saveX, count, color); - } - } - } - } - - else - { - - if (DesSizeX>SrcSizeX) - { - /* Draw one pixel on X - Led to the Des Zoom In*/ - for (DesY=DestRect->bottom-zoomY; DesY>=DestRect->top; DesY-=zoomY) - { - if (DesIsBiggerY) - sy = (int) ((ULONG) SrcSizeY * (ULONG) DesY) / ((ULONG) DesSizeY); - else - sy = (int) ((ULONG) DesSizeY * (ULONG) DesY) / ((ULONG) SrcSizeY); - - if (sy > SourceRect->bottom) break; - - saveY = DesY+zoomY; - - for (DesX=DestRect->right-zoomX; DesX>=DestRect->left; DesX-=zoomX) - { - sx = (int) ((ULONG) SrcSizeX * (ULONG) DesX) / ((ULONG) DesSizeX); - - if (sx > SourceRect->right) break; - - color = XLATEOBJ_iXlate(ColorTranslation, DIB_4BPP_GetPixel(SourceSurf, sx, sy)); - - for (count=DesY;count<saveY;count++) - DIB_16BPP_PutPixel(DestSurf, DesX, count, color); - } - } - } - else - { - /* Draw one pixel on X - Led to the Des Zoom Out*/ - for (DesY=DestRect->bottom-zoomY; DesY>=DestRect->top; DesY-=zoomY) - { - if (DesIsBiggerY) - sy = (int) ((ULONG) SrcSizeY * (ULONG) DesY) / ((ULONG) DesSizeY); - else - sy = (int) ((ULONG) DesSizeY * (ULONG) DesY) / ((ULONG) SrcSizeY); - - if (sy > SourceRect->bottom) break; - - saveY = DesY+zoomY; - - for (DesX=DestRect->right-zoomX; DesX>=DestRect->left; DesX-=zoomX) - { - sx = (int) ((ULONG) DesSizeX * (ULONG) DesX) / ((ULONG) SrcSizeX); - - if (sx > SourceRect->right) break; - - color = XLATEOBJ_iXlate(ColorTranslation, DIB_4BPP_GetPixel(SourceSurf, sx, sy)); - - for (count=DesY;count<saveY;count++) - DIB_16BPP_PutPixel(DestSurf, DesX, count, color); - } - } - } - } - break; - + /* FIXME : MaskOrigin, BrushOrigin, ClipRegion, Mode ? */ + /* This is a reference implementation, it hasn't been optimized for speed */ + + for (DesY=DestRect->top; DesY<DestRect->bottom; DesY++) + { + if (DesSizeY>SrcSizeY) + sy = SourceRect->top + ((DesY - DestRect->top) / zoomY); + else + sy = SourceRect->top + ((DesY - DestRect->top) * zoomY); + + if (sy > SourceRect->bottom) + sy = SourceRect->bottom; + + for (DesX=DestRect->left; DesX<DestRect->right; DesX++) + { + if (DesSizeX>SrcSizeX) + sx = SourceRect->left + ((DesX - DestRect->left) / zoomX); + else + sx = SourceRect->left + ((DesX - DestRect->left) * zoomX); + + if (sx > SourceRect->right) + sx = SourceRect->right; + + color = DIB_4BPP_GetPixel(SourceSurf, sx, sy); + DIB_16BPP_PutPixel(DestSurf, DesX, DesY, XLATEOBJ_iXlate(ColorTranslation, color)); + } + } + break; + case BMF_8BPP: - /* FIXME : MaskOrigin, BrushOrigin, ClipRegion, Mode ? */ - /* This is a reference implementation, it hasn't been optimized for speed */ - if (zoomX>1) - { - /* Draw one Hline on X - Led to the Des Zoom In*/ - if (DesSizeX>SrcSizeX) - { - for (DesY=DestRect->bottom-zoomY; DesY>=DestRect->top; DesY-=zoomY) - { - if (DesIsBiggerY) - sy = (int) ((ULONG) SrcSizeY * (ULONG) DesY) / ((ULONG) DesSizeY); - else - sy = (int) ((ULONG) DesSizeY * (ULONG) DesY) / ((ULONG) SrcSizeY); - - if (sy > SourceRect->bottom) break; + /* FIXME : MaskOrigin, BrushOrigin, ClipRegion, Mode ? */ + /* This is a reference implementation, it hasn't been optimized for speed */ + + for (DesY=DestRect->top; DesY<DestRect->bottom; DesY++) + { + if (DesSizeY>SrcSizeY) + sy = SourceRect->top + ((DesY - DestRect->top) / zoomY); + else + sy = SourceRect->top + ((DesY - DestRect->top) * zoomY); + + if (sy > SourceRect->bottom) + sy = SourceRect->bottom; + + for (DesX=DestRect->left; DesX<DestRect->right; DesX++) + { + if (DesSizeX>SrcSizeX) + sx = SourceRect->left + ((DesX - DestRect->left) / zoomX); + else + sx = SourceRect->left + ((DesX - DestRect->left) * zoomX); + + if (sx > SourceRect->right) + sx = SourceRect->right; + + color = DIB_8BPP_GetPixel(SourceSurf, sx, sy); + DIB_16BPP_PutPixel(DestSurf, DesX, DesY, XLATEOBJ_iXlate(ColorTranslation, color)); + } + } + break; - saveY = DesY+zoomY; + case BMF_24BPP: + /* FIXME : MaskOrigin, BrushOrigin, ClipRegion, Mode ? */ + /* This is a reference implementation, it hasn't been optimized for speed */ + + for (DesY=DestRect->top; DesY<DestRect->bottom; DesY++) + { + if (DesSizeY>SrcSizeY) + sy = SourceRect->top + ((DesY - DestRect->top) / zoomY); + else + sy = SourceRect->top + ((DesY - DestRect->top) * zoomY); + + if (sy > SourceRect->bottom) + sy = SourceRect->bottom; + + for (DesX=DestRect->left; DesX<DestRect->right; DesX++) + { + if (DesSizeX>SrcSizeX) + sx = SourceRect->left + ((DesX - DestRect->left) / zoomX); + else + sx = SourceRect->left + ((DesX - DestRect->left) * zoomX); + + if (sx > SourceRect->right) + sx = SourceRect->right; + + color = DIB_24BPP_GetPixel(SourceSurf, sx, sy); + DIB_16BPP_PutPixel(DestSurf, DesX, DesY, XLATEOBJ_iXlate(ColorTranslation, color)); + } + } + break; - for (DesX=DestRect->right-zoomX; DesX>=DestRect->left; DesX-=zoomX) - { - sx = (int) ((ULONG) SrcSizeX * (ULONG) DesX) / ((ULONG) DesSizeX); - - if (sx > SourceRect->right) break; - - color = XLATEOBJ_iXlate(ColorTranslation, DIB_8BPP_GetPixel(SourceSurf, sx, sy)); - - saveX = DesX + zoomX; - for (count=DesY;count<saveY;count++) - DIB_16BPP_HLine(DestSurf, DesX, saveX, count, color); - } - } - } - else - { - /* Draw one Hline on X - Led to the Des Zoom Out*/ + case BMF_32BPP: + /* FIXME : MaskOrigin, BrushOrigin, ClipRegion, Mode ? */ + /* This is a reference implementation, it hasn't been optimized for speed */ + + for (DesY=DestRect->top; DesY<DestRect->bottom; DesY++) + { + if (DesSizeY>SrcSizeY) + sy = SourceRect->top + ((DesY - DestRect->top) / zoomY); + else + sy = SourceRect->top + ((DesY - DestRect->top) * zoomY); + + if (sy > SourceRect->bottom) + sy = SourceRect->bottom; + + for (DesX=DestRect->left; DesX<DestRect->right; DesX++) + { + if (DesSizeX>SrcSizeX) + sx = SourceRect->left + ((DesX - DestRect->left) / zoomX); + else + sx = SourceRect->left + ((DesX - DestRect->left) * zoomX); + + if (sx > SourceRect->right) + sx = SourceRect->right; + + color = DIB_32BPP_GetPixel(SourceSurf, sx, sy); + DIB_16BPP_PutPixel(DestSurf, DesX, DesY, XLATEOBJ_iXlate(ColorTranslation, color)); + } + } + break; - for (DesY=DestRect->bottom-zoomY; DesY>=DestRect->top; DesY-=zoomY) - { - if (DesIsBiggerY) - sy = (int) ((ULONG) SrcSizeY * (ULONG) DesY) / ((ULONG) DesSizeY); - else - sy = (int) ((ULONG) DesSizeY * (ULONG) DesY) / ((ULONG) SrcSizeY); - - if (sy > SourceRect->bottom) break; - - saveY = DesY+zoomY; - - for (DesX=DestRect->right-zoomX; DesX>=DestRect->left; DesX-=zoomX) - { - sx = (int) ((ULONG) DesSizeX * (ULONG) DesX) / ((ULONG) SrcSizeX); - - if (sx > SourceRect->right) break; - - color = XLATEOBJ_iXlate(ColorTranslation, DIB_8BPP_GetPixel(SourceSurf, sx, sy)); - - saveX = DesX + zoomX; - for (count=DesY;count<saveY;count++) - DIB_16BPP_HLine(DestSurf, DesX, saveX, count, color); - } - } - } - } - - else - { - - if (DesSizeX>SrcSizeX) - { - /* Draw one pixel on X - Led to the Des Zoom In*/ - for (DesY=DestRect->bottom-zoomY; DesY>=DestRect->top; DesY-=zoomY) - { - if (DesIsBiggerY) - sy = (int) ((ULONG) SrcSizeY * (ULONG) DesY) / ((ULONG) DesSizeY); - else - sy = (int) ((ULONG) DesSizeY * (ULONG) DesY) / ((ULONG) SrcSizeY); - - if (sy > SourceRect->bottom) break; - - saveY = DesY+zoomY; - - for (DesX=DestRect->right-zoomX; DesX>=DestRect->left; DesX-=zoomX) - { - sx = (int) ((ULONG) SrcSizeX * (ULONG) DesX) / ((ULONG) DesSizeX); - - if (sx > SourceRect->right) break; - - color = XLATEOBJ_iXlate(ColorTranslation, DIB_8BPP_GetPixel(SourceSurf, sx, sy)); - - for (count=DesY;count<saveY;count++) - DIB_16BPP_PutPixel(DestSurf, DesX, count, color); - } - } - } - else - { - /* Draw one pixel on X - Led to the Des Zoom Out*/ - for (DesY=DestRect->bottom-zoomY; DesY>=DestRect->top; DesY-=zoomY) - { - if (DesIsBiggerY) - sy = (int) ((ULONG) SrcSizeY * (ULONG) DesY) / ((ULONG) DesSizeY); - else - sy = (int) ((ULONG) DesSizeY * (ULONG) DesY) / ((ULONG) SrcSizeY); - - if (sy > SourceRect->bottom) break; - - saveY = DesY+zoomY; - - for (DesX=DestRect->right-zoomX; DesX>=DestRect->left; DesX-=zoomX) - { - sx = (int) ((ULONG) DesSizeX * (ULONG) DesX) / ((ULONG) SrcSizeX); - - if (sx > SourceRect->right) break; - - color = XLATEOBJ_iXlate(ColorTranslation, DIB_8BPP_GetPixel(SourceSurf, sx, sy)); - - for (count=DesY;count<saveY;count++) - DIB_16BPP_PutPixel(DestSurf, DesX, count, color); - } - } - } - } - break; - case BMF_16BPP: return ScaleRectAvg16(DestSurf, SourceSurf, DestRect, SourceRect, MaskOrigin, BrushOrigin, ClipRegion, ColorTranslation, Mode); break; - case BMF_24BPP: - /* FIXME : MaskOrigin, BrushOrigin, ClipRegion, Mode ? */ - /* This is a reference implementation, it hasn't been optimized for speed */ - if (zoomX>1) - { - /* Draw one Hline on X - Led to the Des Zoom In*/ - if (DesSizeX>SrcSizeX) - { - for (DesY=DestRect->bottom-zoomY; DesY>=DestRect->top; DesY-=zoomY) - { - if (DesIsBiggerY) - sy = (int) ((ULONG) SrcSizeY * (ULONG) DesY) / ((ULONG) DesSizeY); - else - sy = (int) ((ULONG) DesSizeY * (ULONG) DesY) / ((ULONG) SrcSizeY); - - if (sy > SourceRect->bottom) break; - - saveY = DesY+zoomY; - - for (DesX=DestRect->right-zoomX; DesX>=DestRect->left; DesX-=zoomX) - { - sx = (int) ((ULONG) SrcSizeX * (ULONG) DesX) / ((ULONG) DesSizeX); - - if (sx > SourceRect->right) break; - - color = XLATEOBJ_iXlate(ColorTranslation, DIB_24BPP_GetPixel(SourceSurf, sx, sy)); - - saveX = DesX + zoomX; - for (count=DesY;count<saveY;count++) - DIB_16BPP_HLine(DestSurf, DesX, saveX, count, color); - } - } - } - else - { - /* Draw one Hline on X - Led to the Des Zoom Out*/ - - for (DesY=DestRect->bottom-zoomY; DesY>=DestRect->top; DesY-=zoomY) - { - if (DesIsBiggerY) - sy = (int) ((ULONG) SrcSizeY * (ULONG) DesY) / ((ULONG) DesSizeY); - else - sy = (int) ((ULONG) DesSizeY * (ULONG) DesY) / ((ULONG) SrcSizeY); - - if (sy > SourceRect->bottom) break; - - saveY = DesY+zoomY; - - for (DesX=DestRect->right-zoomX; DesX>=DestRect->left; DesX-=zoomX) - { - sx = (int) ((ULONG) DesSizeX * (ULONG) DesX) / ((ULONG) SrcSizeX); - - if (sx > SourceRect->right) break; - - color = XLATEOBJ_iXlate(ColorTranslation, DIB_24BPP_GetPixel(SourceSurf, sx, sy)); - - saveX = DesX + zoomX; - for (count=DesY;count<saveY;count++) - DIB_16BPP_HLine(DestSurf, DesX, saveX, count, color); - } - } - } - } - - else - { - - if (DesSizeX>SrcSizeX) - { - /* Draw one pixel on X - Led to the Des Zoom In*/ - for (DesY=DestRect->bottom-zoomY; DesY>=DestRect->top; DesY-=zoomY) - { - if (DesIsBiggerY) - sy = (int) ((ULONG) SrcSizeY * (ULONG) DesY) / ((ULONG) DesSizeY); - else - sy = (int) ((ULONG) DesSizeY * (ULONG) DesY) / ((ULONG) SrcSizeY); - - if (sy > SourceRect->bottom) break; - - saveY = DesY+zoomY; - - for (DesX=DestRect->right-zoomX; DesX>=DestRect->left; DesX-=zoomX) - { - sx = (int) ((ULONG) SrcSizeX * (ULONG) DesX) / ((ULONG) DesSizeX); - - if (sx > SourceRect->right) break; - - color = XLATEOBJ_iXlate(ColorTranslation, DIB_24BPP_GetPixel(SourceSurf, sx, sy)); - - for (count=DesY;count<saveY;count++) - DIB_16BPP_PutPixel(DestSurf, DesX, count, color); - } - } - } - else - { - /* Draw one pixel on X - Led to the Des Zoom Out*/ - for (DesY=DestRect->bottom-zoomY; DesY>=DestRect->top; DesY-=zoomY) - { - if (DesIsBiggerY) - sy = (int) ((ULONG) SrcSizeY * (ULONG) DesY) / ((ULONG) DesSizeY); - else - sy = (int) ((ULONG) DesSizeY * (ULONG) DesY) / ((ULONG) SrcSizeY); - - if (sy > SourceRect->bottom) break; - - saveY = DesY+zoomY; - - for (DesX=DestRect->right-zoomX; DesX>=DestRect->left; DesX-=zoomX) - { - sx = (int) ((ULONG) DesSizeX * (ULONG) DesX) / ((ULONG) SrcSizeX); - - if (sx > SourceRect->right) break; - - color = XLATEOBJ_iXlate(ColorTranslation, DIB_24BPP_GetPixel(SourceSurf, sx, sy)); - - for (count=DesY;count<saveY;count++) - DIB_16BPP_PutPixel(DestSurf, DesX, count, color); - } - } - } - } - break; - - case BMF_32BPP: - /* FIXME : MaskOrigin, BrushOrigin, ClipRegion, Mode ? */ - /* This is a reference implementation, it hasn't been optimized for speed */ - if (zoomX>1) - { - /* Draw one Hline on X - Led to the Des Zoom In*/ - if (DesSizeX>SrcSizeX) - { - for (DesY=DestRect->bottom-zoomY; DesY>=DestRect->top; DesY-=zoomY) - { - if (DesIsBiggerY) - sy = (int) ((ULONG) SrcSizeY * (ULONG) DesY) / ((ULONG) DesSizeY); - else - sy = (int) ((ULONG) DesSizeY * (ULONG) DesY) / ((ULONG) SrcSizeY); - - if (sy > SourceRect->bottom) break; - - saveY = DesY+zoomY; - - for (DesX=DestRect->right-zoomX; DesX>=DestRect->left; DesX-=zoomX) - { - sx = (int) ((ULONG) SrcSizeX * (ULONG) DesX) / ((ULONG) DesSizeX); - - if (sx > SourceRect->right) break; - - color = XLATEOBJ_iXlate(ColorTranslation, DIB_32BPP_GetPixel(SourceSurf, sx, sy)); - - saveX = DesX + zoomX; - for (count=DesY;count<saveY;count++) - DIB_16BPP_HLine(DestSurf, DesX, saveX, count, color); - } - } - } - else - { - /* Draw one Hline on X - Led to the Des Zoom Out*/ - - for (DesY=DestRect->bottom-zoomY; DesY>=DestRect->top; DesY-=zoomY) - { - if (DesIsBiggerY) - sy = (int) ((ULONG) SrcSizeY * (ULONG) DesY) / ((ULONG) DesSizeY); - else - sy = (int) ((ULONG) DesSizeY * (ULONG) DesY) / ((ULONG) SrcSizeY); - - if (sy > SourceRect->bottom) break; - - saveY = DesY+zoomY; - - for (DesX=DestRect->right-zoomX; DesX>=DestRect->left; DesX-=zoomX) - { - sx = (int) ((ULONG) DesSizeX * (ULONG) DesX) / ((ULONG) SrcSizeX); - - if (sx > SourceRect->right) break; - - color = XLATEOBJ_iXlate(ColorTranslation, DIB_32BPP_GetPixel(SourceSurf, sx, sy)); - - saveX = DesX + zoomX; - for (count=DesY;count<saveY;count++) - DIB_16BPP_HLine(DestSurf, DesX, saveX, count, color); - } - } - } - } - - else - { - - if (DesSizeX>SrcSizeX) - { - /* Draw one pixel on X - Led to the Des Zoom In*/ - for (DesY=DestRect->bottom-zoomY; DesY>=DestRect->top; DesY-=zoomY) - { - if (DesIsBiggerY) - sy = (int) ((ULONG) SrcSizeY * (ULONG) DesY) / ((ULONG) DesSizeY); - else - sy = (int) ((ULONG) DesSizeY * (ULONG) DesY) / ((ULONG) SrcSizeY); - - if (sy > SourceRect->bottom) break; - - saveY = DesY+zoomY; - - for (DesX=DestRect->right-zoomX; DesX>=DestRect->left; DesX-=zoomX) - { - sx = (int) ((ULONG) SrcSizeX * (ULONG) DesX) / ((ULONG) DesSizeX); - - if (sx > SourceRect->right) break; - - color = XLATEOBJ_iXlate(ColorTranslation, DIB_32BPP_GetPixel(SourceSurf, sx, sy)); - - for (count=DesY;count<saveY;count++) - DIB_16BPP_PutPixel(DestSurf, DesX, count, color); - } - } - } - else - { - /* Draw one pixel on X - Led to the Des Zoom Out*/ - for (DesY=DestRect->bottom-zoomY; DesY>=DestRect->top; DesY-=zoomY) - { - if (DesIsBiggerY) - sy = (int) ((ULONG) SrcSizeY * (ULONG) DesY) / ((ULONG) DesSizeY); - else - sy = (int) ((ULONG) DesSizeY * (ULONG) DesY) / ((ULONG) SrcSizeY); - - if (sy > SourceRect->bottom) break; - - saveY = DesY+zoomY; - - for (DesX=DestRect->right-zoomX; DesX>=DestRect->left; DesX-=zoomX) - { - sx = (int) ((ULONG) DesSizeX * (ULONG) DesX) / ((ULONG) SrcSizeX); - - if (sx > SourceRect->right) break; - - color = XLATEOBJ_iXlate(ColorTranslation, DIB_32BPP_GetPixel(SourceSurf, sx, sy)); - - for (count=DesY;count<saveY;count++) - DIB_16BPP_PutPixel(DestSurf, DesX, count, color); - } - } - } - } - break; - - break; - default: DPRINT1("DIB_16BPP_StretchBlt: Unhandled Source BPP: %u\n", BitsPerFormat(SourceSurf->iBitmapFormat)); return FALSE;

1 0

[hbirr] 20533: Implemented the 'red zone check' for the non paged pool.
by hbirr＠svn.reactos.org 02 Jan '06

02 Jan '06

Implemented the 'red zone check' for the non paged pool. Modified: trunk/reactos/ntoskrnl/mm/npool.c _____ Modified: trunk/reactos/ntoskrnl/mm/npool.c --- trunk/reactos/ntoskrnl/mm/npool.c 2006-01-02 18:34:31 UTC (rev 20532) +++ trunk/reactos/ntoskrnl/mm/npool.c 2006-01-02 18:45:52 UTC (rev 20533) @@ -37,6 +37,15 @@ #endif /* __GNUC__ */ #endif +VOID MmPrintMemoryStatistic(VOID); + +#define NPOOL_REDZONE_CHECK /* check the block at deallocation */ +// #define NPOOL_REDZONE_CHECK_FULL /* check all blocks at each allocation/deallocation */ +#define NPOOL_REDZONE_SIZE 8 /* number of red zone bytes */ +#define NPOOL_REDZONE_LOVALUE 0x87 +#define NPOOL_REDZONE_HIVALUE 0xA5 + + /* avl types ****************************************************************/ /* FIXME: @@ -73,6 +82,9 @@ ULONG Tag; PVOID Caller; LIST_ENTRY TagListEntry; +#if defined(NPOOL_REDZONE_CHECK) || defined(NPOOL_REDZONE_CHECK_FULL) + ULONG UserSize; +#endif BOOLEAN Dumped; } HDR_USED, *PHDR_USED; @@ -83,9 +95,13 @@ } HDR_FREE, *PHDR_FREE; #define HDR_FREE_SIZE ROUND_UP(sizeof(HDR_FREE), MM_POOL_ALIGNMENT) + +#if defined(NPOOL_REDZONE_CHECK) || #defined(NPOOL_REDZONE_CHECK_FULL) +#define HDR_USED_SIZE ROUND_UP(sizeof(HDR_USED) + NPOOL_REDZONE_SIZE, MM_POOL_ALIGNMENT) +#else #define HDR_USED_SIZE ROUND_UP(sizeof(HDR_USED), MM_POOL_ALIGNMENT) +#endif - /* GLOBALS *****************************************************************/ extern PVOID MiNonPagedPoolStart; @@ -131,15 +147,6 @@ /* Total quota for Non Paged Pool */ ULONG MmTotalNonPagedPoolQuota = 0; -/* - * Allocate a range of memory in the nonpaged pool - */ -PVOID -MiAllocNonPagedPoolRegion(unsigned int nr_pages); - -VOID -MiFreeNonPagedPoolRegion(PVOID Addr, ULONG Count, BOOLEAN Free); - #ifdef TAG_STATISTICS_TRACKING #define TAG_HASH_TABLE_SIZE (1024) static LIST_ENTRY tag_hash_table[TAG_HASH_TABLE_SIZE]; @@ -772,9 +779,11 @@ } else { - DbgPrint("Tag %x Blocks %d Total Size %d Average Size %d\n", + DbgPrint("Tag %x Blocks %d Total Size %d Average Size %d ", CurrentTag, CurrentNrBlocks, CurrentSize, CurrentSize / CurrentNrBlocks); + KeRosPrintAddress((PVOID)CurrentTag); + DbgPrint("\n"); } } #endif /* defined(TAG_STATISTICS_TRACKING) */ @@ -1458,6 +1467,71 @@ return blk->Tag; } +#if defined(NPOOL_REDZONE_CHECK) || defined(NPOOL_REDZONE_CHECK_FULL) +void check_redzone_header(HDR_USED* hdr) +{ + PBYTE LoZone = (PBYTE)((ULONG_PTR)hdr + HDR_USED_SIZE - NPOOL_REDZONE_SIZE); + PBYTE HiZone = (PBYTE)((ULONG_PTR)hdr + HDR_USED_SIZE + hdr->UserSize); + BOOL LoOK = TRUE; + BOOL HiOK = TRUE; + ULONG i; + CHAR c[5]; + + for (i = 0; i < NPOOL_REDZONE_SIZE; i++) + { + if (LoZone[i] != NPOOL_REDZONE_LOVALUE) + { + LoOK = FALSE; + } + if (HiZone[i] != NPOOL_REDZONE_HIVALUE) + { + HiOK = FALSE; + } + } + + if (!HiOK || !LoOK) + { + c[0] = (CHAR)((hdr->Tag >> 24) & 0xFF); + c[1] = (CHAR)((hdr->Tag >> 16) & 0xFF); + c[2] = (CHAR)((hdr->Tag >> 8) & 0xFF); + c[3] = (CHAR)(hdr->Tag & 0xFF); + c[4] = 0; + + if (!isprint(c[0]) || !isprint(c[1]) || !isprint(c[2]) || !isprint(c[3])) + { + c[0] = 0; + } + + if (!LoOK) + { + DbgPrint("NPOOL: Low-side redzone overwritten, Block %x, Size %d, Tag %x(%s), Caller %x\n", + (ULONG_PTR)hdr + HDR_USED_SIZE, hdr->UserSize, hdr->Tag, c, hdr->Caller); + } + if (!HiOK) + { + DbgPrint("NPPOL: High-side redzone overwritten, Block %x, Size %d, Tag %x(%s), Caller %x\n", + (ULONG_PTR)hdr + HDR_USED_SIZE, hdr->UserSize, hdr->Tag, c, hdr->Caller); + } + KEBUGCHECK(0); + } +} +#endif + +#ifdef NPOOL_REDZONE_CHECK_FULL +void check_redzone_list(void) +{ + PLIST_ENTRY current_entry; + + current_entry = UsedBlockListHead.Flink; + while (current_entry != &UsedBlockListHead) + { + check_redzone_header(CONTAINING_RECORD(current_entry, HDR_USED, ListEntry)); + current_entry = current_entry->Flink; + } +} +#endif + + VOID STDCALL ExFreeNonPagedPool (PVOID block) /* * FUNCTION: Releases previously allocated memory @@ -1494,9 +1568,18 @@ KEBUGCHECK(0); return; } + +#if defined(NPOOL_REDZONE_CHECK) || defined(NPOOL_REDZONE_CHECK_FULL) + check_redzone_header(blk); +#endif + +#ifdef NPOOL_REDZONE_CHECK_FULL + check_redzone_list(); +#endif + memset(block, 0xcc, blk->hdr.Size - HDR_USED_SIZE); + #ifdef TAG_STATISTICS_TRACKING - MiRemoveFromTagHashTable(blk); #endif @@ -1510,6 +1593,9 @@ PVOID STDCALL ExAllocateNonPagedPoolWithTag(POOL_TYPE Type, ULONG Size, ULONG Tag, PVOID Caller) { +#if defined(NPOOL_REDZONE_CHECK) || defined(NPOOL_REDZONE_CHECK_FULL) + ULONG UserSize; +#endif PVOID block; HDR_USED* best = NULL; KIRQL oldIrql; @@ -1520,9 +1606,13 @@ KeAcquireSpinLock(&MmNpoolLock, &oldIrql); +#ifdef NPOOL_REDZONE_CHECK_FULL + check_redzone_list(); +#endif + VALIDATE_POOL; -#if 0 +#if 1 /* after some allocations print the npaged pool stats */ #ifdef TAG_STATISTICS_TRACKING @@ -1531,6 +1621,7 @@ if (counter++ % 100000 == 0) { MiDebugDumpNonPagedPoolStats(FALSE); + MmPrintMemoryStatistic(); } } #endif @@ -1545,7 +1636,12 @@ return(NULL); } /* Make the size dword alligned, this makes the block dword alligned */ +#if defined(NPOOL_REDZONE_CHECK) || defined(NPOOL_REDZONE_CHECK_FULL) + UserSize = Size; + Size = ROUND_UP(Size + NPOOL_REDZONE_SIZE, MM_POOL_ALIGNMENT); +#else Size = ROUND_UP(Size, MM_POOL_ALIGNMENT); +#endif if (Size >= PAGE_SIZE) { @@ -1566,12 +1662,19 @@ KeReleaseSpinLock(&MmNpoolLock, oldIrql); DPRINT1("Trying to allocate %lu bytes from nonpaged pool - nothing suitable found, returning NULL\n", Size ); + KeRosDumpStackFrames(NULL, 10); return NULL; } best->Tag = Tag; best->Caller = Caller; best->Dumped = FALSE; best->TagListEntry.Flink = best->TagListEntry.Blink = NULL; +#if defined(NPOOL_REDZONE_CHECK) || defined(NPOOL_REDZONE_CHECK_FULL) + best->UserSize = UserSize; + memset((PVOID)((ULONG_PTR)best + HDR_USED_SIZE - NPOOL_REDZONE_SIZE), NPOOL_REDZONE_LOVALUE, NPOOL_REDZONE_SIZE); + memset((PVOID)((ULONG_PTR)best + HDR_USED_SIZE + UserSize), NPOOL_REDZONE_HIVALUE, NPOOL_REDZONE_SIZE); +#endif + #ifdef TAG_STATISTICS_TRACKING MiAddToTagHashTable(best); @@ -1607,7 +1710,13 @@ FreeBlockListRoot = NULL; MiNonPagedPoolAllocMap = (PVOID)((ULONG_PTR)MiNonPagedPoolStart + PAGE_SIZE); +#if defined(NPOOL_REDZONE_CHECK) || defined(NPOOL_REDZONE_CHECK_FULL) + MiNonPagedPoolNrOfPages = ROUND_UP(MiNonPagedPoolLength / PAGE_SIZE, 32) / 8; + MiNonPagedPoolNrOfPages = ROUND_UP(MiNonPagedPoolNrOfPages + NPOOL_REDZONE_SIZE, MM_POOL_ALIGNMENT); + MiNonPagedPoolNrOfPages = PAGE_ROUND_UP(MiNonPagedPoolNrOfPages + HDR_FREE_SIZE) + PAGE_SIZE; +#else MiNonPagedPoolNrOfPages = PAGE_ROUND_UP(ROUND_UP(MiNonPagedPoolLength / PAGE_SIZE, 32) / 8 + HDR_FREE_SIZE) + PAGE_SIZE; +#endif MiNonPagedPoolNrOfPages /= PAGE_SIZE; Address = MiNonPagedPoolStart; @@ -1649,10 +1758,17 @@ /* the second block contains the non paged pool bitmap */ used = (HDR_USED*)((ULONG_PTR)free + free->hdr.Size); used->hdr.Magic = BLOCK_HDR_USED_MAGIC; +#if defined(NPOOL_REDZONE_CHECK) || defined(NPOOL_REDZONE_CHECK_FULL) + used->UserSize = ROUND_UP(MiNonPagedPoolLength / PAGE_SIZE, 32) / 8; + used->hdr.Size = ROUND_UP(used->UserSize + NPOOL_REDZONE_SIZE, MM_POOL_ALIGNMENT) + HDR_USED_SIZE; + memset((PVOID)((ULONG_PTR)used + HDR_USED_SIZE - NPOOL_REDZONE_SIZE), NPOOL_REDZONE_LOVALUE, NPOOL_REDZONE_SIZE); + memset((PVOID)((ULONG_PTR)used + HDR_USED_SIZE + used->UserSize), NPOOL_REDZONE_HIVALUE, NPOOL_REDZONE_SIZE); +#else used->hdr.Size = ROUND_UP(MiNonPagedPoolLength / PAGE_SIZE, 32) / 8 + HDR_USED_SIZE; +#endif used->hdr.previous = &free->hdr; used->Tag = 0xffffffff; - used->Caller = 0; + used->Caller = (PVOID)MiInitializeNonPagedPool; used->Dumped = FALSE; add_to_used_list(used); #ifdef TAG_STATISTICS_TRACKING @@ -1664,7 +1780,7 @@ free->hdr.Magic = BLOCK_HDR_FREE_MAGIC; free->hdr.Size = MiNonPagedPoolLength - ((ULONG_PTR)free - (ULONG_PTR)MiNonPagedPoolStart); free->hdr.previous = &used->hdr; - memset((PVOID)((ULONG_PTR)free + HDR_FREE_SIZE), 0x0cc, (ULONG_PTR)Address - (ULONG_PTR)free - HDR_FREE_SIZE); + memset((PVOID)((ULONG_PTR)free + HDR_FREE_SIZE), 0xcc, (ULONG_PTR)Address - (ULONG_PTR)free - HDR_FREE_SIZE); add_to_free_list(free); }

1 0

[hbirr] 20532: Simplified the definition of the interrupt handlers for non smp machines.
by hbirr＠svn.reactos.org 02 Jan '06

02 Jan '06

Simplified the definition of the interrupt handlers for non smp machines. Modified: trunk/reactos/ntoskrnl/ke/i386/irqhand.s _____ Modified: trunk/reactos/ntoskrnl/ke/i386/irqhand.s --- trunk/reactos/ntoskrnl/ke/i386/irqhand.s 2006-01-02 18:03:19 UTC (rev 20531) +++ trunk/reactos/ntoskrnl/ke/i386/irqhand.s 2006-01-02 18:34:31 UTC (rev 20532) @@ -1,6 +1,31 @@ #include <ndk/asm.h> #include <../hal/halx86/include/halirq.h> +_KiCommonInterrupt: + cld + pushl %ds + pushl %es + pushl %fs + pushl %gs + pushl $0xceafbeef + movl $KGDT_R0_DATA,%eax + movl %eax,%ds + movl %eax,%es + movl %eax,%gs + movl $KGDT_R0_PCR,%eax + movl %eax,%fs + pushl %esp + pushl %ebx + call _KiInterruptDispatch + addl $0xC, %esp + popl %gs + popl %fs + popl %es + popl %ds + popa + iret + + #ifdef CONFIG_SMP #define BUILD_INTERRUPT_HANDLER(intnum) \ @@ -21,31 +46,6 @@ B(x,8) B(x,9) B(x,A) B(x,B) \ B(x,C) B(x,D) B(x,E) B(x,F) -_KiCommonInterrupt: - cld - pushl %ds - pushl %es - pushl %fs - pushl %gs - movl $0xceafbeef,%eax - pushl %eax - movl $KGDT_R0_DATA,%eax - movl %eax,%ds - movl %eax,%es - movl %eax,%gs - movl $KGDT_R0_PCR,%eax - movl %eax,%fs - pushl %esp - pushl %ebx - call _KiInterruptDispatch - addl $0xC, %esp - popl %gs - popl %fs - popl %es - popl %ds - popa - iret - B16(3) B16(4) B16(5) B16(6) B16(7) B16(8) B16(9) B16(A) B16(B) B16(C) B16(D) B16(E) @@ -53,441 +53,30 @@ #undef B #undef B16 +#undef BUILD_INTERRUPT_HANDLER #else /* CONFIG_SMP */ -.global _irq_handler_0 -_irq_handler_0: - cld - pusha - pushl %ds - pushl %es - pushl %fs - pushl %gs - movl $0xceafbeef,%eax - pushl %eax - movw $KGDT_R0_DATA,%ax - movw %ax,%ds - movw %ax,%es - movw %ax,%gs - movl $KGDT_R0_PCR, %eax - movl %eax, %fs - pushl %esp - pushl $(IRQ_BASE + 0) - call _KiInterruptDispatch - addl $0xC, %esp - popl %gs - popl %fs - popl %es - popl %ds - popa - iret +#define BUILD_INTERRUPT_HANDLER(intnum) \ + .global _irq_handler_##intnum; \ + _irq_handler_##intnum:; \ + pusha; \ + movl $(##intnum + IRQ_BASE), %ebx; \ + jmp _KiCommonInterrupt; -.global _irq_handler_1 -_irq_handler_1: - cld - pusha - pushl %ds - pushl %es - pushl %fs - pushl %gs - movl $0xceafbeef,%eax - pushl %eax - movw $KGDT_R0_DATA,%ax - movw %ax,%ds - movw %ax,%es - movw %ax,%gs - movl $KGDT_R0_PCR, %eax - movl %eax, %fs - pushl %esp - pushl $(IRQ_BASE + 1) - call _KiInterruptDispatch - addl $0xC, %esp - popl %gs - popl %fs - popl %es - popl %ds - popa - iret +/* Interrupt handlers and declarations */ -.global _irq_handler_2 -_irq_handler_2: - cld - pusha - pushl %ds - pushl %es - pushl %fs - pushl %gs - movl $0xceafbeef,%eax - pushl %eax - movw $KGDT_R0_DATA,%ax - movw %ax,%ds - movw %ax,%es - movw %ax,%gs - movl $KGDT_R0_PCR, %eax - movl %eax, %fs - pushl %esp - pushl $(IRQ_BASE + 2) - call _KiInterruptDispatch - addl $0xC, %esp - popl %gs - popl %fs - popl %es - popl %ds - popa - iret +#define B(x) \ + BUILD_INTERRUPT_HANDLER(x) -.global _irq_handler_3 -_irq_handler_3: - cld - pusha - pushl %ds - pushl %es - pushl %fs - pushl %gs - movl $0xceafbeef,%eax - pushl %eax - movw $KGDT_R0_DATA,%ax - movw %ax,%ds - movw %ax,%es - movw %ax,%gs - movl $KGDT_R0_PCR, %eax - movl %eax, %fs - pushl %esp - pushl $(IRQ_BASE + 3) - call _KiInterruptDispatch - addl $0xC, %esp - popl %gs - popl %fs - popl %es - popl %ds - popa - iret +B(0) B(1) B(2) B(3) +B(4) B(5) B(6) B(7) +B(8) B(9) B(10) B(11) +B(12) B(13) B(14) B(15) -.global _irq_handler_4 -_irq_handler_4: - cld - pusha - pushl %ds - pushl %es - pushl %fs - pushl %gs - movl $0xceafbeef,%eax - pushl %eax - movw $KGDT_R0_DATA,%ax - movw %ax,%ds - movw %ax,%es - movw %ax,%gs - movl $KGDT_R0_PCR, %eax - movl %eax, %fs - pushl %esp - pushl $(IRQ_BASE + 4) - call _KiInterruptDispatch - addl $0xC, %esp - popl %gs - popl %fs - popl %es - popl %ds - popa - iret +#undef B +#undef BUILD_INTERRUPT_HANDLER -.global _irq_handler_5 -_irq_handler_5: - cld - pusha - pushl %ds - pushl %es - pushl %fs - pushl %gs - movl $0xceafbeef,%eax - pushl %eax - movw $KGDT_R0_DATA,%ax - movw %ax,%ds - movw %ax,%es - movw %ax,%gs - movl $KGDT_R0_PCR, %eax - movl %eax, %fs - pushl %esp - pushl $(IRQ_BASE + 5) - call _KiInterruptDispatch - addl $0xC, %esp - popl %gs - popl %fs - popl %es - popl %ds - popa - iret - -.global _irq_handler_6 -_irq_handler_6: - cld - pusha - pushl %ds - pushl %es - pushl %fs - pushl %gs - movl $0xceafbeef,%eax - pushl %eax - movw $KGDT_R0_DATA,%ax - movw %ax,%ds - movw %ax,%es - movw %ax,%gs - movl $KGDT_R0_PCR, %eax - movl %eax, %fs - pushl %esp - pushl $(IRQ_BASE + 6) - call _KiInterruptDispatch - addl $0xC, %esp - popl %gs - popl %fs - popl %es - popl %ds - popa - iret - -.global _irq_handler_7 -_irq_handler_7: - cld - pusha - pushl %ds - pushl %es - pushl %fs - pushl %gs - movl $0xceafbeef,%eax - pushl %eax - movw $KGDT_R0_DATA,%ax - movw %ax,%ds - movw %ax,%es - movw %ax,%gs - movl $KGDT_R0_PCR, %eax - movl %eax, %fs - pushl %esp - pushl $(IRQ_BASE + 7) - call _KiInterruptDispatch - addl $0xC, %esp - popl %gs - popl %fs - popl %es - popl %ds - popa - iret - -.global _irq_handler_8 -_irq_handler_8: - cld - pusha - pushl %ds - pushl %es - pushl %fs - pushl %gs - movl $0xceafbeef,%eax - pushl %eax - movw $KGDT_R0_DATA,%ax - movw %ax,%ds - movw %ax,%es - movw %ax,%gs - movl $KGDT_R0_PCR, %eax - movl %eax, %fs - pushl %esp - pushl $(IRQ_BASE + 8) - call _KiInterruptDispatch - addl $0xC, %esp - popl %gs - popl %fs - popl %es - popl %ds - popa - iret - -.global _irq_handler_9 -_irq_handler_9: - cld - pusha - pushl %ds - pushl %es - pushl %fs - pushl %gs - movl $0xceafbeef,%eax - pushl %eax - movw $KGDT_R0_DATA,%ax - movw %ax,%ds - movw %ax,%es - movw %ax,%gs - movl $KGDT_R0_PCR, %eax - movl %eax, %fs - pushl %esp - pushl $(IRQ_BASE + 9) - call _KiInterruptDispatch - addl $0xC, %esp - popl %gs - popl %fs - popl %es - popl %ds - popa - iret - -.global _irq_handler_10 -_irq_handler_10: - cld - pusha - pushl %ds - pushl %es - pushl %fs - pushl %gs - movl $0xceafbeef,%eax - pushl %eax - movw $KGDT_R0_DATA,%ax - movw %ax,%ds - movw %ax,%es - movw %ax,%gs - movl $KGDT_R0_PCR, %eax - movl %eax, %fs - pushl %esp - pushl $(IRQ_BASE + 10) - call _KiInterruptDispatch - addl $0xC, %esp - popl %gs - popl %fs - popl %es - popl %ds - popa - iret - -.global _irq_handler_11 -_irq_handler_11: - cld - pusha - pushl %ds - pushl %es - pushl %fs - pushl %gs - movl $0xceafbeef,%eax - pushl %eax - movw $KGDT_R0_DATA,%ax - movw %ax,%ds - movw %ax,%es - movw %ax,%gs - movl $KGDT_R0_PCR, %eax - movl %eax, %fs - pushl %esp - pushl $(IRQ_BASE + 11) - call _KiInterruptDispatch - addl $0xC, %esp - popl %gs - popl %fs - popl %es - popl %ds - popa - iret - -.global _irq_handler_12 -_irq_handler_12: - cld - pusha - pushl %ds - pushl %es - pushl %fs - pushl %gs - movl $0xceafbeef,%eax - pushl %eax - movw $KGDT_R0_DATA,%ax - movw %ax,%ds - movw %ax,%es - movw %ax,%gs - movl $KGDT_R0_PCR, %eax - movl %eax, %fs - pushl %esp - pushl $(IRQ_BASE + 12) - call _KiInterruptDispatch - addl $0xC, %esp - popl %gs - popl %fs - popl %es - popl %ds - popa - iret - -.global _irq_handler_13 -_irq_handler_13: - cld - pusha - pushl %ds - pushl %es - pushl %fs - pushl %gs - movl $0xceafbeef,%eax - pushl %eax - movw $KGDT_R0_DATA,%ax - movw %ax,%ds - movw %ax,%es - movw %ax,%gs - movl $KGDT_R0_PCR, %eax - movl %eax, %fs - pushl %esp - pushl $(IRQ_BASE + 13) - call _KiInterruptDispatch - addl $0xC, %esp - popl %gs - popl %fs - popl %es - popl %ds - popa - iret - -.global _irq_handler_14 -_irq_handler_14: - cld - pusha - pushl %ds - pushl %es - pushl %fs - pushl %gs - movl $0xceafbeef,%eax - pushl %eax - movw $KGDT_R0_DATA,%ax - movw %ax,%ds - movw %ax,%es - movw %ax,%gs - movl $KGDT_R0_PCR, %eax - movl %eax, %fs - pushl %esp - pushl $(IRQ_BASE + 14) - call _KiInterruptDispatch - addl $0xC, %esp - popl %gs - popl %fs - popl %es - popl %ds - popa - iret - -.global _irq_handler_15 -_irq_handler_15: - cld - pusha - pushl %ds - pushl %es - pushl %fs - pushl %gs - movl $0xceafbeef,%eax - pushl %eax - movw $KGDT_R0_DATA,%ax - movw %ax,%ds - movw %ax,%es - movw %ax,%gs - movl $KGDT_R0_PCR, %eax - movl %eax, %fs - pushl %esp - pushl $(IRQ_BASE + 15) - call _KiInterruptDispatch - addl $0xC, %esp - popl %gs - popl %fs - popl %es - popl %ds - popa - iret - #endif /* CONFIG_SMP */ .intel_syntax noprefix

1 0

[ion] 20531: - Fix building with old binutils. Thanks to Ge for the fix.
by ion＠svn.reactos.org 02 Jan '06

02 Jan '06

- Fix building with old binutils. Thanks to Ge for the fix. Modified: trunk/reactos/include/ndk/asm.h Modified: trunk/reactos/include/ndk/extypes.h _____ Modified: trunk/reactos/include/ndk/asm.h --- trunk/reactos/include/ndk/asm.h 2006-01-02 17:46:35 UTC (rev 20530) +++ trunk/reactos/include/ndk/asm.h 2006-01-02 18:03:19 UTC (rev 20531) @@ -291,7 +291,9 @@ #define EFLAGS_VIP 0x100000 #define EFLAG_SIGN 0x8000 #define EFLAG_ZERO 0x4000 -#define EFLAG_SELECT (EFLAG_SIGN | EFLAG_ZERO) +#ifndef EFLAG_SELECT +#define EFLAG_SELECT (EFLAG_SIGN + EFLAG_ZERO) +#endif // // CR0 _____ Modified: trunk/reactos/include/ndk/extypes.h --- trunk/reactos/include/ndk/extypes.h 2006-01-02 17:46:35 UTC (rev 20530) +++ trunk/reactos/include/ndk/extypes.h 2006-01-02 18:03:19 UTC (rev 20531) @@ -354,7 +354,7 @@ LONG ShareCount; LONG Flags; #if DBG - BOOL Signaled; + BOOLEAN Signaled; EX_PUSH_LOCK NewValue; EX_PUSH_LOCK OldValue; PEX_PUSH_LOCK PushLock;

1 0

[hbirr] 20530: Fixed the size of the allocated port structure.
by hbirr＠svn.reactos.org 02 Jan '06

02 Jan '06

Fixed the size of the allocated port structure. Modified: trunk/reactos/ntoskrnl/ps/kill.c _____ Modified: trunk/reactos/ntoskrnl/ps/kill.c --- trunk/reactos/ntoskrnl/ps/kill.c 2006-01-02 16:43:54 UTC (rev 20529) +++ trunk/reactos/ntoskrnl/ps/kill.c 2006-01-02 17:46:35 UTC (rev 20530) @@ -754,7 +754,7 @@ /* Allocate the Port and make sure it suceeded */ if((TerminationPort = ExAllocatePoolWithTag(NonPagedPool, - sizeof(PTERMINATION_PORT), + sizeof(TERMINATION_PORT), TAG('P', 's', 'T', '=')))) { /* Associate the Port */

1 0

[gedmurphy] 20529: Allow files other than C to be included in the projects
by gedmurphy＠svn.reactos.org 02 Jan '06

02 Jan '06

Allow files other than C to be included in the projects Patch by Brezenbak (IRC) Modified: trunk/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp _____ Modified: trunk/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp --- trunk/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp 2006-01-02 11:39:15 UTC (rev 20528) +++ trunk/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp 2006-01-02 16:43:54 UTC (rev 20529) @@ -116,10 +116,10 @@ // TODO FIXME - do we want the full path of the file here? string file = string(".") + &files[i]->name[vcproj_path.size()]; - if ( !stricmp ( Right(file,2).c_str(), ".c" ) ) - source_files.push_back ( file ); if ( !stricmp ( Right(file,3).c_str(), ".rc" ) ) resource_files.push_back ( file ); + else + source_files.push_back ( file ); } const vector<Include*>& incs = data.includes; for ( i = 0; i < incs.size(); i++ )

1 0

[hpoussin] 20528: Report current bus number during IRP_MN_QUERY_RESOURCES
by hpoussin＠svn.reactos.org 02 Jan '06

02 Jan '06

Report current bus number during IRP_MN_QUERY_RESOURCES Child bus number is in u.type1.SecondaryBus field, not u.type1.SubordinateBus Modified: trunk/reactos/drivers/bus/pci/pdo.c _____ Modified: trunk/reactos/drivers/bus/pci/pdo.c --- trunk/reactos/drivers/bus/pci/pdo.c 2006-01-02 11:37:00 UTC (rev 20527) +++ trunk/reactos/drivers/bus/pci/pdo.c 2006-01-02 11:39:15 UTC (rev 20528) @@ -373,6 +373,7 @@ } else if (PCI_CONFIGURATION_TYPE(&PciConfig) == PCI_CARDBUS_BRIDGE_TYPE) { + /* FIXME: Count Cardbus bridge resources */ } else { @@ -386,11 +387,8 @@ } /* Calculate the resource list size */ - ListSize = sizeof(IO_RESOURCE_REQUIREMENTS_LIST); - if (ResCount > 1) - { - ListSize += ((ResCount - 1) * sizeof(IO_RESOURCE_DESCRIPTOR)); - } + ListSize = FIELD_OFFSET(IO_RESOURCE_REQUIREMENTS_LIST, List->Descriptors) + + ResCount * sizeof(IO_RESOURCE_DESCRIPTOR); DPRINT("ListSize %lu (0x%lx)\n", ListSize, ListSize); @@ -403,6 +401,7 @@ return STATUS_INSUFFICIENT_RESOURCES; } + RtlZeroMemory(ResourceList, ListSize); ResourceList->ListSize = ListSize; ResourceList->InterfaceType = PCIBus; ResourceList->BusNumber = DeviceExtension->PciDevice->BusNumber; @@ -584,11 +583,10 @@ { Descriptor->Option = 0; /* Required */ Descriptor->Type = CmResourceTypeBusNumber; - Descriptor->ShareDisposition = CmResourceShareShared; - Descriptor->Flags = CM_RESOURCE_INTERRUPT_LEVEL_SENSITIVE; + Descriptor->ShareDisposition = CmResourceShareDeviceExclusive; Descriptor->u.BusNumber.MinBusNumber = - Descriptor->u.BusNumber.MaxBusNumber = DeviceExtension->PciDevice->PciConfig.u.type1.SubordinateBus; + Descriptor->u.BusNumber.MaxBusNumber = DeviceExtension->PciDevice->PciConfig.u.type1.SecondaryBus; Descriptor->u.BusNumber.Length = 1; Descriptor->u.BusNumber.Reserved = 0; } @@ -677,10 +675,12 @@ if (Length != 0) ResCount++; } + if (DeviceExtension->PciDevice->PciConfig.BaseClass == PCI_CLASS_BRIDGE_DEV) + ResCount++; } else if (PCI_CONFIGURATION_TYPE(&PciConfig) == PCI_CARDBUS_BRIDGE_TYPE) { - + /* FIXME: Count Cardbus bridge resources */ } else { @@ -694,11 +694,8 @@ } /* Calculate the resource list size */ - ListSize = sizeof(CM_RESOURCE_LIST); - if (ResCount > 1) - { - ListSize += ((ResCount - 1) * sizeof(CM_PARTIAL_RESOURCE_DESCRIPTOR)); - } + ListSize = FIELD_OFFSET(CM_RESOURCE_LIST, List->PartialResourceList.PartialDescriptors) + + ResCount * sizeof(CM_PARTIAL_RESOURCE_DESCRIPTOR); /* Allocate the resource list */ ResourceList = ExAllocatePool(PagedPool, @@ -706,13 +703,14 @@ if (ResourceList == NULL) return STATUS_INSUFFICIENT_RESOURCES; + RtlZeroMemory(ResourceList, ListSize); ResourceList->Count = 1; ResourceList->List[0].InterfaceType = PCIConfiguration; ResourceList->List[0].BusNumber = DeviceExtension->PciDevice->BusNumber; PartialList = &ResourceList->List[0].PartialResourceList; - PartialList->Version = 0; - PartialList->Revision = 0; + PartialList->Version = 1; + PartialList->Revision = 1; PartialList->Count = ResCount; Descriptor = &PartialList->PartialDescriptors[0]; @@ -811,10 +809,19 @@ Descriptor++; } + if (DeviceExtension->PciDevice->PciConfig.BaseClass == PCI_CLASS_BRIDGE_DEV) + { + Descriptor->Type = CmResourceTypeBusNumber; + Descriptor->ShareDisposition = CmResourceShareDeviceExclusive; + + Descriptor->u.BusNumber.Start = DeviceExtension->PciDevice->PciConfig.u.type1.SecondaryBus; + Descriptor->u.BusNumber.Length = 1; + Descriptor->u.BusNumber.Reserved = 0; + } } else if (PCI_CONFIGURATION_TYPE(&PciConfig) == PCI_CARDBUS_BRIDGE_TYPE) { - /* FIXME: Cardbus */ + /* FIXME: Add Cardbus bridge resources */ } Irp->IoStatus.Information = (ULONG_PTR)ResourceList;

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs