Ros-diffs March 2009

ros-diffs@reactos.org

28 participants
483 discussions

[tkreuzer] 40145: Rename IntGdiInitBrushInstance to EBRUSHOBJ_vInit and move it to engbrush.c. Add 2 FIXME comments.
by tkreuzer＠svn.reactos.org 20 Mar '09

20 Mar '09

Author: tkreuzer Date: Sat Mar 21 02:40:59 2009 New Revision: 40145 URL: http://svn.reactos.org/svn/reactos?rev=40145&view=rev Log: Rename IntGdiInitBrushInstance to EBRUSHOBJ_vInit and move it to engbrush.c. Add 2 FIXME comments. Modified: trunk/reactos/subsystems/win32/win32k/eng/engbrush.c trunk/reactos/subsystems/win32/win32k/include/intgdi.h trunk/reactos/subsystems/win32/win32k/objects/arc.c trunk/reactos/subsystems/win32/win32k/objects/bitblt.c trunk/reactos/subsystems/win32/win32k/objects/brush.c trunk/reactos/subsystems/win32/win32k/objects/drawing.c trunk/reactos/subsystems/win32/win32k/objects/fillshap.c trunk/reactos/subsystems/win32/win32k/objects/freetype.c trunk/reactos/subsystems/win32/win32k/objects/line.c trunk/reactos/subsystems/win32/win32k/objects/region.c Modified: trunk/reactos/subsystems/win32/win32k/eng/engbrush.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/en… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/eng/engbrush.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/eng/engbrush.c [iso-8859-1] Sat Mar 21 02:40:59 2009 @@ -1,27 +1,8 @@ -/* - * ReactOS W32 Subsystem - * Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003 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 kernel * PURPOSE: GDI Driver Brush Functions - * FILE: subsys/win32k/eng/brush.c + * FILE: subsystem/win32/win32k/eng/engbrush.c * PROGRAMER: Jason Filby * REVISION HISTORY: * 3/7/1999: Created @@ -31,6 +12,37 @@ #define NDEBUG #include <debug.h> + +/** Internal functions ********************************************************/ + +VOID FASTCALL +EBRUSHOBJ_vInit(EBRUSHOBJ *pebo, PBRUSH pbrush, XLATEOBJ *pxlo) +{ + ASSERT(pebo); + ASSERT(pbrush); + + if (pbrush->flAttrs & GDIBRUSH_IS_NULL) + { + pebo->BrushObject.iSolidColor = 0; + } + else if (pbrush->flAttrs & GDIBRUSH_IS_SOLID) + { + pebo->BrushObject.iSolidColor = XLATEOBJ_iXlate(pxlo, pbrush->BrushAttr.lbColor); + } + else + { + pebo->BrushObject.iSolidColor = 0xFFFFFFFF; + // FIXME: What about calling DrvRealizeBrush? + } + + pebo->BrushObject.pvRbrush = pbrush->ulRealization; + pebo->BrushObject.flColorType = 0; + pebo->GdiBrushObject = pbrush; + pebo->XlateObject = pxlo; +} + + +/** Exported DDI functions ****************************************************/ /* * @implemented @@ -49,6 +61,7 @@ PVOID APIENTRY BRUSHOBJ_pvGetRbrush(IN BRUSHOBJ *BrushObj) { + // FIXME: this is wrong! Read msdn. return(BrushObj->pvRbrush); } Modified: trunk/reactos/subsystems/win32/win32k/include/intgdi.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/intgdi.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/include/intgdi.h [iso-8859-1] Sat Mar 21 02:40:59 2009 @@ -14,9 +14,6 @@ XLATEOBJ* FASTCALL IntCreateXlateForBlt(PDC pDCDest, PDC pDCSrc, SURFACE* pDestSurf, SURFACE* pSrcSurf); - -VOID FASTCALL -IntGdiInitBrushInstance(EBRUSHOBJ *BrushInst, PBRUSH BrushObj, XLATEOBJ *XlateObj); HBRUSH APIENTRY IntGdiCreateDIBBrush( Modified: trunk/reactos/subsystems/win32/win32k/objects/arc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/arc.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/arc.c [iso-8859-1] Sat Mar 21 02:40:59 2009 @@ -166,7 +166,7 @@ return FALSE; } - IntGdiInitBrushInstance(&eboPen, pbrushPen, dc->rosdc.XlatePen); + EBRUSHOBJ_vInit(&eboPen, pbrushPen, dc->rosdc.XlatePen); if (arctype == GdiTypePie) { 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] Sat Mar 21 02:40:59 2009 @@ -292,7 +292,7 @@ goto cleanup; } BrushOrigin = *((PPOINTL)&pbrush->ptOrigin); - IntGdiInitBrushInstance(&BrushInst, pbrush, DCDest->rosdc.XlateBrush); + EBRUSHOBJ_vInit(&BrushInst, pbrush, DCDest->rosdc.XlateBrush); } /* Create the XLATEOBJ. */ @@ -874,7 +874,7 @@ goto failed; } BrushOrigin = *((PPOINTL)&pbrush->ptOrigin); - IntGdiInitBrushInstance(&BrushInst, pbrush, DCDest->rosdc.XlateBrush); + EBRUSHOBJ_vInit(&BrushInst, pbrush, DCDest->rosdc.XlateBrush); } /* Offset the brush */ @@ -968,7 +968,7 @@ BrushOrigin.x = BrushObj->ptOrigin.x + dc->ptlDCOrig.x; BrushOrigin.y = BrushObj->ptOrigin.y + dc->ptlDCOrig.y; - IntGdiInitBrushInstance(&eboFill, BrushObj, dc->rosdc.XlateBrush); + EBRUSHOBJ_vInit(&eboFill, BrushObj, dc->rosdc.XlateBrush); ret = IntEngBitBlt( &psurf->SurfObj, 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] Sat Mar 21 02:40:59 2009 @@ -164,30 +164,6 @@ } return Result; -} - -VOID FASTCALL -IntGdiInitBrushInstance(EBRUSHOBJ *BrushInst, PBRUSH pbrush, XLATEOBJ *XlateObj) -{ - ASSERT(BrushInst); - ASSERT(pbrush); - if (pbrush->flAttrs & GDIBRUSH_IS_NULL) - { - BrushInst->BrushObject.iSolidColor = 0; - } - else if (pbrush->flAttrs & GDIBRUSH_IS_SOLID) - { - BrushInst->BrushObject.iSolidColor = XLATEOBJ_iXlate(XlateObj, pbrush->BrushAttr.lbColor); - } - else - { - BrushInst->BrushObject.iSolidColor = 0xFFFFFFFF; - } - - BrushInst->BrushObject.pvRbrush = pbrush->ulRealization; - BrushInst->BrushObject.flColorType = 0; - BrushInst->GdiBrushObject = pbrush; - BrushInst->XlateObject = XlateObj; } /** Modified: trunk/reactos/subsystems/win32/win32k/objects/drawing.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/drawing.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/drawing.c [iso-8859-1] Sat Mar 21 02:40:59 2009 @@ -1237,9 +1237,9 @@ ROP = PATCOPY; if (Pen) - IntGdiInitBrushInstance(&eboFill, pbrush, dc->rosdc.XlatePen); + EBRUSHOBJ_vInit(&eboFill, pbrush, dc->rosdc.XlatePen); else - IntGdiInitBrushInstance(&eboFill, pbrush, dc->rosdc.XlateBrush); + EBRUSHOBJ_vInit(&eboFill, pbrush, dc->rosdc.XlateBrush); Ret = IntEngBitBlt( &psurf->SurfObj, 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] Sat Mar 21 02:40:59 2009 @@ -107,7 +107,7 @@ BrushOrigin = *((PPOINTL)&pbrushFill->ptOrigin); BrushOrigin.x += dc->ptlDCOrig.x; BrushOrigin.y += dc->ptlDCOrig.y; - IntGdiInitBrushInstance(&eboFill, pbrushFill, dc->rosdc.XlateBrush); + EBRUSHOBJ_vInit(&eboFill, pbrushFill, dc->rosdc.XlateBrush); ret = IntFillPolygon (dc, psurf, &eboFill.BrushObject, Points, Count, DestRect, &BrushOrigin); } @@ -119,7 +119,7 @@ { int i; - IntGdiInitBrushInstance(&eboLine, pbrushLine, dc->rosdc.XlatePen); + EBRUSHOBJ_vInit(&eboLine, pbrushLine, dc->rosdc.XlatePen); for (i = 0; i < Count-1; i++) { @@ -600,7 +600,7 @@ BrushOrigin = *((PPOINTL)&pbrushFill->ptOrigin); BrushOrigin.x += dc->ptlDCOrig.x; BrushOrigin.y += dc->ptlDCOrig.y; - IntGdiInitBrushInstance(&eboFill, pbrushFill, dc->rosdc.XlateBrush); + EBRUSHOBJ_vInit(&eboFill, pbrushFill, dc->rosdc.XlateBrush); ret = IntEngBitBlt(&psurf->SurfObj, NULL, NULL, @@ -615,7 +615,7 @@ } } - IntGdiInitBrushInstance(&eboLine, pbrushLine, dc->rosdc.XlatePen); + EBRUSHOBJ_vInit(&eboLine, pbrushLine, dc->rosdc.XlatePen); // Draw the rectangle with the current pen @@ -1147,7 +1147,7 @@ BrushOrigin = *((PPOINTL)&pbrushFill->ptOrigin); BrushOrigin.x += dc->ptlDCOrig.x; BrushOrigin.y += dc->ptlDCOrig.y; - IntGdiInitBrushInstance(&eboFill, pbrushFill, dc->rosdc.XlateBrush); + EBRUSHOBJ_vInit(&eboFill, pbrushFill, dc->rosdc.XlateBrush); Ret = IntEngBitBlt(&psurf->SurfObj, NULL, NULL, dc->rosdc.CombinedClip, NULL, &DestRect, NULL, NULL, Modified: trunk/reactos/subsystems/win32/win32k/objects/freetype.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/freetype.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/freetype.c [iso-8859-1] Sat Mar 21 02:40:59 2009 @@ -3237,7 +3237,7 @@ { goto fail; } - IntGdiInitBrushInstance(&eboText, pbrushText, NULL); + EBRUSHOBJ_vInit(&eboText, pbrushText, NULL); if ((fuOptions & ETO_OPAQUE) || pdcattr->jBkMode == OPAQUE) { hbrushBackGnd = NtGdiCreateSolidBrush(XLATEOBJ_iXlate(XlateObj, pdcattr->crBackgroundClr), 0); @@ -3250,7 +3250,7 @@ { goto fail; } - IntGdiInitBrushInstance(&eboBackGnd, pbrushBackGnd, NULL); + EBRUSHOBJ_vInit(&eboBackGnd, pbrushBackGnd, NULL); } XlateObj2 = (XLATEOBJ*)IntEngCreateXlate(PAL_RGB, Mode, NULL, hDestPalette); if ( !XlateObj2 ) Modified: trunk/reactos/subsystems/win32/win32k/objects/line.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/line.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/line.c [iso-8859-1] Sat Mar 21 02:40:59 2009 @@ -154,7 +154,7 @@ if (!(pbrushLine->flAttrs & GDIBRUSH_IS_NULL)) { - IntGdiInitBrushInstance(&eboLine, pbrushLine, dc->rosdc.XlatePen); + EBRUSHOBJ_vInit(&eboLine, pbrushLine, dc->rosdc.XlatePen); Ret = IntEngLineTo(&psurf->SurfObj, dc->rosdc.CombinedClip, &eboLine.BrushObject, @@ -292,7 +292,7 @@ Points[i].y += dc->ptlDCOrig.y; } - IntGdiInitBrushInstance(&eboLine, pbrushLine, dc->rosdc.XlatePen); + EBRUSHOBJ_vInit(&eboLine, pbrushLine, dc->rosdc.XlatePen); Ret = IntEngPolyline(&psurf->SurfObj, dc->rosdc.CombinedClip, &eboLine.BrushObject, Modified: trunk/reactos/subsystems/win32/win32k/objects/region.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/region.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/region.c [iso-8859-1] Sat Mar 21 02:40:59 2009 @@ -2937,7 +2937,7 @@ ASSERT(ClipRegion); pbrush = BRUSH_LockBrush(pdcattr->hbrush); ASSERT(pbrush); - IntGdiInitBrushInstance(&eboFill, pbrush, dc->rosdc.XlateBrush); + EBRUSHOBJ_vInit(&eboFill, pbrush, dc->rosdc.XlateBrush); BrushOrigin.x = pdcattr->ptlBrushOrigin.x; BrushOrigin.y = pdcattr->ptlBrushOrigin.y;

1 0

[jmorlan] 40144: Replace hard-coded English string constants with translatable resource strings. (Bug 3718)
by jmorlan＠svn.reactos.org 20 Mar '09

20 Mar '09

