Ros-diffs

ros-diffs@reactos.org

81390 discussions

[jgardou] 48407: [WIN32K] - Colors passed to EngCreatePalette are PALETTEENTRYs, my bad.
by jgardou＠svn.reactos.org 02 Aug '10

02 Aug '10

Author: jgardou Date: Mon Aug 2 01:09:36 2010 New Revision: 48407 URL: http://svn.reactos.org/svn/reactos?rev=48407&view=rev Log: [WIN32K] - Colors passed to EngCreatePalette are PALETTEENTRYs, my bad. Modified: branches/reactos-yarotows/subsystems/win32/win32k/objects/palette.c Modified: branches/reactos-yarotows/subsystems/win32/win32k/objects/palette.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/subsystems/win… ============================================================================== --- branches/reactos-yarotows/subsystems/win32/win32k/objects/palette.c [iso-8859-1] (original) +++ branches/reactos-yarotows/subsystems/win32/win32k/objects/palette.c [iso-8859-1] Mon Aug 2 01:09:36 2010 @@ -392,15 +392,7 @@ { HPALETTE Palette; - /* Low order three bytes are RGB -> RGBQUAD */ - if(Mode == PAL_INDEXED) - { - Palette = PALETTE_AllocPaletteIndexedRGB(NumColors, (RGBQUAD*)Colors); - } - else - { - Palette = PALETTE_AllocPalette(Mode, NumColors, Colors, Red, Green, Blue); - } + Palette = PALETTE_AllocPalette(Mode, NumColors, Colors, Red, Green, Blue); if (Palette != NULL) { GDIOBJ_SetOwnership(Palette, NULL);

1 0

[jgardou] 48406: [WIN32K] - DDB are 16 bits aligned. - Reset hdc field of the unselected bitmap. - Lock it too, so it's not messed with when we unselect it. - Move Pattern creation of IntGdiCreateDIBBrush to DIB_CreateDIBSection.
by jgardou＠svn.reactos.org 02 Aug '10

02 Aug '10

