Ros-diffs April 2009

ros-diffs@reactos.org

25 participants
476 discussions

[gedmurphy] 40422: Open folders in the existing window. Patch by Gabriel Ilardi See issue #4345 for more details.

by gedmurphy＠svn.reactos.org

Author: gedmurphy Date: Thu Apr 9 00:48:23 2009 New Revision: 40422 URL: http://svn.reactos.org/svn/reactos?rev=40422&view=rev Log: Open folders in the existing window. Patch by Gabriel Ilardi See issue #4345 for more details. Modified: trunk/reactos/base/shell/explorer/shell/mainframe.cpp Modified: trunk/reactos/base/shell/explorer/shell/mainframe.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/shell/… ============================================================================== --- trunk/reactos/base/shell/explorer/shell/mainframe.cpp [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer/shell/mainframe.cpp [iso-8859-1] Thu Apr 9 00:48:23 2009 @@ -96,7 +96,7 @@ XMLPos explorer_options = g_Globals.get_cfg("general/explorer"); bool mdi = XMLBool(explorer_options, "mdi", true); - bool separateFolders = XMLBool(explorer_options, "separate-folders", true); + bool separateFolders = XMLBool(explorer_options, "separate-folders", false); ShellPath pidl_abs = ShellPath(pidl).create_absolute_pidl(parent_pidl); LOG(FmtString(TEXT("MainFrameBase::OpenShellFolders(): pidl_abs=%s"), (LPCTSTR)FileSysShellPath(pidl_abs)));

16 years, 1 month

[cgutman] 40421: - Fix some copy/paste bugs - ISAPNP_MIN_READ_PORT is an acceptable read port so don't skip it (We add READ_DATA_PORT_STEP in FindNextReadPort) - Don't add READ_DATA_PORT_STEP before calling IsolateReadDataPortSelect (We add READ_DATA_PORT_STEP in FindNextReadPort) because then we skip a read data port - Thanks to the linux kernel source ; )

by cgutman＠svn.reactos.org

Author: cgutman Date: Wed Apr 8 23:10:06 2009 New Revision: 40421 URL: http://svn.reactos.org/svn/reactos?rev=40421&view=rev Log: - Fix some copy/paste bugs - ISAPNP_MIN_READ_PORT is an acceptable read port so don't skip it (We add READ_DATA_PORT_STEP in FindNextReadPort) - Don't add READ_DATA_PORT_STEP before calling IsolateReadDataPortSelect (We add READ_DATA_PORT_STEP in FindNextReadPort) because then we skip a read data port - Thanks to the linux kernel source ;) Modified: trunk/reactos/drivers/bus/isapnp/isapnp.c Modified: trunk/reactos/drivers/bus/isapnp/isapnp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/isapnp/isapnp.… ============================================================================== --- trunk/reactos/drivers/bus/isapnp/isapnp.c [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/isapnp/isapnp.c [iso-8859-1] Wed Apr 8 23:10:06 2009 @@ -301,7 +301,7 @@ DPRINT("Called\n"); - IsaPnPReadPort = (PUCHAR)ISAPNP_MIN_READ_PORT; + IsaPnPReadPort = (PUCHAR)(ISAPNP_MIN_READ_PORT - READ_DATA_PORT_STEP); if (!IsolateReadDataPortSelect()) { DPRINT("Could not set read data port\n"); return 0; @@ -340,7 +340,6 @@ goto next; } if (iteration == 1) { - IsaPnPReadPort += READ_DATA_PORT_STEP; if (!IsolateReadDataPortSelect()) { DPRINT("Could not set read data port\n"); return 0;

16 years, 1 month