Author: jmorlan Date: Sat Mar 21 02:16:12 2009 New Revision: 40144 URL: http://svn.reactos.org/svn/reactos?rev=40144&view=rev Log: Replace hard-coded English string constants with translatable resource strings. (Bug 3718) Modified: trunk/reactos/base/shell/cmd/cmd.c trunk/reactos/base/shell/cmd/lang/de-DE.rc trunk/reactos/base/shell/cmd/lang/el-GR.rc trunk/reactos/base/shell/cmd/lang/en-US.rc trunk/reactos/base/shell/cmd/lang/es-ES.rc trunk/reactos/base/shell/cmd/lang/fr-FR.rc trunk/reactos/base/shell/cmd/lang/hu-HU.rc trunk/reactos/base/shell/cmd/lang/id-ID.rc trunk/reactos/base/shell/cmd/lang/it-IT.rc trunk/reactos/base/shell/cmd/lang/ja-JP.rc trunk/reactos/base/shell/cmd/lang/no-NO.rc trunk/reactos/base/shell/cmd/lang/pl-PL.rc trunk/reactos/base/shell/cmd/lang/ru-RU.rc trunk/reactos/base/shell/cmd/lang/uk-UA.rc trunk/reactos/base/shell/cmd/misc.c trunk/reactos/base/shell/cmd/parser.c trunk/reactos/base/shell/cmd/resource.h trunk/reactos/base/shell/cmd/ver.c Modified: trunk/reactos/base/shell/cmd/cmd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/cmd.c?rev=4… ============================================================================== --- trunk/reactos/base/shell/cmd/cmd.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/cmd.c [iso-8859-1] Sat Mar 21 02:16:12 2009 @@ -1462,7 +1462,7 @@ { if (bMore) { - ConOutPrintf(_T("More? ")); + ConOutResPrintf(STRING_MORE); } else { @@ -1812,7 +1812,7 @@ if (ShowVersion) { /* Display a simple version string */ - ConOutPrintf(_T("ReactOS Operating System [Version %s-%s]\n"), + ConOutResPrintf(STRING_REACTOS_VERSION, _T(KERNEL_RELEASE_STR), _T(KERNEL_VERSION_BUILD_STR)); Modified: trunk/reactos/base/shell/cmd/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/lang/de-DE.… ============================================================================== --- trunk/reactos/base/shell/cmd/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/lang/de-DE.rc [iso-8859-1] Sat Mar 21 02:16:12 2009 @@ -680,7 +680,8 @@ STRING_REPLACE_ERROR5, "Zugriff verweigert - %s\n" STRING_REPLACE_ERROR6, "Keine Dateien gefunden - %s\n" STRING_REPLACE_ERROR7, "Erweiterter Fehler 32\n" -STRING_CMD_SHELLINFO, "\nReactOS Befehlszeilen Interpreter" +STRING_REACTOS_VERSION, "ReactOS Operating System [Version %s-%s]\n" +STRING_CMD_SHELLINFO, "\nReactOS Befehlszeilen Interpreter\nVersion %s %s" STRING_VERSION_RUNVER, " läuft in %s" STRING_COPY_FILE , " %d Datei(en) kopiert\n" STRING_DELETE_WIPE, "gewiped" @@ -691,6 +692,8 @@ STRING_MKLINK_CREATED_SYMBOLIC, "Symbolic link created for %s <<===>> %s\n" STRING_MKLINK_CREATED_HARD, "Hard link created for %s <<===>> %s\n" STRING_MKLINK_CREATED_JUNCTION, "Junction created for %s <<===>> %s\n" +STRING_MORE, "More? " +STRING_CANCEL_BATCH_FILE, "\r\nCtrl-Break pressed. Cancel batch file? (Ja/Nein/Alle) " STRING_INVALID_OPERAND, "Ungültiger Operand." STRING_EXPECTED_CLOSE_PAREN, "Erwartet ')'." STRING_EXPECTED_NUMBER_OR_VARIABLE,"Erwartet Nummer oder Variablennamen." Modified: trunk/reactos/base/shell/cmd/lang/el-GR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/lang/el-GR.… ============================================================================== --- trunk/reactos/base/shell/cmd/lang/el-GR.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/lang/el-GR.rc [iso-8859-1] Sat Mar 21 02:16:12 2009 @@ -697,7 +697,8 @@ STRING_REPLACE_ERROR6, "Äå âñÝèçêáí áñ÷åßá - %s\n" STRING_REPLACE_ERROR7, "Extended Error 32\n" -STRING_CMD_SHELLINFO, "\nReactOS Command Line Interpreter" +STRING_REACTOS_VERSION, "ReactOS Operating System [Version %s-%s]\n" +STRING_CMD_SHELLINFO, "\nReactOS Command Line Interpreter\nVersion %s %s" STRING_VERSION_RUNVER, " running on %s" STRING_COPY_FILE , " %d file(s) copied\n" STRING_DELETE_WIPE, "wiped" @@ -708,6 +709,8 @@ STRING_MKLINK_CREATED_SYMBOLIC, "Symbolic link created for %s <<===>> %s\n" STRING_MKLINK_CREATED_HARD, "Hard link created for %s <<===>> %s\n" STRING_MKLINK_CREATED_JUNCTION, "Junction created for %s <<===>> %s\n" +STRING_MORE, "More? " +STRING_CANCEL_BATCH_FILE, "\r\nCtrl-Break pressed. Cancel batch file? (Yes/No/All) " STRING_INVALID_OPERAND, "Invalid operand." STRING_EXPECTED_CLOSE_PAREN, "Áíáìåíüôáí ')'." Modified: trunk/reactos/base/shell/cmd/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/lang/en-US.… ============================================================================== --- trunk/reactos/base/shell/cmd/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/lang/en-US.rc [iso-8859-1] Sat Mar 21 02:16:12 2009 @@ -701,7 +701,8 @@ STRING_REPLACE_ERROR6, "No files found - %s\n" STRING_REPLACE_ERROR7, "Extended Error 32\n" -STRING_CMD_SHELLINFO, "\nReactOS Command Line Interpreter" +STRING_REACTOS_VERSION, "ReactOS Operating System [Version %s-%s]\n" +STRING_CMD_SHELLINFO, "\nReactOS Command Line Interpreter\nVersion %s %s" STRING_VERSION_RUNVER, " running on %s" STRING_COPY_FILE , " %d file(s) copied\n" STRING_DELETE_WIPE, "wiped" @@ -712,6 +713,8 @@ STRING_MKLINK_CREATED_SYMBOLIC, "Symbolic link created for %s <<===>> %s\n" STRING_MKLINK_CREATED_HARD, "Hard link created for %s <<===>> %s\n" STRING_MKLINK_CREATED_JUNCTION, "Junction created for %s <<===>> %s\n" +STRING_MORE, "More? " +STRING_CANCEL_BATCH_FILE, "\r\nCtrl-Break pressed. Cancel batch file? (Yes/No/All) " STRING_INVALID_OPERAND, "Invalid operand." STRING_EXPECTED_CLOSE_PAREN, "Expected ')'." Modified: trunk/reactos/base/shell/cmd/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/lang/es-ES.… ============================================================================== --- trunk/reactos/base/shell/cmd/lang/es-ES.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/lang/es-ES.rc [iso-8859-1] Sat Mar 21 02:16:12 2009 @@ -649,7 +649,8 @@ STRING_PATH_ERROR, "CMD: No está en el entorno '%s'\n" -STRING_CMD_SHELLINFO, "\nIntérprete de comandos de ReactOS" +STRING_REACTOS_VERSION, "ReactOS Operating System [Version %s-%s]\n" +STRING_CMD_SHELLINFO, "\nIntérprete de comandos de ReactOS\nVersion %s %s" STRING_VERSION_RUNVER, " corriendo en %s" STRING_COPY_FILE , " %d archivo(s) copado(s)\n" STRING_DELETE_WIPE, "Limpiado" @@ -660,6 +661,8 @@ STRING_MKLINK_CREATED_SYMBOLIC, "Symbolic link created for %s <<===>> %s\n" STRING_MKLINK_CREATED_HARD, "Hard link created for %s <<===>> %s\n" STRING_MKLINK_CREATED_JUNCTION, "Junction created for %s <<===>> %s\n" +STRING_MORE, "More? " +STRING_CANCEL_BATCH_FILE, "\r\nCtrl-Break pressed. Cancel batch file? (Si/No/Todos) " STRING_INVALID_OPERAND, "Operador erróneo.\n" STRING_EXPECTED_CLOSE_PAREN, "Se esperaba ')'.\n" Modified: trunk/reactos/base/shell/cmd/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/lang/fr-FR.… ============================================================================== --- trunk/reactos/base/shell/cmd/lang/fr-FR.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/lang/fr-FR.rc [iso-8859-1] Sat Mar 21 02:16:12 2009 @@ -715,7 +715,8 @@ STRING_REPLACE_ERROR6, "Aucun fichier trouvé - %s\n" STRING_REPLACE_ERROR7, "Erreur étendue 32\n" -STRING_CMD_SHELLINFO, "\n Interpréteur de ligne de commandes ReactOS" +STRING_REACTOS_VERSION, "ReactOS Operating System [Version %s-%s]\n" +STRING_CMD_SHELLINFO, "\n Interpréteur de ligne de commandes ReactOS\nVersion %s %s" STRING_VERSION_RUNVER, " tournant sur %s" STRING_COPY_FILE, " %d fichier(s) copié(s)\n" STRING_DELETE_WIPE, "effacé(s)" @@ -726,6 +727,8 @@ STRING_MKLINK_CREATED_SYMBOLIC, "Symbolic link created for %s <<===>> %s\n" STRING_MKLINK_CREATED_HARD, "Hard link created for %s <<===>> %s\n" STRING_MKLINK_CREATED_JUNCTION, "Junction created for %s <<===>> %s\n" +STRING_MORE, "More? " +STRING_CANCEL_BATCH_FILE, "\r\nCtrl-Break pressed. Cancel batch file? (Oui/Non/Tous) " STRING_INVALID_OPERAND, "Opérande invalide." STRING_EXPECTED_CLOSE_PAREN, "Attendu ')'." Modified: trunk/reactos/base/shell/cmd/lang/hu-HU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/lang/hu-HU.… ============================================================================== --- trunk/reactos/base/shell/cmd/lang/hu-HU.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/lang/hu-HU.rc [iso-8859-1] Sat Mar 21 02:16:12 2009 @@ -629,7 +629,8 @@ STRING_PATH_ERROR, "CMD: Not in environment '%s'\n" -STRING_CMD_SHELLINFO, "\nReactOS Parancssor értelmezõ" +STRING_REACTOS_VERSION, "ReactOS Operating System [Version %s-%s]\n" +STRING_CMD_SHELLINFO, "\nReactOS Parancssor értelmezõ\nVersion %s %s" STRING_VERSION_RUNVER, " running on %s" STRING_COPY_FILE , " %d állomány másolva\n" STRING_DELETE_WIPE, "wiped" @@ -640,4 +641,7 @@ STRING_MKLINK_CREATED_SYMBOLIC, "Symbolic link created for %s <<===>> %s\n" STRING_MKLINK_CREATED_HARD, "Hard link created for %s <<===>> %s\n" STRING_MKLINK_CREATED_JUNCTION, "Junction created for %s <<===>> %s\n" +STRING_MORE, "More? " +STRING_CANCEL_BATCH_FILE, "\r\nCtrl-Break pressed. Cancel batch file? (Igen/Nem/Mind) " + END Modified: trunk/reactos/base/shell/cmd/lang/id-ID.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/lang/id-ID.… ============================================================================== --- trunk/reactos/base/shell/cmd/lang/id-ID.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/lang/id-ID.rc [iso-8859-1] Sat Mar 21 02:16:12 2009 @@ -651,7 +651,8 @@ STRING_PATH_ERROR, "CMD: Tidak dalam lingkungan '%s'\n" -STRING_CMD_SHELLINFO, "\nInterpreter Baris Perintah ReactOS" +STRING_REACTOS_VERSION, "ReactOS Operating System [Version %s-%s]\n" +STRING_CMD_SHELLINFO, "\nInterpreter Baris Perintah ReactOS\nVersion %s %s" STRING_VERSION_RUNVER, " berjalan pada %s" STRING_COPY_FILE , " %d file di-copy\n" STRING_DELETE_WIPE, "dihapus" @@ -662,6 +663,8 @@ STRING_MKLINK_CREATED_SYMBOLIC, "Symbolic link created for %s <<===>> %s\n" STRING_MKLINK_CREATED_HARD, "Hard link created for %s <<===>> %s\n" STRING_MKLINK_CREATED_JUNCTION, "Junction created for %s <<===>> %s\n" +STRING_MORE, "More? " +STRING_CANCEL_BATCH_FILE, "\r\nCtrl-Break pressed. Cancel batch file? (Ya/Tidak/Semua) " STRING_INVALID_OPERAND, "Operand tidak benar." STRING_EXPECTED_CLOSE_PAREN, "Diharapkan ')'." Modified: trunk/reactos/base/shell/cmd/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/lang/it-IT.… ============================================================================== --- trunk/reactos/base/shell/cmd/lang/it-IT.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/lang/it-IT.rc [iso-8859-1] Sat Mar 21 02:16:12 2009 @@ -705,7 +705,8 @@ STRING_REPLACE_ERROR6, "Nessun file trovato - %s\n" STRING_REPLACE_ERROR7, "Errore esteso 32\n" -STRING_CMD_SHELLINFO, "\nInterprete di linea di comando di ReactOS" +STRING_REACTOS_VERSION, "ReactOS Operating System [Version %s-%s]\n" +STRING_CMD_SHELLINFO, "\nInterprete di linea di comando di ReactOS\nVersion %s %s" STRING_VERSION_RUNVER, " in esecuzione su %s" STRING_COPY_FILE , " %d file copiati\n" STRING_DELETE_WIPE, "resi illeggibili" @@ -716,6 +717,8 @@ STRING_MKLINK_CREATED_SYMBOLIC, "Symbolic link created for %s <<===>> %s\n" STRING_MKLINK_CREATED_HARD, "Hard link created for %s <<===>> %s\n" STRING_MKLINK_CREATED_JUNCTION, "Junction created for %s <<===>> %s\n" +STRING_MORE, "More? " +STRING_CANCEL_BATCH_FILE, "\r\nCtrl-Break pressed. Cancel batch file? (Si/No/Tutti) " STRING_INVALID_OPERAND, "Operando non valido." STRING_EXPECTED_CLOSE_PAREN, "Attesa una ')'." Modified: trunk/reactos/base/shell/cmd/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/lang/ja-JP.… ============================================================================== --- trunk/reactos/base/shell/cmd/lang/ja-JP.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/lang/ja-JP.rc [iso-8859-1] Sat Mar 21 02:16:12 2009 @@ -658,7 +658,8 @@ STRING_PATH_ERROR, "CMD: Not in environment '%s'\n" -STRING_CMD_SHELLINFO, "\nReactOS Command Line Interpreter" +STRING_REACTOS_VERSION, "ReactOS Operating System [Version %s-%s]\n" +STRING_CMD_SHELLINFO, "\nReactOS Command Line Interpreter\nVersion %s %s" STRING_VERSION_RUNVER, " running on %s" STRING_COPY_FILE , " %d ÂÌt@CªRs[³êÜµ½\n" STRING_DELETE_WIPE, "®SÉÁ³êÜµ½B" @@ -669,6 +670,8 @@ STRING_MKLINK_CREATED_SYMBOLIC, "Symbolic link created for %s <<===>> %s\n" STRING_MKLINK_CREATED_HARD, "Hard link created for %s <<===>> %s\n" STRING_MKLINK_CREATED_JUNCTION, "Junction created for %s <<===>> %s\n" +STRING_MORE, "More? " +STRING_CANCEL_BATCH_FILE, "\r\nCtrl-Break pressed. Cancel batch file? (Yes/No/All) " STRING_INVALID_OPERAND, "³øÈIyhÅ·B" STRING_EXPECTED_CLOSE_PAREN, "Expected ')'" Modified: trunk/reactos/base/shell/cmd/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/lang/no-NO.… ============================================================================== --- trunk/reactos/base/shell/cmd/lang/no-NO.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/lang/no-NO.rc [iso-8859-1] Sat Mar 21 02:16:12 2009 @@ -643,7 +643,8 @@ STRING_PATH_ERROR, "CMD: Ikke i miljøet '%s'\n" -STRING_CMD_SHELLINFO, "\nReactOS Kommandotolk" +STRING_REACTOS_VERSION, "ReactOS Operating System [Version %s-%s]\n" +STRING_CMD_SHELLINFO, "\nReactOS Kommandotolk\nVersion %s %s" STRING_VERSION_RUNVER, " kjører på %s" STRING_COPY_FILE , " %d file(r) kopiert\n" STRING_DELETE_WIPE, "slettet" @@ -654,6 +655,8 @@ STRING_MKLINK_CREATED_SYMBOLIC, "Symbolic link created for %s <<===>> %s\n" STRING_MKLINK_CREATED_HARD, "Hard link created for %s <<===>> %s\n" STRING_MKLINK_CREATED_JUNCTION, "Junction created for %s <<===>> %s\n" +STRING_MORE, "More? " +STRING_CANCEL_BATCH_FILE, "\r\nCtrl-Break pressed. Cancel batch file? (Yes/No/All) " STRING_INVALID_OPERAND, "Ugyldig operand." STRING_EXPECTED_CLOSE_PAREN, "Forventet ')'." Modified: trunk/reactos/base/shell/cmd/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/lang/pl-PL.… ============================================================================== --- trunk/reactos/base/shell/cmd/lang/pl-PL.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/lang/pl-PL.rc [iso-8859-1] Sat Mar 21 02:16:12 2009 @@ -649,7 +649,8 @@ STRING_PATH_ERROR, "CMD: Poza rodowiskiem '%s'\n" -STRING_CMD_SHELLINFO, "\nInterpreter linii poleceñ ReactOS " +STRING_REACTOS_VERSION, "ReactOS Operating System [Version %s-%s]\n" +STRING_CMD_SHELLINFO, "\nInterpreter linii poleceñ ReactOS\nVersion %s %s" STRING_VERSION_RUNVER, " dzia³aj¹cy na %s" STRING_COPY_FILE , " %d plik(ów) skopiowano\n" STRING_DELETE_WIPE, "skasowano" @@ -660,6 +661,8 @@ STRING_MKLINK_CREATED_SYMBOLIC, "Symbolic link created for %s <<===>> %s\n" STRING_MKLINK_CREATED_HARD, "Hard link created for %s <<===>> %s\n" STRING_MKLINK_CREATED_JUNCTION, "Junction created for %s <<===>> %s\n" +STRING_MORE, "More? " +STRING_CANCEL_BATCH_FILE, "\r\nCtrl-Break pressed. Cancel batch file? (Tak/Nie/Zawsze) " STRING_INVALID_OPERAND, "Nieprawid³owy argument operatora." STRING_EXPECTED_CLOSE_PAREN, "Oczekiwano ')'." Modified: trunk/reactos/base/shell/cmd/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/lang/ru-RU.… ============================================================================== --- trunk/reactos/base/shell/cmd/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/lang/ru-RU.rc [iso-8859-1] Sat Mar 21 02:16:12 2009 @@ -656,7 +656,8 @@ STRING_PATH_ERROR, "CMD: Íå â ñðåäå îêðóæåíèÿ '%s'\n" -STRING_CMD_SHELLINFO, "\nÈíòåðïðåòàòîð êîìàíäíîé ñòðîêè ReactOS" +STRING_REACTOS_VERSION, "ReactOS Operating System [Version %s-%s]\n" +STRING_CMD_SHELLINFO, "\nÈíòåðïðåòàòîð êîìàíäíîé ñòðîêè ReactOS\nVersion %s %s" STRING_VERSION_RUNVER, " çàïóùåí íà %s" STRING_COPY_FILE , " %d ôàéë(îâ) ñêîïèðîâàíî\n" STRING_DELETE_WIPE, "wiped" @@ -667,6 +668,8 @@ STRING_MKLINK_CREATED_SYMBOLIC, "Symbolic link created for %s <<===>> %s\n" STRING_MKLINK_CREATED_HARD, "Hard link created for %s <<===>> %s\n" STRING_MKLINK_CREATED_JUNCTION, "Junction created for %s <<===>> %s\n" +STRING_MORE, "More? " +STRING_CANCEL_BATCH_FILE, "\r\nCtrl-Break pressed. Cancel batch file? (Yes/No/All) " STRING_INVALID_OPERAND, "Íåâåðíûé îïåðàíä." STRING_EXPECTED_CLOSE_PAREN, "Îæèäàåòñÿ ')'." Modified: trunk/reactos/base/shell/cmd/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/lang/uk-UA.… ============================================================================== --- trunk/reactos/base/shell/cmd/lang/uk-UA.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/lang/uk-UA.rc [iso-8859-1] Sat Mar 21 02:16:12 2009 @@ -705,7 +705,8 @@ STRING_REPLACE_ERROR6, "No files found - %s\n" STRING_REPLACE_ERROR7, "Extended Error 32\n" -STRING_CMD_SHELLINFO, "\nReactOS Command Line Interpreter" +STRING_REACTOS_VERSION, "ReactOS Operating System [Version %s-%s]\n" +STRING_CMD_SHELLINFO, "\nReactOS Command Line Interpreter\nVersion %s %s" STRING_VERSION_RUNVER, " running on %s" STRING_COPY_FILE , " %d ôàéë(³â) ñêîï³éîâàíî\n" STRING_DELETE_WIPE, "wiped" @@ -716,6 +717,8 @@ STRING_MKLINK_CREATED_SYMBOLIC, "Symbolic link created for %s <<===>> %s\n" STRING_MKLINK_CREATED_HARD, "Hard link created for %s <<===>> %s\n" STRING_MKLINK_CREATED_JUNCTION, "Junction created for %s <<===>> %s\n" +STRING_MORE, "More? " +STRING_CANCEL_BATCH_FILE, "\r\nCtrl-Break pressed. Cancel batch file? (Yes/No/All) " STRING_INVALID_OPERAND, "Íåâ³ðíèé îïåðàíä." STRING_EXPECTED_CLOSE_PAREN, "Î÷³êóºòüñÿ ')'." Modified: trunk/reactos/base/shell/cmd/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/misc.c?rev=… ============================================================================== --- trunk/reactos/base/shell/cmd/misc.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/misc.c [iso-8859-1] Sat Mar 21 02:16:12 2009 @@ -153,6 +153,7 @@ BOOL CheckCtrlBreak (INT mode) { static BOOL bLeaveAll = FALSE; /* leave all batch files */ + TCHAR options[4]; /* Yes, No, All */ TCHAR c; switch (mode) @@ -168,18 +169,22 @@ if (!bCtrlBreak) return FALSE; + LoadString(CMD_ModuleHandle, STRING_COPY_OPTION, options, 4); + /* we need to be sure the string arrives on the screen! */ do - ConOutPuts (_T("\r\nCtrl-Break pressed. Cancel batch file? (Yes/No/All) ")); - while (!_tcschr (_T("YNA\3"), c = _totupper (cgetchar())) || !c); + { + ConOutResPuts(STRING_CANCEL_BATCH_FILE); + c = _totupper(cgetchar()); + } while (!(_tcschr(options, c) || c == _T('\3')) || !c); ConOutPuts (_T("\r\n")); - if (c == _T('N')) + if (c == options[1]) return bCtrlBreak = FALSE; /* ignore */ /* leave all batch files */ - bLeaveAll = ((c == _T('A')) || (c == _T('\3'))); + bLeaveAll = ((c == options[2]) || (c == _T('\3'))); break; case BREAK_INPUT: Modified: trunk/reactos/base/shell/cmd/parser.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/parser.c?re… ============================================================================== --- trunk/reactos/base/shell/cmd/parser.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/parser.c [iso-8859-1] Sat Mar 21 02:16:12 2009 @@ -84,10 +84,7 @@ static void ParseError() { - if (CurrentTokenType == TOK_END) - ConOutResPuts(STRING_SYNTAX_COMMAND_INCORRECT); - else - ConOutPrintf(_T("%s was unexpected at this time.\n"), CurrentToken); + error_syntax(CurrentTokenType != TOK_END ? CurrentToken : NULL); bParseError = TRUE; } Modified: trunk/reactos/base/shell/cmd/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/resource.h?… ============================================================================== --- trunk/reactos/base/shell/cmd/resource.h [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/resource.h [iso-8859-1] Sat Mar 21 02:16:12 2009 @@ -91,6 +91,7 @@ #define STRING_ASSOC_HELP 616 #define STRING_MKLINK_HELP 617 +#define STRING_REACTOS_VERSION 623 #define STRING_CMD_SHELLINFO 624 #define STRING_COLOR_HELP1 625 @@ -247,6 +248,9 @@ #define STRING_MKLINK_CREATED_HARD 739 #define STRING_MKLINK_CREATED_JUNCTION 740 +#define STRING_MORE 741 +#define STRING_CANCEL_BATCH_FILE 742 + /* These strings are language independent (cmd.rc) */ #define STRING_FREEDOS_DEV 800 #define STRING_REACTOS_DEV 801 Modified: trunk/reactos/base/shell/cmd/ver.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/ver.c?rev=4… ============================================================================== --- trunk/reactos/base/shell/cmd/ver.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/ver.c [iso-8859-1] Sat Mar 21 02:16:12 2009 @@ -30,10 +30,8 @@ unsigned RosVersionLen; LPTSTR RosVersion; - ConOutResPuts (STRING_CMD_SHELLINFO ); + ConOutResPrintf(STRING_CMD_SHELLINFO, _T(KERNEL_RELEASE_STR), _T(KERNEL_VERSION_BUILD_STR)); VersionInfo.dwOSVersionInfoSize = sizeof(OSVERSIONINFO); - - ConOutPrintf(_T("Version %s %s"), _T(KERNEL_RELEASE_STR), _T(KERNEL_VERSION_BUILD_STR)); memset(VersionInfo.szCSDVersion, 0, sizeof(VersionInfo.szCSDVersion)); if (GetVersionEx(&VersionInfo))

1 0

[tkreuzer] 40143: Start to cleanup the mess that claims to be our brush implementation: Rename GDIBRUSHOBJ to BRUSH and GDIBRUSHINST to EBRUSHOBJ. Because that's what it is and nothing else. Rename several BRUSHOBJ_xxx functions to BRUSH_xxx, as they deal with a BRUSH, not a BRUSHOBJ. There is a strict difference between a BRUSH and an (E)BRUSHOBJ. Please don't mix this up by giving them all names like BrushObj. Please use (proper!) hungarian notation. Now the willing reader might actually get a
by tkreuzer＠svn.reactos.org 20 Mar '09

20 Mar '09

Author: tkreuzer Date: Sat Mar 21 01:40:14 2009 New Revision: 40143 URL: http://svn.reactos.org/svn/reactos?rev=40143&view=rev Log: Start to cleanup the mess that claims to be our brush implementation: Rename GDIBRUSHOBJ to BRUSH and GDIBRUSHINST to EBRUSHOBJ. Because that's what it is and nothing else. Rename several BRUSHOBJ_xxx functions to BRUSH_xxx, as they deal with a BRUSH, not a BRUSHOBJ. There is a strict difference between a BRUSH and an (E)BRUSHOBJ. Please don't mix this up by giving them all names like BrushObj. Please use (proper!) hungarian notation. Now the willing reader might actually get a clue how this stuff is supposed to work and maybe also realize how broken it is. Modified: trunk/reactos/subsystems/win32/win32k/eng/bitblt.c trunk/reactos/subsystems/win32/win32k/eng/lineto.c trunk/reactos/subsystems/win32/win32k/include/brush.h trunk/reactos/subsystems/win32/win32k/include/dc.h trunk/reactos/subsystems/win32/win32k/include/intgdi.h trunk/reactos/subsystems/win32/win32k/include/pen.h trunk/reactos/subsystems/win32/win32k/objects/arc.c trunk/reactos/subsystems/win32/win32k/objects/bitblt.c trunk/reactos/subsystems/win32/win32k/objects/bitmaps.c trunk/reactos/subsystems/win32/win32k/objects/brush.c trunk/reactos/subsystems/win32/win32k/objects/drawing.c trunk/reactos/subsystems/win32/win32k/objects/fillshap.c trunk/reactos/subsystems/win32/win32k/objects/freetype.c trunk/reactos/subsystems/win32/win32k/objects/gdiobj.c trunk/reactos/subsystems/win32/win32k/objects/line.c trunk/reactos/subsystems/win32/win32k/objects/pen.c trunk/reactos/subsystems/win32/win32k/objects/region.c trunk/reactos/subsystems/win32/win32k/objects/stockobj.c [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/subsystems/win32/win32k/eng/bitblt.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/en… Modified: trunk/reactos/subsystems/win32/win32k/eng/lineto.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/en… Modified: trunk/reactos/subsystems/win32/win32k/include/brush.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… Modified: trunk/reactos/subsystems/win32/win32k/include/dc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… Modified: trunk/reactos/subsystems/win32/win32k/include/intgdi.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… Modified: trunk/reactos/subsystems/win32/win32k/include/pen.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… Modified: trunk/reactos/subsystems/win32/win32k/objects/arc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… Modified: trunk/reactos/subsystems/win32/win32k/objects/bitblt.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… Modified: trunk/reactos/subsystems/win32/win32k/objects/bitmaps.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… Modified: trunk/reactos/subsystems/win32/win32k/objects/brush.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… Modified: trunk/reactos/subsystems/win32/win32k/objects/drawing.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… Modified: trunk/reactos/subsystems/win32/win32k/objects/fillshap.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… Modified: trunk/reactos/subsystems/win32/win32k/objects/freetype.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… Modified: trunk/reactos/subsystems/win32/win32k/objects/gdiobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… Modified: trunk/reactos/subsystems/win32/win32k/objects/line.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… Modified: trunk/reactos/subsystems/win32/win32k/objects/pen.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… Modified: trunk/reactos/subsystems/win32/win32k/objects/region.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… Modified: trunk/reactos/subsystems/win32/win32k/objects/stockobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob…

1 0

[cgutman] 40142: - Reorganize NDIS code
by cgutman＠svn.reactos.org 20 Mar '09

20 Mar '09