Author: jgardou Date: Mon Aug 2 00:53:25 2010 New Revision: 48406 URL: http://svn.reactos.org/svn/reactos?rev=48406&view=rev Log: [WIN32K] - DDB are 16 bits aligned. - Reset hdc field of the unselected bitmap. - Lock it too, so it's not messed with when we unselect it. - Move Pattern creation of IntGdiCreateDIBBrush to DIB_CreateDIBSection. Modified: branches/reactos-yarotows/subsystems/win32/win32k/eng/surface.c branches/reactos-yarotows/subsystems/win32/win32k/include/bitmaps.h branches/reactos-yarotows/subsystems/win32/win32k/objects/bitmaps.c branches/reactos-yarotows/subsystems/win32/win32k/objects/brush.c branches/reactos-yarotows/subsystems/win32/win32k/objects/dcobjs.c branches/reactos-yarotows/subsystems/win32/win32k/objects/dibobj.c Modified: branches/reactos-yarotows/subsystems/win32/win32k/eng/surface.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/subsystems/win… ============================================================================== --- branches/reactos-yarotows/subsystems/win32/win32k/eng/surface.c [iso-8859-1] (original) +++ branches/reactos-yarotows/subsystems/win32/win32k/eng/surface.c [iso-8859-1] Mon Aug 2 00:53:25 2010 @@ -200,16 +200,21 @@ cBitsPixel = gajBitsPerFormat[pso->iBitmapFormat]; /* Is a width in bytes given? */ - if (ulWidth) - { - /* Align the width (Windows compatibility) */ - ulWidth = ((((ulWidth << 3) / cBitsPixel) * cBitsPixel + 31) & ~31) >> 3; - } - else - { - /* Calculate width from the bitmap width in pixels */ - ulWidth = ((pso->sizlBitmap.cx * cBitsPixel + 31) & ~31) >> 3; - } + if (!ulWidth) + { + /* Align the width (windows compatibility) */ + if(psurf->flags & DDB_SURFACE) + { + /* DDB are 16 bits aligned */ + ulWidth = BITMAP_GetWidthBytes(pso->sizlBitmap.cx, cBitsPixel); + } + else + { + /* Others are 32 bits aligned */ + ulWidth = DIB_GetDIBWidthBytes(pso->sizlBitmap.cx, cBitsPixel); + } + } + /* Calculate the bitmap size in bytes */ pso->cjBits = ulWidth * pso->sizlBitmap.cy; Modified: branches/reactos-yarotows/subsystems/win32/win32k/include/bitmaps.h URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/subsystems/win… ============================================================================== --- branches/reactos-yarotows/subsystems/win32/win32k/include/bitmaps.h [iso-8859-1] (original) +++ branches/reactos-yarotows/subsystems/win32/win32k/include/bitmaps.h [iso-8859-1] Mon Aug 2 00:53:25 2010 @@ -32,7 +32,8 @@ IN ULONG iFormat, IN USHORT fjBitmap, IN ULONG cjBits, - IN OPTIONAL PVOID pvBits); + IN OPTIONAL PVOID pvBits, + IN FLONG flags); HBITMAP FASTCALL Modified: branches/reactos-yarotows/subsystems/win32/win32k/objects/bitmaps.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/subsystems/win… ============================================================================== --- branches/reactos-yarotows/subsystems/win32/win32k/objects/bitmaps.c [iso-8859-1] (original) +++ branches/reactos-yarotows/subsystems/win32/win32k/objects/bitmaps.c [iso-8859-1] Mon Aug 2 00:53:25 2010 @@ -76,14 +76,14 @@ IN ULONG iFormat, IN USHORT fjBitmap, IN ULONG cjSizeImage, - IN OPTIONAL PVOID pvBits) + IN OPTIONAL PVOID pvBits, + IN FLONG flags) { PSURFACE psurf; SURFOBJ *pso; HBITMAP hbmp; PVOID pvCompressedBits; SIZEL sizl; - FLONG fl = 0; /* Verify format */ if (iFormat < BMF_1BPP || iFormat > BMF_PNG) return NULL; @@ -107,7 +107,7 @@ pvCompressedBits = pvBits; pvBits = EngAllocMem(FL_ZERO_MEMORY, pso->cjBits, TAG_DIB); Decompress4bpp(sizl, pvCompressedBits, pvBits, pso->lDelta); - fl |= BMF_RLE_HACK; + fjBitmap |= BMF_RLE_HACK; } else if (iFormat == BMF_8RLE) { @@ -115,8 +115,11 @@ pvCompressedBits = pvBits; pvBits = EngAllocMem(FL_ZERO_MEMORY, pso->cjBits, TAG_DIB); Decompress8bpp(sizl, pvCompressedBits, pvBits, pso->lDelta); - fl |= BMF_RLE_HACK; - } + fjBitmap |= BMF_RLE_HACK; + } + + /* Mark as API bitmap */ + psurf->flags |= (flags | API_BITMAP); /* Set the bitmap bits */ if (!SURFACE_bSetBitmapBits(psurf, fjBitmap, cjWidthBytes, pvBits)) @@ -127,14 +130,14 @@ return NULL; } - /* Mark as API bitmap */ - psurf->flags |= API_BITMAP; - /* Unlock the surface and return */ SURFACE_UnlockSurface(psurf); return hbmp; } +/* Creates a DDB surface, + * as in CreateCompatibleBitmap or CreateBitmap. + */ HBITMAP APIENTRY GreCreateBitmap( @@ -151,7 +154,8 @@ BitmapFormat(cBitsPixel * cPlanes, BI_RGB), 0, /* no bitmap flags */ 0, /* auto size */ - pvBits); + pvBits, + DDB_SURFACE /* DDB */); } HBITMAP @@ -163,10 +167,7 @@ IN UINT cBitsPixel, IN OPTIONAL LPBYTE pUnsafeBits) { - PSURFACE psurf; - SURFOBJ *pso; HBITMAP hbmp; - FLONG fl = 0; ULONG cjWidthBytes, iFormat; /* NOTE: Windows also doesn't store nr. of planes separately! */ @@ -185,7 +186,7 @@ } /* Make sure that cjBits will not overflow */ - cjWidthBytes = DIB_GetDIBWidthBytes(nWidth, cBitsPixel); + cjWidthBytes = BITMAP_GetWidthBytes(nWidth, cBitsPixel); if ((ULONGLONG)cjWidthBytes * nHeight >= 0x100000000ULL) { DPRINT1("Width = %d, Height = %d BitsPixel = %d\n", @@ -194,30 +195,12 @@ return NULL; } - /* Allocate a surface */ - psurf = SURFACE_AllocSurface(STYPE_BITMAP, nWidth, nHeight, iFormat); - if (!psurf) - { - DPRINT1("SURFACE_AllocSurface failed.\n"); - EngSetLastError(ERROR_OUTOFMEMORY); - return NULL; - } - - /* Get the handle for the bitmap and the surfobj */ - hbmp = (HBITMAP)psurf->SurfObj.hsurf; - pso = &psurf->SurfObj; - - /* Allocate the bitmap bits */ - if (!SURFACE_bSetBitmapBits(psurf, fl, 0, NULL)) - { - /* Bail out if that failed */ - DPRINT1("SURFACE_bSetBitmapBits failed.\n"); - SURFACE_FreeSurfaceByHandle(hbmp); - return NULL; - } - + /* cBitsPixel = cBitsPixel * cPlanes now! */ + hbmp = GreCreateBitmap(nWidth, nHeight, 1, cBitsPixel, NULL); + if (pUnsafeBits) { + PSURFACE psurf = SURFACE_LockSurface(hbmp); _SEH2_TRY { ProbeForRead(pUnsafeBits, cjWidthBytes * nHeight, 1); @@ -225,17 +208,15 @@ } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { + SURFACE_UnlockSurface(psurf); SURFACE_FreeSurfaceByHandle(hbmp); _SEH2_YIELD(return NULL;) } _SEH2_END - } - - /* Mark as API bitmap */ - psurf->flags |= API_BITMAP; - - /* Unlock the surface and return */ - SURFACE_UnlockSurface(psurf); + + SURFACE_UnlockSurface(psurf); + } + return hbmp; } @@ -931,7 +912,8 @@ Bitmap->SurfObj.iBitmapFormat, Bitmap->SurfObj.fjBitmap, Bitmap->SurfObj.cjBits, - NULL); + NULL, + Bitmap->flags); if (res) @@ -1052,4 +1034,5 @@ return hdc; } + /* EOF */ Modified: branches/reactos-yarotows/subsystems/win32/win32k/objects/brush.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/subsystems/win… ============================================================================== --- branches/reactos-yarotows/subsystems/win32/win32k/objects/brush.c [iso-8859-1] (original) +++ branches/reactos-yarotows/subsystems/win32/win32k/objects/brush.c [iso-8859-1] Mon Aug 2 00:53:25 2010 @@ -25,7 +25,7 @@ RGN_ATTR Attr[GDIOBJATTRFREE]; } GDI_OBJ_ATTR_ENTRY, *PGDI_OBJ_ATTR_ENTRY; -static const ULONG HatchBrushes[NB_HATCH_STYLES][8] = +static const USHORT HatchBrushes[NB_HATCH_STYLES][8] = { {0xFF, 0xFF, 0xFF, 0xFF, 0x00, 0xFF, 0xFF, 0xFF}, /* HS_HORIZONTAL */ {0xF7, 0xF7, 0xF7, 0xF7, 0xF7, 0xF7, 0xF7, 0xF7}, /* HS_VERTICAL */ @@ -256,8 +256,7 @@ PBRUSH pbrush; HBITMAP hPattern; ULONG_PTR DataPtr; - PSURFACE psurfPattern; - HPALETTE hpal ; + PVOID pvDIBits; if (BitmapInfo->bmiHeader.biSize < sizeof(BITMAPINFOHEADER)) { @@ -267,25 +266,17 @@ DataPtr = (ULONG_PTR)BitmapInfo + DIB_BitmapInfoSize(BitmapInfo, ColorSpec); - hPattern = GreCreateBitmap(BitmapInfo->bmiHeader.biWidth, - BitmapInfo->bmiHeader.biHeight, - BitmapInfo->bmiHeader.biPlanes, - BitmapInfo->bmiHeader.biBitCount, - (PVOID)DataPtr); + hPattern = DIB_CreateDIBSection(NULL, BitmapInfo, ColorSpec, &pvDIBits, NULL, 0, 0); if (hPattern == NULL) { SetLastWin32Error(ERROR_NOT_ENOUGH_MEMORY); return NULL; } - - psurfPattern = SURFACE_LockSurface(hPattern); - ASSERT(psurfPattern != NULL); - if(ColorSpec == DIB_PAL_COLORS) DPRINT1("FIXME, unsupported color spec!\n"); - hpal = BuildDIBPalette(BitmapInfo); - psurfPattern->ppal = PALETTE_ShareLockPalette(hpal); - /* Lazy delete palette, it will be freed when its shared reference is zeroed */ - GreDeleteObject(hpal); - SURFACE_UnlockSurface(psurfPattern); + RtlCopyMemory(pvDIBits, + (PVOID)DataPtr, + DIB_GetDIBImageBytes(BitmapInfo->bmiHeader.biWidth, + BitmapInfo->bmiHeader.biHeight, + BitmapInfo->bmiHeader.biBitCount * BitmapInfo->bmiHeader.biPlanes)); pbrush = BRUSH_AllocBrushWithHandle(); if (pbrush == NULL) Modified: branches/reactos-yarotows/subsystems/win32/win32k/objects/dcobjs.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/subsystems/win… ============================================================================== --- branches/reactos-yarotows/subsystems/win32/win32k/objects/dcobjs.c [iso-8859-1] (original) +++ branches/reactos-yarotows/subsystems/win32/win32k/objects/dcobjs.c [iso-8859-1] Mon Aug 2 00:53:25 2010 @@ -284,14 +284,24 @@ } /* Get the handle for the old bitmap */ - psurfOld = pDC->dclevel.pSurface; - hOrgBmp = psurfOld ? psurfOld->BaseObject.hHmgr : NULL; + ASSERT(pDC->dclevel.pSurface); + hOrgBmp = pDC->dclevel.pSurface->BaseObject.hHmgr; + + /* Lock it, to be sure while we mess with it*/ + psurfOld = SURFACE_LockSurface(hOrgBmp); + + /* Reset hdc, this surface isn't selected anymore */ + psurfOld->hdc = NULL; /* Release the old bitmap, reference the new */ DC_vSelectSurface(pDC, psurfBmp); + /* And unlock it, now we're done */ + SURFACE_UnlockSurface(psurfOld); + // If Info DC this is zero and pSurface is moved to DC->pSurfInfo. psurfBmp->hdc = hDC; + /* FIXME; improve by using a region without a handle and selecting it */ hVisRgn = IntSysCreateRectRgn( 0, Modified: branches/reactos-yarotows/subsystems/win32/win32k/objects/dibobj.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/subsystems/win… ============================================================================== --- branches/reactos-yarotows/subsystems/win32/win32k/objects/dibobj.c [iso-8859-1] (original) +++ branches/reactos-yarotows/subsystems/win32/win32k/objects/dibobj.c [iso-8859-1] Mon Aug 2 00:53:25 2010 @@ -1463,10 +1463,20 @@ if (usage == DIB_PAL_COLORS) { - PPALETTE pdcPal ; - pdcPal = PALETTE_LockPalette(dc->dclevel.hpal); - hpal = DIB_MapPaletteColors(pdcPal, bmi); - PALETTE_UnlockPalette(pdcPal); + if(dc) + { + PPALETTE pdcPal ; + pdcPal = PALETTE_LockPalette(dc->dclevel.hpal); + hpal = DIB_MapPaletteColors(pdcPal, bmi); + PALETTE_UnlockPalette(pdcPal); + } + else + { + /* For DIB Brushes */ + DPRINT1("FIXME : Unsupported DIB_PAL_COLORS without a DC to map colors.\n"); + /* HACK */ + hpal = (HPALETTE) 0xFFFFFFFF; + } } else { @@ -1475,7 +1485,7 @@ if(!hpal) { - DPRINT1("Error : Could not create a aplette for the DIB.\n"); + DPRINT1("Error : Could not create a palette for the DIB.\n"); goto cleanup; } @@ -1489,7 +1499,8 @@ BMF_DONTCACHE | BMF_USERMEM | BMF_NOZEROINIT | (bi->biHeight < 0 ? BMF_TOPDOWN : 0), bi->biSizeImage, - bm.bmBits); + bm.bmBits, + 0); if (!res) { SetLastWin32Error(ERROR_NO_SYSTEM_RESOURCES); @@ -1512,9 +1523,13 @@ bmp->flags = API_BITMAP; bmp->biClrImportant = bi->biClrImportant; - bmp->ppal = PALETTE_ShareLockPalette(hpal); - /* Lazy delete hpal, it will be freed at surface release */ - GreDeleteObject(hpal); + /* HACK */ + if(hpal != (HPALETTE)0xFFFFFFFF) + { + bmp->ppal = PALETTE_ShareLockPalette(hpal); + /* Lazy delete hpal, it will be freed at surface release */ + GreDeleteObject(hpal); + } // Clean up in case of errors cleanup:

1 0

[cgutman] 48405: [AFD]: BytesAvailable needs to be updated even when peeking so we don't run off the end of our buffer
by cgutman＠svn.reactos.org 01 Aug '10

01 Aug '10

Author: cgutman Date: Sun Aug 1 23:52:23 2010 New Revision: 48405 URL: http://svn.reactos.org/svn/reactos?rev=48405&view=rev Log: [AFD]: BytesAvailable needs to be updated even when peeking so we don't run off the end of our buffer Modified: trunk/reactos/drivers/network/afd/afd/read.c Modified: trunk/reactos/drivers/network/afd/afd/read.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/afd/afd/re… ============================================================================== --- trunk/reactos/drivers/network/afd/afd/read.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/afd/afd/read.c [iso-8859-1] Sun Aug 1 23:52:23 2010 @@ -122,11 +122,10 @@ *TotalBytesCopied += BytesToCopy; FcbBytesCopied += BytesToCopy; - - if (!(RecvReq->TdiFlags & TDI_RECEIVE_PEEK)) { + BytesAvailable -= BytesToCopy; + + if (!(RecvReq->TdiFlags & TDI_RECEIVE_PEEK)) FCB->Recv.BytesUsed += BytesToCopy; - BytesAvailable -= BytesToCopy; - } } }