[tkreuzer] 40420: Remove IntGdiSelectBrush and IntGdiSelectBrush, they are not needed anymore and superceded by DC_vUpdateFillBrush and DC_vUpdateLineBrush.

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Wed Apr 8 22:10:33 2009 New Revision: 40420 URL: http://svn.reactos.org/svn/reactos?rev=40420&view=rev Log: Remove IntGdiSelectBrush and IntGdiSelectBrush, they are not needed anymore and superceded by DC_vUpdateFillBrush and DC_vUpdateLineBrush. Modified: trunk/reactos/subsystems/win32/win32k/include/dc.h trunk/reactos/subsystems/win32/win32k/objects/bitblt.c trunk/reactos/subsystems/win32/win32k/objects/dcobjs.c trunk/reactos/subsystems/win32/win32k/objects/fillshap.c trunk/reactos/subsystems/win32/win32k/objects/path.c Modified: trunk/reactos/subsystems/win32/win32k/include/dc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/dc.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/include/dc.h [iso-8859-1] Wed Apr 8 22:10:33 2009 @@ -180,8 +180,6 @@ HDC FASTCALL IntGdiCreateDisplayDC(HDEV hDev, ULONG DcType, BOOL EmptyDC); BOOL FASTCALL IntGdiCleanDC(HDC hDC); VOID FASTCALL IntvGetDeviceCaps(PPDEVOBJ, PDEVCAPS); -HPEN FASTCALL IntGdiSelectPen(PDC,HPEN); -HBRUSH FASTCALL IntGdiSelectBrush(PDC,HBRUSH); INT FASTCALL IntGdiGetDeviceCaps(PDC,INT); extern PPDEVOBJ pPrimarySurface; Modified: trunk/reactos/subsystems/win32/win32k/objects/bitblt.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/bitblt.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/bitblt.c [iso-8859-1] Wed Apr 8 22:10:33 2009 @@ -1047,8 +1047,8 @@ pdcattr = dc->pdcattr; - if (pdcattr->ulDirty_ & DC_BRUSH_DIRTY) - IntGdiSelectBrush(dc,pdcattr->hbrush); + if (pdcattr->ulDirty_ & (DIRTY_FILL | DC_BRUSH_DIRTY)) + DC_vUpdateFillBrush(dc); for (r = pRects, i = 0; i < cRects; i++) { @@ -1110,8 +1110,8 @@ pdcattr = dc->pdcattr; - if (pdcattr->ulDirty_ & DC_BRUSH_DIRTY) - IntGdiSelectBrush(dc,pdcattr->hbrush); + if (pdcattr->ulDirty_ & (DIRTY_FILL | DC_BRUSH_DIRTY)) + DC_vUpdateFillBrush(dc); pbrush = BRUSH_LockBrush(pdcattr->hbrush); if (pbrush == NULL) Modified: trunk/reactos/subsystems/win32/win32k/objects/dcobjs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/dcobjs.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/dcobjs.c [iso-8859-1] Wed Apr 8 22:10:33 2009 @@ -284,49 +284,6 @@ return oldPal; } -HBRUSH -FASTCALL -IntGdiSelectBrush( - PDC pDC, - HBRUSH hBrush) -{ - PDC_ATTR pdcattr; - HBRUSH hOrgBrush; - - if (pDC == NULL || hBrush == NULL) return NULL; - - pdcattr = pDC->pdcattr; - - hOrgBrush = pdcattr->hbrush; - pdcattr->hbrush = hBrush; - - DC_vUpdateFillBrush(pDC); - - return hOrgBrush; -} - -HPEN -FASTCALL -IntGdiSelectPen( - PDC pDC, - HPEN hPen) -{ - PDC_ATTR pdcattr; - HPEN hOrgPen = NULL; - - if (pDC == NULL || hPen == NULL) return NULL; - - pdcattr = pDC->pdcattr; - - hOrgPen = pdcattr->hpen; - pdcattr->hpen = hPen; - - DC_vUpdateLineBrush(pDC); - - return hOrgPen; -} - - /* * @implemented */ @@ -347,7 +304,7 @@ return NULL; } -// hOrgBrush = IntGdiSelectBrush(pDC,hBrush); + /* Simply return the user mode value, without checking */ hOrgBrush = pDC->pdcattr->hbrush; pDC->pdcattr->hbrush = hBrush; DC_vUpdateFillBrush(pDC); @@ -377,7 +334,7 @@ return NULL; } -// hOrgPen = IntGdiSelectPen(pDC, hPen); + /* Simply return the user mode value, without checking */ hOrgPen = pDC->pdcattr->hpen; pDC->pdcattr->hpen = hPen; DC_vUpdateLineBrush(pDC); @@ -547,11 +504,11 @@ } pdcattr = pdc->pdcattr; - if (pdcattr->ulDirty_ & DC_BRUSH_DIRTY) - IntGdiSelectBrush(pdc, pdcattr->hbrush); - - if (pdcattr->ulDirty_ & DC_PEN_DIRTY) - IntGdiSelectPen(pdc, pdcattr->hpen); + if (pdcattr->ulDirty_ & (DIRTY_FILL | DC_BRUSH_DIRTY)) + DC_vUpdateFillBrush(pdc); + + if (pdcattr->ulDirty_ & (DIRTY_LINE | DC_PEN_DIRTY)) + DC_vUpdateLineBrush(pdc); switch(ObjectType) { Modified: trunk/reactos/subsystems/win32/win32k/objects/fillshap.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/fillshap.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/fillshap.c [iso-8859-1] Wed Apr 8 22:10:33 2009 @@ -243,11 +243,11 @@ pdcattr = dc->pdcattr; - if (pdcattr->ulDirty_ & DC_BRUSH_DIRTY) - IntGdiSelectBrush(dc,pdcattr->hbrush); - - if (pdcattr->ulDirty_ & DC_PEN_DIRTY) - IntGdiSelectPen(dc,pdcattr->hpen); + if (pdcattr->ulDirty_ & (DIRTY_FILL | DC_BRUSH_DIRTY)) + DC_vUpdateFillBrush(dc); + + if (pdcattr->ulDirty_ & (DIRTY_LINE | DC_PEN_DIRTY)) + DC_vUpdateLineBrush(dc); pbrush = PEN_LockPen(pdcattr->hpen); if (!pbrush) @@ -726,11 +726,11 @@ pdcattr = dc->pdcattr; - if (pdcattr->ulDirty_ & DC_BRUSH_DIRTY) - IntGdiSelectBrush(dc,pdcattr->hbrush); - - if (pdcattr->ulDirty_ & DC_PEN_DIRTY) - IntGdiSelectPen(dc,pdcattr->hpen); + if (pdcattr->ulDirty_ & (DIRTY_FILL | DC_BRUSH_DIRTY)) + DC_vUpdateFillBrush(dc); + + if (pdcattr->ulDirty_ & (DIRTY_LINE | DC_PEN_DIRTY)) + DC_vUpdateLineBrush(dc); pbrushLine = PEN_LockPen(pdcattr->hpen); if (!pbrushLine) Modified: trunk/reactos/subsystems/win32/win32k/objects/path.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/path.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/path.c [iso-8859-1] Wed Apr 8 22:10:33 2009 @@ -2294,8 +2294,8 @@ pdcattr = dc->pdcattr; - if (pdcattr->ulDirty_ & DC_BRUSH_DIRTY) - IntGdiSelectBrush(dc,pdcattr->hbrush); + if (pdcattr->ulDirty_ & (DIRTY_LINE | DC_PEN_DIRTY)) + DC_vUpdateLineBrush(dc); ret = PATH_FillPath( dc, pPath ); if ( ret ) @@ -2569,10 +2569,11 @@ pdcattr = pDc->pdcattr; - if (pdcattr->ulDirty_ & DC_BRUSH_DIRTY) - IntGdiSelectBrush(pDc,pdcattr->hbrush); - if (pdcattr->ulDirty_ & DC_PEN_DIRTY) - IntGdiSelectPen(pDc,pdcattr->hpen); + if (pdcattr->ulDirty_ & (DIRTY_FILL | DC_BRUSH_DIRTY)) + DC_vUpdateFillBrush(pDc); + + if (pdcattr->ulDirty_ & (DIRTY_LINE | DC_PEN_DIRTY)) + DC_vUpdateLineBrush(pDc); bRet = PATH_FillPath(pDc, pPath); if (bRet) bRet = PATH_StrokePath(pDc, pPath); @@ -2608,8 +2609,8 @@ pdcattr = pDc->pdcattr; - if (pdcattr->ulDirty_ & DC_PEN_DIRTY) - IntGdiSelectPen(pDc,pdcattr->hpen); + if (pdcattr->ulDirty_ & (DIRTY_LINE | DC_PEN_DIRTY)) + DC_vUpdateLineBrush(pDc); bRet = PATH_StrokePath(pDc, pPath); PATH_EmptyPath(pPath);

16 years, 1 month

[fireball] 40419: - Remove trunk/web. Web development moves to another repository.

by fireball＠svn.reactos.org

Author: fireball Date: Wed Apr 8 21:18:34 2009 New Revision: 40419 URL: http://svn.reactos.org/svn/reactos?rev=40419&view=rev Log: - Remove trunk/web. Web development moves to another repository. Removed: trunk/web/