Author: cgutman Date: Sat Mar 21 00:29:53 2009 New Revision: 40142 URL: http://svn.reactos.org/svn/reactos?rev=40142&view=rev Log: - Reorganize NDIS code Added: trunk/reactos/drivers/network/ndis/ndis/30stubs.c - copied, changed from r40140, trunk/reactos/drivers/network/ndis/ndis/40gone.c trunk/reactos/drivers/network/ndis/ndis/40stubs.c - copied, changed from r40141, trunk/reactos/drivers/network/ndis/ndis/50gone.c trunk/reactos/drivers/network/ndis/ndis/50stubs.c - copied, changed from r40113, trunk/reactos/drivers/network/ndis/ndis/stubs.c trunk/reactos/drivers/network/ndis/ndis/misc.c (with props) Removed: trunk/reactos/drivers/network/ndis/ndis/40gone.c trunk/reactos/drivers/network/ndis/ndis/50gone.c trunk/reactos/drivers/network/ndis/ndis/stubs.c Modified: trunk/reactos/drivers/network/ndis/ndis.rbuild trunk/reactos/drivers/network/ndis/ndis/buffer.c trunk/reactos/drivers/network/ndis/ndis/control.c trunk/reactos/drivers/network/ndis/ndis/hardware.c trunk/reactos/drivers/network/ndis/ndis/io.c trunk/reactos/drivers/network/ndis/ndis/memory.c trunk/reactos/drivers/network/ndis/ndis/miniport.c trunk/reactos/drivers/network/ndis/ndis/protocol.c Modified: trunk/reactos/drivers/network/ndis/ndis.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/ndis/ndis.… ============================================================================== --- trunk/reactos/drivers/network/ndis/ndis.rbuild [iso-8859-1] (original) +++ trunk/reactos/drivers/network/ndis/ndis.rbuild [iso-8859-1] Sat Mar 21 00:29:53 2009 @@ -18,8 +18,9 @@ <pch>ndissys.h</pch> </directory> <directory name="ndis"> - <file>40gone.c</file> - <file>50gone.c</file> + <file>30stubs.c</file> + <file>40stubs.c</file> + <file>50stubs.c</file> <file>buffer.c</file> <file>cl.c</file> <file>cm.c</file> @@ -32,9 +33,9 @@ <file>main.c</file> <file>memory.c</file> <file>miniport.c</file> + <file>misc.c</file> <file>protocol.c</file> <file>string.c</file> - <file>stubs.c</file> <file>time.c</file> </directory> <file>ndis.rc</file> Copied: trunk/reactos/drivers/network/ndis/ndis/30stubs.c (from r40140, trunk/reactos/drivers/network/ndis/ndis/40gone.c) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/ndis/ndis/… ============================================================================== --- trunk/reactos/drivers/network/ndis/ndis/40gone.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/ndis/ndis/30stubs.c [iso-8859-1] Sat Mar 21 00:29:53 2009 @@ -1,8 +1,8 @@ /* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS NDIS library - * FILE: ndis/40gone.c - * PURPOSE: Obsoleted functions in NDIS 4.0 + * FILE: ndis/30stubs.c + * PURPOSE: NDIS 3.0 Stubs * PROGRAMMERS: Casper S. Hornstrup (chorns(a)users.sourceforge.net) * REVISIONS: * CSH 01/08-2000 Created @@ -102,27 +102,6 @@ UNIMPLEMENTED } - -/* - * @implemented - */ -VOID -EXPORT -NdisAllocateSharedMemory( - IN NDIS_HANDLE NdisAdapterHandle, - IN ULONG Length, - IN BOOLEAN Cached, - OUT PVOID *VirtualAddress, - OUT PNDIS_PHYSICAL_ADDRESS PhysicalAddress) -{ - NdisMAllocateSharedMemory(NdisAdapterHandle, - Length, - Cached, - VirtualAddress, - PhysicalAddress); -} - - /* * @unimplemented */ Removed: trunk/reactos/drivers/network/ndis/ndis/40gone.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/ndis/ndis/… ============================================================================== --- trunk/reactos/drivers/network/ndis/ndis/40gone.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/ndis/ndis/40gone.c (removed) @@ -1,186 +1,0 @@ -/* - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS NDIS library - * FILE: ndis/40gone.c - * PURPOSE: Obsoleted functions in NDIS 4.0 - * PROGRAMMERS: Casper S. Hornstrup (chorns(a)users.sourceforge.net) - * REVISIONS: - * CSH 01/08-2000 Created - */ - -#include "ndissys.h" - - -/* - * @unimplemented - */ -VOID -EXPORT -NdisCompleteDmaTransfer( - OUT PNDIS_STATUS Status, - IN PNDIS_HANDLE NdisDmaHandle, - IN PNDIS_BUFFER Buffer, - IN ULONG Offset, - IN ULONG Length, - IN BOOLEAN WriteToDevice) -{ - UNIMPLEMENTED -} - - -/* - * @unimplemented - */ -VOID -EXPORT -ArcFilterDprIndicateReceive( - IN PARC_FILTER Filter, - IN PUCHAR pRawHeader, - IN PUCHAR pData, - IN UINT Length) -{ - UNIMPLEMENTED -} - - -/* - * @unimplemented - */ -VOID -EXPORT -ArcFilterDprIndicateReceiveComplete( - IN PARC_FILTER Filter) -{ - UNIMPLEMENTED -} - - -/* - * @unimplemented - */ -VOID -EXPORT -FddiFilterDprIndicateReceive( - IN PFDDI_FILTER Filter, - IN NDIS_HANDLE MacReceiveContext, - IN PCHAR Address, - IN UINT AddressLength, - IN PVOID HeaderBuffer, - IN UINT HeaderBufferSize, - IN PVOID LookaheadBuffer, - IN UINT LookaheadBufferSize, - IN UINT PacketSize) -{ - UNIMPLEMENTED -} - - -/* - * @unimplemented - */ -VOID -EXPORT -FddiFilterDprIndicateReceiveComplete( - IN PFDDI_FILTER Filter) -{ - UNIMPLEMENTED -} - - -/* - * @unimplemented - */ -VOID -EXPORT -NdisAllocateDmaChannel( - OUT PNDIS_STATUS Status, - OUT PNDIS_HANDLE NdisDmaHandle, - IN NDIS_HANDLE NdisAdapterHandle, - IN PNDIS_DMA_DESCRIPTION DmaDescription, - IN ULONG MaximumLength) -{ - UNIMPLEMENTED -} - - -/* - * @implemented - */ -VOID -EXPORT -NdisAllocateSharedMemory( - IN NDIS_HANDLE NdisAdapterHandle, - IN ULONG Length, - IN BOOLEAN Cached, - OUT PVOID *VirtualAddress, - OUT PNDIS_PHYSICAL_ADDRESS PhysicalAddress) -{ - NdisMAllocateSharedMemory(NdisAdapterHandle, - Length, - Cached, - VirtualAddress, - PhysicalAddress); -} - - -/* - * @unimplemented - */ -NDIS_STATUS -EXPORT -NdisPciAssignResources( - IN NDIS_HANDLE NdisMacHandle, - IN NDIS_HANDLE NdisWrapperHandle, - IN NDIS_HANDLE WrapperConfigurationContext, - IN ULONG SlotNumber, - OUT PNDIS_RESOURCE_LIST *AssignedResources) -{ - UNIMPLEMENTED - - return NDIS_STATUS_FAILURE; -} - - -/* - * @unimplemented - */ -VOID -EXPORT -NdisReadBindingInformation ( - OUT PNDIS_STATUS Status, - OUT PNDIS_STRING * Binding, - IN NDIS_HANDLE ConfigurationHandle) -{ - UNIMPLEMENTED -} - -/* - * @unimplemented - */ -VOID -EXPORT -TrFilterDprIndicateReceive( - IN PTR_FILTER Filter, - IN NDIS_HANDLE MacReceiveContext, - IN PVOID HeaderBuffer, - IN UINT HeaderBufferSize, - IN PVOID LookaheadBuffer, - IN UINT LookaheadBufferSize, - IN UINT PacketSize) -{ - UNIMPLEMENTED -} - - -/* - * @unimplemented - */ -VOID -EXPORT -TrFilterDprIndicateReceiveComplete( - IN PTR_FILTER Filter) -{ - UNIMPLEMENTED -} - -/* EOF */ Copied: trunk/reactos/drivers/network/ndis/ndis/40stubs.c (from r40141, trunk/reactos/drivers/network/ndis/ndis/50gone.c) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/ndis/ndis/… ============================================================================== --- trunk/reactos/drivers/network/ndis/ndis/50gone.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/ndis/ndis/40stubs.c [iso-8859-1] Sat Mar 21 00:29:53 2009 @@ -1,8 +1,8 @@ /* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS NDIS library - * FILE: ndis/50gone.c - * PURPOSE: Obsoleted functions in NDIS 5.0 + * FILE: ndis/40stubs.c + * PURPOSE: NDIS 4.0 stubs * PROGRAMMERS: Casper S. Hornstrup (chorns(a)users.sourceforge.net) * REVISIONS: * CSH 01/08-2000 Created @@ -71,24 +71,6 @@ /* - * @implemented - */ -VOID -EXPORT -NdisDeregisterAdapterShutdownHandler( - IN NDIS_HANDLE NdisAdapterHandle) -/* - * FUNCTION: - * ARGUMENTS: - * NOTES: - * NDIS 4.0 - */ -{ - NdisMDeregisterAdapterShutdownHandler(NdisAdapterHandle); -} - - -/* * @unimplemented */ VOID @@ -122,32 +104,6 @@ */ { UNIMPLEMENTED -} - - -/* - * @implemented - */ -VOID -EXPORT -NdisFreeSharedMemory( - IN NDIS_HANDLE NdisAdapterHandle, - IN ULONG Length, - IN BOOLEAN Cached, - IN PVOID VirtualAddress, - IN NDIS_PHYSICAL_ADDRESS PhysicalAddress) -/* - * FUNCTION: - * ARGUMENTS: - * NOTES: - * NDIS 4.0 - */ -{ - NdisMFreeSharedMemory(NdisAdapterHandle, - Length, - Cached, - VirtualAddress, - PhysicalAddress); } @@ -210,31 +166,6 @@ UNIMPLEMENTED return FALSE; -} - - -/* - * @implemented - */ -VOID -EXPORT -NdisMapIoSpace( - OUT PNDIS_STATUS Status, - OUT PVOID *VirtualAddress, - IN NDIS_HANDLE NdisAdapterHandle, - IN NDIS_PHYSICAL_ADDRESS PhysicalAddress, - IN UINT Length) -/* - * FUNCTION: - * ARGUMENTS: - * NOTES: - * NDIS 4.0 - */ -{ - *Status = NdisMMapIoSpace(VirtualAddress, - NdisAdapterHandle, - PhysicalAddress, - Length); } @@ -331,28 +262,6 @@ /* - * @implemented - */ -VOID -EXPORT -NdisRegisterAdapterShutdownHandler( - IN NDIS_HANDLE NdisAdapterHandle, - IN PVOID ShutdownContext, - IN ADAPTER_SHUTDOWN_HANDLER ShutdownHandler) -/* - * FUNCTION: - * ARGUMENTS: - * NOTES: - * NDIS 4.0 - */ -{ - NdisMRegisterAdapterShutdownHandler(NdisAdapterHandle, - ShutdownContext, - ShutdownHandler); -} - - -/* * @unimplemented */ VOID @@ -414,4 +323,66 @@ /* No-op. */ } + +/* + * @unimplemented + */ +VOID +EXPORT +NdisImmediateReadSharedMemory( + IN NDIS_HANDLE WrapperConfigurationContext, + IN ULONG SharedMemoryAddress, + OUT PUCHAR Buffer, + IN ULONG Length) +{ + UNIMPLEMENTED +} + + +/* + * @unimplemented + */ +VOID +EXPORT +NdisImmediateWriteSharedMemory( + IN NDIS_HANDLE WrapperConfigurationContext, + IN ULONG SharedMemoryAddress, + IN PUCHAR Buffer, + IN ULONG Length) +{ + UNIMPLEMENTED +} + + + +/* + * @unimplemented + */ +VOID +EXPORT +NdisReadEisaSlotInformation( + OUT PNDIS_STATUS Status, + IN NDIS_HANDLE WrapperConfigurationContext, + OUT PUINT SlotNumber, + OUT PNDIS_EISA_FUNCTION_INFORMATION EisaData) +{ + UNIMPLEMENTED +} + + +/* + * @unimplemented + */ +VOID +EXPORT +NdisReadEisaSlotInformationEx( + OUT PNDIS_STATUS Status, + IN NDIS_HANDLE WrapperConfigurationContext, + OUT PUINT SlotNumber, + OUT PNDIS_EISA_FUNCTION_INFORMATION *EisaData, + OUT PUINT NumberOfFunctions) +{ + UNIMPLEMENTED +} + /* EOF */ Removed: trunk/reactos/drivers/network/ndis/ndis/50gone.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/ndis/ndis/… ============================================================================== --- trunk/reactos/drivers/network/ndis/ndis/50gone.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/ndis/ndis/50gone.c (removed) @@ -1,417 +1,0 @@ -/* - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS NDIS library - * FILE: ndis/50gone.c - * PURPOSE: Obsoleted functions in NDIS 5.0 - * PROGRAMMERS: Casper S. Hornstrup (chorns(a)users.sourceforge.net) - * REVISIONS: - * CSH 01/08-2000 Created - */ - -#include "ndissys.h" - - -/* - * @unimplemented - */ -VOID -EXPORT -NdisCompleteCloseAdapter( - IN NDIS_HANDLE NdisBindingContext, - IN NDIS_STATUS Status) -/* - * FUNCTION: - * ARGUMENTS: - * NOTES: - * NDIS 4.0 - */ -{ - UNIMPLEMENTED -} - - -/* - * @unimplemented - */ -VOID -EXPORT -NdisCompleteOpenAdapter( - IN NDIS_HANDLE NdisBindingContext, - IN NDIS_STATUS Status, - IN NDIS_STATUS OpenErrorStatus) -/* - * FUNCTION: - * ARGUMENTS: - * NOTES: - * NDIS 4.0 - */ -{ - UNIMPLEMENTED -} - - -/* - * @unimplemented - */ -NDIS_STATUS -EXPORT -NdisDeregisterAdapter( - IN NDIS_HANDLE NdisAdapterHandle) -/* - * FUNCTION: - * ARGUMENTS: - * NOTES: - * NDIS 4.0 - */ -{ - UNIMPLEMENTED - - return NDIS_STATUS_FAILURE; -} - - -/* - * @implemented - */ -VOID -EXPORT -NdisDeregisterAdapterShutdownHandler( - IN NDIS_HANDLE NdisAdapterHandle) -/* - * FUNCTION: - * ARGUMENTS: - * NOTES: - * NDIS 4.0 - */ -{ - NdisMDeregisterAdapterShutdownHandler(NdisAdapterHandle); -} - - -/* - * @unimplemented - */ -VOID -EXPORT -NdisDeregisterMac( - OUT PNDIS_STATUS Status, - IN NDIS_HANDLE NdisMacHandle) -/* - * FUNCTION: - * ARGUMENTS: - * NOTES: - * NDIS 4.0 - */ -{ - UNIMPLEMENTED -} - - -/* - * @unimplemented - */ -VOID -EXPORT -NdisFreeDmaChannel( - IN PNDIS_HANDLE NdisDmaHandle) -/* - * FUNCTION: - * ARGUMENTS: - * NOTES: - * NDIS 4.0 - */ -{ - UNIMPLEMENTED -} - - -/* - * @implemented - */ -VOID -EXPORT -NdisFreeSharedMemory( - IN NDIS_HANDLE NdisAdapterHandle, - IN ULONG Length, - IN BOOLEAN Cached, - IN PVOID VirtualAddress, - IN NDIS_PHYSICAL_ADDRESS PhysicalAddress) -/* - * FUNCTION: - * ARGUMENTS: - * NOTES: - * NDIS 4.0 - */ -{ - NdisMFreeSharedMemory(NdisAdapterHandle, - Length, - Cached, - VirtualAddress, - PhysicalAddress); -} - - -/* - * @unimplemented - */ -NDIS_STATUS -EXPORT -NdisIMQueueMiniportCallback( - IN NDIS_HANDLE MiniportAdapterHandle, - IN W_MINIPORT_CALLBACK CallbackRoutine, - IN PVOID CallbackContext) -/* - * FUNCTION: - * ARGUMENTS: - * NOTES: - * NDIS 4.0 - */ -{ - UNIMPLEMENTED - - return NDIS_STATUS_FAILURE; -} - - -/* - * @unimplemented - */ -VOID -EXPORT -NdisIMRevertBack( - IN NDIS_HANDLE MiniportAdapterHandle, - IN NDIS_HANDLE SwitchHandle) -/* - * FUNCTION: - * ARGUMENTS: - * NOTES: - * NDIS 4.0 - */ -{ - UNIMPLEMENTED -} - - -/* - * @unimplemented - */ -BOOLEAN -EXPORT -NdisIMSwitchToMiniport( - IN NDIS_HANDLE MiniportAdapterHandle, - OUT PNDIS_HANDLE SwitchHandle) -/* - * FUNCTION: - * ARGUMENTS: - * NOTES: - * NDIS 4.0 - */ -{ - UNIMPLEMENTED - - return FALSE; -} - - -/* - * @implemented - */ -VOID -EXPORT -NdisMapIoSpace( - OUT PNDIS_STATUS Status, - OUT PVOID *VirtualAddress, - IN NDIS_HANDLE NdisAdapterHandle, - IN NDIS_PHYSICAL_ADDRESS PhysicalAddress, - IN UINT Length) -/* - * FUNCTION: - * ARGUMENTS: - * NOTES: - * NDIS 4.0 - */ -{ - *Status = NdisMMapIoSpace(VirtualAddress, - NdisAdapterHandle, - PhysicalAddress, - Length); -} - - -/* - * @unimplemented - */ -VOID -EXPORT -NdisOverrideBusNumber( - IN NDIS_HANDLE WrapperConfigurationContext, - IN NDIS_HANDLE MiniportAdapterHandle OPTIONAL, - IN ULONG BusNumber) -/* - * FUNCTION: - * ARGUMENTS: - * NOTES: - * NDIS 4.0 - */ -{ - UNIMPLEMENTED -} - - -/* - * @unimplemented - */ -NDIS_STATUS -EXPORT -NdisQueryReceiveInformation( - IN NDIS_HANDLE NdisBindingHandle, - IN NDIS_HANDLE MacContext, - OUT PLONGLONG TimeSent OPTIONAL, - OUT PLONGLONG TimeReceived OPTIONAL, - IN PUCHAR Buffer, - IN UINT BufferSize, - OUT PUINT SizeNeeded) -/* - * FUNCTION: - * ARGUMENTS: - * NOTES: - * NDIS 4.0 - */ -{ - UNIMPLEMENTED - - return NDIS_STATUS_FAILURE; -} - - -/* - * @unimplemented - */ -VOID -EXPORT -NdisReadMcaPosInformation( - OUT PNDIS_STATUS Status, - IN NDIS_HANDLE WrapperConfigurationContext, - IN PUINT ChannelNumber, - OUT PNDIS_MCA_POS_DATA McaData) -/* - * FUNCTION: - * ARGUMENTS: - * NOTES: - * NDIS 4.0 - */ -{ - UNIMPLEMENTED -} - - -/* - * @unimplemented - */ -NDIS_STATUS -EXPORT -NdisRegisterAdapter( - OUT PNDIS_HANDLE NdisAdapterHandle, - IN NDIS_HANDLE NdisMacHandle, - IN NDIS_HANDLE MacAdapterContext, - IN NDIS_HANDLE WrapperConfigurationContext, - IN PNDIS_STRING AdapterName, - IN PVOID AdapterInformation) -/* - * FUNCTION: - * ARGUMENTS: - * NOTES: - * NDIS 4.0 - */ -{ - UNIMPLEMENTED - - return NDIS_STATUS_FAILURE; -} - - -/* - * @implemented - */ -VOID -EXPORT -NdisRegisterAdapterShutdownHandler( - IN NDIS_HANDLE NdisAdapterHandle, - IN PVOID ShutdownContext, - IN ADAPTER_SHUTDOWN_HANDLER ShutdownHandler) -/* - * FUNCTION: - * ARGUMENTS: - * NOTES: - * NDIS 4.0 - */ -{ - NdisMRegisterAdapterShutdownHandler(NdisAdapterHandle, - ShutdownContext, - ShutdownHandler); -} - - -/* - * @unimplemented - */ -VOID -EXPORT -NdisReleaseAdapterResources( - IN NDIS_HANDLE NdisAdapterHandle) -/* - * FUNCTION: - * ARGUMENTS: - * NOTES: - * NDIS 4.0 - */ -{ - UNIMPLEMENTED -} - - -/* - * @unimplemented - */ -VOID -EXPORT -NdisSetupDmaTransfer( - OUT PNDIS_STATUS Status, - IN PNDIS_HANDLE NdisDmaHandle, - IN PNDIS_BUFFER Buffer, - IN ULONG Offset, - IN ULONG Length, - IN BOOLEAN WriteToDevice) -/* - * FUNCTION: - * ARGUMENTS: - * NOTES: - * NDIS 4.0 - */ -{ - UNIMPLEMENTED -} - - -/* - * @implemented - */ -#undef NdisUpdateSharedMemory -VOID -EXPORT -NdisUpdateSharedMemory( - IN NDIS_HANDLE NdisAdapterHandle, - IN ULONG Length, - IN PVOID VirtualAddress, - IN NDIS_PHYSICAL_ADDRESS PhysicalAddress) -/* - * FUNCTION: - * ARGUMENTS: - * NOTES: - * NDIS 4.0 - */ -{ - /* No-op. */ -} - -/* EOF */ Copied: trunk/reactos/drivers/network/ndis/ndis/50stubs.c (from r40113, trunk/reactos/drivers/network/ndis/ndis/stubs.c) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/ndis/ndis/… ============================================================================== --- trunk/reactos/drivers/network/ndis/ndis/stubs.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/ndis/ndis/50stubs.c [iso-8859-1] Sat Mar 21 00:29:53 2009 @@ -1,8 +1,8 @@ /* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS NDIS library - * FILE: ndis/stubs.c - * PURPOSE: Stubs + * FILE: ndis/50stubs.c + * PURPOSE: NDIS 5.0 Stubs * PROGRAMMERS: Casper S. Hornstrup (chorns(a)users.sourceforge.net) * REVISIONS: * CSH 01/08-2000 Created @@ -21,133 +21,6 @@ IN NDIS_STATUS Status) { UNIMPLEMENTED -} - - -/* - * @implemented - */ -#undef NdisInterlockedAddUlong -VOID -EXPORT -NdisInterlockedAddUlong ( - IN PULONG Addend, - IN ULONG Increment, - IN PNDIS_SPIN_LOCK SpinLock) -{ - ExInterlockedAddUlong ( Addend, Increment, (PKSPIN_LOCK)SpinLock ); -} - - -/* - * @implemented - */ -#undef NdisInterlockedInsertHeadList -PLIST_ENTRY -EXPORT -NdisInterlockedInsertHeadList( - IN PLIST_ENTRY ListHead, - IN PLIST_ENTRY ListEntry, - IN PNDIS_SPIN_LOCK SpinLock) -{ - return ExInterlockedInsertHeadList ( ListHead, ListEntry, (PKSPIN_LOCK)SpinLock ); -} - - -/* - * @implemented - */ -#undef NdisInterlockedInsertTailList -PLIST_ENTRY -EXPORT -NdisInterlockedInsertTailList( - IN PLIST_ENTRY ListHead, - IN PLIST_ENTRY ListEntry, - IN PNDIS_SPIN_LOCK SpinLock) -{ - return ExInterlockedInsertTailList ( ListHead, ListEntry, (PKSPIN_LOCK)SpinLock ); -} - - -/* - * @implemented - */ -#undef NdisInterlockedRemoveHeadList -PLIST_ENTRY -EXPORT -NdisInterlockedRemoveHeadList( - IN PLIST_ENTRY ListHead, - IN PNDIS_SPIN_LOCK SpinLock) -{ - return ExInterlockedRemoveHeadList ( ListHead, (PKSPIN_LOCK)SpinLock ); -} - - -/* - * @unimplemented - */ -VOID -EXPORT -NdisMapFile( - OUT PNDIS_STATUS Status, - OUT PVOID * MappedBuffer, - IN NDIS_HANDLE FileHandle) -{ - UNIMPLEMENTED -} - -typedef struct _NDIS_HANDLE_OBJECT -{ - HANDLE FileHandle; - BOOLEAN Mapped; - ULONG FileLength; - PVOID MapBuffer; -} NDIS_HANDLE_OBJECT, *PNDIS_HANDLE_OBJECT; - -__inline -PNDIS_HANDLE_OBJECT -NDIS_HANDLE_TO_POBJECT ( NDIS_HANDLE handle ) -{ - return (PNDIS_HANDLE_OBJECT)handle; -} - -__inline -NDIS_HANDLE -NDIS_POBJECT_TO_HANDLE ( PNDIS_HANDLE_OBJECT obj ) -{ - return (NDIS_HANDLE)obj; -} - -const WCHAR* NDIS_FILE_FOLDER = L"\\SystemRoot\\System32\\Drivers\\"; - -/* - * @implemented - */ -VOID -EXPORT -NdisCloseFile( - IN NDIS_HANDLE FileHandle) -{ - PNDIS_HANDLE_OBJECT FileHandleObject; - - ASSERT_IRQL(PASSIVE_LEVEL); - - ASSERT ( FileHandle ); - - FileHandleObject = NDIS_HANDLE_TO_POBJECT(FileHandle); - - ASSERT ( FileHandleObject->FileHandle ); - - /* - if ( FileHandleObject->Mapped ) - NdisUnmapFile ( FileHandle ); - */ - - ZwClose ( FileHandleObject->FileHandle ); - - memset ( FileHandleObject, 0, sizeof(NDIS_HANDLE_OBJECT) ); - - ExFreePool ( FileHandleObject ); } @@ -240,101 +113,6 @@ IN NDIS_STATUS Status) { UNIMPLEMENTED -} - - -/* - * @unimplemented - */ -VOID -EXPORT -NdisOpenFile( - OUT PNDIS_STATUS Status, - OUT PNDIS_HANDLE FileHandle, - OUT PUINT FileLength, - IN PNDIS_STRING FileName, - IN NDIS_PHYSICAL_ADDRESS HighestAcceptableAddress) -{ - NDIS_STRING FullFileName; - OBJECT_ATTRIBUTES ObjectAttributes; - PNDIS_HANDLE_OBJECT FileHandleObject = NULL; - IO_STATUS_BLOCK IoStatusBlock; - - ASSERT_IRQL(PASSIVE_LEVEL); - - *Status = NDIS_STATUS_SUCCESS; - FullFileName.Buffer = NULL; - - ASSERT ( Status && FileName ); - - FullFileName.Length = sizeof(NDIS_FILE_FOLDER); - FullFileName.MaximumLength = FileName->MaximumLength + sizeof(NDIS_FILE_FOLDER); - FullFileName.Buffer = ExAllocatePool ( NonPagedPool, FullFileName.MaximumLength ); - - if ( !FullFileName.Buffer ) - { - *Status = NDIS_STATUS_RESOURCES; - goto cleanup; - } - - FileHandleObject = ExAllocatePool ( NonPagedPool, sizeof(NDIS_HANDLE_OBJECT) ); - if ( !FileHandleObject ) - { - *Status = NDIS_STATUS_RESOURCES; - goto cleanup; - } - memset ( FileHandleObject, 0, sizeof(NDIS_HANDLE_OBJECT) ); - - memmove ( FullFileName.Buffer, NDIS_FILE_FOLDER, FullFileName.Length ); - *Status = RtlAppendUnicodeStringToString ( &FullFileName, FileName ); - if ( !NT_SUCCESS(*Status) ) - { - *Status = NDIS_STATUS_FAILURE; - goto cleanup; - } - - InitializeObjectAttributes ( &ObjectAttributes, - &FullFileName, - OBJ_CASE_INSENSITIVE, - NULL, - NULL ); - - *Status = ZwCreateFile ( - &FileHandleObject->FileHandle, - FILE_READ_DATA|SYNCHRONIZE, - &ObjectAttributes, - &IoStatusBlock, - NULL, // PLARGE_INTEGER AllocationSize - 0, // ULONG FileAttributes - FILE_SHARE_READ, // ULONG ShareAccess - FILE_CREATE, // ULONG CreateDisposition - FILE_SYNCHRONOUS_IO_NONALERT, // ULONG CreateOptions - 0, // PVOID EaBuffer - 0 ); // ULONG EaLength - - if ( !NT_SUCCESS(*Status) ) - { - *Status = NDIS_STATUS_FAILURE; - } - -cleanup: - if ( FullFileName.Buffer != NULL ) - { - ExFreePool ( FullFileName.Buffer ); - FullFileName.Buffer = NULL; - } - if ( !NT_SUCCESS(*Status) ) - { - if( FileHandleObject ) { - ExFreePool ( FileHandleObject ); - FileHandleObject = NULL; - } - *FileHandle = NULL; - } - else - *FileHandle = NDIS_POBJECT_TO_HANDLE(FileHandleObject); - - return; } @@ -377,30 +155,6 @@ /* - * @implemented - */ -CCHAR -EXPORT -NdisSystemProcessorCount( - VOID) -{ - return (CCHAR)KeNumberProcessors; -} - - -/* - * @unimplemented - */ -VOID -EXPORT -NdisUnmapFile( - IN NDIS_HANDLE FileHandle) -{ - UNIMPLEMENTED -} - - -/* NdisUpcaseUnicodeString NdisUpdateSharedMemory@4 */ @@ -410,9 +164,6 @@ NdisWriteEventLogEntry */ - - -/* NDIS 5.0 extensions */ /* * @unimplemented @@ -455,53 +206,6 @@ /* - * @implemented - */ -VOID -EXPORT -NdisGetCurrentProcessorCounts( - OUT PULONG pIdleCount, - OUT PULONG pKernelAndUser, - OUT PULONG pIndex) -/* - * FUNCTION: - * ARGUMENTS: - * NOTES: - * NDIS 5.0 - */ -{ - ExGetCurrentProcessorCounts( (PULONG) pIdleCount, (PULONG) pKernelAndUser, (PULONG) pIndex); -} - - -/* - * @implemented - */ -VOID -EXPORT -NdisGetDriverHandle( - IN PNDIS_HANDLE NdisBindingHandle, - OUT PNDIS_HANDLE NdisDriverHandle) -/* - * FUNCTION: - * ARGUMENTS: - * NOTES: - * NDIS 5.0 - */ -{ - PADAPTER_BINDING Binding = (PADAPTER_BINDING)NdisBindingHandle; - - if (!Binding) - { - *NdisDriverHandle = NULL; - return; - } - - *NdisDriverHandle = Binding->Adapter->NdisMiniportBlock.DriverHandle; -} - - -/* * @unimplemented */ PNDIS_PACKET @@ -519,106 +223,6 @@ UNIMPLEMENTED return NULL; -} - - -/* - * @implemented - */ -VOID -EXPORT -NdisGetSystemUpTime(OUT PULONG pSystemUpTime) -{ - ULONG Increment; - LARGE_INTEGER TickCount; - - /* Get the increment and current tick count */ - Increment = KeQueryTimeIncrement(); - KeQueryTickCount(&TickCount); - - /* Convert to milliseconds and return */ - TickCount.QuadPart *= Increment; - TickCount.QuadPart /= (10 * 1000); - *pSystemUpTime = TickCount.LowPart; -} - - -/* - * @implemented - */ -#undef NdisInterlockedDecrement -LONG -EXPORT -NdisInterlockedDecrement( - IN PLONG Addend) -/* - * FUNCTION: - * ARGUMENTS: - * NOTES: - * NDIS 5.0 - */ -{ - return InterlockedDecrement ( Addend ); -} - - -/* - * @implemented - */ -#undef NdisInterlockedIncrement -LONG -EXPORT -NdisInterlockedIncrement( - IN PLONG Addend) -/* - * FUNCTION: - * ARGUMENTS: - * NOTES: - * NDIS 5.0 - */ -{ - return InterlockedIncrement ( Addend ); -} - - -/* - * @implemented - */ -#undef NdisInterlockedPopEntrySList -PSINGLE_LIST_ENTRY -EXPORT -NdisInterlockedPopEntrySList( - IN PSLIST_HEADER ListHead, - IN PKSPIN_LOCK Lock) -/* - * FUNCTION: - * ARGUMENTS: - * NOTES: - * NDIS 5.0 - */ -{ - return ExInterlockedPopEntrySList ( ListHead, Lock ); -} - - -/* - * @implemented - */ -#undef NdisInterlockedPushEntrySList -PSINGLE_LIST_ENTRY -EXPORT -NdisInterlockedPushEntrySList( - IN PSLIST_HEADER ListHead, - IN PSINGLE_LIST_ENTRY ListEntry, - IN PKSPIN_LOCK Lock) -/* - * FUNCTION: - * ARGUMENTS: - * NOTES: - * NDIS 5.0 - */ -{ - return ExInterlockedPushEntrySList ( ListHead, ListEntry, Lock ); } @@ -838,8 +442,6 @@ } -/* NDIS 5.0 extensions for intermediate drivers */ - /* * @unimplemented */ @@ -998,22 +600,123 @@ } - -VOID -NTAPI -ndisProcWorkItemHandler(PVOID pContext) -{ - PNDIS_WORK_ITEM pNdisItem = (PNDIS_WORK_ITEM)pContext; - pNdisItem->Routine(pNdisItem, pNdisItem->Context); -} - -EXPORT -NDIS_STATUS -NdisScheduleWorkItem( - IN PNDIS_WORK_ITEM pWorkItem) -{ - PWORK_QUEUE_ITEM pntWorkItem = (PWORK_QUEUE_ITEM)pWorkItem->WrapperReserved; - ExInitializeWorkItem(pntWorkItem, ndisProcWorkItemHandler, pWorkItem); - ExQueueWorkItem(pntWorkItem, CriticalWorkQueue); - return NDIS_STATUS_SUCCESS; -} +/* + * @unimplemented + */ +VOID +EXPORT +NdisReturnPackets( + IN PNDIS_PACKET *PacketsToReturn, + IN UINT NumberOfPackets) +/* + * FUNCTION: Releases ownership of one or more packets + * ARGUMENTS: + * PacketsToReturn = Pointer to an array of pointers to packet descriptors + * NumberOfPackets = Number of pointers in descriptor pointer array + */ +{ + UNIMPLEMENTED +} + + +/* + * @unimplemented + */ +UINT +EXPORT +NdisPacketPoolUsage( + IN NDIS_HANDLE PoolHandle) +/* + * FUNCTION: + * ARGUMENTS: + * NOTES: + * NDIS 5.0 + */ +{ + UNIMPLEMENTED + + return 0; +} + + +/* + * @unimplemented + */ +VOID +EXPORT +NdisMDeregisterIoPortRange( + IN NDIS_HANDLE MiniportAdapterHandle, + IN UINT InitialPort, + IN UINT NumberOfPorts, + IN PVOID PortOffset) +/* + * FUNCTION: Releases a register mapping to I/O ports + * ARGUMENTS: + * MiniportAdapterHandle = Specifies handle input to MiniportInitialize + * InitialPort = Bus-relative base port address of a range to be mapped + * NumberOfPorts = Specifies number of ports to be mapped + * PortOffset = Pointer to mapped base port address + */ +{ + UNIMPLEMENTED +} + + +/* + * @unimplemented + */ +NDIS_STATUS +EXPORT +NdisMAllocateSharedMemoryAsync( + IN NDIS_HANDLE MiniportAdapterHandle, + IN ULONG Length, + IN BOOLEAN Cached, + IN PVOID Context) +{ + UNIMPLEMENTED + + return NDIS_STATUS_FAILURE; +} + +/* + * @unimplemented + */ +VOID +EXPORT +NdisCopyBuffer( + OUT PNDIS_STATUS Status, + OUT PNDIS_BUFFER *Buffer, + IN NDIS_HANDLE PoolHandle, + IN PVOID MemoryDescriptor, + IN UINT Offset, + IN UINT Length) +/* + * FUNCTION: Returns a new buffer descriptor for a (partial) buffer + * ARGUMENTS: + * Status = Address of a buffer to place status of operation + * Buffer = Address of a buffer to place new buffer descriptor + * PoolHandle = Handle returned by NdisAllocateBufferPool + * MemoryDescriptor = Pointer to a memory descriptor (possibly NDIS_BUFFER) + * Offset = Offset in buffer to start copying + * Length = Number of bytes to copy + */ +{ + *Status = NDIS_STATUS_FAILURE; +} + + +/* + * @unimplemented + */ +VOID +EXPORT +NdisGetCurrentProcessorCpuUsage( + PULONG pCpuUsage) +/* + * FUNCTION: Returns how busy the current processor is as a percentage + * ARGUMENTS: + * pCpuUsage = Pointer to a buffer to place CPU usage + */ +{ + UNIMPLEMENTED +} Modified: trunk/reactos/drivers/network/ndis/ndis/buffer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/ndis/ndis/… ============================================================================== --- trunk/reactos/drivers/network/ndis/ndis/buffer.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/ndis/ndis/buffer.c [iso-8859-1] Sat Mar 21 00:29:53 2009 @@ -582,33 +582,6 @@ /* - * @unimplemented - */ -VOID -EXPORT -NdisCopyBuffer( - OUT PNDIS_STATUS Status, - OUT PNDIS_BUFFER *Buffer, - IN NDIS_HANDLE PoolHandle, - IN PVOID MemoryDescriptor, - IN UINT Offset, - IN UINT Length) -/* - * FUNCTION: Returns a new buffer descriptor for a (partial) buffer - * ARGUMENTS: - * Status = Address of a buffer to place status of operation - * Buffer = Address of a buffer to place new buffer descriptor - * PoolHandle = Handle returned by NdisAllocateBufferPool - * MemoryDescriptor = Pointer to a memory descriptor (possibly NDIS_BUFFER) - * Offset = Offset in buffer to start copying - * Length = Number of bytes to copy - */ -{ - *Status = NDIS_STATUS_FAILURE; -} - - -/* * @implemented */ VOID @@ -976,45 +949,6 @@ /* - * @unimplemented - */ -VOID -EXPORT -NdisReturnPackets( - IN PNDIS_PACKET *PacketsToReturn, - IN UINT NumberOfPackets) -/* - * FUNCTION: Releases ownership of one or more packets - * ARGUMENTS: - * PacketsToReturn = Pointer to an array of pointers to packet descriptors - * NumberOfPackets = Number of pointers in descriptor pointer array - */ -{ - UNIMPLEMENTED -} - - -/* - * @unimplemented - */ -UINT -EXPORT -NdisPacketPoolUsage( - IN NDIS_HANDLE PoolHandle) -/* - * FUNCTION: - * ARGUMENTS: - * NOTES: - * NDIS 5.0 - */ -{ - UNIMPLEMENTED - - return 0; -} - - -/* * @implemented */ #undef NdisQueryBuffer Modified: trunk/reactos/drivers/network/ndis/ndis/control.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/ndis/ndis/… ============================================================================== --- trunk/reactos/drivers/network/ndis/ndis/control.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/ndis/ndis/control.c [iso-8859-1] Sat Mar 21 00:29:53 2009 @@ -218,23 +218,6 @@ /* Nothing to do here! */ } - -/* - * @unimplemented - */ -VOID -EXPORT -NdisGetCurrentProcessorCpuUsage( - PULONG pCpuUsage) -/* - * FUNCTION: Returns how busy the current processor is as a percentage - * ARGUMENTS: - * pCpuUsage = Pointer to a buffer to place CPU usage - */ -{ - UNIMPLEMENTED -} - /* * @implemented Modified: trunk/reactos/drivers/network/ndis/ndis/hardware.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/ndis/ndis/… ============================================================================== --- trunk/reactos/drivers/network/ndis/ndis/hardware.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/ndis/ndis/hardware.c [iso-8859-1] Sat Mar 21 00:29:53 2009 @@ -152,37 +152,6 @@ return NDIS_STATUS_NOT_SUPPORTED; } - -/* - * @unimplemented - */ -VOID -EXPORT -NdisReadEisaSlotInformation( - OUT PNDIS_STATUS Status, - IN NDIS_HANDLE WrapperConfigurationContext, - OUT PUINT SlotNumber, - OUT PNDIS_EISA_FUNCTION_INFORMATION EisaData) -{ - UNIMPLEMENTED -} - - -/* - * @unimplemented - */ -VOID -EXPORT -NdisReadEisaSlotInformationEx( - OUT PNDIS_STATUS Status, - IN NDIS_HANDLE WrapperConfigurationContext, - OUT PUINT SlotNumber, - OUT PNDIS_EISA_FUNCTION_INFORMATION *EisaData, - OUT PUINT NumberOfFunctions) -{ - UNIMPLEMENTED -} - /* * @implemented Modified: trunk/reactos/drivers/network/ndis/ndis/io.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/ndis/ndis/… ============================================================================== --- trunk/reactos/drivers/network/ndis/ndis/io.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/ndis/ndis/io.c [iso-8859-1] Sat Mar 21 00:29:53 2009 @@ -527,29 +527,6 @@ /* - * @unimplemented - */ -VOID -EXPORT -NdisMDeregisterIoPortRange( - IN NDIS_HANDLE MiniportAdapterHandle, - IN UINT InitialPort, - IN UINT NumberOfPorts, - IN PVOID PortOffset) -/* - * FUNCTION: Releases a register mapping to I/O ports - * ARGUMENTS: - * MiniportAdapterHandle = Specifies handle input to MiniportInitialize - * InitialPort = Bus-relative base port address of a range to be mapped - * NumberOfPorts = Specifies number of ports to be mapped - * PortOffset = Pointer to mapped base port address - */ -{ - NDIS_DbgPrint(MAX_TRACE, ("called - IMPLEMENT ME.\n")); -} - - -/* * @implemented */ VOID @@ -971,5 +948,31 @@ return NDIS_STATUS_SUCCESS; } + +/* + * @implemented + */ +VOID +EXPORT +NdisMapIoSpace( + OUT PNDIS_STATUS Status, + OUT PVOID *VirtualAddress, + IN NDIS_HANDLE NdisAdapterHandle, + IN NDIS_PHYSICAL_ADDRESS PhysicalAddress, + IN UINT Length) +/* + * FUNCTION: + * ARGUMENTS: + * NOTES: + * NDIS 4.0 + */ +{ + *Status = NdisMMapIoSpace(VirtualAddress, + NdisAdapterHandle, + PhysicalAddress, + Length); +} + + /* EOF */ Modified: trunk/reactos/drivers/network/ndis/ndis/memory.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/ndis/ndis/… ============================================================================== --- trunk/reactos/drivers/network/ndis/ndis/memory.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/ndis/ndis/memory.c [iso-8859-1] Sat Mar 21 00:29:53 2009 @@ -137,36 +137,6 @@ /* - * @unimplemented - */ -VOID -EXPORT -NdisImmediateReadSharedMemory( - IN NDIS_HANDLE WrapperConfigurationContext, - IN ULONG SharedMemoryAddress, - OUT PUCHAR Buffer, - IN ULONG Length) -{ - UNIMPLEMENTED -} - - -/* - * @unimplemented - */ -VOID -EXPORT -NdisImmediateWriteSharedMemory( - IN NDIS_HANDLE WrapperConfigurationContext, - IN ULONG SharedMemoryAddress, - IN PUCHAR Buffer, - IN ULONG Length) -{ - UNIMPLEMENTED -} - - -/* * @implemented */ VOID @@ -198,24 +168,6 @@ } -/* - * @unimplemented - */ -NDIS_STATUS -EXPORT -NdisMAllocateSharedMemoryAsync( - IN NDIS_HANDLE MiniportAdapterHandle, - IN ULONG Length, - IN BOOLEAN Cached, - IN PVOID Context) -{ - NDIS_DbgPrint(MAX_TRACE, ("Called.\n")); - UNIMPLEMENTED - - return NDIS_STATUS_FAILURE; -} - - VOID NTAPI NdisMFreeSharedMemoryPassive( @@ -293,5 +245,52 @@ ZwClose(ThreadHandle); } + +/* + * @implemented + */ +VOID +EXPORT +NdisAllocateSharedMemory( + IN NDIS_HANDLE NdisAdapterHandle, + IN ULONG Length, + IN BOOLEAN Cached, + OUT PVOID *VirtualAddress, + OUT PNDIS_PHYSICAL_ADDRESS PhysicalAddress) +{ + NdisMAllocateSharedMemory(NdisAdapterHandle, + Length, + Cached, + VirtualAddress, + PhysicalAddress); +} + + +/* + * @implemented + */ +VOID +EXPORT +NdisFreeSharedMemory( + IN NDIS_HANDLE NdisAdapterHandle, + IN ULONG Length, + IN BOOLEAN Cached, + IN PVOID VirtualAddress, + IN NDIS_PHYSICAL_ADDRESS PhysicalAddress) +/* + * FUNCTION: + * ARGUMENTS: + * NOTES: + * NDIS 4.0 + */ +{ + NdisMFreeSharedMemory(NdisAdapterHandle, + Length, + Cached, + VirtualAddress, + PhysicalAddress); +} + + /* EOF */ 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] Sat Mar 21 00:29:53 2009 @@ -2491,5 +2491,44 @@ return NDIS_STATUS_SUCCESS; } +/* + * @implemented + */ +VOID +EXPORT +NdisDeregisterAdapterShutdownHandler( + IN NDIS_HANDLE NdisAdapterHandle) +/* + * FUNCTION: + * ARGUMENTS: + * NOTES: + * NDIS 4.0 + */ +{ + NdisMDeregisterAdapterShutdownHandler(NdisAdapterHandle); +} + + +/* + * @implemented + */ +VOID +EXPORT +NdisRegisterAdapterShutdownHandler( + IN NDIS_HANDLE NdisAdapterHandle, + IN PVOID ShutdownContext, + IN ADAPTER_SHUTDOWN_HANDLER ShutdownHandler) +/* + * FUNCTION: + * ARGUMENTS: + * NOTES: + * NDIS 4.0 + */ +{ + NdisMRegisterAdapterShutdownHandler(NdisAdapterHandle, + ShutdownContext, + ShutdownHandler); +} + /* EOF */ Added: trunk/reactos/drivers/network/ndis/ndis/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/ndis/ndis/… ============================================================================== --- trunk/reactos/drivers/network/ndis/ndis/misc.c (added) +++ trunk/reactos/drivers/network/ndis/ndis/misc.c [iso-8859-1] Sat Mar 21 00:29:53 2009 @@ -1,0 +1,408 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS NDIS library + * FILE: ndis/misc.c + */ + +#include "ndissys.h" + +/* + * @implemented + */ +#undef NdisInterlockedAddUlong +VOID +EXPORT +NdisInterlockedAddUlong ( + IN PULONG Addend, + IN ULONG Increment, + IN PNDIS_SPIN_LOCK SpinLock) +{ + ExInterlockedAddUlong ( Addend, Increment, (PKSPIN_LOCK)SpinLock ); +} + + +/* + * @implemented + */ +#undef NdisInterlockedInsertHeadList +PLIST_ENTRY +EXPORT +NdisInterlockedInsertHeadList( + IN PLIST_ENTRY ListHead, + IN PLIST_ENTRY ListEntry, + IN PNDIS_SPIN_LOCK SpinLock) +{ + return ExInterlockedInsertHeadList ( ListHead, ListEntry, (PKSPIN_LOCK)SpinLock ); +} + + +/* + * @implemented + */ +#undef NdisInterlockedInsertTailList +PLIST_ENTRY +EXPORT +NdisInterlockedInsertTailList( + IN PLIST_ENTRY ListHead, + IN PLIST_ENTRY ListEntry, + IN PNDIS_SPIN_LOCK SpinLock) +{ + return ExInterlockedInsertTailList ( ListHead, ListEntry, (PKSPIN_LOCK)SpinLock ); +} + + +/* + * @implemented + */ +#undef NdisInterlockedRemoveHeadList +PLIST_ENTRY +EXPORT +NdisInterlockedRemoveHeadList( + IN PLIST_ENTRY ListHead, + IN PNDIS_SPIN_LOCK SpinLock) +{ + return ExInterlockedRemoveHeadList ( ListHead, (PKSPIN_LOCK)SpinLock ); +} + +typedef struct _NDIS_HANDLE_OBJECT +{ + HANDLE FileHandle; + BOOLEAN Mapped; + ULONG FileLength; + PVOID MapBuffer; +} NDIS_HANDLE_OBJECT, *PNDIS_HANDLE_OBJECT; + +__inline +PNDIS_HANDLE_OBJECT +NDIS_HANDLE_TO_POBJECT ( NDIS_HANDLE handle ) +{ + return (PNDIS_HANDLE_OBJECT)handle; +} + +__inline +NDIS_HANDLE +NDIS_POBJECT_TO_HANDLE ( PNDIS_HANDLE_OBJECT obj ) +{ + return (NDIS_HANDLE)obj; +} + +const WCHAR* NDIS_FILE_FOLDER = L"\\SystemRoot\\System32\\Drivers\\"; + +/* + * @implemented + */ +VOID +EXPORT +NdisMapFile( + OUT PNDIS_STATUS Status, + OUT PVOID *MappedBuffer, + IN NDIS_HANDLE FileHandle) +{ + PNDIS_HANDLE_OBJECT HandleObject = (PNDIS_HANDLE_OBJECT) FileHandle; + + NDIS_DbgPrint(MAX_TRACE, ("called: FileHandle 0x%x\n", FileHandle)); + + if (HandleObject->Mapped) + { + /* If a file already mapped we will return an error code */ + *Status = NDIS_STATUS_ALREADY_MAPPED; + return; + } + + HandleObject->Mapped = TRUE; + *MappedBuffer = HandleObject->MapBuffer; + + /* Set returned status */ + *Status = STATUS_SUCCESS; +} + +/* + * @implemented + */ +VOID +EXPORT +NdisCloseFile( + IN NDIS_HANDLE FileHandle) +{ + PNDIS_HANDLE_OBJECT FileHandleObject; + + ASSERT_IRQL(PASSIVE_LEVEL); + + ASSERT ( FileHandle ); + + FileHandleObject = NDIS_HANDLE_TO_POBJECT(FileHandle); + + ASSERT ( FileHandleObject->FileHandle ); + + /* + if ( FileHandleObject->Mapped ) + NdisUnmapFile ( FileHandle ); + */ + + ZwClose ( FileHandleObject->FileHandle ); + + memset ( FileHandleObject, 0, sizeof(NDIS_HANDLE_OBJECT) ); + + ExFreePool ( FileHandleObject ); +} + + +/* + * @implemented + */ +VOID +EXPORT +NdisOpenFile( + OUT PNDIS_STATUS Status, + OUT PNDIS_HANDLE FileHandle, + OUT PUINT FileLength, + IN PNDIS_STRING FileName, + IN NDIS_PHYSICAL_ADDRESS HighestAcceptableAddress) +{ + NDIS_STRING FullFileName; + OBJECT_ATTRIBUTES ObjectAttributes; + PNDIS_HANDLE_OBJECT FileHandleObject = NULL; + IO_STATUS_BLOCK IoStatusBlock; + + ASSERT_IRQL(PASSIVE_LEVEL); + + *Status = NDIS_STATUS_SUCCESS; + FullFileName.Buffer = NULL; + + ASSERT ( Status && FileName ); + + FullFileName.Length = sizeof(NDIS_FILE_FOLDER); + FullFileName.MaximumLength = FileName->MaximumLength + sizeof(NDIS_FILE_FOLDER); + FullFileName.Buffer = ExAllocatePool ( NonPagedPool, FullFileName.MaximumLength ); + + if ( !FullFileName.Buffer ) + { + *Status = NDIS_STATUS_RESOURCES; + goto cleanup; + } + + FileHandleObject = ExAllocatePool ( NonPagedPool, sizeof(NDIS_HANDLE_OBJECT) ); + if ( !FileHandleObject ) + { + *Status = NDIS_STATUS_RESOURCES; + goto cleanup; + } + memset ( FileHandleObject, 0, sizeof(NDIS_HANDLE_OBJECT) ); + + memmove ( FullFileName.Buffer, NDIS_FILE_FOLDER, FullFileName.Length ); + *Status = RtlAppendUnicodeStringToString ( &FullFileName, FileName ); + if ( !NT_SUCCESS(*Status) ) + { + *Status = NDIS_STATUS_FAILURE; + goto cleanup; + } + + InitializeObjectAttributes ( &ObjectAttributes, + &FullFileName, + OBJ_CASE_INSENSITIVE, + NULL, + NULL ); + + *Status = ZwCreateFile ( + &FileHandleObject->FileHandle, + FILE_READ_DATA|SYNCHRONIZE, + &ObjectAttributes, + &IoStatusBlock, + NULL, // PLARGE_INTEGER AllocationSize + 0, // ULONG FileAttributes + FILE_SHARE_READ, // ULONG ShareAccess + FILE_CREATE, // ULONG CreateDisposition + FILE_SYNCHRONOUS_IO_NONALERT, // ULONG CreateOptions + 0, // PVOID EaBuffer + 0 ); // ULONG EaLength + + if ( !NT_SUCCESS(*Status) ) + { + *Status = NDIS_STATUS_FAILURE; + } + +cleanup: + if ( FullFileName.Buffer != NULL ) + { + ExFreePool ( FullFileName.Buffer ); + FullFileName.Buffer = NULL; + } + if ( !NT_SUCCESS(*Status) ) + { + if( FileHandleObject ) { + ExFreePool ( FileHandleObject ); + FileHandleObject = NULL; + } + *FileHandle = NULL; + } + else + *FileHandle = NDIS_POBJECT_TO_HANDLE(FileHandleObject); + + return; +} + +/* + * @implemented + */ +CCHAR +EXPORT +NdisSystemProcessorCount( + VOID) +{ + return (CCHAR)KeNumberProcessors; +} + + +/* + * @implemented + */ +VOID +EXPORT +NdisUnmapFile( + IN NDIS_HANDLE FileHandle) +{ + PNDIS_HANDLE_OBJECT HandleObject = (PNDIS_HANDLE_OBJECT) FileHandle; + + HandleObject->Mapped = FALSE; +} + + +/* + * @implemented + */ +VOID +EXPORT +NdisGetCurrentProcessorCounts( + OUT PULONG pIdleCount, + OUT PULONG pKernelAndUser, + OUT PULONG pIndex) +/* + * FUNCTION: + * ARGUMENTS: + * NOTES: + * NDIS 5.0 + */ +{ + ExGetCurrentProcessorCounts( (PULONG) pIdleCount, (PULONG) pKernelAndUser, (PULONG) pIndex); +} + + +/* + * @implemented + */ +VOID +EXPORT +NdisGetSystemUpTime(OUT PULONG pSystemUpTime) +{ + ULONG Increment; + LARGE_INTEGER TickCount; + + /* Get the increment and current tick count */ + Increment = KeQueryTimeIncrement(); + KeQueryTickCount(&TickCount); + + /* Convert to milliseconds and return */ + TickCount.QuadPart *= Increment; + TickCount.QuadPart /= (10 * 1000); + *pSystemUpTime = TickCount.LowPart; +} + +/* + * @implemented + */ +#undef NdisInterlockedDecrement +LONG +EXPORT +NdisInterlockedDecrement( + IN PLONG Addend) +/* + * FUNCTION: + * ARGUMENTS: + * NOTES: + * NDIS 5.0 + */ +{ + return InterlockedDecrement ( Addend ); +} + + +/* + * @implemented + */ +#undef NdisInterlockedIncrement +LONG +EXPORT +NdisInterlockedIncrement( + IN PLONG Addend) +/* + * FUNCTION: + * ARGUMENTS: + * NOTES: + * NDIS 5.0 + */ +{ + return InterlockedIncrement ( Addend ); +} + + +/* + * @implemented + */ +#undef NdisInterlockedPopEntrySList +PSINGLE_LIST_ENTRY +EXPORT +NdisInterlockedPopEntrySList( + IN PSLIST_HEADER ListHead, + IN PKSPIN_LOCK Lock) +/* + * FUNCTION: + * ARGUMENTS: + * NOTES: + * NDIS 5.0 + */ +{ + return ExInterlockedPopEntrySList ( ListHead, Lock ); +} + + +/* + * @implemented + */ +#undef NdisInterlockedPushEntrySList +PSINGLE_LIST_ENTRY +EXPORT +NdisInterlockedPushEntrySList( + IN PSLIST_HEADER ListHead, + IN PSINGLE_LIST_ENTRY ListEntry, + IN PKSPIN_LOCK Lock) +/* + * FUNCTION: + * ARGUMENTS: + * NOTES: + * NDIS 5.0 + */ +{ + return ExInterlockedPushEntrySList ( ListHead, ListEntry, Lock ); +} + + +VOID +NTAPI +ndisProcWorkItemHandler(PVOID pContext) +{ + PNDIS_WORK_ITEM pNdisItem = (PNDIS_WORK_ITEM)pContext; + pNdisItem->Routine(pNdisItem, pNdisItem->Context); +} + +EXPORT +NDIS_STATUS +NdisScheduleWorkItem( + IN PNDIS_WORK_ITEM pWorkItem) +{ + PWORK_QUEUE_ITEM pntWorkItem = (PWORK_QUEUE_ITEM)pWorkItem->WrapperReserved; + ExInitializeWorkItem(pntWorkItem, ndisProcWorkItemHandler, pWorkItem); + ExQueueWorkItem(pntWorkItem, CriticalWorkQueue); + return NDIS_STATUS_SUCCESS; +} + +/* EOF */ Propchange: trunk/reactos/drivers/network/ndis/ndis/misc.c ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/drivers/network/ndis/ndis/misc.c ------------------------------------------------------------------------------ svn:keywords = author date id revision 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] Sat Mar 21 00:29:53 2009 @@ -980,4 +980,31 @@ ndisBindMiniportsToProtocol(&NdisStatus, &Protocol->Chars); } + +/* + * @implemented + */ +VOID +EXPORT +NdisGetDriverHandle( + IN PNDIS_HANDLE NdisBindingHandle, + OUT PNDIS_HANDLE NdisDriverHandle) +/* + * FUNCTION: + * ARGUMENTS: + * NOTES: + * NDIS 5.0 + */ +{ + PADAPTER_BINDING Binding = (PADAPTER_BINDING)NdisBindingHandle; + + if (!Binding) + { + *NdisDriverHandle = NULL; + return; + } + + *NdisDriverHandle = Binding->Adapter->NdisMiniportBlock.DriverHandle; +} + /* EOF */ Removed: trunk/reactos/drivers/network/ndis/ndis/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/ndis/ndis/… ============================================================================== --- trunk/reactos/drivers/network/ndis/ndis/stubs.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/ndis/ndis/stubs.c (removed) @@ -1,1035 +1,0 @@ -/* - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS NDIS library - * FILE: ndis/stubs.c - * PURPOSE: Stubs - * PROGRAMMERS: Casper S. Hornstrup (chorns(a)users.sourceforge.net) - * REVISIONS: - * CSH 01/08-2000 Created - */ - -#include "ndissys.h" - -/* - * @unimplemented - */ -VOID -EXPORT -NdisCompleteQueryStatistics( - IN NDIS_HANDLE NdisAdapterHandle, - IN PNDIS_REQUEST NdisRequest, - IN NDIS_STATUS Status) -{ - UNIMPLEMENTED -} - - -/* - * @implemented - */ -#undef NdisInterlockedAddUlong -VOID -EXPORT -NdisInterlockedAddUlong ( - IN PULONG Addend, - IN ULONG Increment, - IN PNDIS_SPIN_LOCK SpinLock) -{ - ExInterlockedAddUlong ( Addend, Increment, (PKSPIN_LOCK)SpinLock ); -} - - -/* - * @implemented - */ -#undef NdisInterlockedInsertHeadList -PLIST_ENTRY -EXPORT -NdisInterlockedInsertHeadList( - IN PLIST_ENTRY ListHead, - IN PLIST_ENTRY ListEntry, - IN PNDIS_SPIN_LOCK SpinLock) -{ - return ExInterlockedInsertHeadList ( ListHead, ListEntry, (PKSPIN_LOCK)SpinLock ); -} - - -/* - * @implemented - */ -#undef NdisInterlockedInsertTailList -PLIST_ENTRY -EXPORT -NdisInterlockedInsertTailList( - IN PLIST_ENTRY ListHead, - IN PLIST_ENTRY ListEntry, - IN PNDIS_SPIN_LOCK SpinLock) -{ - return ExInterlockedInsertTailList ( ListHead, ListEntry, (PKSPIN_LOCK)SpinLock ); -} - - -/* - * @implemented - */ -#undef NdisInterlockedRemoveHeadList -PLIST_ENTRY -EXPORT -NdisInterlockedRemoveHeadList( - IN PLIST_ENTRY ListHead, - IN PNDIS_SPIN_LOCK SpinLock) -{ - return ExInterlockedRemoveHeadList ( ListHead, (PKSPIN_LOCK)SpinLock ); -} - -typedef struct _NDIS_HANDLE_OBJECT -{ - HANDLE FileHandle; - BOOLEAN Mapped; - ULONG FileLength; - PVOID MapBuffer; -} NDIS_HANDLE_OBJECT, *PNDIS_HANDLE_OBJECT; - -__inline -PNDIS_HANDLE_OBJECT -NDIS_HANDLE_TO_POBJECT ( NDIS_HANDLE handle ) -{ - return (PNDIS_HANDLE_OBJECT)handle; -} - -__inline -NDIS_HANDLE -NDIS_POBJECT_TO_HANDLE ( PNDIS_HANDLE_OBJECT obj ) -{ - return (NDIS_HANDLE)obj; -} - -const WCHAR* NDIS_FILE_FOLDER = L"\\SystemRoot\\System32\\Drivers\\"; - -/* - * @implemented - */ -VOID -EXPORT -NdisMapFile( - OUT PNDIS_STATUS Status, - OUT PVOID *MappedBuffer, - IN NDIS_HANDLE FileHandle) -{ - PNDIS_HANDLE_OBJECT HandleObject = (PNDIS_HANDLE_OBJECT) FileHandle; - - NDIS_DbgPrint(MAX_TRACE, ("called: FileHandle 0x%x\n", FileHandle)); - - if (HandleObject->Mapped) - { - /* If a file already mapped we will return an error code */ - *Status = NDIS_STATUS_ALREADY_MAPPED; - return; - } - - HandleObject->Mapped = TRUE; - *MappedBuffer = HandleObject->MapBuffer; - - /* Set returned status */ - *Status = STATUS_SUCCESS; -} - -/* - * @implemented - */ -VOID -EXPORT -NdisCloseFile( - IN NDIS_HANDLE FileHandle) -{ - PNDIS_HANDLE_OBJECT FileHandleObject; - - ASSERT_IRQL(PASSIVE_LEVEL); - - ASSERT ( FileHandle ); - - FileHandleObject = NDIS_HANDLE_TO_POBJECT(FileHandle); - - ASSERT ( FileHandleObject->FileHandle ); - - /* - if ( FileHandleObject->Mapped ) - NdisUnmapFile ( FileHandle ); - */ - - ZwClose ( FileHandleObject->FileHandle ); - - memset ( FileHandleObject, 0, sizeof(NDIS_HANDLE_OBJECT) ); - - ExFreePool ( FileHandleObject ); -} - - -/* - * @unimplemented - */ -NDIS_STATUS -EXPORT -NdisIMDeInitializeDeviceInstance( - IN NDIS_HANDLE NdisMiniportHandle) -{ - UNIMPLEMENTED - - return NDIS_STATUS_FAILURE; -} - - -/* - * @unimplemented - */ -#undef NdisIMInitializeDeviceInstance -NDIS_STATUS -EXPORT -NdisIMInitializeDeviceInstance( - IN NDIS_HANDLE DriverHandle, - IN PNDIS_STRING DeviceInstance) -{ - UNIMPLEMENTED - - return NDIS_STATUS_FAILURE; -} - - -/* - * @unimplemented - */ -NDIS_STATUS -EXPORT -NdisIMRegisterLayeredMiniport( - IN NDIS_HANDLE NdisWrapperHandle, - IN PNDIS_MINIPORT_CHARACTERISTICS MiniportCharacteristics, - IN UINT CharacteristicsLength, - OUT PNDIS_HANDLE DriverHandle) -{ - UNIMPLEMENTED - - return NDIS_STATUS_FAILURE; -} - - -/* - * @unimplemented - */ -#undef NdisMWanIndicateReceive -VOID -EXPORT -NdisMWanIndicateReceive( - OUT PNDIS_STATUS Status, - IN NDIS_HANDLE MiniportAdapterHandle, - IN NDIS_HANDLE NdisLinkContext, - IN PUCHAR PacketBuffer, - IN UINT PacketSize) -{ - UNIMPLEMENTED -} - - -/* - * @unimplemented - */ -#undef NdisMWanIndicateReceiveComplete -VOID -EXPORT -NdisMWanIndicateReceiveComplete( - IN NDIS_HANDLE MiniportAdapterHandle) -{ - UNIMPLEMENTED -} - - -/* - * @unimplemented - */ -#undef NdisMWanSendComplete -VOID -EXPORT -NdisMWanSendComplete( - IN NDIS_HANDLE MiniportAdapterHandle, - IN PNDIS_WAN_PACKET Packet, - IN NDIS_STATUS Status) -{ - UNIMPLEMENTED -} - - -/* - * @unimplemented - */ -VOID -EXPORT -NdisOpenFile( - OUT PNDIS_STATUS Status, - OUT PNDIS_HANDLE FileHandle, - OUT PUINT FileLength, - IN PNDIS_STRING FileName, - IN NDIS_PHYSICAL_ADDRESS HighestAcceptableAddress) -{ - NDIS_STRING FullFileName; - OBJECT_ATTRIBUTES ObjectAttributes; - PNDIS_HANDLE_OBJECT FileHandleObject = NULL; - IO_STATUS_BLOCK IoStatusBlock; - - ASSERT_IRQL(PASSIVE_LEVEL); - - *Status = NDIS_STATUS_SUCCESS; - FullFileName.Buffer = NULL; - - ASSERT ( Status && FileName ); - - FullFileName.Length = sizeof(NDIS_FILE_FOLDER); - FullFileName.MaximumLength = FileName->MaximumLength + sizeof(NDIS_FILE_FOLDER); - FullFileName.Buffer = ExAllocatePool ( NonPagedPool, FullFileName.MaximumLength ); - - if ( !FullFileName.Buffer ) - { - *Status = NDIS_STATUS_RESOURCES; - goto cleanup; - } - - FileHandleObject = ExAllocatePool ( NonPagedPool, sizeof(NDIS_HANDLE_OBJECT) ); - if ( !FileHandleObject ) - { - *Status = NDIS_STATUS_RESOURCES; - goto cleanup; - } - memset ( FileHandleObject, 0, sizeof(NDIS_HANDLE_OBJECT) ); - - memmove ( FullFileName.Buffer, NDIS_FILE_FOLDER, FullFileName.Length ); - *Status = RtlAppendUnicodeStringToString ( &FullFileName, FileName ); - if ( !NT_SUCCESS(*Status) ) - { - *Status = NDIS_STATUS_FAILURE; - goto cleanup; - } - - InitializeObjectAttributes ( &ObjectAttributes, - &FullFileName, - OBJ_CASE_INSENSITIVE, - NULL, - NULL ); - - *Status = ZwCreateFile ( - &FileHandleObject->FileHandle, - FILE_READ_DATA|SYNCHRONIZE, - &ObjectAttributes, - &IoStatusBlock, - NULL, // PLARGE_INTEGER AllocationSize - 0, // ULONG FileAttributes - FILE_SHARE_READ, // ULONG ShareAccess - FILE_CREATE, // ULONG CreateDisposition - FILE_SYNCHRONOUS_IO_NONALERT, // ULONG CreateOptions - 0, // PVOID EaBuffer - 0 ); // ULONG EaLength - - if ( !NT_SUCCESS(*Status) ) - { - *Status = NDIS_STATUS_FAILURE; - } - -cleanup: - if ( FullFileName.Buffer != NULL ) - { - ExFreePool ( FullFileName.Buffer ); - FullFileName.Buffer = NULL; - } - if ( !NT_SUCCESS(*Status) ) - { - if( FileHandleObject ) { - ExFreePool ( FileHandleObject ); - FileHandleObject = NULL; - } - *FileHandle = NULL; - } - else - *FileHandle = NDIS_POBJECT_TO_HANDLE(FileHandleObject); - - return; -} - - -/* -NdisOpenGlobalConfiguration -*/ - -#if 0 -VOID -EXPORT -NdisRegisterTdiCallBack( - IN TDI_REGISTER_CALLBACK RegsterCallback) -{ - UNIMPLEMENTED -} -#endif - - -/* -NdisScheduleWorkItem -*/ - - -#if 0 -VOID -EXPORT -NdisSetProtocolFilter( - OUT PNDIS_STATUS Status, - IN NDIS_HANDLE NdisBindingHandle, - IN RECEIVE_HANDLER ReceiveHandler, - IN RECEIVE_PACKET_HANDLER ReceivePacketHandler, - IN NDIS_MEDIUM Medium, - IN UINT Offset, - IN UINT Size, - IN PUCHAR Pattern) -{ - UNIMPLEMENTED -} -#endif - - -/* - * @implemented - */ -CCHAR -EXPORT -NdisSystemProcessorCount( - VOID) -{ - return (CCHAR)KeNumberProcessors; -} - - -/* - * @implemented - */ -VOID -EXPORT -NdisUnmapFile( - IN NDIS_HANDLE FileHandle) -{ - PNDIS_HANDLE_OBJECT HandleObject = (PNDIS_HANDLE_OBJECT) FileHandle; - - HandleObject->Mapped = FALSE; -} - - -/* -NdisUpcaseUnicodeString -NdisUpdateSharedMemory@4 -*/ - - -/* -NdisWriteEventLogEntry -*/ - - - -/* NDIS 5.0 extensions */ - -/* - * @unimplemented - */ -VOID -EXPORT -NdisCompletePnPEvent( - IN NDIS_STATUS Status, - IN NDIS_HANDLE NdisBindingHandle, - IN PNET_PNP_EVENT NetPnPEvent) -/* - * FUNCTION: - * ARGUMENTS: - * NOTES: - * NDIS 5.0 - */ -{ - UNIMPLEMENTED -} - - -/* - * @unimplemented - */ -VOID -EXPORT -NdisConvertStringToAtmAddress( - OUT PNDIS_STATUS Status, - IN PNDIS_STRING String, - OUT PATM_ADDRESS AtmAddress) -/* - * FUNCTION: - * ARGUMENTS: - * NOTES: - * NDIS 5.0 - */ -{ - UNIMPLEMENTED -} - - -/* - * @implemented - */ -VOID -EXPORT -NdisGetCurrentProcessorCounts( - OUT PULONG pIdleCount, - OUT PULONG pKernelAndUser, - OUT PULONG pIndex) -/* - * FUNCTION: - * ARGUMENTS: - * NOTES: - * NDIS 5.0 - */ -{ - ExGetCurrentProcessorCounts( (PULONG) pIdleCount, (PULONG) pKernelAndUser, (PULONG) pIndex); -} - - -/* - * @implemented - */ -VOID -EXPORT -NdisGetDriverHandle( - IN PNDIS_HANDLE NdisBindingHandle, - OUT PNDIS_HANDLE NdisDriverHandle) -/* - * FUNCTION: - * ARGUMENTS: - * NOTES: - * NDIS 5.0 - */ -{ - PADAPTER_BINDING Binding = (PADAPTER_BINDING)NdisBindingHandle; - - if (!Binding) - { - *NdisDriverHandle = NULL; - return; - } - - *NdisDriverHandle = Binding->Adapter->NdisMiniportBlock.DriverHandle; -} - - -/* - * @unimplemented - */ -PNDIS_PACKET -EXPORT -NdisGetReceivedPacket( - IN PNDIS_HANDLE NdisBindingHandle, - IN PNDIS_HANDLE MacContext) -/* - * FUNCTION: - * ARGUMENTS: - * NOTES: - * NDIS 5.0 - */ -{ - UNIMPLEMENTED - - return NULL; -} - - -/* - * @implemented - */ -VOID -EXPORT -NdisGetSystemUpTime(OUT PULONG pSystemUpTime) -{ - ULONG Increment; - LARGE_INTEGER TickCount; - - /* Get the increment and current tick count */ - Increment = KeQueryTimeIncrement(); - KeQueryTickCount(&TickCount); - - /* Convert to milliseconds and return */ - TickCount.QuadPart *= Increment; - TickCount.QuadPart /= (10 * 1000); - *pSystemUpTime = TickCount.LowPart; -} - - -/* - * @implemented - */ -#undef NdisInterlockedDecrement -LONG -EXPORT -NdisInterlockedDecrement( - IN PLONG Addend) -/* - * FUNCTION: - * ARGUMENTS: - * NOTES: - * NDIS 5.0 - */ -{ - return InterlockedDecrement ( Addend ); -} - - -/* - * @implemented - */ -#undef NdisInterlockedIncrement -LONG -EXPORT -NdisInterlockedIncrement( - IN PLONG Addend) -/* - * FUNCTION: - * ARGUMENTS: - * NOTES: - * NDIS 5.0 - */ -{ - return InterlockedIncrement ( Addend ); -} - - -/* - * @implemented - */ -#undef NdisInterlockedPopEntrySList -PSINGLE_LIST_ENTRY -EXPORT -NdisInterlockedPopEntrySList( - IN PSLIST_HEADER ListHead, - IN PKSPIN_LOCK Lock) -/* - * FUNCTION: - * ARGUMENTS: - * NOTES: - * NDIS 5.0 - */ -{ - return ExInterlockedPopEntrySList ( ListHead, Lock ); -} - - -/* - * @implemented - */ -#undef NdisInterlockedPushEntrySList -PSINGLE_LIST_ENTRY -EXPORT -NdisInterlockedPushEntrySList( - IN PSLIST_HEADER ListHead, - IN PSINGLE_LIST_ENTRY ListEntry, - IN PKSPIN_LOCK Lock) -/* - * FUNCTION: - * ARGUMENTS: - * NOTES: - * NDIS 5.0 - */ -{ - return ExInterlockedPushEntrySList ( ListHead, ListEntry, Lock ); -} - - -/* - * @unimplemented - */ -NDIS_STATUS -EXPORT -NdisMDeregisterDevice( - IN NDIS_HANDLE NdisDeviceHandle) -/* - * FUNCTION: - * ARGUMENTS: - * NOTES: - * NDIS 5.0 - */ -{ - UNIMPLEMENTED - - return NDIS_STATUS_FAILURE; -} - - -/* - * @unimplemented - */ -VOID -EXPORT -NdisMGetDeviceProperty( - IN NDIS_HANDLE MiniportAdapterHandle, - IN OUT PDEVICE_OBJECT *PhysicalDeviceObject OPTIONAL, - IN OUT PDEVICE_OBJECT *FunctionalDeviceObject OPTIONAL, - IN OUT PDEVICE_OBJECT *NextDeviceObject OPTIONAL, - IN OUT PCM_RESOURCE_LIST *AllocatedResources OPTIONAL, - IN OUT PCM_RESOURCE_LIST *AllocatedResourcesTranslated OPTIONAL) -/* - * FUNCTION: - * ARGUMENTS: - * NOTES: - * NDIS 5.0 - */ -{ - UNIMPLEMENTED -} - - -/* - * @unimplemented - */ -NDIS_STATUS -EXPORT -NdisMPromoteMiniport( - IN NDIS_HANDLE MiniportAdapterHandle) -/* - * FUNCTION: - * ARGUMENTS: - * NOTES: - * NDIS 5.0 - */ -{ - UNIMPLEMENTED - - return NDIS_STATUS_FAILURE; -} - - -/* - * @unimplemented - */ -NDIS_STATUS -EXPORT -NdisMRegisterDevice( - IN NDIS_HANDLE NdisWrapperHandle, - IN PNDIS_STRING DeviceName, - IN PNDIS_STRING SymbolicName, - IN PDRIVER_DISPATCH MajorFunctions[], - OUT PDEVICE_OBJECT *pDeviceObject, - OUT NDIS_HANDLE *NdisDeviceHandle) -/* - * FUNCTION: - * ARGUMENTS: - * NOTES: - * NDIS 5.0 - */ -{ - UNIMPLEMENTED - - return NDIS_STATUS_FAILURE; -} - - -/* - * @unimplemented - */ -VOID -EXPORT -NdisMRegisterUnloadHandler( - IN NDIS_HANDLE NdisWrapperHandle, - IN PDRIVER_UNLOAD UnloadHandler) -/* - * FUNCTION: - * ARGUMENTS: - * NOTES: - * NDIS 5.0 - */ -{ - UNIMPLEMENTED -} - - -/* - * @unimplemented - */ -NDIS_STATUS -EXPORT -NdisMRemoveMiniport( - IN NDIS_HANDLE MiniportAdapterHandle) -/* - * FUNCTION: - * ARGUMENTS: - * NOTES: - * NDIS 5.0 - */ -{ - UNIMPLEMENTED - - return NDIS_STATUS_FAILURE; -} - - -/* - * @unimplemented - */ -NDIS_STATUS -EXPORT -NdisMSetMiniportSecondary( - IN NDIS_HANDLE MiniportAdapterHandle, - IN NDIS_HANDLE PrimaryMiniportAdapterHandle) -/* - * FUNCTION: - * ARGUMENTS: - * NOTES: - * NDIS 5.0 - */ -{ - UNIMPLEMENTED - - return NDIS_STATUS_FAILURE; -} - - - -/* - * @unimplemented - */ -NDIS_STATUS -EXPORT -NdisQueryAdapterInstanceName( - OUT PNDIS_STRING AdapterInstanceName, - IN NDIS_HANDLE NdisBindingHandle) -/* - * FUNCTION: - * ARGUMENTS: - * NOTES: - * NDIS 5.0 - */ -{ - UNIMPLEMENTED - - return NDIS_STATUS_FAILURE; -} - - -/* - * @unimplemented - */ -ULONG -EXPORT -NdisReadPcmciaAttributeMemory( - IN NDIS_HANDLE NdisAdapterHandle, - IN ULONG Offset, - IN PVOID Buffer, - IN ULONG Length) -/* - * FUNCTION: - * ARGUMENTS: - * NOTES: - * NDIS 5.0 - */ -{ - UNIMPLEMENTED - - return 0; -} - - -/* - * @unimplemented - */ -ULONG -EXPORT -NdisWritePcmciaAttributeMemory( - IN NDIS_HANDLE NdisAdapterHandle, - IN ULONG Offset, - IN PVOID Buffer, - IN ULONG Length) -/* - * FUNCTION: - * ARGUMENTS: - * NOTES: - * NDIS 5.0 - */ -{ - UNIMPLEMENTED - - return 0; -} - - -/* NDIS 5.0 extensions for intermediate drivers */ - -/* - * @unimplemented - */ -VOID -EXPORT -NdisIMAssociateMiniport( - IN NDIS_HANDLE DriverHandle, - IN NDIS_HANDLE ProtocolHandle) -/* - * FUNCTION: - * ARGUMENTS: - * NOTES: - * NDIS 5.0 - */ -{ - UNIMPLEMENTED -} - - -/* - * @unimplemented - */ -NDIS_STATUS -EXPORT -NdisIMCancelInitializeDeviceInstance( - IN NDIS_HANDLE DriverHandle, - IN PNDIS_STRING DeviceInstance) -/* - * FUNCTION: - * ARGUMENTS: - * NOTES: - * NDIS 5.0 - */ -{ - UNIMPLEMENTED - - return NDIS_STATUS_FAILURE; -} - - -/* - * @unimplemented - */ -VOID -EXPORT -NdisIMCopySendCompletePerPacketInfo( - IN PNDIS_PACKET DstPacket, - IN PNDIS_PACKET SrcPacket) -/* - * FUNCTION: - * ARGUMENTS: - * NOTES: - * NDIS 5.0 - */ -{ - UNIMPLEMENTED -} - - -/* - * @unimplemented - */ -VOID -EXPORT -NdisIMCopySendPerPacketInfo( - IN PNDIS_PACKET DstPacket, - IN PNDIS_PACKET SrcPacket) -/* - * FUNCTION: - * ARGUMENTS: - * NOTES: - * NDIS 5.0 - */ -{ - UNIMPLEMENTED -} - - -/* - * @unimplemented - */ -VOID -EXPORT -NdisIMDeregisterLayeredMiniport( - IN NDIS_HANDLE DriverHandle) -/* - * FUNCTION: - * ARGUMENTS: - * NOTES: - * NDIS 5.0 - */ -{ - UNIMPLEMENTED -} - - -/* - * @unimplemented - */ -NDIS_HANDLE -EXPORT -NdisIMGetBindingContext( - IN NDIS_HANDLE NdisBindingHandle) -/* - * FUNCTION: - * ARGUMENTS: - * NOTES: - * NDIS 5.0 - */ -{ - UNIMPLEMENTED - - return (NDIS_HANDLE)NULL; -} - - -/* - * @unimplemented - */ -NDIS_HANDLE -EXPORT -NdisIMGetDeviceContext( - IN NDIS_HANDLE MiniportAdapterHandle) -/* - * FUNCTION: - * ARGUMENTS: - * NOTES: - * NDIS 5.0 - */ -{ - UNIMPLEMENTED - - return (NDIS_HANDLE)NULL; -} - - -/* - * @unimplemented - */ -NDIS_STATUS -EXPORT -NdisIMInitializeDeviceInstanceEx( - IN NDIS_HANDLE DriverHandle, - IN PNDIS_STRING DriverInstance, - IN NDIS_HANDLE DeviceContext OPTIONAL) -/* - * FUNCTION: - * ARGUMENTS: - * NOTES: - * NDIS 5.0 - */ -{ - UNIMPLEMENTED - - return NDIS_STATUS_FAILURE; -} - - - -VOID -NTAPI -ndisProcWorkItemHandler(PVOID pContext) -{ - PNDIS_WORK_ITEM pNdisItem = (PNDIS_WORK_ITEM)pContext; - pNdisItem->Routine(pNdisItem, pNdisItem->Context); -} - -EXPORT -NDIS_STATUS -NdisScheduleWorkItem( - IN PNDIS_WORK_ITEM pWorkItem) -{ - PWORK_QUEUE_ITEM pntWorkItem = (PWORK_QUEUE_ITEM)pWorkItem->WrapperReserved; - ExInitializeWorkItem(pntWorkItem, ndisProcWorkItemHandler, pWorkItem); - ExQueueWorkItem(pntWorkItem, CriticalWorkQueue); - return NDIS_STATUS_SUCCESS; -}