1 0

[cgutman] 48404: Forgetting to save really sucks. Sorry again for the wasted commit.
by cgutman＠svn.reactos.org 01 Aug '10

01 Aug '10

Author: cgutman Date: Sun Aug 1 23:46:57 2010 New Revision: 48404 URL: http://svn.reactos.org/svn/reactos?rev=48404&view=rev Log: Forgetting to save really sucks. Sorry again for the wasted commit. Modified: trunk/reactos/drivers/network/afd/afd/read.c Modified: trunk/reactos/drivers/network/afd/afd/read.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/afd/afd/re… ============================================================================== --- trunk/reactos/drivers/network/afd/afd/read.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/afd/afd/read.c [iso-8859-1] Sun Aug 1 23:46:57 2010 @@ -80,7 +80,7 @@ static NTSTATUS TryToSatisfyRecvRequestFromBuffer( PAFD_FCB FCB, PAFD_RECV_INFO RecvReq, PUINT TotalBytesCopied ) { - UINT i, BytesToCopy = 0, FcbBytesCopied = FCB->Recv.BytesUsed; + UINT i, BytesToCopy = 0, FcbBytesCopied = FCB->Recv.BytesUsed, BytesAvailable = FCB->Recv.Content - FCB->Recv.BytesUsed; PAFD_MAPBUF Map;