16 years, 1 month

[gschneider] 40418: - Offset coordinates with viewport origin for gradient filled triangular and rectangular shapes

by gschneider＠svn.reactos.org

Author: gschneider Date: Wed Apr 8 20:53:21 2009 New Revision: 40418 URL: http://svn.reactos.org/svn/reactos?rev=40418&view=rev Log: - Offset coordinates with viewport origin for gradient filled triangular and rectangular shapes Modified: trunk/reactos/subsystems/win32/win32k/objects/fillshap.c Modified: trunk/reactos/subsystems/win32/win32k/objects/fillshap.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/fillshap.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/fillshap.c [iso-8859-1] Wed Apr 8 20:53:21 2009 @@ -907,6 +907,8 @@ DitherOrg.x = dc->ptlDCOrig.x; DitherOrg.y = dc->ptlDCOrig.y; + IntLPtoDP(dc, (LPPOINT)&DitherOrg, 1); + Extent.left += DitherOrg.x; Extent.right += DitherOrg.x; Extent.top += DitherOrg.y;

16 years, 1 month

[tkreuzer] 40417: [FORMATTING] - fix indentation - move an internal function out of public functions area - Use small file header - No code change

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Wed Apr 8 18:18:23 2009 New Revision: 40417 URL: http://svn.reactos.org/svn/reactos?rev=40417&view=rev Log: [FORMATTING] - fix indentation - move an internal function out of public functions area - Use small file header - No code change Modified: trunk/reactos/subsystems/win32/win32k/objects/brush.c Modified: trunk/reactos/subsystems/win32/win32k/objects/brush.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/brush.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/brush.c [iso-8859-1] Wed Apr 8 18:18:23 2009 @@ -1,23 +1,9 @@ -/* - * ReactOS Win32 Subsystem - * - * Copyright (C) 1998 - 2004 ReactOS Team - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - * - * $Id$ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS win32 subsystem + * PURPOSE: Functions for brushes + * FILE: subsystem/win32/win32k/objects/brush.c + * PROGRAMER: */ #include <w32k.h> @@ -27,44 +13,46 @@ static const USHORT HatchBrushes[NB_HATCH_STYLES][8] = { - {0x00, 0x00, 0x00, 0x00, 0xff, 0x00, 0x00, 0x00}, /* HS_HORIZONTAL */ - {0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08}, /* HS_VERTICAL */ - {0x01, 0x02, 0x04, 0x08, 0x10, 0x20, 0x40, 0x80}, /* HS_FDIAGONAL */ - {0x80, 0x40, 0x20, 0x10, 0x08, 0x04, 0x02, 0x01}, /* HS_BDIAGONAL */ - {0x08, 0x08, 0x08, 0x08, 0xff, 0x08, 0x08, 0x08}, /* HS_CROSS */ - {0x81, 0x42, 0x24, 0x18, 0x18, 0x24, 0x42, 0x81} /* HS_DIAGCROSS */ + {0x00, 0x00, 0x00, 0x00, 0xff, 0x00, 0x00, 0x00}, /* HS_HORIZONTAL */ + {0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08}, /* HS_VERTICAL */ + {0x01, 0x02, 0x04, 0x08, 0x10, 0x20, 0x40, 0x80}, /* HS_FDIAGONAL */ + {0x80, 0x40, 0x20, 0x10, 0x08, 0x04, 0x02, 0x01}, /* HS_BDIAGONAL */ + {0x08, 0x08, 0x08, 0x08, 0xff, 0x08, 0x08, 0x08}, /* HS_CROSS */ + {0x81, 0x42, 0x24, 0x18, 0x18, 0x24, 0x42, 0x81} /* HS_DIAGCROSS */ }; -BOOL INTERNAL_CALL +BOOL +INTERNAL_CALL BRUSH_Cleanup(PVOID ObjectBody) { - PBRUSH pbrush = (PBRUSH)ObjectBody; - if(pbrush->flAttrs & (GDIBRUSH_IS_HATCH | GDIBRUSH_IS_BITMAP)) - { - ASSERT(pbrush->hbmPattern); - GDIOBJ_SetOwnership(pbrush->hbmPattern, PsGetCurrentProcess()); - GreDeleteObject(pbrush->hbmPattern); - } - - /* Free the kmode styles array of EXTPENS */ - if (pbrush->pStyle) - { - ExFreePool(pbrush->pStyle); - } - - return TRUE; -} - -INT FASTCALL -BRUSH_GetObject (PBRUSH pbrush, INT Count, LPLOGBRUSH Buffer) -{ - if( Buffer == NULL ) return sizeof(LOGBRUSH); - if (Count == 0) return 0; - - /* Set colour */ + PBRUSH pbrush = (PBRUSH)ObjectBody; + if (pbrush->flAttrs & (GDIBRUSH_IS_HATCH | GDIBRUSH_IS_BITMAP)) + { + ASSERT(pbrush->hbmPattern); + GDIOBJ_SetOwnership(pbrush->hbmPattern, PsGetCurrentProcess()); + GreDeleteObject(pbrush->hbmPattern); + } + + /* Free the kmode styles array of EXTPENS */ + if (pbrush->pStyle) + { + ExFreePool(pbrush->pStyle); + } + + return TRUE; +} + +INT +FASTCALL +BRUSH_GetObject(PBRUSH pbrush, INT Count, LPLOGBRUSH Buffer) +{ + if (Buffer == NULL) return sizeof(LOGBRUSH); + if (Count == 0) return 0; + + /* Set colour */ Buffer->lbColor = pbrush->BrushAttr.lbColor; - /* set Hatch */ + /* Set Hatch */ if ((pbrush->flAttrs & GDIBRUSH_IS_HATCH)!=0) { /* FIXME : this is not the right value */ @@ -135,448 +123,453 @@ * @return * TRUE if the input values together form a valid image, FALSE otherwise. */ - -BOOL APIENTRY +BOOL +APIENTRY CalculateColorTableSize( - CONST BITMAPINFOHEADER *BitmapInfoHeader, - UINT *ColorSpec, - UINT *ColorTableSize) -{ - WORD BitCount; - DWORD ClrUsed; - DWORD Compression; - - /* - * At first get some basic parameters from the passed BitmapInfoHeader - * structure. It can have one of the following formats: - * - BITMAPCOREHEADER (the oldest one with totally different layout - * from the others) - * - BITMAPINFOHEADER (the standard and most common header) - * - BITMAPV4HEADER (extension of BITMAPINFOHEADER) - * - BITMAPV5HEADER (extension of BITMAPV4HEADER) - */ - - if (BitmapInfoHeader->biSize == sizeof(BITMAPCOREHEADER)) - { - BitCount = ((LPBITMAPCOREHEADER)BitmapInfoHeader)->bcBitCount; - ClrUsed = 0; - Compression = BI_RGB; - } - else - { - BitCount = BitmapInfoHeader->biBitCount; - ClrUsed = BitmapInfoHeader->biClrUsed; - Compression = BitmapInfoHeader->biCompression; - } - - switch (Compression) - { - case BI_BITFIELDS: - if (*ColorSpec == DIB_PAL_COLORS) - *ColorSpec = DIB_RGB_COLORS; - - if (BitCount != 16 && BitCount != 32) + CONST BITMAPINFOHEADER *BitmapInfoHeader, + UINT *ColorSpec, + UINT *ColorTableSize) +{ + WORD BitCount; + DWORD ClrUsed; + DWORD Compression; + + /* + * At first get some basic parameters from the passed BitmapInfoHeader + * structure. It can have one of the following formats: + * - BITMAPCOREHEADER (the oldest one with totally different layout + * from the others) + * - BITMAPINFOHEADER (the standard and most common header) + * - BITMAPV4HEADER (extension of BITMAPINFOHEADER) + * - BITMAPV5HEADER (extension of BITMAPV4HEADER) + */ + if (BitmapInfoHeader->biSize == sizeof(BITMAPCOREHEADER)) + { + BitCount = ((LPBITMAPCOREHEADER)BitmapInfoHeader)->bcBitCount; + ClrUsed = 0; + Compression = BI_RGB; + } + else + { + BitCount = BitmapInfoHeader->biBitCount; + ClrUsed = BitmapInfoHeader->biClrUsed; + Compression = BitmapInfoHeader->biCompression; + } + + switch (Compression) + { + case BI_BITFIELDS: + if (*ColorSpec == DIB_PAL_COLORS) + *ColorSpec = DIB_RGB_COLORS; + + if (BitCount != 16 && BitCount != 32) + return FALSE; + + /* For BITMAPV4HEADER/BITMAPV5HEADER the masks are included in + * the structure itself (bV4RedMask, bV4GreenMask, and bV4BlueMask). + * For BITMAPINFOHEADER the color masks are stored in the palette. */ + if (BitmapInfoHeader->biSize > sizeof(BITMAPINFOHEADER)) + *ColorTableSize = 0; + else + *ColorTableSize = 3; + + return TRUE; + + case BI_RGB: + switch (BitCount) + { + case 1: + *ColorTableSize = ClrUsed ? min(ClrUsed, 2) : 2; + return TRUE; + + case 4: + *ColorTableSize = ClrUsed ? min(ClrUsed, 16) : 16; + return TRUE; + + case 8: + *ColorTableSize = ClrUsed ? min(ClrUsed, 256) : 256; + return TRUE; + + default: + if (*ColorSpec == DIB_PAL_COLORS) + *ColorSpec = DIB_RGB_COLORS; + if (BitCount != 16 && BitCount != 24 && BitCount != 32) + return FALSE; + *ColorTableSize = ClrUsed; + return TRUE; + } + + case BI_RLE4: + if (BitCount == 4) + { + *ColorTableSize = ClrUsed ? min(ClrUsed, 16) : 16; + return TRUE; + } return FALSE; - /* - * For BITMAPV4HEADER/BITMAPV5HEADER the masks are included in - * the structure itself (bV4RedMask, bV4GreenMask, and bV4BlueMask). - * For BITMAPINFOHEADER the color masks are stored in the palette. - */ - - if (BitmapInfoHeader->biSize > sizeof(BITMAPINFOHEADER)) - *ColorTableSize = 0; - else - *ColorTableSize = 3; - - return TRUE; - - case BI_RGB: - switch (BitCount) - { - case 1: - *ColorTableSize = ClrUsed ? min(ClrUsed, 2) : 2; - return TRUE; - - case 4: - *ColorTableSize = ClrUsed ? min(ClrUsed, 16) : 16; - return TRUE; - - case 8: - *ColorTableSize = ClrUsed ? min(ClrUsed, 256) : 256; - return TRUE; - - default: - if (*ColorSpec == DIB_PAL_COLORS) - *ColorSpec = DIB_RGB_COLORS; - if (BitCount != 16 && BitCount != 24 && BitCount != 32) - return FALSE; - *ColorTableSize = ClrUsed; - return TRUE; - } - - case BI_RLE4: - if (BitCount == 4) - { - *ColorTableSize = ClrUsed ? min(ClrUsed, 16) : 16; + case BI_RLE8: + if (BitCount == 8) + { + *ColorTableSize = ClrUsed ? min(ClrUsed, 256) : 256; + return TRUE; + } + return FALSE; + + case BI_JPEG: + case BI_PNG: + *ColorTableSize = ClrUsed; return TRUE; - } - return FALSE; - - case BI_RLE8: - if (BitCount == 8) - { - *ColorTableSize = ClrUsed ? min(ClrUsed, 256) : 256; - return TRUE; - } - return FALSE; - - case BI_JPEG: - case BI_PNG: - *ColorTableSize = ClrUsed; - return TRUE; - - default: - return FALSE; - } -} - -HBRUSH APIENTRY + + default: + return FALSE; + } +} + +HBRUSH +APIENTRY IntGdiCreateDIBBrush( - CONST BITMAPINFO *BitmapInfo, - UINT ColorSpec, - UINT BitmapInfoSize, - CONST VOID *PackedDIB) -{ - HBRUSH hBrush; - PBRUSH pbrush; - HBITMAP hPattern; - ULONG_PTR DataPtr; - UINT PaletteEntryCount; - PSURFACE psurfPattern; - INT PaletteType; - - if (BitmapInfo->bmiHeader.biSize < sizeof(BITMAPINFOHEADER)) - { - SetLastWin32Error(ERROR_INVALID_PARAMETER); - return NULL; - } - - if (!CalculateColorTableSize(&BitmapInfo->bmiHeader, &ColorSpec, - &PaletteEntryCount)) - { - SetLastWin32Error(ERROR_INVALID_PARAMETER); - return NULL; - } - - DataPtr = (ULONG_PTR)BitmapInfo + BitmapInfo->bmiHeader.biSize; - if (ColorSpec == DIB_RGB_COLORS) - DataPtr += PaletteEntryCount * sizeof(RGBQUAD); - else - DataPtr += PaletteEntryCount * sizeof(USHORT); - - hPattern = IntGdiCreateBitmap(BitmapInfo->bmiHeader.biWidth, - BitmapInfo->bmiHeader.biHeight, - BitmapInfo->bmiHeader.biPlanes, - BitmapInfo->bmiHeader.biBitCount, - (PVOID)DataPtr); - if (hPattern == NULL) - { - SetLastWin32Error(ERROR_NOT_ENOUGH_MEMORY); - return NULL; - } - - psurfPattern = SURFACE_LockSurface(hPattern); - ASSERT(psurfPattern != NULL); - psurfPattern->hDIBPalette = BuildDIBPalette(BitmapInfo, &PaletteType); - SURFACE_UnlockSurface(psurfPattern); - - pbrush = BRUSH_AllocBrushWithHandle(); - if (pbrush == NULL) - { - GreDeleteObject(hPattern); - SetLastWin32Error(ERROR_NOT_ENOUGH_MEMORY); - return NULL; - } - hBrush = pbrush->BaseObject.hHmgr; - - pbrush->flAttrs |= GDIBRUSH_IS_BITMAP | GDIBRUSH_IS_DIB; - pbrush->hbmPattern = hPattern; - /* FIXME: Fill in the rest of fields!!! */ - - GDIOBJ_SetOwnership(hPattern, NULL); - - BRUSH_UnlockBrush(pbrush); - - return hBrush; -} - -HBRUSH APIENTRY + CONST BITMAPINFO *BitmapInfo, + UINT ColorSpec, + UINT BitmapInfoSize, + CONST VOID *PackedDIB) +{ + HBRUSH hBrush; + PBRUSH pbrush; + HBITMAP hPattern; + ULONG_PTR DataPtr; + UINT PaletteEntryCount; + PSURFACE psurfPattern; + INT PaletteType; + + if (BitmapInfo->bmiHeader.biSize < sizeof(BITMAPINFOHEADER)) + { + SetLastWin32Error(ERROR_INVALID_PARAMETER); + return NULL; + } + + if (!CalculateColorTableSize(&BitmapInfo->bmiHeader, + &ColorSpec, + &PaletteEntryCount)) + { + SetLastWin32Error(ERROR_INVALID_PARAMETER); + return NULL; + } + + // FIXME: What about BI_BITFIELDS + DataPtr = (ULONG_PTR)BitmapInfo + BitmapInfo->bmiHeader.biSize; + if (ColorSpec == DIB_RGB_COLORS) + DataPtr += PaletteEntryCount * sizeof(RGBQUAD); + else + DataPtr += PaletteEntryCount * sizeof(USHORT); + + hPattern = IntGdiCreateBitmap(BitmapInfo->bmiHeader.biWidth, + BitmapInfo->bmiHeader.biHeight, + BitmapInfo->bmiHeader.biPlanes, + BitmapInfo->bmiHeader.biBitCount, + (PVOID)DataPtr); + if (hPattern == NULL) + { + SetLastWin32Error(ERROR_NOT_ENOUGH_MEMORY); + return NULL; + } + + psurfPattern = SURFACE_LockSurface(hPattern); + ASSERT(psurfPattern != NULL); + psurfPattern->hDIBPalette = BuildDIBPalette(BitmapInfo, &PaletteType); + SURFACE_UnlockSurface(psurfPattern); + + pbrush = BRUSH_AllocBrushWithHandle(); + if (pbrush == NULL) + { + GreDeleteObject(hPattern); + SetLastWin32Error(ERROR_NOT_ENOUGH_MEMORY); + return NULL; + } + hBrush = pbrush->BaseObject.hHmgr; + + pbrush->flAttrs |= GDIBRUSH_IS_BITMAP | GDIBRUSH_IS_DIB; + pbrush->hbmPattern = hPattern; + /* FIXME: Fill in the rest of fields!!! */ + + GDIOBJ_SetOwnership(hPattern, NULL); + + BRUSH_UnlockBrush(pbrush); + + return hBrush; +} + +HBRUSH +APIENTRY IntGdiCreateHatchBrush( - INT Style, - COLORREF Color) -{ - HBRUSH hBrush; - PBRUSH pbrush; - HBITMAP hPattern; - - if (Style < 0 || Style >= NB_HATCH_STYLES) - { - return 0; - } - - hPattern = IntGdiCreateBitmap(8, 8, 1, 1, (LPBYTE)HatchBrushes[Style]); - if (hPattern == NULL) - { - SetLastWin32Error(ERROR_NOT_ENOUGH_MEMORY); - return NULL; - } - - pbrush = BRUSH_AllocBrushWithHandle(); - if (pbrush == NULL) - { - GreDeleteObject(hPattern); - SetLastWin32Error(ERROR_NOT_ENOUGH_MEMORY); - return NULL; - } - hBrush = pbrush->BaseObject.hHmgr; - - pbrush->flAttrs |= GDIBRUSH_IS_HATCH; - pbrush->hbmPattern = hPattern; - pbrush->BrushAttr.lbColor = Color & 0xFFFFFF; - - GDIOBJ_SetOwnership(hPattern, NULL); - - BRUSH_UnlockBrush(pbrush); - - return hBrush; -} - -HBRUSH APIENTRY + INT Style, + COLORREF Color) +{ + HBRUSH hBrush; + PBRUSH pbrush; + HBITMAP hPattern; + + if (Style < 0 || Style >= NB_HATCH_STYLES) + { + return 0; + } + + hPattern = IntGdiCreateBitmap(8, 8, 1, 1, (LPBYTE)HatchBrushes[Style]); + if (hPattern == NULL) + { + SetLastWin32Error(ERROR_NOT_ENOUGH_MEMORY); + return NULL; + } + + pbrush = BRUSH_AllocBrushWithHandle(); + if (pbrush == NULL) + { + GreDeleteObject(hPattern); + SetLastWin32Error(ERROR_NOT_ENOUGH_MEMORY); + return NULL; + } + hBrush = pbrush->BaseObject.hHmgr; + + pbrush->flAttrs |= GDIBRUSH_IS_HATCH; + pbrush->hbmPattern = hPattern; + pbrush->BrushAttr.lbColor = Color & 0xFFFFFF; + + GDIOBJ_SetOwnership(hPattern, NULL); + + BRUSH_UnlockBrush(pbrush); + + return hBrush; +} + +HBRUSH +APIENTRY IntGdiCreatePatternBrush( - HBITMAP hBitmap) -{ - HBRUSH hBrush; - PBRUSH pbrush; - HBITMAP hPattern; - - hPattern = BITMAP_CopyBitmap(hBitmap); - if (hPattern == NULL) - { - SetLastWin32Error(ERROR_NOT_ENOUGH_MEMORY); - return NULL; - } - - pbrush = BRUSH_AllocBrushWithHandle(); - if (pbrush == NULL) - { - GreDeleteObject(hPattern); - SetLastWin32Error(ERROR_NOT_ENOUGH_MEMORY); - return NULL; - } - hBrush = pbrush->BaseObject.hHmgr; - - pbrush->flAttrs |= GDIBRUSH_IS_BITMAP; - pbrush->hbmPattern = hPattern; - /* FIXME: Fill in the rest of fields!!! */ - - GDIOBJ_SetOwnership(hPattern, NULL); - - BRUSH_UnlockBrush(pbrush); - - return hBrush; -} - -HBRUSH APIENTRY + HBITMAP hBitmap) +{ + HBRUSH hBrush; + PBRUSH pbrush; + HBITMAP hPattern; + + hPattern = BITMAP_CopyBitmap(hBitmap); + if (hPattern == NULL) + { + SetLastWin32Error(ERROR_NOT_ENOUGH_MEMORY); + return NULL; + } + + pbrush = BRUSH_AllocBrushWithHandle(); + if (pbrush == NULL) + { + GreDeleteObject(hPattern); + SetLastWin32Error(ERROR_NOT_ENOUGH_MEMORY); + return NULL; + } + hBrush = pbrush->BaseObject.hHmgr; + + pbrush->flAttrs |= GDIBRUSH_IS_BITMAP; + pbrush->hbmPattern = hPattern; + /* FIXME: Fill in the rest of fields!!! */ + + GDIOBJ_SetOwnership(hPattern, NULL); + + BRUSH_UnlockBrush(pbrush); + + return hBrush; +} + +HBRUSH +APIENTRY IntGdiCreateSolidBrush( - COLORREF Color) -{ - HBRUSH hBrush; - PBRUSH pbrush; - - pbrush = BRUSH_AllocBrushWithHandle(); - if (pbrush == NULL) - { - SetLastWin32Error(ERROR_NOT_ENOUGH_MEMORY); - return NULL; - } - hBrush = pbrush->BaseObject.hHmgr; - - pbrush->flAttrs |= GDIBRUSH_IS_SOLID; - - pbrush->BrushAttr.lbColor = Color; - /* FIXME: Fill in the rest of fields!!! */ - - BRUSH_UnlockBrush(pbrush); - - return hBrush; -} - -HBRUSH APIENTRY + COLORREF Color) +{ + HBRUSH hBrush; + PBRUSH pbrush; + + pbrush = BRUSH_AllocBrushWithHandle(); + if (pbrush == NULL) + { + SetLastWin32Error(ERROR_NOT_ENOUGH_MEMORY); + return NULL; + } + hBrush = pbrush->BaseObject.hHmgr; + + pbrush->flAttrs |= GDIBRUSH_IS_SOLID; + + pbrush->BrushAttr.lbColor = Color; + /* FIXME: Fill in the rest of fields!!! */ + + BRUSH_UnlockBrush(pbrush); + + return hBrush; +} + +HBRUSH +APIENTRY IntGdiCreateNullBrush(VOID) { - HBRUSH hBrush; - PBRUSH pbrush; - - pbrush = BRUSH_AllocBrushWithHandle(); - if (pbrush == NULL) - { - SetLastWin32Error(ERROR_NOT_ENOUGH_MEMORY); - return NULL; - } - hBrush = pbrush->BaseObject.hHmgr; - - pbrush->flAttrs |= GDIBRUSH_IS_NULL; - BRUSH_UnlockBrush(pbrush); - - return hBrush; + HBRUSH hBrush; + PBRUSH pbrush; + + pbrush = BRUSH_AllocBrushWithHandle(); + if (pbrush == NULL) + { + SetLastWin32Error(ERROR_NOT_ENOUGH_MEMORY); + return NULL; + } + hBrush = pbrush->BaseObject.hHmgr; + + pbrush->flAttrs |= GDIBRUSH_IS_NULL; + BRUSH_UnlockBrush(pbrush); + + return hBrush; +} + +VOID +FASTCALL +IntGdiSetSolidBrushColor(HBRUSH hBrush, COLORREF Color) +{ + PBRUSH pbrush; + + pbrush = BRUSH_LockBrush(hBrush); + if (pbrush->flAttrs & GDIBRUSH_IS_SOLID) + { + pbrush->BrushAttr.lbColor = Color & 0xFFFFFF; + } + BRUSH_UnlockBrush(pbrush); } /* PUBLIC FUNCTIONS ***********************************************************/ -HBRUSH APIENTRY +HBRUSH +APIENTRY NtGdiCreateDIBBrush( - IN PVOID BitmapInfoAndData, - IN FLONG ColorSpec, - IN UINT BitmapInfoSize, - IN BOOL b8X8, - IN BOOL bPen, - IN PVOID PackedDIB) -{ - BITMAPINFO *SafeBitmapInfoAndData; - NTSTATUS Status = STATUS_SUCCESS; - HBRUSH hBrush; - - SafeBitmapInfoAndData = EngAllocMem(FL_ZERO_MEMORY, BitmapInfoSize, TAG_DIB); - if (SafeBitmapInfoAndData == NULL) - { - SetLastWin32Error(ERROR_NOT_ENOUGH_MEMORY); - return NULL; - } - - _SEH2_TRY - { - ProbeForRead(BitmapInfoAndData, - BitmapInfoSize, - 1); - RtlCopyMemory(SafeBitmapInfoAndData, - BitmapInfoAndData, - BitmapInfoSize); - } - _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) - { - Status = _SEH2_GetExceptionCode(); - } - _SEH2_END; - - if (!NT_SUCCESS(Status)) - { - EngFreeMem(SafeBitmapInfoAndData); - SetLastNtError(Status); - return 0; - } - - hBrush = IntGdiCreateDIBBrush(SafeBitmapInfoAndData, ColorSpec, - BitmapInfoSize, PackedDIB); - - EngFreeMem(SafeBitmapInfoAndData); - - return hBrush; -} - -HBRUSH APIENTRY + IN PVOID BitmapInfoAndData, + IN FLONG ColorSpec, + IN UINT BitmapInfoSize, + IN BOOL b8X8, + IN BOOL bPen, + IN PVOID PackedDIB) +{ + BITMAPINFO *SafeBitmapInfoAndData; + NTSTATUS Status = STATUS_SUCCESS; + HBRUSH hBrush; + + SafeBitmapInfoAndData = EngAllocMem(FL_ZERO_MEMORY, BitmapInfoSize, TAG_DIB); + if (SafeBitmapInfoAndData == NULL) + { + SetLastWin32Error(ERROR_NOT_ENOUGH_MEMORY); + return NULL; + } + + _SEH2_TRY + { + ProbeForRead(BitmapInfoAndData, BitmapInfoSize, 1); + RtlCopyMemory(SafeBitmapInfoAndData, BitmapInfoAndData, BitmapInfoSize); + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + Status = _SEH2_GetExceptionCode(); + } + _SEH2_END; + + if (!NT_SUCCESS(Status)) + { + EngFreeMem(SafeBitmapInfoAndData); + SetLastNtError(Status); + return 0; + } + + hBrush = IntGdiCreateDIBBrush(SafeBitmapInfoAndData, + ColorSpec, + BitmapInfoSize, + PackedDIB); + + EngFreeMem(SafeBitmapInfoAndData); + + return hBrush; +} + +HBRUSH +APIENTRY NtGdiCreateHatchBrushInternal( - ULONG Style, - COLORREF Color, - BOOL bPen) -{ - return IntGdiCreateHatchBrush(Style, Color); -} - -HBRUSH APIENTRY + ULONG Style, + COLORREF Color, + BOOL bPen) +{ + return IntGdiCreateHatchBrush(Style, Color); +} + +HBRUSH +APIENTRY NtGdiCreatePatternBrushInternal( - HBITMAP hBitmap, - BOOL bPen, - BOOL b8x8) -{ - return IntGdiCreatePatternBrush(hBitmap); -} - -HBRUSH APIENTRY + HBITMAP hBitmap, + BOOL bPen, + BOOL b8x8) +{ + return IntGdiCreatePatternBrush(hBitmap); +} + +HBRUSH +APIENTRY NtGdiCreateSolidBrush(COLORREF Color, IN OPTIONAL HBRUSH hbr) { - return IntGdiCreateSolidBrush(Color); -} - -/* - * NtGdiSetBrushOrg - * - * The NtGdiSetBrushOrg function sets the brush origin that GDI assigns to + return IntGdiCreateSolidBrush(Color); +} + +/** + * \name NtGdiSetBrushOrg + * + * \brief Sets the brush origin that GDI assigns to * the next brush an application selects into the specified device context. * - * Status - * @implemented + * @implemented */ - -BOOL APIENTRY +BOOL +APIENTRY NtGdiSetBrushOrg(HDC hDC, INT XOrg, INT YOrg, LPPOINT Point) { - PDC dc; - PDC_ATTR pdcattr; - - dc = DC_LockDc(hDC); - if (dc == NULL) - { - SetLastWin32Error(ERROR_INVALID_HANDLE); - return FALSE; - } - pdcattr = dc->pdcattr; - - if (Point != NULL) - { - NTSTATUS Status = STATUS_SUCCESS; - POINT SafePoint; - SafePoint.x = pdcattr->ptlBrushOrigin.x; - SafePoint.y = pdcattr->ptlBrushOrigin.y; - _SEH2_TRY - { - ProbeForWrite(Point, - sizeof(POINT), - 1); - *Point = SafePoint; - } - _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) - { - Status = _SEH2_GetExceptionCode(); - } - _SEH2_END; - - if(!NT_SUCCESS(Status)) - { - DC_UnlockDc(dc); - SetLastNtError(Status); + PDC dc; + PDC_ATTR pdcattr; + + dc = DC_LockDc(hDC); + if (dc == NULL) + { + SetLastWin32Error(ERROR_INVALID_HANDLE); return FALSE; - } - } - pdcattr->ptlBrushOrigin.x = XOrg; - pdcattr->ptlBrushOrigin.y = YOrg; - DC_UnlockDc(dc); - return TRUE; -} - -VOID FASTCALL -IntGdiSetSolidBrushColor(HBRUSH hBrush, COLORREF Color) -{ - PBRUSH pbrush; - - pbrush = BRUSH_LockBrush(hBrush); - if (pbrush->flAttrs & GDIBRUSH_IS_SOLID) - { - pbrush->BrushAttr.lbColor = Color & 0xFFFFFF; - } - BRUSH_UnlockBrush(pbrush); + } + pdcattr = dc->pdcattr; + + if (Point != NULL) + { + NTSTATUS Status = STATUS_SUCCESS; + POINT SafePoint; + SafePoint.x = pdcattr->ptlBrushOrigin.x; + SafePoint.y = pdcattr->ptlBrushOrigin.y; + _SEH2_TRY + { + ProbeForWrite(Point, sizeof(POINT), 1); + *Point = SafePoint; + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + Status = _SEH2_GetExceptionCode(); + } + _SEH2_END; + + if (!NT_SUCCESS(Status)) + { + DC_UnlockDc(dc); + SetLastNtError(Status); + return FALSE; + } + } + + pdcattr->ptlBrushOrigin.x = XOrg; + pdcattr->ptlBrushOrigin.y = YOrg; + DC_UnlockDc(dc); + + return TRUE; } /* EOF */