1 0

[cgutman] 40141: - Implement NdisFreeSharedMemory
by cgutman＠svn.reactos.org 20 Mar '09

20 Mar '09

Author: cgutman Date: Fri Mar 20 23:51:05 2009 New Revision: 40141 URL: http://svn.reactos.org/svn/reactos?rev=40141&view=rev Log: - Implement NdisFreeSharedMemory Modified: trunk/reactos/drivers/network/ndis/ndis/50gone.c Modified: trunk/reactos/drivers/network/ndis/ndis/50gone.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/ndis/ndis/… ============================================================================== --- trunk/reactos/drivers/network/ndis/ndis/50gone.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/ndis/ndis/50gone.c [iso-8859-1] Fri Mar 20 23:51:05 2009 @@ -126,7 +126,7 @@ /* - * @unimplemented + * @implemented */ VOID EXPORT @@ -143,7 +143,11 @@ * NDIS 4.0 */ { - UNIMPLEMENTED + NdisMFreeSharedMemory(NdisAdapterHandle, + Length, + Cached, + VirtualAddress, + PhysicalAddress); }

1 0

[cgutman] 40140: - Implement NdisAllocateSharedMemory
by cgutman＠svn.reactos.org 20 Mar '09

20 Mar '09

Author: cgutman Date: Fri Mar 20 23:45:27 2009 New Revision: 40140 URL: http://svn.reactos.org/svn/reactos?rev=40140&view=rev Log: - Implement NdisAllocateSharedMemory Modified: trunk/reactos/drivers/network/ndis/ndis/40gone.c Modified: trunk/reactos/drivers/network/ndis/ndis/40gone.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/ndis/ndis/… ============================================================================== --- trunk/reactos/drivers/network/ndis/ndis/40gone.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/ndis/ndis/40gone.c [iso-8859-1] Fri Mar 20 23:45:27 2009 @@ -104,7 +104,7 @@ /* - * @unimplemented + * @implemented */ VOID EXPORT @@ -115,7 +115,11 @@ OUT PVOID *VirtualAddress, OUT PNDIS_PHYSICAL_ADDRESS PhysicalAddress) { - UNIMPLEMENTED + NdisMAllocateSharedMemory(NdisAdapterHandle, + Length, + Cached, + VirtualAddress, + PhysicalAddress); }