1 0

[cgutman] 48403: [AFD]: Fix read data corruption when peeking at network data (TDI_RECEIVE_PEEK is specified for a stream socket)
by cgutman＠svn.reactos.org 01 Aug '10

01 Aug '10

Author: cgutman Date: Sun Aug 1 23:42:33 2010 New Revision: 48403 URL: http://svn.reactos.org/svn/reactos?rev=48403&view=rev Log: [AFD]: Fix read data corruption when peeking at network data (TDI_RECEIVE_PEEK is specified for a stream socket) Modified: trunk/reactos/drivers/network/afd/afd/read.c Modified: trunk/reactos/drivers/network/afd/afd/read.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/afd/afd/re… ============================================================================== --- trunk/reactos/drivers/network/afd/afd/read.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/afd/afd/read.c [iso-8859-1] Sun Aug 1 23:42:33 2010 @@ -80,7 +80,7 @@ static NTSTATUS TryToSatisfyRecvRequestFromBuffer( PAFD_FCB FCB, PAFD_RECV_INFO RecvReq, PUINT TotalBytesCopied ) { - UINT i, BytesToCopy = 0, + UINT i, BytesToCopy = 0, FcbBytesCopied = FCB->Recv.BytesUsed; BytesAvailable = FCB->Recv.Content - FCB->Recv.BytesUsed; PAFD_MAPBUF Map; @@ -115,12 +115,13 @@ BytesToCopy)); RtlCopyMemory( Map[i].BufferAddress, - FCB->Recv.Window + FCB->Recv.BytesUsed, + FCB->Recv.Window + FcbBytesCopied, BytesToCopy ); MmUnmapLockedPages( Map[i].BufferAddress, Map[i].Mdl ); *TotalBytesCopied += BytesToCopy; + FcbBytesCopied += BytesToCopy; if (!(RecvReq->TdiFlags & TDI_RECEIVE_PEEK)) { FCB->Recv.BytesUsed += BytesToCopy;

1 0

[cgutman] 48402: Fix a typo
by cgutman＠svn.reactos.org 01 Aug '10

01 Aug '10

Author: cgutman Date: Sun Aug 1 23:20:31 2010 New Revision: 48402 URL: http://svn.reactos.org/svn/reactos?rev=48402&view=rev Log: Fix a typo Modified: trunk/reactos/drivers/network/afd/afd/read.c Modified: trunk/reactos/drivers/network/afd/afd/read.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/afd/afd/re… ============================================================================== --- trunk/reactos/drivers/network/afd/afd/read.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/afd/afd/read.c [iso-8859-1] Sun Aug 1 23:20:31 2010 @@ -1,4 +1,4 @@ -/* $Id$ +ter/* $Id$ * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel * FILE: drivers/net/afd/afd/read.c @@ -28,7 +28,7 @@ static VOID HandleEOFOnIrp( PAFD_FCB FCB, NTSTATUS Status, ULONG_PTR Information ) { - if( ( Status == STATUS_SUCCESS && !FCB->ReceiveIrp.Iosb.Information ) || + if( ( Status == STATUS_SUCCESS && !Information ) || ( !NT_SUCCESS( Status ) ) ) { /* The socket has been closed */

1 0

[cgutman] 48401: Fix a copy-paste mistake and remove an unused variable
by cgutman＠svn.reactos.org 01 Aug '10

01 Aug '10

Author: cgutman Date: Sun Aug 1 21:08:53 2010 New Revision: 48401 URL: http://svn.reactos.org/svn/reactos?rev=48401&view=rev Log: Fix a copy-paste mistake and remove an unused variable Modified: trunk/reactos/drivers/network/afd/afd/read.c Modified: trunk/reactos/drivers/network/afd/afd/read.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/afd/afd/re… ============================================================================== --- trunk/reactos/drivers/network/afd/afd/read.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/afd/afd/read.c [iso-8859-1] Sun Aug 1 21:08:53 2010 @@ -84,7 +84,6 @@ BytesAvailable = FCB->Recv.Content - FCB->Recv.BytesUsed; PAFD_MAPBUF Map; - NTSTATUS Status; *TotalBytesCopied = 0; @@ -178,6 +177,7 @@ NextIrp->IoStatus.Information = 0; if( NextIrp == Irp ) RetStatus = Status; if( NextIrp->MdlAddress ) UnlockRequest( NextIrp, IoGetCurrentIrpStackLocation( NextIrp ) ); + (void)IoSetCancelRoutine(NextIrp, NULL); IoCompleteRequest( NextIrp, IO_NETWORK_INCREMENT ); FCB->Overread = TRUE; } @@ -220,6 +220,7 @@ RetBytesCopied = TotalBytesCopied; } if( NextIrp->MdlAddress ) UnlockRequest( NextIrp, IoGetCurrentIrpStackLocation( NextIrp ) ); + (void)IoSetCancelRoutine(NextIrp, NULL); IoCompleteRequest( NextIrp, IO_NETWORK_INCREMENT ); } }