16 years, 1 month

[fireball] 40416: - ScsiPortNotification and ScsiPortDebugPrint are cdecl (stdcall introduced in r29277 by mistake).

by fireball＠svn.reactos.org

Author: fireball Date: Wed Apr 8 17:07:17 2009 New Revision: 40416 URL: http://svn.reactos.org/svn/reactos?rev=40416&view=rev Log: - ScsiPortNotification and ScsiPortDebugPrint are cdecl (stdcall introduced in r29277 by mistake). Modified: trunk/reactos/drivers/storage/ide/uniata/srb.h Modified: trunk/reactos/drivers/storage/ide/uniata/srb.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/uniata… ============================================================================== --- trunk/reactos/drivers/storage/ide/uniata/srb.h [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/ide/uniata/srb.h [iso-8859-1] Wed Apr 8 17:07:17 2009 @@ -715,7 +715,7 @@ ); SCSIPORT_API -VOID DDKAPI +VOID DDKCDECLAPI ScsiPortNotification( IN SCSI_NOTIFICATION_TYPE NotificationType, IN PVOID HwDeviceExtension, @@ -960,7 +960,7 @@ // begin_ntminitape SCSIPORT_API -VOID DDKAPI +VOID DDKCDECLAPI ScsiDebugPrint( ULONG DebugPrintLevel, PCCHAR DebugMessage,