1 0

[cgutman] 40139: - Implement NdisMCreateLog, NdisMCloseLog, and NdisMFlushLog - Patch by Dmitry Chapyshev (with modifications by me)
by cgutman＠svn.reactos.org 20 Mar '09

20 Mar '09

Author: cgutman Date: Fri Mar 20 23:43:43 2009 New Revision: 40139 URL: http://svn.reactos.org/svn/reactos?rev=40139&view=rev Log: - Implement NdisMCreateLog, NdisMCloseLog, and NdisMFlushLog - Patch by Dmitry Chapyshev (with modifications by me) Modified: trunk/reactos/drivers/network/ndis/ndis/miniport.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] Fri Mar 20 23:43:43 2009 @@ -1164,19 +1164,28 @@ /* - * @unimplemented + * @implemented */ VOID EXPORT NdisMCloseLog( IN NDIS_HANDLE LogHandle) { - UNIMPLEMENTED -} - - -/* - * @unimplemented + PNDIS_LOG Log = (PNDIS_LOG)LogHandle; + PNDIS_MINIPORT_BLOCK Miniport = Log->Miniport; + KIRQL OldIrql; + + NDIS_DbgPrint(MAX_TRACE, ("called: LogHandle 0x%x\n", LogHandle)); + + KeAcquireSpinLock(&(Miniport)->Lock, &OldIrql); + Miniport->Log = NULL; + KeReleaseSpinLock(&(Miniport)->Lock, OldIrql); + + ExFreePool(Log); +} + +/* + * @implemented */ NDIS_STATUS EXPORT @@ -1185,12 +1194,45 @@ IN UINT Size, OUT PNDIS_HANDLE LogHandle) { - UNIMPLEMENTED - - return NDIS_STATUS_FAILURE; -} - - + PLOGICAL_ADAPTER Adapter = MiniportAdapterHandle; + PNDIS_LOG Log; + KIRQL OldIrql; + + NDIS_DbgPrint(MAX_TRACE, ("called: MiniportAdapterHandle 0x%x, Size %ld\n", MiniportAdapterHandle, Size)); + + KeAcquireSpinLock(&Adapter->NdisMiniportBlock.Lock, &OldIrql); + + if (Adapter->NdisMiniportBlock.Log) + { + *LogHandle = NULL; + return NDIS_STATUS_FAILURE; + } + + Log = ExAllocatePool(NonPagedPool, Size + sizeof(NDIS_LOG)); + if (!Log) + { + *LogHandle = NULL; + return NDIS_STATUS_RESOURCES; + } + + Adapter->NdisMiniportBlock.Log = Log; + + KeInitializeSpinLock(&Log->LogLock); + + Log->Miniport = &Adapter->NdisMiniportBlock; + Log->TotalSize = Size; + Log->CurrentSize = 0; + Log->OutPtr = 0; + Log->InPtr = 0; + Log->Irp = NULL; + + *LogHandle = Log; + + KeReleaseSpinLock(&Adapter->NdisMiniportBlock.Lock, OldIrql); + + return NDIS_STATUS_SUCCESS; +} + /* * @implemented */ @@ -1213,16 +1255,29 @@ } } - -/* - * @unimplemented +/* + * @implemented */ VOID EXPORT NdisMFlushLog( IN NDIS_HANDLE LogHandle) { - UNIMPLEMENTED + PNDIS_LOG Log = (PNDIS_LOG) LogHandle; + KIRQL OldIrql; + + NDIS_DbgPrint(MAX_TRACE, ("called: LogHandle 0x%x\n", LogHandle)); + + /* Lock object */ + KeAcquireSpinLock(&Log->LogLock, &OldIrql); + + /* Set buffers size */ + Log->CurrentSize = 0; + Log->OutPtr = 0; + Log->InPtr = 0; + + /* Unlock object */ + KeReleaseSpinLock(&Log->LogLock, OldIrql); } /*