1 0

[cgutman] 48400: [AFD]: Revert r42674 and part of r47156
by cgutman＠svn.reactos.org 01 Aug '10

01 Aug '10

Author: cgutman Date: Sun Aug 1 21:00:40 2010 New Revision: 48400 URL: http://svn.reactos.org/svn/reactos?rev=48400&view=rev Log: [AFD]: Revert r42674 and part of r47156 Modified: trunk/reactos/drivers/network/afd/afd/read.c Modified: trunk/reactos/drivers/network/afd/afd/read.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/afd/afd/re… ============================================================================== --- trunk/reactos/drivers/network/afd/afd/read.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/afd/afd/read.c [iso-8859-1] Sun Aug 1 21:00:40 2010 @@ -26,8 +26,28 @@ #include "tdiconn.h" #include "debug.h" -static NTSTATUS RefillSocketBuffer( PAFD_FCB FCB ) { - NTSTATUS Status = STATUS_PENDING; +static VOID HandleEOFOnIrp( PAFD_FCB FCB, NTSTATUS Status, ULONG_PTR Information ) +{ + if( ( Status == STATUS_SUCCESS && !FCB->ReceiveIrp.Iosb.Information ) || + ( !NT_SUCCESS( Status ) ) ) + { + /* The socket has been closed */ + FCB->PollState |= AFD_EVENT_DISCONNECT; + FCB->PollStatus[FD_CLOSE_BIT] = Status; + + PollReeval( FCB->DeviceExt, FCB->FileObject ); + } +} + +static BOOLEAN CantReadMore( PAFD_FCB FCB ) { + UINT BytesAvailable = FCB->Recv.Content - FCB->Recv.BytesUsed; + + return !BytesAvailable && + (FCB->PollState & (AFD_EVENT_CLOSE | AFD_EVENT_DISCONNECT)); +} + +static VOID RefillSocketBuffer( PAFD_FCB FCB ) { + NTSTATUS Status; if( !FCB->ReceiveIrp.InFlightRequest ) { AFD_DbgPrint(MID_TRACE,("Replenishing buffer\n")); @@ -41,25 +61,20 @@ ReceiveComplete, FCB ); - if( ( Status == STATUS_SUCCESS && !FCB->ReceiveIrp.Iosb.Information ) || - ( !NT_SUCCESS( Status ) ) ) - { - /* The socket has been closed */ - FCB->PollState |= AFD_EVENT_DISCONNECT; - FCB->PollStatus[FD_CLOSE_BIT] = Status; - FCB->Overread = TRUE; - Status = STATUS_FILE_CLOSED; - } - else if( Status == STATUS_SUCCESS ) + if( Status == STATUS_SUCCESS && FCB->ReceiveIrp.Iosb.Information ) { FCB->Recv.Content = FCB->ReceiveIrp.Iosb.Information; FCB->PollState |= AFD_EVENT_RECEIVE; FCB->PollStatus[FD_READ_BIT] = STATUS_SUCCESS; + + PollReeval( FCB->DeviceExt, FCB->FileObject ); } - PollReeval( FCB->DeviceExt, FCB->FileObject ); + else + { + /* Check for EOF */ + HandleEOFOnIrp(FCB, Status, FCB->ReceiveIrp.Iosb.Information); + } } - - return Status; } static NTSTATUS TryToSatisfyRecvRequestFromBuffer( PAFD_FCB FCB, @@ -76,22 +91,8 @@ AFD_DbgPrint(MID_TRACE,("Called, BytesAvailable = %d\n", BytesAvailable)); - if( FCB->Overread ) return STATUS_FILE_CLOSED; - if( !BytesAvailable ) { - FCB->Recv.Content = FCB->Recv.BytesUsed = 0; - Status = RefillSocketBuffer( FCB ); - if ( Status != STATUS_SUCCESS ) - return Status; - - /* If RefillSocketBuffer returns STATUS_SUCCESS, we're good to go - * If RefillSocketBuffer returns STATUS_PENDING, then it's waiting on the transport for data - * If RefillSocketBuffer returns STATUS_FILE_CLOSED, then the connection was terminated - */ - - /* Recalculate BytesAvailable based on new data */ - BytesAvailable = FCB->Recv.Content - FCB->Recv.BytesUsed; - ASSERT(BytesAvailable); - } + if( CantReadMore(FCB) ) return STATUS_SUCCESS; + if( !BytesAvailable ) return STATUS_PENDING; Map = (PAFD_MAPBUF)(RecvReq->BufferArray + RecvReq->BufferCount); @@ -156,37 +157,72 @@ AFD_DbgPrint(MID_TRACE,("FCB %x Receive data waiting %d\n", FCB, FCB->Recv.Content)); - /* Try to clear some requests */ - while( !IsListEmpty( &FCB->PendingIrpList[FUNCTION_RECV] ) ) { - NextIrpEntry = RemoveHeadList(&FCB->PendingIrpList[FUNCTION_RECV]); - NextIrp = CONTAINING_RECORD(NextIrpEntry, IRP, Tail.Overlay.ListEntry); - NextIrpSp = IoGetCurrentIrpStackLocation( NextIrp ); - RecvReq = NextIrpSp->Parameters.DeviceIoControl.Type3InputBuffer; - - AFD_DbgPrint(MID_TRACE,("RecvReq @ %x\n", RecvReq)); - - Status = TryToSatisfyRecvRequestFromBuffer( FCB, RecvReq, &TotalBytesCopied ); - - if( Status == STATUS_PENDING ) { - AFD_DbgPrint(MID_TRACE,("Ran out of data for %x\n", NextIrp)); - InsertHeadList(&FCB->PendingIrpList[FUNCTION_RECV], - &NextIrp->Tail.Overlay.ListEntry); - break; - } else { - AFD_DbgPrint(MID_TRACE,("Completing recv %x (%d)\n", NextIrp, - TotalBytesCopied)); - UnlockBuffers( RecvReq->BufferArray, - RecvReq->BufferCount, FALSE ); - NextIrp->IoStatus.Status = Status; - NextIrp->IoStatus.Information = TotalBytesCopied; - if( NextIrp == Irp ) { - RetStatus = Status; - RetBytesCopied = TotalBytesCopied; + if( CantReadMore( FCB ) ) { + /* Success here means that we got an EOF. Complete a pending read + * with zero bytes if we haven't yet overread, then kill the others. + */ + while( !IsListEmpty( &FCB->PendingIrpList[FUNCTION_RECV] ) ) { + NextIrpEntry = + RemoveHeadList(&FCB->PendingIrpList[FUNCTION_RECV]); + NextIrp = + CONTAINING_RECORD(NextIrpEntry, IRP, Tail.Overlay.ListEntry); + NextIrpSp = IoGetCurrentIrpStackLocation( NextIrp ); + RecvReq = NextIrpSp->Parameters.DeviceIoControl.Type3InputBuffer; + + AFD_DbgPrint(MID_TRACE,("Completing recv %x (%d)\n", NextIrp, + TotalBytesCopied)); + UnlockBuffers( RecvReq->BufferArray, + RecvReq->BufferCount, FALSE ); + Status = NextIrp->IoStatus.Status = + FCB->Overread ? STATUS_END_OF_FILE : STATUS_SUCCESS; + NextIrp->IoStatus.Information = 0; + if( NextIrp == Irp ) RetStatus = Status; + if( NextIrp->MdlAddress ) UnlockRequest( NextIrp, IoGetCurrentIrpStackLocation( NextIrp ) ); + IoCompleteRequest( NextIrp, IO_NETWORK_INCREMENT ); + FCB->Overread = TRUE; + } + } else { + /* Kick the user that receive would be possible now */ + /* XXX Not implemented yet */ + + AFD_DbgPrint(MID_TRACE,("FCB %x Receive data waiting %d\n", + FCB, FCB->Recv.Content)); + /*OskitDumpBuffer( FCB->Recv.Window, FCB->Recv.Content );*/ + + /* Try to clear some requests */ + while( !IsListEmpty( &FCB->PendingIrpList[FUNCTION_RECV] ) ) { + NextIrpEntry = + RemoveHeadList(&FCB->PendingIrpList[FUNCTION_RECV]); + NextIrp = + CONTAINING_RECORD(NextIrpEntry, IRP, Tail.Overlay.ListEntry); + NextIrpSp = IoGetCurrentIrpStackLocation( NextIrp ); + RecvReq = NextIrpSp->Parameters.DeviceIoControl.Type3InputBuffer; + + AFD_DbgPrint(MID_TRACE,("RecvReq @ %x\n", RecvReq)); + + Status = TryToSatisfyRecvRequestFromBuffer + ( FCB, RecvReq, &TotalBytesCopied ); + + if( Status == STATUS_PENDING ) { + AFD_DbgPrint(MID_TRACE,("Ran out of data for %x\n", NextIrp)); + InsertHeadList(&FCB->PendingIrpList[FUNCTION_RECV], + &NextIrp->Tail.Overlay.ListEntry); + break; + } else { + AFD_DbgPrint(MID_TRACE,("Completing recv %x (%d)\n", NextIrp, + TotalBytesCopied)); + UnlockBuffers( RecvReq->BufferArray, + RecvReq->BufferCount, FALSE ); + NextIrp->IoStatus.Status = Status; + NextIrp->IoStatus.Information = TotalBytesCopied; + if( NextIrp == Irp ) { + RetStatus = Status; + RetBytesCopied = TotalBytesCopied; + } + if( NextIrp->MdlAddress ) UnlockRequest( NextIrp, IoGetCurrentIrpStackLocation( NextIrp ) ); + IoCompleteRequest( NextIrp, IO_NETWORK_INCREMENT ); + } } - if( NextIrp->MdlAddress ) UnlockRequest( NextIrp, IoGetCurrentIrpStackLocation( NextIrp ) ); - (void)IoSetCancelRoutine(NextIrp, NULL); - IoCompleteRequest( NextIrp, IO_NETWORK_INCREMENT ); - } } if( FCB->Recv.Content ) { @@ -249,6 +285,8 @@ SocketStateUnlock( FCB ); return STATUS_INVALID_PARAMETER; } + + HandleEOFOnIrp( FCB, Irp->IoStatus.Status, Irp->IoStatus.Information ); ReceiveActivity( FCB, NULL );