16 years, 1 month

[fireball] 40415: - Remove danny-web branch. Web development moves to another repository.

by fireball＠svn.reactos.org

Author: fireball Date: Wed Apr 8 12:58:31 2009 New Revision: 40415 URL: http://svn.reactos.org/svn/reactos?rev=40415&view=rev Log: - Remove danny-web branch. Web development moves to another repository. Removed: branches/danny-web/

16 years, 1 month

[fireball] 40414: - Remove vendor imports of Web stuff (bugzilla, buildbot, mediawiki, serendipity. Web development moves to another repository.

by fireball＠svn.reactos.org

Author: fireball Date: Wed Apr 8 12:36:31 2009 New Revision: 40414 URL: http://svn.reactos.org/svn/reactos?rev=40414&view=rev Log: - Remove vendor imports of Web stuff (bugzilla, buildbot, mediawiki, serendipity. Web development moves to another repository. Removed: vendor/bugzilla/ vendor/buildbot/ vendor/mediawiki/ vendor/serendipity/

16 years, 1 month

[cgutman] 40413: - Pass the packet flags to the MiniportSend handler

by cgutman＠svn.reactos.org

Author: cgutman Date: Wed Apr 8 08:01:13 2009 New Revision: 40413 URL: http://svn.reactos.org/svn/reactos?rev=40413&view=rev Log: - Pass the packet flags to the MiniportSend handler Modified: trunk/reactos/drivers/network/ndis/ndis/miniport.c trunk/reactos/drivers/network/ndis/ndis/protocol.c Modified: trunk/reactos/drivers/network/ndis/ndis/miniport.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/ndis/ndis/… ============================================================================== --- trunk/reactos/drivers/network/ndis/ndis/miniport.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/ndis/ndis/miniport.c [iso-8859-1] Wed Apr 8 08:01:13 2009 @@ -1000,7 +1000,8 @@ { NDIS_DbgPrint(MAX_TRACE, ("Calling miniport's Send handler\n")); NdisStatus = (*Adapter->NdisMiniportBlock.DriverHandle->MiniportCharacteristics.SendHandler)( - Adapter->NdisMiniportBlock.MiniportAdapterContext, (PNDIS_PACKET)WorkItemContext, 0); + Adapter->NdisMiniportBlock.MiniportAdapterContext, (PNDIS_PACKET)WorkItemContext, + ((PNDIS_PACKET)WorkItemContext)->Private.Flags); NDIS_DbgPrint(MAX_TRACE, ("back from miniport's send handler\n")); } else @@ -1009,7 +1010,8 @@ KeRaiseIrql(DISPATCH_LEVEL, &RaiseOldIrql); NDIS_DbgPrint(MAX_TRACE, ("Calling miniport's Send handler\n")); NdisStatus = (*Adapter->NdisMiniportBlock.DriverHandle->MiniportCharacteristics.SendHandler)( - Adapter->NdisMiniportBlock.MiniportAdapterContext, (PNDIS_PACKET)WorkItemContext, 0); + Adapter->NdisMiniportBlock.MiniportAdapterContext, (PNDIS_PACKET)WorkItemContext, + ((PNDIS_PACKET)WorkItemContext)->Private.Flags); NDIS_DbgPrint(MAX_TRACE, ("back from miniport's send handler\n")); KeLowerIrql(RaiseOldIrql); if( NdisStatus == NDIS_STATUS_RESOURCES ) { Modified: trunk/reactos/drivers/network/ndis/ndis/protocol.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/ndis/ndis/… ============================================================================== --- trunk/reactos/drivers/network/ndis/ndis/protocol.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/ndis/ndis/protocol.c [iso-8859-1] Wed Apr 8 08:01:13 2009 @@ -225,14 +225,14 @@ { NDIS_DbgPrint(MAX_TRACE, ("Calling miniport's Send handler\n")); NdisStatus = (*Adapter->NdisMiniportBlock.DriverHandle->MiniportCharacteristics.SendHandler)( - Adapter->NdisMiniportBlock.MiniportAdapterContext, Packet, 0); + Adapter->NdisMiniportBlock.MiniportAdapterContext, Packet, Packet->Private.Flags); NDIS_DbgPrint(MAX_TRACE, ("back from miniport's send handler\n")); } else { /* Send is called at DISPATCH_LEVEL for all serialized miniports */ KeRaiseIrql(DISPATCH_LEVEL, &RaiseOldIrql); NDIS_DbgPrint(MAX_TRACE, ("Calling miniport's Send handler\n")); NdisStatus = (*Adapter->NdisMiniportBlock.DriverHandle->MiniportCharacteristics.SendHandler)( - Adapter->NdisMiniportBlock.MiniportAdapterContext, Packet, 0); + Adapter->NdisMiniportBlock.MiniportAdapterContext, Packet, Packet->Private.Flags); NDIS_DbgPrint(MAX_TRACE, ("back from miniport's send handler\n")); KeLowerIrql(RaiseOldIrql); @@ -351,7 +351,7 @@ for (i = 0; i < NumberOfPackets; i++) { NdisStatus = (*Adapter->NdisMiniportBlock.DriverHandle->MiniportCharacteristics.SendHandler)( - Adapter->NdisMiniportBlock.MiniportAdapterContext, PacketArray[i], 0); + Adapter->NdisMiniportBlock.MiniportAdapterContext, PacketArray[i], PacketArray[i]->Private.Flags); if (NdisStatus != NDIS_STATUS_PENDING) MiniSendComplete(Adapter, PacketArray[i], NdisStatus); } @@ -363,7 +363,7 @@ for (i = 0; i < NumberOfPackets; i++) { NdisStatus = (*Adapter->NdisMiniportBlock.DriverHandle->MiniportCharacteristics.SendHandler)( - Adapter->NdisMiniportBlock.MiniportAdapterContext, PacketArray[i], 0); + Adapter->NdisMiniportBlock.MiniportAdapterContext, PacketArray[i], PacketArray[i]->Private.Flags); if (NdisStatus != NDIS_STATUS_PENDING) MiniSendComplete(Adapter, PacketArray[i], NdisStatus); }

16 years, 1 month

← Newer
1
...
34
35
36
37
38
39
40
...
48
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 April 2009