1 0

[cgutman] 40138: - Implement NdisDeregisterAdapterShutdownHandler, NdisMapIoSpace, and NdisRegisterAdapterShutdownHandler - Move NdisCompleteDmaTransfer to 40gone.c
by cgutman＠svn.reactos.org 20 Mar '09

20 Mar '09

Author: cgutman Date: Fri Mar 20 23:14:01 2009 New Revision: 40138 URL: http://svn.reactos.org/svn/reactos?rev=40138&view=rev Log: - Implement NdisDeregisterAdapterShutdownHandler, NdisMapIoSpace, and NdisRegisterAdapterShutdownHandler - Move NdisCompleteDmaTransfer to 40gone.c Modified: trunk/reactos/drivers/network/ndis/ndis/40gone.c trunk/reactos/drivers/network/ndis/ndis/50gone.c trunk/reactos/drivers/network/ndis/ndis/io.c Modified: trunk/reactos/drivers/network/ndis/ndis/40gone.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/ndis/ndis/… ============================================================================== --- trunk/reactos/drivers/network/ndis/ndis/40gone.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/ndis/ndis/40gone.c [iso-8859-1] Fri Mar 20 23:14:01 2009 @@ -9,6 +9,23 @@ */ #include "ndissys.h" + + +/* + * @unimplemented + */ +VOID +EXPORT +NdisCompleteDmaTransfer( + OUT PNDIS_STATUS Status, + IN PNDIS_HANDLE NdisDmaHandle, + IN PNDIS_BUFFER Buffer, + IN ULONG Offset, + IN ULONG Length, + IN BOOLEAN WriteToDevice) +{ + UNIMPLEMENTED +} /* Modified: trunk/reactos/drivers/network/ndis/ndis/50gone.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/ndis/ndis/… ============================================================================== --- trunk/reactos/drivers/network/ndis/ndis/50gone.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/ndis/ndis/50gone.c [iso-8859-1] Fri Mar 20 23:14:01 2009 @@ -71,7 +71,7 @@ /* - * @unimplemented + * @implemented */ VOID EXPORT @@ -84,7 +84,7 @@ * NDIS 4.0 */ { - UNIMPLEMENTED + NdisMDeregisterAdapterShutdownHandler(NdisAdapterHandle); } @@ -210,7 +210,7 @@ /* - * @unimplemented + * @implemented */ VOID EXPORT @@ -227,7 +227,10 @@ * NDIS 4.0 */ { - UNIMPLEMENTED + *Status = NdisMMapIoSpace(VirtualAddress, + NdisAdapterHandle, + PhysicalAddress, + Length); } @@ -324,7 +327,7 @@ /* - * @unimplemented + * @implemented */ VOID EXPORT @@ -339,7 +342,9 @@ * NDIS 4.0 */ { - UNIMPLEMENTED + NdisMRegisterAdapterShutdownHandler(NdisAdapterHandle, + ShutdownContext, + ShutdownHandler); } Modified: trunk/reactos/drivers/network/ndis/ndis/io.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/ndis/ndis/… ============================================================================== --- trunk/reactos/drivers/network/ndis/ndis/io.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/ndis/ndis/io.c [iso-8859-1] Fri Mar 20 23:14:01 2009 @@ -90,23 +90,6 @@ NDIS_DbgPrint(MAX_TRACE, ("Leaving.\n")); return InterruptRecognized; -} - - -/* - * @unimplemented - */ -VOID -EXPORT -NdisCompleteDmaTransfer( - OUT PNDIS_STATUS Status, - IN PNDIS_HANDLE NdisDmaHandle, - IN PNDIS_BUFFER Buffer, - IN ULONG Offset, - IN ULONG Length, - IN BOOLEAN WriteToDevice) -{ - UNIMPLEMENTED }

1 0

[tkreuzer] 40137: Rename GDIDEVICE to PDEVOBJ. Is seems ms uses both PDEV and PDEVOBJ, whith the latter being the C++ representation. But we don't use C++ and PDEVOBJ seems to be a more appropriate name, as PDEV is often used by display drivers. Make DC.ppdev of type PDEVOBJ* and remove a bunch of typecasts.
by tkreuzer＠svn.reactos.org 20 Mar '09

20 Mar '09