1 0

[cgutman] 48399: [DHCPCSVC]: Revert part of r48215
by cgutman＠svn.reactos.org 01 Aug '10

01 Aug '10

Author: cgutman Date: Sun Aug 1 20:34:10 2010 New Revision: 48399 URL: http://svn.reactos.org/svn/reactos?rev=48399&view=rev Log: [DHCPCSVC]: Revert part of r48215 Modified: trunk/reactos/dll/win32/dhcpcsvc/dhcp/adapter.c Modified: trunk/reactos/dll/win32/dhcpcsvc/dhcp/adapter.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/dhcpcsvc/dhcp/ad… ============================================================================== --- trunk/reactos/dll/win32/dhcpcsvc/dhcp/adapter.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/dhcpcsvc/dhcp/adapter.c [iso-8859-1] Sun Aug 1 20:34:10 2010 @@ -102,8 +102,7 @@ "SYSTEM\\CurrentControlSet\\Control\\Class\\" "{4D36E972-E325-11CE-BFC1-08002BE10318}"; PCHAR TargetKeyNameStart = - "SYSTEM\\CurrentControlSet\\Services\\"; - PCHAR TargetKeyNameEnd = "\\Parameters\\Tcpip"; + "SYSTEM\\CurrentControlSet\\Services\\Tcpip\\Parameters\\Interfaces\\"; PCHAR TargetKeyName = NULL; PCHAR *EnumKeysLinkage = GetSubkeyNames( EnumKeyName, "\\Linkage" ); PCHAR *EnumKeysTop = GetSubkeyNames( EnumKeyName, "" ); @@ -125,10 +124,10 @@ !strcmp( RootDevice, Adapter->DhclientInfo.name ) ) { TargetKeyName = (CHAR*) malloc( strlen( TargetKeyNameStart ) + - strlen( RootDevice ) + strlen( TargetKeyNameEnd ) + 1); + strlen( RootDevice ) + 1); if( !TargetKeyName ) goto cleanup; - sprintf( TargetKeyName, "%s%s%s", - TargetKeyNameStart, RootDevice, TargetKeyNameEnd ); + sprintf( TargetKeyName, "%s%s", + TargetKeyNameStart, RootDevice ); Error = RegCreateKeyExA( HKEY_LOCAL_MACHINE, TargetKeyName, 0, NULL, 0, KEY_READ, NULL, &OutKey, NULL ); break; } else {

1 0

[gadamopoulos] 48398: [rtl] - Use __inline instead of __inline__ to fix compilation with msvc
by gadamopoulos＠svn.reactos.org 01 Aug '10

01 Aug '10

Author: gadamopoulos Date: Sun Aug 1 16:34:22 2010 New Revision: 48398 URL: http://svn.reactos.org/svn/reactos?rev=48398&view=rev Log: [rtl] - Use __inline instead of __inline__ to fix compilation with msvc Modified: trunk/reactos/lib/rtl/bitmap.c Modified: trunk/reactos/lib/rtl/bitmap.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/bitmap.c?rev=48398… ============================================================================== --- trunk/reactos/lib/rtl/bitmap.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/bitmap.c [iso-8859-1] Sun Aug 1 16:34:22 2010 @@ -43,7 +43,7 @@ /* PRIVATE FUNCTIONS ********************************************************/ -static __inline__ +static __inline ULONG RtlpGetLengthOfRunClear( IN PRTL_BITMAP BitMapHeader, @@ -92,7 +92,7 @@ return Length; } -static __inline__ +static __inline ULONG RtlpGetLengthOfRunSet( IN PRTL_BITMAP BitMapHeader,

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