Author: tkreuzer Date: Fri Mar 20 21:02:55 2009 New Revision: 40137 URL: http://svn.reactos.org/svn/reactos?rev=40137&view=rev Log: Rename GDIDEVICE to PDEVOBJ. Is seems ms uses both PDEV and PDEVOBJ, whith the latter being the C++ representation. But we don't use C++ and PDEVOBJ seems to be a more appropriate name, as PDEV is often used by display drivers. Make DC.ppdev of type PDEVOBJ* and remove a bunch of typecasts. Modified: trunk/reactos/subsystems/win32/win32k/eng/driverobj.c trunk/reactos/subsystems/win32/win32k/eng/mouse.c trunk/reactos/subsystems/win32/win32k/eng/palette.c trunk/reactos/subsystems/win32/win32k/eng/surface.c trunk/reactos/subsystems/win32/win32k/include/dc.h trunk/reactos/subsystems/win32/win32k/include/monitor.h trunk/reactos/subsystems/win32/win32k/include/surface.h trunk/reactos/subsystems/win32/win32k/ntddraw/ddraw.c trunk/reactos/subsystems/win32/win32k/ntddraw/dxeng.c trunk/reactos/subsystems/win32/win32k/ntuser/cursoricon.c trunk/reactos/subsystems/win32/win32k/ntuser/input.c trunk/reactos/subsystems/win32/win32k/ntuser/metric.c trunk/reactos/subsystems/win32/win32k/ntuser/monitor.c trunk/reactos/subsystems/win32/win32k/objects/bitmaps.c trunk/reactos/subsystems/win32/win32k/objects/color.c trunk/reactos/subsystems/win32/win32k/objects/coord.c trunk/reactos/subsystems/win32/win32k/objects/dc.c trunk/reactos/subsystems/win32/win32k/objects/dibobj.c trunk/reactos/subsystems/win32/win32k/objects/gdibatch.c trunk/reactos/subsystems/win32/win32k/objects/icm.c trunk/reactos/subsystems/win32/win32k/objects/print.c Modified: trunk/reactos/subsystems/win32/win32k/eng/driverobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/en… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/eng/driverobj.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/eng/driverobj.c [iso-8859-1] Fri Mar 20 21:02:55 2009 @@ -45,7 +45,7 @@ { PEDRIVEROBJ pedo; HDRVOBJ hdo; - GDIDEVICE *ppdev = (GDIDEVICE*)hdev; + PDEVOBJ *ppdev = (PDEVOBJ*)hdev; /* Allocate a new DRIVEROBJ */ pedo = DRIVEROBJ_AllocObjectWithHandle(); Modified: trunk/reactos/subsystems/win32/win32k/eng/mouse.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/en… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/eng/mouse.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/eng/mouse.c [iso-8859-1] Fri Mar 20 21:02:55 2009 @@ -43,7 +43,7 @@ */ { LONG tmp; - GDIDEVICE *ppdev; + PDEVOBJ *ppdev; GDIPOINTER *pgp; ASSERT(SurfObj != NULL); @@ -101,7 +101,7 @@ * FUNCTION: Notify the mouse driver that drawing has finished on a surface. */ { - GDIDEVICE *ppdev; + PDEVOBJ *ppdev; GDIPOINTER *pgp; ASSERT(SurfObj != NULL); @@ -138,7 +138,7 @@ /* SOFTWARE MOUSE POINTER IMPLEMENTATION **************************************/ VOID INTERNAL_CALL -IntHideMousePointer(GDIDEVICE *ppdev, SURFOBJ *psoDest) +IntHideMousePointer(PDEVOBJ *ppdev, SURFOBJ *psoDest) { GDIPOINTER *pgp; POINTL pt; @@ -207,7 +207,7 @@ } VOID INTERNAL_CALL -IntShowMousePointer(GDIDEVICE *ppdev, SURFOBJ *psoDest) +IntShowMousePointer(PDEVOBJ *ppdev, SURFOBJ *psoDest) { GDIPOINTER *pgp; SURFOBJ *SaveSurface; @@ -335,7 +335,7 @@ IN RECTL *prcl, IN FLONG fl) { - GDIDEVICE *ppdev; + PDEVOBJ *ppdev; SURFOBJ *psoTemp; GDIPOINTER *pgp; @@ -536,7 +536,7 @@ IN LONG y, IN RECTL *prcl) { - GDIDEVICE *ppdev; + PDEVOBJ *ppdev; GDIPOINTER *pgp; ASSERT(pso); Modified: trunk/reactos/subsystems/win32/win32k/eng/palette.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/en… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/eng/palette.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/eng/palette.c [iso-8859-1] Fri Mar 20 21:02:55 2009 @@ -38,14 +38,14 @@ VOID FASTCALL ColorCorrection(PPALGDI PalGDI, PPALETTEENTRY PaletteEntry, ULONG Colors) { - PGDIDEVICE pGDev = (PGDIDEVICE)PalGDI->hPDev; + PPDEVOBJ ppdev = (PPDEVOBJ)PalGDI->hPDev; - if (!pGDev) return; + if (!ppdev) return; - if (pGDev->flFlags & PDEV_GAMMARAMP_TABLE) + if (ppdev->flFlags & PDEV_GAMMARAMP_TABLE) { INT i; - PGAMMARAMP GammaRamp = (PGAMMARAMP)pGDev->pvGammaRamp; + PGAMMARAMP GammaRamp = (PGAMMARAMP)ppdev->pvGammaRamp; for ( i = 0; i < Colors; i++) { PaletteEntry[i].peRed += GammaRamp->Red[i]; Modified: trunk/reactos/subsystems/win32/win32k/eng/surface.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/en… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/eng/surface.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/eng/surface.c [iso-8859-1] Fri Mar 20 21:02:55 2009 @@ -508,21 +508,21 @@ */ BOOL APIENTRY EngAssociateSurface(IN HSURF hsurf, - IN HDEV Dev, + IN HDEV hdev, IN ULONG Hooks) { SURFOBJ *pso; PSURFACE psurf; - GDIDEVICE* Device; - - Device = (GDIDEVICE*)Dev; + PDEVOBJ* Device; + + Device = (PDEVOBJ*)hdev; psurf = SURFACE_LockSurface(hsurf); ASSERT(psurf); pso = &psurf->SurfObj; /* Associate the hdev */ - pso->hdev = Dev; + pso->hdev = hdev; pso->dhpdev = Device->hPDev; /* Hook up specified functions */ 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] Fri Mar 20 21:02:55 2009 @@ -9,7 +9,7 @@ /* Get/SetBounds/Rect support. */ #define DCB_WINDOWMGR 0x8000 /* Queries the Windows bounding rectangle instead of the application's */ -/* GDIDEVICE flags */ +/* PDEVOBJ flags */ #define PDEV_DISPLAY 0x00000001 /* Display device */ #define PDEV_HARDWARE_POINTER 0x00000002 /* Supports hardware cursor */ #define PDEV_SOFTWARE_POINTER 0x00000004 @@ -28,6 +28,69 @@ #define PDEV_CLONE_DEVICE 0x00080000 /* Type definitions ***********************************************************/ + +// FIXME: move me to an appropriate header +typedef struct _GDIPOINTER /* should stay private to ENG? No, part of PDEVOBJ aka HDEV aka PDEV. */ +{ + /* private GDI pointer handling information, required for software emulation */ + BOOL Enabled; + SIZEL Size; + POINTL HotSpot; + XLATEOBJ *XlateObject; + HSURF ColorSurface; + HSURF MaskSurface; + HSURF SaveSurface; + int ShowPointer; /* counter negtive do not show the mouse postive show the mouse */ + + /* public pointer information */ + RECTL Exclude; /* required publicly for SPS_ACCEPT_EXCLUDE */ + PGD_MOVEPOINTER MovePointer; + ULONG Status; +} GDIPOINTER, *PGDIPOINTER; + +typedef struct _PDEVOBJ +{ + BASEOBJECT BaseObject; + + struct _PDEVOBJ *ppdevNext; + INT cPdevRefs; + INT cPdevOpenRefs; + struct _PDEVOBJ *ppdevParent; + FLONG flFlags; + PERESOURCE hsemDevLock; /* Device lock. */ + + PVOID pvGammaRamp; /* Gamma ramp pointer. */ + + HSURF FillPatterns[HS_DDI_MAX]; + + ULONG DxDd_nCount; + + DHPDEV hPDev; /* DHPDEV for device. */ + PVOID ppalSurf; /* PEPALOBJ/PPALGDI for this device. */ + DEVINFO DevInfo; + GDIINFO GDIInfo; + HSURF pSurface; /* SURFACE for this device. */ + HANDLE hSpooler; /* Handle to spooler, if spooler dev driver. */ + ULONG DisplayNumber; + PVOID pGraphicsDev; /* PGRAPHICS_DEVICE */ + + DEVMODEW DMW; + PVOID pdmwDev; /* Ptr->DEVMODEW.dmSize + dmDriverExtra == alloc size. */ + + FLONG DxDd_Flags; /* DxDD active status flags. */ + + PFILE_OBJECT VideoFileObject; + BOOLEAN PreparedDriver; + GDIPOINTER Pointer; + /* Stuff to keep track of software cursors; win32k gdi part */ + UINT SafetyRemoveLevel; /* at what level was the cursor removed? + 0 for not removed */ + UINT SafetyRemoveCount; + + DRIVER_FUNCTIONS DriverFunctions; + struct _EDD_DIRECTDRAW_GLOBAL * pEDDgpl; +} PDEVOBJ, *PPDEVOBJ; + typedef struct _ROS_DC_INFO { @@ -106,10 +169,10 @@ Do not (re)move this. */ BASEOBJECT BaseObject; - DHPDEV dhpdev; /* <- GDIDEVICE.hPDev DHPDEV for device. */ + DHPDEV dhpdev; /* <- PDEVOBJ.hPDev DHPDEV for device. */ INT dctype; INT fs; - PVOID ppdev; /* PGDIDEVICE aka PDEVOBJ */ + PPDEVOBJ ppdev; PVOID hsem; /* PERESOURCE aka HSEMAPHORE */ FLONG flGraphicsCaps; FLONG flGraphicsCaps2; @@ -155,66 +218,6 @@ DWORD StateFlags; /* See DISPLAY_DEVICE_* */ } GRAPHICS_DEVICE, *PGRAPHICS_DEVICE; -typedef struct _GDIPOINTER /* should stay private to ENG? No, part of GDIDEVICE aka HDEV aka PDEV. */ -{ - /* private GDI pointer handling information, required for software emulation */ - BOOL Enabled; - SIZEL Size; - POINTL HotSpot; - XLATEOBJ *XlateObject; - HSURF ColorSurface; - HSURF MaskSurface; - HSURF SaveSurface; - int ShowPointer; /* counter negtive do not show the mouse postive show the mouse */ - - /* public pointer information */ - RECTL Exclude; /* required publicly for SPS_ACCEPT_EXCLUDE */ - PGD_MOVEPOINTER MovePointer; - ULONG Status; -} GDIPOINTER, *PGDIPOINTER; - -typedef struct _GDIDEVICE -{ - BASEOBJECT BaseObject; - - struct _GDIDEVICE *ppdevNext; - INT cPdevRefs; - INT cPdevOpenRefs; - struct _GDIDEVICE *ppdevParent; - FLONG flFlags; - PERESOURCE hsemDevLock; /* Device lock. */ - - PVOID pvGammaRamp; /* Gamma ramp pointer. */ - - HSURF FillPatterns[HS_DDI_MAX]; - - ULONG DxDd_nCount; - - DHPDEV hPDev; /* DHPDEV for device. */ - PVOID ppalSurf; /* PEPALOBJ/PPALGDI for this device. */ - DEVINFO DevInfo; - GDIINFO GDIInfo; - HSURF pSurface; /* SURFACE for this device. */ - HANDLE hSpooler; /* Handle to spooler, if spooler dev driver. */ - ULONG DisplayNumber; - PVOID pGraphicsDev; /* PGRAPHICS_DEVICE */ - - DEVMODEW DMW; - PVOID pdmwDev; /* Ptr->DEVMODEW.dmSize + dmDriverExtra == alloc size. */ - - FLONG DxDd_Flags; /* DxDD active status flags. */ - - PFILE_OBJECT VideoFileObject; - BOOLEAN PreparedDriver; - GDIPOINTER Pointer; - /* Stuff to keep track of software cursors; win32k gdi part */ - UINT SafetyRemoveLevel; /* at what level was the cursor removed? - 0 for not removed */ - UINT SafetyRemoveCount; - - DRIVER_FUNCTIONS DriverFunctions; - struct _EDD_DIRECTDRAW_GLOBAL * pEDDgpl; -} GDIDEVICE, *PGDIDEVICE; /* Internal functions *********************************************************/ @@ -226,7 +229,7 @@ extern PDC defaultDCstate; NTSTATUS FASTCALL InitDcImpl(VOID); -PGDIDEVICE FASTCALL IntEnumHDev(VOID); +PPDEVOBJ FASTCALL IntEnumHDev(VOID); HDC FASTCALL DC_AllocDC(PUNICODE_STRING Driver); VOID FASTCALL DC_InitDC(HDC DCToInit); HDC FASTCALL DC_FindOpenDC(PUNICODE_STRING Driver); @@ -264,15 +267,15 @@ UINT APIENTRY IntGdiGetTextAlign(HDC hDC); COLORREF APIENTRY IntGdiGetTextColor(HDC hDC); INT APIENTRY IntGdiSetStretchBltMode(HDC hDC, INT stretchBltMode); -VOID FASTCALL IntGdiReferencePdev(PGDIDEVICE pPDev); -VOID FASTCALL IntGdiUnreferencePdev(PGDIDEVICE pPDev, DWORD CleanUpType); +VOID FASTCALL IntGdiReferencePdev(PPDEVOBJ pPDev); +VOID FASTCALL IntGdiUnreferencePdev(PPDEVOBJ pPDev, DWORD CleanUpType); HDC FASTCALL IntGdiCreateDisplayDC(HDEV hDev, ULONG DcType, BOOL EmptyDC); BOOL FASTCALL IntGdiCleanDC(HDC hDC); -VOID FASTCALL IntvGetDeviceCaps(PGDIDEVICE, PDEVCAPS); +VOID FASTCALL IntvGetDeviceCaps(PPDEVOBJ, PDEVCAPS); HPEN FASTCALL IntGdiSelectPen(PDC,HPEN); HBRUSH FASTCALL IntGdiSelectBrush(PDC,HBRUSH); INT FASTCALL IntGdiGetDeviceCaps(PDC,INT); -extern PGDIDEVICE pPrimarySurface; +extern PPDEVOBJ pPrimarySurface; #endif /* not __WIN32K_DC_H */ Modified: trunk/reactos/subsystems/win32/win32k/include/monitor.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/monitor.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/include/monitor.h [iso-8859-1] Fri Mar 20 21:02:55 2009 @@ -1,7 +1,7 @@ #ifndef _WIN32K_MONITOR_H #define _WIN32K_MONITOR_H -struct GDIDEVICE; +//struct PDEVOBJ; /* monitor object */ typedef struct _MONITOR_OBJECT @@ -11,7 +11,7 @@ BOOL IsPrimary; /* wether this is the primary monitor */ UNICODE_STRING DeviceName; /* name of the monitor */ - GDIDEVICE *GdiDevice; /* pointer to the GDI device to + PDEVOBJ *GdiDevice; /* pointer to the GDI device to which this monitor is attached */ struct _MONITOR_OBJECT *Prev, *Next; /* doubly linked list */ } MONITOR_OBJECT, *PMONITOR_OBJECT; @@ -20,8 +20,8 @@ NTSTATUS InitMonitorImpl(); NTSTATUS CleanupMonitorImpl(); -NTSTATUS IntAttachMonitor(GDIDEVICE *pGdiDevice, ULONG DisplayNumber); -NTSTATUS IntDetachMonitor(GDIDEVICE *pGdiDevice); +NTSTATUS IntAttachMonitor(PDEVOBJ *pGdiDevice, ULONG DisplayNumber); +NTSTATUS IntDetachMonitor(PDEVOBJ *pGdiDevice); PMONITOR_OBJECT FASTCALL UserGetMonitorObject(IN HMONITOR); #endif /* _WIN32K_MONITOR_H */ Modified: trunk/reactos/subsystems/win32/win32k/include/surface.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/surface.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/include/surface.h [iso-8859-1] Fri Mar 20 21:02:55 2009 @@ -57,8 +57,8 @@ BOOL INTERNAL_CALL SURFACE_InitBitsLock(SURFACE *pBMObj); void INTERNAL_CALL SURFACE_CleanupBitsLock(SURFACE *pBMObj); -#define GDIDEV(SurfObj) ((GDIDEVICE *)((SurfObj)->hdev)) -#define GDIDEVFUNCS(SurfObj) ((GDIDEVICE *)((SurfObj)->hdev))->DriverFunctions +#define GDIDEV(SurfObj) ((PDEVOBJ *)((SurfObj)->hdev)) +#define GDIDEVFUNCS(SurfObj) ((PDEVOBJ *)((SurfObj)->hdev))->DriverFunctions INT FASTCALL BitsPerFormat (ULONG Format); ULONG FASTCALL BitmapFormat (WORD Bits, DWORD Compression); Modified: trunk/reactos/subsystems/win32/win32k/ntddraw/ddraw.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntddraw/ddraw.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntddraw/ddraw.c [iso-8859-1] Fri Mar 20 21:02:55 2009 @@ -35,7 +35,7 @@ NTSTATUS Status; PEPROCESS Proc = NULL; PDC pDC = NULL; - PGDIDEVICE pDev = NULL; + PPDEVOBJ pDev = NULL; PGD_DXDDENABLEDIRECTDRAW pfnDdEnableDirectDraw = NULL; BOOL success = FALSE; @@ -59,7 +59,7 @@ return FALSE; } - pDev = (PGDIDEVICE)pDC->ppdev; + pDev = pDC->ppdev; /* test see if drv got a dx interface or not */ if ( ( pDev->DriverFunctions.DisableDirectDraw == NULL) || Modified: trunk/reactos/subsystems/win32/win32k/ntddraw/dxeng.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntddraw/dxeng.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntddraw/dxeng.c [iso-8859-1] Fri Mar 20 21:02:55 2009 @@ -281,7 +281,7 @@ DXEGSHDEVDATA Type) { DWORD_PTR retVal = 0; - PGDIDEVICE PDev = (PGDIDEVICE)hDev; + PPDEVOBJ PDev = (PPDEVOBJ)hDev; DPRINT1("ReactX Calling : DxEngGetHdevData DXEGSHDEVDATA : %ld\n", Type); @@ -416,7 +416,7 @@ if ( Type == DxEGShDevData_dd_nCount ) { - ((PGDIDEVICE)hDev)->DxDd_nCount = Data; + ((PPDEVOBJ)hDev)->DxDd_nCount = Data; retVal = TRUE; // Set } return retVal; @@ -514,7 +514,7 @@ * The function DxEngLockHdev lock the internal PDEV * * @param HDEV type -* it is a pointer to win32k internal pdev struct known as PGDIDEVICE +* it is a pointer to win32k internal pdev struct known as PPDEVOBJ * @return * This function returns TRUE no matter what. @@ -527,7 +527,7 @@ APIENTRY DxEngLockHdev(HDEV hDev) { - PGDIDEVICE ppdev = (PGDIDEVICE)hDev; + PPDEVOBJ ppdev = (PPDEVOBJ)hDev; PERESOURCE Resource; DPRINT1("ReactX Calling : DxEngLockHdev \n"); @@ -551,7 +551,7 @@ * The function DxEngUnlockHdev unlock the internal PDEV * * @param HDEV type -* it is a pointer to win32k internal pdev struct known as PGDIDEVICE +* it is a pointer to win32k internal pdev struct known as PPDEVOBJ * @return * This function returns TRUE no matter what. @@ -564,7 +564,7 @@ APIENTRY DxEngUnlockHdev(HDEV hDev) { - PGDIDEVICE ppdev = (PGDIDEVICE)hDev; + PPDEVOBJ ppdev = (PPDEVOBJ)hDev; PERESOURCE Resource = ppdev->hsemDevLock; DPRINT1("ReactX Calling : DxEngUnlockHdev \n"); @@ -585,7 +585,7 @@ APIENTRY DxEngReferenceHdev(HDEV hDev) { - IntGdiReferencePdev((PGDIDEVICE) hDev); + IntGdiReferencePdev((PPDEVOBJ) hDev); /* ALWAYS return true */ return TRUE; } @@ -675,7 +675,7 @@ APIENTRY DxEngIsHdevLockedByCurrentThread(HDEV hDev) { // base on EngIsSemaphoreOwnedByCurrentThread w/o the Ex call. - PERESOURCE pSem = ((PGDIDEVICE)hDev)->hsemDevLock; + PERESOURCE pSem = ((PPDEVOBJ)hDev)->hsemDevLock; return pSem->OwnerEntry.OwnerThread == (ERESOURCE_THREAD)PsGetCurrentThread(); } @@ -687,7 +687,7 @@ APIENTRY DxEngUnreferenceHdev(HDEV hDev) { - IntGdiUnreferencePdev((PGDIDEVICE) hDev, 0); + IntGdiUnreferencePdev((PPDEVOBJ) hDev, 0); return TRUE; // Always true. } Modified: trunk/reactos/subsystems/win32/win32k/ntuser/cursoricon.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/cursoricon.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/cursoricon.c [iso-8859-1] Fri Mar 20 21:02:55 2009 @@ -120,7 +120,7 @@ return Ret; } dcbmp = dc->rosdc.hBitmap; - DevInfo = (PDEVINFO)&((GDIDEVICE *)dc->ppdev)->DevInfo; + DevInfo = (PDEVINFO)&dc->ppdev->DevInfo; DC_UnlockDc(dc); psurf = SURFACE_LockSurface(dcbmp); @@ -1753,7 +1753,7 @@ HBITMAP hbmpDc; SURFOBJ *SurfObj; SURFACE *psurfDc; - GDIDEVICE *ppdev; + PDEVOBJ *ppdev; GDIPOINTER *pgp; int showpointer=0; Modified: trunk/reactos/subsystems/win32/win32k/ntuser/input.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/input.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/input.c [iso-8859-1] Fri Mar 20 21:02:55 2009 @@ -1181,7 +1181,7 @@ { IntEngMovePointer(pso, MousePos.x, MousePos.y, &(GDIDEV(pso)->Pointer.Exclude)); } - /* Only now, update the info in the GDIDEVICE, so EngMovePointer can + /* Only now, update the info in the PDEVOBJ, so EngMovePointer can * use the old values to move the pointer image */ gpsi->ptCursor.x = MousePos.x; gpsi->ptCursor.y = MousePos.y; Modified: trunk/reactos/subsystems/win32/win32k/ntuser/metric.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/metric.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/metric.c [iso-8859-1] Fri Mar 20 21:02:55 2009 @@ -40,8 +40,8 @@ pScreenDC = DC_LockDc(hScreenDC); if (pScreenDC) { - Width = ((PGDIDEVICE)pScreenDC->ppdev)->GDIInfo.ulHorzRes; - Height = ((PGDIDEVICE)pScreenDC->ppdev)->GDIInfo.ulVertRes; + Width = pScreenDC->ppdev->GDIInfo.ulHorzRes; + Height = pScreenDC->ppdev->GDIInfo.ulVertRes; DC_UnlockDc(pScreenDC); } NtGdiDeleteObjectApp(hScreenDC); Modified: trunk/reactos/subsystems/win32/win32k/ntuser/monitor.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/monitor.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/monitor.c [iso-8859-1] Fri Mar 20 21:02:55 2009 @@ -151,14 +151,14 @@ * * Arguments * - * pGdiDevice Pointer to the GDIDEVICE onto which the monitor was attached + * pGdiDevice Pointer to the PDEVOBJ onto which the monitor was attached * DisplayNumber Display Number (starting with 0) * * Return value * Returns a NTSTATUS */ NTSTATUS -IntAttachMonitor(IN GDIDEVICE *pGdiDevice, +IntAttachMonitor(IN PDEVOBJ *pGdiDevice, IN ULONG DisplayNumber) { PMONITOR_OBJECT Monitor; @@ -211,13 +211,13 @@ * * Arguments * - * pGdiDevice Pointer to the GDIDEVICE from which the monitor was detached + * pGdiDevice Pointer to the PDEVOBJ from which the monitor was detached * * Return value * Returns a NTSTATUS */ NTSTATUS -IntDetachMonitor(IN GDIDEVICE *pGdiDevice) +IntDetachMonitor(IN PDEVOBJ *pGdiDevice) { PMONITOR_OBJECT Monitor; Modified: trunk/reactos/subsystems/win32/win32k/objects/bitmaps.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/bitmaps.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/bitmaps.c [iso-8859-1] Fri Mar 20 21:02:55 2009 @@ -281,7 +281,7 @@ Dc = DC_LockDc(hDC); DPRINT("NtGdiCreateCompatibleBitmap(%04x,%d,%d, bpp:%d) = \n", - hDC, Width, Height, ((PGDIDEVICE)Dc->ppdev)->GDIInfo.cBitsPixel); + hDC, Width, Height, Dc->ppdev->GDIInfo.cBitsPixel); if (NULL == Dc) { Modified: trunk/reactos/subsystems/win32/win32k/objects/color.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/color.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/color.c [iso-8859-1] Fri Mar 20 21:02:55 2009 @@ -449,7 +449,7 @@ } else { - Ret = ((PGDIDEVICE)dc->ppdev)->GDIInfo.ulNumPalReg; + Ret = dc->ppdev->GDIInfo.ulNumPalReg; } } Modified: trunk/reactos/subsystems/win32/win32k/objects/coord.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/coord.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/coord.c [iso-8859-1] Fri Mar 20 21:02:55 2009 @@ -668,36 +668,36 @@ case MM_LOMETRIC: pdcattr->szlWindowExt.cx = 3600; pdcattr->szlWindowExt.cy = 2700; - pdcattr->szlViewportExt.cx = ((PGDIDEVICE)dc->ppdev)->GDIInfo.ulHorzRes; - pdcattr->szlViewportExt.cy = -((PGDIDEVICE)dc->ppdev)->GDIInfo.ulVertRes; + pdcattr->szlViewportExt.cx = dc->ppdev->GDIInfo.ulHorzRes; + pdcattr->szlViewportExt.cy = -dc->ppdev->GDIInfo.ulVertRes; break; case MM_HIMETRIC: pdcattr->szlWindowExt.cx = 36000; pdcattr->szlWindowExt.cy = 27000; - pdcattr->szlViewportExt.cx = ((PGDIDEVICE)dc->ppdev)->GDIInfo.ulHorzRes; - pdcattr->szlViewportExt.cy = -((PGDIDEVICE)dc->ppdev)->GDIInfo.ulVertRes; + pdcattr->szlViewportExt.cx = dc->ppdev->GDIInfo.ulHorzRes; + pdcattr->szlViewportExt.cy = -dc->ppdev->GDIInfo.ulVertRes; break; case MM_LOENGLISH: pdcattr->szlWindowExt.cx = 1417; pdcattr->szlWindowExt.cy = 1063; - pdcattr->szlViewportExt.cx = ((PGDIDEVICE)dc->ppdev)->GDIInfo.ulHorzRes; - pdcattr->szlViewportExt.cy = -((PGDIDEVICE)dc->ppdev)->GDIInfo.ulVertRes; + pdcattr->szlViewportExt.cx = dc->ppdev->GDIInfo.ulHorzRes; + pdcattr->szlViewportExt.cy = -dc->ppdev->GDIInfo.ulVertRes; break; case MM_HIENGLISH: pdcattr->szlWindowExt.cx = 14173; pdcattr->szlWindowExt.cy = 10630; - pdcattr->szlViewportExt.cx = ((PGDIDEVICE)dc->ppdev)->GDIInfo.ulHorzRes; - pdcattr->szlViewportExt.cy = -((PGDIDEVICE)dc->ppdev)->GDIInfo.ulVertRes; + pdcattr->szlViewportExt.cx = dc->ppdev->GDIInfo.ulHorzRes; + pdcattr->szlViewportExt.cy = -dc->ppdev->GDIInfo.ulVertRes; break; case MM_TWIPS: pdcattr->szlWindowExt.cx = 20409; pdcattr->szlWindowExt.cy = 15307; - pdcattr->szlViewportExt.cx = ((PGDIDEVICE)dc->ppdev)->GDIInfo.ulHorzRes; - pdcattr->szlViewportExt.cy = -((PGDIDEVICE)dc->ppdev)->GDIInfo.ulVertRes; + pdcattr->szlViewportExt.cx = dc->ppdev->GDIInfo.ulHorzRes; + pdcattr->szlViewportExt.cy = -dc->ppdev->GDIInfo.ulVertRes; break; case MM_ANISOTROPIC: Modified: trunk/reactos/subsystems/win32/win32k/objects/dc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/dc.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/dc.c [iso-8859-1] Fri Mar 20 21:02:55 2009 @@ -29,8 +29,8 @@ // --------------------------------------------------------- File Statics -static GDIDEVICE PrimarySurface; -PGDIDEVICE pPrimarySurface = &PrimarySurface; +static PDEVOBJ PrimarySurface; +PPDEVOBJ pPrimarySurface = &PrimarySurface; static KEVENT VideoDriverNeedsPreparation; static KEVENT VideoDriverPrepared; PDC defaultDCstate = NULL; @@ -358,7 +358,7 @@ RtlZeroMemory(&PrimarySurface, sizeof(PrimarySurface)); -// if (!pPrimarySurface) pPrimarySurface = ExAllocatePoolWithTag(PagedPool, sizeof(GDIDEVICE), TAG_GDIPDEV); +// if (!pPrimarySurface) pPrimarySurface = ExAllocatePoolWithTag(PagedPool, sizeof(PDEVOBJ), TAG_GDIPDEV); PrimarySurface.VideoFileObject = DRIVER_FindMPDriver(DisplayNumber); @@ -824,8 +824,8 @@ // ATM we only have one display. pdcattr->ulDirty_ |= DC_PRIMARY_DISPLAY; - pdc->rosdc.bitsPerPixel = ((PGDIDEVICE)pdc->ppdev)->GDIInfo.cBitsPixel * - ((PGDIDEVICE)pdc->ppdev)->GDIInfo.cPlanes; + pdc->rosdc.bitsPerPixel = pdc->ppdev->GDIInfo.cBitsPixel * + pdc->ppdev->GDIInfo.cPlanes; DPRINT("Bits per pel: %u\n", pdc->rosdc.bitsPerPixel); pdc->flGraphicsCaps = PrimarySurface.DevInfo.flGraphicsCaps; @@ -836,14 +836,14 @@ pdcattr->jROP2 = R2_COPYPEN; pdc->erclWindow.top = pdc->erclWindow.left = 0; - pdc->erclWindow.right = ((PGDIDEVICE)pdc->ppdev)->GDIInfo.ulHorzRes; - pdc->erclWindow.bottom = ((PGDIDEVICE)pdc->ppdev)->GDIInfo.ulVertRes; + pdc->erclWindow.right = pdc->ppdev->GDIInfo.ulHorzRes; + pdc->erclWindow.bottom = pdc->ppdev->GDIInfo.ulVertRes; pdc->dclevel.flPath &= ~DCPATH_CLOCKWISE; // Default is CCW. pdcattr->iCS_CP = ftGdiGetTextCharsetInfo(pdc,NULL,0); - hVisRgn = NtGdiCreateRectRgn(0, 0, ((PGDIDEVICE)pdc->ppdev)->GDIInfo.ulHorzRes, - ((PGDIDEVICE)pdc->ppdev)->GDIInfo.ulVertRes); + hVisRgn = NtGdiCreateRectRgn(0, 0, pdc->ppdev->GDIInfo.ulHorzRes, + pdc->ppdev->GDIInfo.ulVertRes); if (!CreateAsIC) { @@ -1245,8 +1245,8 @@ { // "This specifies that Windows should only match fonts that have the // same aspect ratio as the display.", Programming Windows, Fifth Ed. - AspectRatio->cx = ((PGDIDEVICE)pDC->ppdev)->GDIInfo.ulLogPixelsX; - AspectRatio->cy = ((PGDIDEVICE)pDC->ppdev)->GDIInfo.ulLogPixelsY; + AspectRatio->cx = pDC->ppdev->GDIInfo.ulLogPixelsX; + AspectRatio->cy = pDC->ppdev->GDIInfo.ulLogPixelsY; } else { @@ -1595,7 +1595,7 @@ INT FASTCALL -IntcFonts(PGDIDEVICE pDevObj) +IntcFonts(PPDEVOBJ pDevObj) { ULONG_PTR Junk; // Msdn DrvQueryFont: @@ -1614,7 +1614,7 @@ INT FASTCALL -IntGetColorManagementCaps(PGDIDEVICE pDevObj) +IntGetColorManagementCaps(PPDEVOBJ pDevObj) { INT ret = CM_NONE; @@ -1635,7 +1635,7 @@ IntGdiGetDeviceCaps(PDC dc, INT Index) { INT ret = 0; - PGDIDEVICE ppdev = dc->ppdev; + PPDEVOBJ ppdev = dc->ppdev; /* Retrieve capability */ switch (Index) { @@ -1834,7 +1834,7 @@ VOID FASTCALL IntvGetDeviceCaps( - PGDIDEVICE pDevObj, + PPDEVOBJ pDevObj, PDEVCAPS pDevCaps) { ULONG Tmp = 0; @@ -2715,7 +2715,7 @@ PERESOURCE Resource; PDC dc = DC_LockDc(hDC); if (!dc) return; - Resource = ((PGDIDEVICE)dc->ppdev)->hsemDevLock; + Resource = dc->ppdev->hsemDevLock; DC_UnlockDc(dc); if (!Resource) return; KeEnterCriticalRegion(); @@ -2729,7 +2729,7 @@ PERESOURCE Resource; PDC dc = DC_LockDc(hDC); if (!dc) return; - Resource = ((PGDIDEVICE)dc->ppdev)->hsemDevLock; + Resource = dc->ppdev->hsemDevLock; DC_UnlockDc(dc); if (!Resource) return; ExReleaseResourceLite( Resource ); @@ -2749,7 +2749,7 @@ // // Enumerate HDev // -PGDIDEVICE FASTCALL +PPDEVOBJ FASTCALL IntEnumHDev(VOID) { // I guess we will soon have more than one primary surface. @@ -2759,7 +2759,7 @@ VOID FASTCALL -IntGdiReferencePdev(PGDIDEVICE ppdev) +IntGdiReferencePdev(PPDEVOBJ ppdev) { if(!hsemDriverMgmt) hsemDriverMgmt = EngCreateSemaphore(); // Hax, should be in dllmain.c IntGdiAcquireSemaphore(hsemDriverMgmt); @@ -2768,13 +2768,13 @@ } VOID FASTCALL -IntGdiUnreferencePdev(PGDIDEVICE ppdev, DWORD CleanUpType) +IntGdiUnreferencePdev(PPDEVOBJ ppdev, DWORD CleanUpType) { IntGdiAcquireSemaphore(hsemDriverMgmt); ppdev->cPdevRefs--; if (!ppdev->cPdevRefs) { - // Handle the destruction of ppdev or GDIDEVICE or PDEVOBJ or PDEV etc. + // Handle the destruction of ppdev or PDEVOBJ or PDEVOBJ or PDEV etc. } IntGdiReleaseSemaphore(hsemDriverMgmt); } @@ -2813,7 +2813,7 @@ DesktopHDC = UserGetWindowDC(DesktopObject); pDC = DC_LockDc(DesktopHDC); - *DisplayNumber = ((GDIDEVICE *)pDC->ppdev)->DisplayNumber; + *DisplayNumber = pDC->ppdev->DisplayNumber; DC_UnlockDc(pDC); UserReleaseDC(DesktopObject, DesktopHDC, FALSE); @@ -3338,7 +3338,7 @@ { return FALSE; } - swprintf (szBuffer, L"\\\\.\\DISPLAY%lu", ((GDIDEVICE *)DC->ppdev)->DisplayNumber); + swprintf (szBuffer, L"\\\\.\\DISPLAY%lu", DC->ppdev->DisplayNumber); DC_UnlockDc(DC); RtlInitUnicodeString(&InDeviceName, szBuffer); @@ -3437,9 +3437,9 @@ NtGdiGetDhpdev( IN HDEV hdev) { - PGDIDEVICE ppdev, pGdiDevice = (PGDIDEVICE) hdev; + PPDEVOBJ ppdev, pGdiDevice = (PPDEVOBJ) hdev; if (!pGdiDevice) return NULL; - if ( pGdiDevice < (PGDIDEVICE)MmSystemRangeStart) return NULL; + if ( pGdiDevice < (PPDEVOBJ)MmSystemRangeStart) return NULL; ppdev = pPrimarySurface; IntGdiAcquireSemaphore(hsemDriverMgmt); do Modified: trunk/reactos/subsystems/win32/win32k/objects/dibobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/dibobj.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/dibobj.c [iso-8859-1] Fri Mar 20 21:02:55 2009 @@ -279,7 +279,7 @@ else { // Destination palette obtained from the hDC - DDB_Palette = ((GDIDEVICE *)DC->ppdev)->DevInfo.hpalDefault; + DDB_Palette = DC->ppdev->DevInfo.hpalDefault; } hDCPalette = PALETTE_LockPalette(DDB_Palette); if (NULL == hDCPalette) @@ -522,7 +522,7 @@ } /* Obtain destination palette from the DC */ - pDCPalette = PALETTE_LockPalette(((GDIDEVICE *)pDC->ppdev)->DevInfo.hpalDefault); + pDCPalette = PALETTE_LockPalette(pDC->ppdev->DevInfo.hpalDefault); if (!pDCPalette) { SetLastWin32Error(ERROR_INVALID_HANDLE); @@ -531,7 +531,7 @@ } DDBPaletteType = pDCPalette->Mode; - DDBPalette = ((GDIDEVICE *)pDC->ppdev)->DevInfo.hpalDefault; + DDBPalette = pDC->ppdev->DevInfo.hpalDefault; PALETTE_UnlockPalette(pDCPalette); DIBPalette = BuildDIBPalette(bmi, (PINT)&DIBPaletteType); Modified: trunk/reactos/subsystems/win32/win32k/objects/gdibatch.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/gdibatch.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/gdibatch.c [iso-8859-1] Fri Mar 20 21:02:55 2009 @@ -19,7 +19,7 @@ FASTCALL DoDeviceSync( SURFOBJ *Surface, PRECTL Rect, FLONG fl) { - PGDIDEVICE Device = (GDIDEVICE*)Surface->hdev; + PPDEVOBJ Device = (PDEVOBJ*)Surface->hdev; // No punting and "Handle to a surface, provided that the surface is device-managed. // Otherwise, dhsurf is zero". if (!(Device->flFlags & PDEV_DRIVER_PUNTED_CALL) && (Surface->dhsurf)) @@ -40,7 +40,7 @@ SynchonizeDriver(FLONG Flags) { SURFOBJ *SurfObj; - PGDIDEVICE Device; + PPDEVOBJ Device; if (Flags & GCAPS2_SYNCFLUSH) Flags = DSS_FLUSH_EVENT; Modified: trunk/reactos/subsystems/win32/win32k/objects/icm.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/icm.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/icm.c [iso-8859-1] Fri Mar 20 21:02:55 2009 @@ -99,7 +99,7 @@ FASTCALL IntGetDeviceGammaRamp(HDEV hPDev, PGAMMARAMP Ramp) { - PGDIDEVICE pGDev = (PGDIDEVICE) hPDev; + PPDEVOBJ pGDev = (PPDEVOBJ) hPDev; int i; if (!(pGDev->flFlags & PDEV_DISPLAY )) return FALSE; @@ -234,7 +234,7 @@ BOOL Ret = FALSE; PPALGDI palGDI; PALOBJ *palPtr; - PGDIDEVICE pGDev = (PGDIDEVICE) hPDev; + PPDEVOBJ pGDev = (PPDEVOBJ) hPDev; if ((pGDev->DevInfo.iDitherFormat == BMF_8BPP) || (pGDev->DevInfo.iDitherFormat == BMF_16BPP) || @@ -290,7 +290,7 @@ { WORD IcmGR, i, R, G, B; BOOL Ret = FALSE, TstPeak; - PGDIDEVICE pGDev = (PGDIDEVICE) hPDev; + PPDEVOBJ pGDev = (PPDEVOBJ) hPDev; if (!hPDev) return FALSE; Modified: trunk/reactos/subsystems/win32/win32k/objects/print.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/print.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/print.c [iso-8859-1] Fri Mar 20 21:02:55 2009 @@ -119,7 +119,7 @@ /* FIXME - Handle psurf == NULL !!!!!! */ - if ( NULL == ((GDIDEVICE *)dc->ppdev)->DriverFunctions.Escape ) + if ( NULL == dc->ppdev->DriverFunctions.Escape ) { Result = IntEngExtEscape( &psurf->SurfObj, @@ -131,7 +131,7 @@ } else { - Result = ((GDIDEVICE *)dc->ppdev)->DriverFunctions.Escape( + Result = dc->ppdev->DriverFunctions.Escape( &psurf->SurfObj, Escape, InSize,

1 0

[cwittich] 40136: add some new (incomplete) network headers
by cwittich＠svn.reactos.org 20 Mar '09

20 Mar '09

Author: cwittich Date: Fri Mar 20 18:08:12 2009 New Revision: 40136 URL: http://svn.reactos.org/svn/reactos?rev=40136&view=rev Log: add some new (incomplete) network headers Added: trunk/reactos/include/psdk/ifdef.h (with props) trunk/reactos/include/psdk/netioapi.h (with props) trunk/reactos/include/psdk/ws2def.h (with props) trunk/reactos/include/psdk/ws2ipdef.h (with props) Modified: trunk/reactos/include/psdk/iptypes.h Added: trunk/reactos/include/psdk/ifdef.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/ifdef.h?rev=4… ============================================================================== --- trunk/reactos/include/psdk/ifdef.h (added) +++ trunk/reactos/include/psdk/ifdef.h [iso-8859-1] Fri Mar 20 18:08:12 2009 @@ -1,0 +1,23 @@ +#ifndef _IFDEF_ +#define _IFDEF_ + +#define IF_MAX_STRING_SIZE 256 +#define IF_MAX_PHYS_ADDRESS_LENGTH 32 + +typedef union _NET_LUID_LH +{ + ULONG64 Value; + struct + { + ULONG64 Reserved:24; + ULONG64 NetLuidIndex:24; + ULONG64 IfType:16; + }Info; +} NET_LUID_LH, *PNET_LUID_LH; + +typedef NET_LUID_LH NET_LUID; +typedef NET_LUID* PNET_LUID; + +typedef ULONG NET_IFINDEX, *PNET_IFINDEX; + +#endif Propchange: trunk/reactos/include/psdk/ifdef.h ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/include/psdk/iptypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/iptypes.h?rev… ============================================================================== --- trunk/reactos/include/psdk/iptypes.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/iptypes.h [iso-8859-1] Fri Mar 20 18:08:12 2009 @@ -2,6 +2,8 @@ #define _IPTYPES_H #include <sys/types.h> +#include <ifdef.h> + #ifdef __cplusplus extern "C" { #endif Added: trunk/reactos/include/psdk/netioapi.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/netioapi.h?re… ============================================================================== --- trunk/reactos/include/psdk/netioapi.h (added) +++ trunk/reactos/include/psdk/netioapi.h [iso-8859-1] Fri Mar 20 18:08:12 2009 @@ -1,0 +1,83 @@ +#ifndef _NETIOAPI_H_ +#define _NETIOAPI_H_ + +#ifdef __cplusplus +extern "C" { +#endif + +#ifdef _IPHLPAPI_H + #define NETIO_STATUS DWORD + #define NETIOAPI_API_ WINAPI +#else + #define NETIO_STATUS NTSTATUS + #define NETIOAPI_API_ NTAPI +#endif + +#define NETIOAPI_API NETIO_STATUS NETIOAPI_API_ + +#ifdef _WS2IPDEF_ +#include <ntddndis.h> + +typedef struct _MIB_IF_ROW2 { + NET_LUID InterfaceLuid; + NET_IFINDEX InterfaceIndex; + GUID InterfaceGuid; + WCHAR Alias[IF_MAX_STRING_SIZE + 1]; + WCHAR Description[IF_MAX_STRING_SIZE + 1]; + ULONG PhysicalAddressLength; + UCHAR PhysicalAddress[IF_MAX_PHYS_ADDRESS_LENGTH]; + UCHAR PermanentPhysicalAddress[IF_MAX_PHYS_ADDRESS_LENGTH]; + ULONG Mtu; + IFTYPE Type; + TUNNEL_TYPE TunnelType; + NDIS_MEDIUM MediaType; + NDIS_PHYSICAL_MEDIUM PhysicalMediumType; + NET_IF_ACCESS_TYPE AccessType; + NET_IF_DIRECTION_TYPE DirectionType; + struct { + BOOLEAN HardwareInterface : 1; + BOOLEAN FilterInterface : 1; + BOOLEAN ConnectorPresent : 1; + BOOLEAN NotAuthenticated : 1; + BOOLEAN NotMediaConnected : 1; + BOOLEAN Paused : 1; + BOOLEAN LowPower : 1; + BOOLEAN EndPointInterface : 1; + } InterfaceAndOperStatusFlags; + IF_OPER_STATUS OperStatus; + NET_IF_ADMIN_STATUS AdminStatus; + NET_IF_MEDIA_CONNECT_STATE MediaConnectState; + NET_IF_NETWORK_GUID NetworkGuid; + NET_IF_CONNECTION_TYPE ConnectionType; + ULONG64 TransmitLinkSpeed; + ULONG64 ReceiveLinkSpeed; + ULONG64 InOctets; + ULONG64 InUcastPkts; + ULONG64 InNUcastPkts; + ULONG64 InDiscards; + ULONG64 InErrors; + ULONG64 InUnknownProtos; + ULONG64 InUcastOctets; + ULONG64 InMulticastOctets; + ULONG64 InBroadcastOctets; + ULONG64 OutOctets; + ULONG64 OutUcastPkts; + ULONG64 OutNUcastPkts; + ULONG64 OutDiscards; + ULONG64 OutErrors; + ULONG64 OutUcastOctets; + ULONG64 OutMulticastOctets; + ULONG64 OutBroadcastOctets; + ULONG64 OutQLen; +} MIB_IF_ROW2, *PMIB_IF_ROW2; + + +NETIOAPI_API GetIfEntry2(IN OUT PMIB_IF_ROW2 Row); + +#endif + +#ifdef __cplusplus +} +#endif + +#endif Propchange: trunk/reactos/include/psdk/netioapi.h ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/include/psdk/ws2def.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/ws2def.h?rev=… ============================================================================== --- trunk/reactos/include/psdk/ws2def.h (added) +++ trunk/reactos/include/psdk/ws2def.h [iso-8859-1] Fri Mar 20 18:08:12 2009 @@ -1,0 +1,15 @@ +#ifndef _WS2DEF_ +#define _WS2DEF_ + +#ifdef __cplusplus +extern "C" { +#endif + + + + +#ifdef __cplusplus +} +#endif + +#endif Propchange: trunk/reactos/include/psdk/ws2def.h ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/include/psdk/ws2ipdef.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/ws2ipdef.h?re… ============================================================================== --- trunk/reactos/include/psdk/ws2ipdef.h (added) +++ trunk/reactos/include/psdk/ws2ipdef.h [iso-8859-1] Fri Mar 20 18:08:12 2009 @@ -1,0 +1,15 @@ +#ifndef _WS2IPDEF_ +#define _WS2IPDEF_ + +#ifdef __cplusplus +extern "C" { +#endif + + + + +#ifdef __cplusplus +} +#endif + +#endif Propchange: trunk/reactos/include/psdk/ws2ipdef.h ------------------------------------------------------------------------------ svn:eol-style = native

1 0

← Newer
1
...
14
15
16
17
18
19
20
...
49
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 March 2009