Ros-diffs July 2012

ros-diffs@reactos.org

14 participants
193 discussions

[tkreuzer] 56980: [WIN32K] Check for NULL dc surface before dereferencing it in IntGdiRealizePalette.
by tkreuzer＠svn.reactos.org 29 Jul '12

29 Jul '12

Author: tkreuzer Date: Sun Jul 29 12:22:06 2012 New Revision: 56980 URL: http://svn.reactos.org/svn/reactos?rev=56980&view=rev Log: [WIN32K] Check for NULL dc surface before dereferencing it in IntGdiRealizePalette. Modified: trunk/reactos/win32ss/gdi/ntgdi/palette.c Modified: trunk/reactos/win32ss/gdi/ntgdi/palette.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/palette.… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/palette.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/palette.c [iso-8859-1] Sun Jul 29 12:22:06 2012 @@ -767,6 +767,11 @@ return 0; } + if (!pdc->dclevel.pSurface) + { + goto cleanup; + } + ppalSurf = pdc->dclevel.pSurface->ppal; ppalDC = pdc->dclevel.ppal;

1 0

[tkreuzer] 56979: [WIN32K] - Change some #defines to enums - Cleanup some obsolete stuff
by tkreuzer＠svn.reactos.org 29 Jul '12

29 Jul '12

Author: tkreuzer Date: Sun Jul 29 11:20:05 2012 New Revision: 56979 URL: http://svn.reactos.org/svn/reactos?rev=56979&view=rev Log: [WIN32K] - Change some #defines to enums - Cleanup some obsolete stuff Added: trunk/reactos/win32ss/gdi/eng/xlateobj.c - copied unchanged from r56966, trunk/reactos/win32ss/gdi/eng/xlate.c Removed: trunk/reactos/win32ss/gdi/eng/xlate.c Modified: trunk/reactos/win32ss/CMakeLists.txt trunk/reactos/win32ss/gdi/eng/engevent.h trunk/reactos/win32ss/gdi/eng/inteng.h trunk/reactos/win32ss/gdi/eng/ldevobj.h trunk/reactos/win32ss/gdi/eng/pdevobj.h trunk/reactos/win32ss/gdi/eng/surface.h trunk/reactos/win32ss/gdi/ntgdi/coord.h trunk/reactos/win32ss/gdi/ntgdi/dc.h trunk/reactos/win32ss/gdi/ntgdi/device.c trunk/reactos/win32ss/gdi/ntgdi/gdiobj.h trunk/reactos/win32ss/gdi/ntgdi/palette.h trunk/reactos/win32ss/gdi/ntgdi/path.h trunk/reactos/win32ss/user/ntuser/metric.c Modified: trunk/reactos/win32ss/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/CMakeLists.txt?rev… ============================================================================== --- trunk/reactos/win32ss/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/win32ss/CMakeLists.txt [iso-8859-1] Sun Jul 29 11:20:05 2012 @@ -79,7 +79,7 @@ gdi/eng/surface.c gdi/eng/transblt.c gdi/eng/engwindow.c - gdi/eng/xlate.c + gdi/eng/xlateobj.c user/ntuser/main.c user/ntuser/misc/file.c user/ntuser/misc/math.c Modified: trunk/reactos/win32ss/gdi/eng/engevent.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/eng/engevent.h… ============================================================================== --- trunk/reactos/win32ss/gdi/eng/engevent.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/eng/engevent.h [iso-8859-1] Sun Jul 29 11:20:05 2012 @@ -3,6 +3,9 @@ // // Flags for the fFlags field of ENG_EVENT // -#define ENG_EVENT_USERMAPPED 0x01 +enum _EVENTFLAGS +{ + ENG_EVENT_USERMAPPED = 0x01 +}; /* EOF */ Modified: trunk/reactos/win32ss/gdi/eng/inteng.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/eng/inteng.h?r… ============================================================================== --- trunk/reactos/win32ss/gdi/eng/inteng.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/eng/inteng.h [iso-8859-1] Sun Jul 29 11:20:05 2012 @@ -2,7 +2,7 @@ typedef ULONG HCLIP; -#define ENUM_RECT_LIMIT 50 +#define ENUM_RECT_LIMIT 50 typedef struct _RECT_ENUM { @@ -17,23 +17,25 @@ ULONG Width; } SPAN, *PSPAN; -#define R3_OPINDEX_NOOP 0xAA - -#define R3_OPINDEX_BLACKNESS 0x00 -#define R3_OPINDEX_NOTSRCERASE 0x11 -#define R3_OPINDEX_NOTSRCCOPY 0x33 -#define R3_OPINDEX_SRCERASE 0x44 -#define R3_OPINDEX_DSTINVERT 0x55 -#define R3_OPINDEX_PATINVERT 0x5A -#define R3_OPINDEX_SRCINVERT 0x66 -#define R3_OPINDEX_SRCAND 0x88 -#define R3_OPINDEX_MERGEPAINT 0xBB -#define R3_OPINDEX_MERGECOPY 0xC0 -#define R3_OPINDEX_SRCCOPY 0xCC -#define R3_OPINDEX_SRCPAINT 0xEE -#define R3_OPINDEX_PATCOPY 0xF0 -#define R3_OPINDEX_PATPAINT 0xFB -#define R3_OPINDEX_WHITENESS 0xFF +enum _R3_ROPCODES +{ + R3_OPINDEX_NOOP = 0xAA, + R3_OPINDEX_BLACKNESS = 0x00, + R3_OPINDEX_NOTSRCERASE = 0x11, + R3_OPINDEX_NOTSRCCOPY = 0x33, + R3_OPINDEX_SRCERASE = 0x44, + R3_OPINDEX_DSTINVERT = 0x55, + R3_OPINDEX_PATINVERT = 0x5A, + R3_OPINDEX_SRCINVERT = 0x66, + R3_OPINDEX_SRCAND = 0x88, + R3_OPINDEX_MERGEPAINT = 0xBB, + R3_OPINDEX_MERGECOPY = 0xC0, + R3_OPINDEX_SRCCOPY = 0xCC, + R3_OPINDEX_SRCPAINT = 0xEE, + R3_OPINDEX_PATCOPY = 0xF0, + R3_OPINDEX_PATPAINT = 0xFB, + R3_OPINDEX_WHITENESS = 0xFF +}; #define ROP2_TO_MIX(Rop2) (((Rop2) << 8) | (Rop2)) Modified: trunk/reactos/win32ss/gdi/eng/ldevobj.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/eng/ldevobj.h?… ============================================================================== --- trunk/reactos/win32ss/gdi/eng/ldevobj.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/eng/ldevobj.h [iso-8859-1] Sun Jul 29 11:20:05 2012 @@ -1,11 +1,7 @@ -#ifdef __GNUC__ -/* HACK, for bug in ld. Will be removed soon. */ -#define __ImageBase _image_base__ -#endif extern IMAGE_DOS_HEADER __ImageBase; -#define GDI_ENGINE_VERSION DDI_DRIVER_VERSION_NT5_01 +static const unsigned GDI_ENGINE_VERSION = DDI_DRIVER_VERSION_NT5_01; typedef enum { Modified: trunk/reactos/win32ss/gdi/eng/pdevobj.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/eng/pdevobj.h?… ============================================================================== --- trunk/reactos/win32ss/gdi/eng/pdevobj.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/eng/pdevobj.h [iso-8859-1] Sun Jul 29 11:20:05 2012 @@ -2,22 +2,25 @@ #define __WIN32K_PDEVOBJ_H /* PDEVOBJ flags */ -#define PDEV_DISPLAY 0x00000001 /* Display device */ -#define PDEV_HARDWARE_POINTER 0x00000002 /* Supports hardware cursor */ -#define PDEV_SOFTWARE_POINTER 0x00000004 -#define PDEV_GOTFONTS 0x00000040 /* Has font driver */ -#define PDEV_PRINTER 0x00000080 -#define PDEV_ALLOCATEDBRUSHES 0x00000100 -#define PDEV_HTPAL_IS_DEVPAL 0x00000200 -#define PDEV_DISABLED 0x00000400 -#define PDEV_SYNCHRONIZE_ENABLED 0x00000800 -#define PDEV_FONTDRIVER 0x00002000 /* Font device */ -#define PDEV_GAMMARAMP_TABLE 0x00004000 -#define PDEV_UMPD 0x00008000 -#define PDEV_SHARED_DEVLOCK 0x00010000 -#define PDEV_META_DEVICE 0x00020000 -#define PDEV_DRIVER_PUNTED_CALL 0x00040000 /* Driver calls back to GDI engine */ -#define PDEV_CLONE_DEVICE 0x00080000 +enum _PDEVFLAGS +{ + PDEV_DISPLAY = 0x00000001, /* Display device */ + PDEV_HARDWARE_POINTER = 0x00000002, /* Supports hardware cursor */ + PDEV_SOFTWARE_POINTER = 0x00000004, + PDEV_GOTFONTS = 0x00000040, /* Has font driver */ + PDEV_PRINTER = 0x00000080, + PDEV_ALLOCATEDBRUSHES = 0x00000100, + PDEV_HTPAL_IS_DEVPAL = 0x00000200, + PDEV_DISABLED = 0x00000400, + PDEV_SYNCHRONIZE_ENABLED = 0x00000800, + PDEV_FONTDRIVER = 0x00002000, /* Font device */ + PDEV_GAMMARAMP_TABLE = 0x00004000, + PDEV_UMPD = 0x00008000, + PDEV_SHARED_DEVLOCK = 0x00010000, + PDEV_META_DEVICE = 0x00020000, + PDEV_DRIVER_PUNTED_CALL = 0x00040000, /* Driver calls back to GDI engine */ + PDEV_CLONE_DEVICE = 0x00080000 +}; /* Type definitions ***********************************************************/ @@ -150,7 +153,6 @@ /* Globals ********************************************************************/ extern PPDEVOBJ gppdevPrimary; -#define pPrimarySurface gppdevPrimary /* Function prototypes ********************************************************/ Modified: trunk/reactos/win32ss/gdi/eng/surface.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/eng/surface.h?… ============================================================================== --- trunk/reactos/win32ss/gdi/eng/surface.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/eng/surface.h [iso-8859-1] Sun Jul 29 11:20:05 2012 @@ -1,6 +1,4 @@ #pragma once - -#define PDEV_SURFACE 0x80000000 /* GDI surface object */ typedef struct _SURFACE @@ -39,7 +37,9 @@ DWORD biClrImportant; } SURFACE, *PSURFACE; -// flags field: +/* flags field */ +enum _SURFACEFLAGS +{ //#define HOOK_BITBLT 0x00000001 //#define HOOK_STRETCHBLT 0x00000002 //#define HOOK_PLGBLT 0x00000004 @@ -65,22 +65,24 @@ //#else // #define HOOK_FLAGS 0x0003B5EF //#endif -#define UMPD_SURFACE 0x00040000 -#define MIRROR_SURFACE 0x00080000 -#define DIRECTDRAW_SURFACE 0x00100000 -#define DRIVER_CREATED_SURFACE 0x00200000 -#define ENG_CREATE_DEVICE_SURFACE 0x00400000 -#define DDB_SURFACE 0x00800000 -#define LAZY_DELETE_SURFACE 0x01000000 -#define BANDING_SURFACE 0x02000000 -#define API_BITMAP 0x04000000 -#define PALETTE_SELECT_SET 0x08000000 -#define UNREADABLE_SURFACE 0x10000000 -#define DYNAMIC_MODE_PALETTE 0x20000000 -#define ABORT_SURFACE 0x40000000 -#define PDEV_SURFACE 0x80000000 + UMPD_SURFACE = 0x00040000, + MIRROR_SURFACE = 0x00080000, + DIRECTDRAW_SURFACE = 0x00100000, + DRIVER_CREATED_SURFACE = 0x00200000, + ENG_CREATE_DEVICE_SURFACE = 0x00400000, + DDB_SURFACE = 0x00800000, + LAZY_DELETE_SURFACE = 0x01000000, + BANDING_SURFACE = 0x02000000, + API_BITMAP = 0x04000000, + PALETTE_SELECT_SET = 0x08000000, + UNREADABLE_SURFACE = 0x10000000, + DYNAMIC_MODE_PALETTE = 0x20000000, + ABORT_SURFACE = 0x40000000, + PDEV_SURFACE = 0x80000000 +}; #define BMF_POOLALLOC 0x100 +#define PDEV_SURFACE 0x80000000 /* Internal interface */ Removed: trunk/reactos/win32ss/gdi/eng/xlate.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/eng/xlate.c?re… ============================================================================== --- trunk/reactos/win32ss/gdi/eng/xlate.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/eng/xlate.c (removed) @@ -1,720 +1,0 @@ -/* - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS Win32k subsystem - * PURPOSE: GDI Color Translation Functions - * FILE: subsystems/win32/win32k/eng/xlate.c - * PROGRAMER: Timo Kreuzer (timo.kreuzer(a)reactos.org) - */ - -#include <win32k.h> - -#define NDEBUG -#include <debug.h> - - -/** Globals *******************************************************************/ - -EXLATEOBJ gexloTrivial = {{0, XO_TRIVIAL, 0, 0, 0, 0}, EXLATEOBJ_iXlateTrivial}; - -static ULONG giUniqueXlate = 0; - -static const BYTE gajXlate5to8[32] = -{ 0, 8, 16, 25, 33, 41, 49, 58, 66, 74, 82, 90, 99,107,115,123, - 132,140,148,156,165,173,181,189,197,206,214,222,231,239,247,255}; - -static const BYTE gajXlate6to8[64] = -{ 0, 4, 8, 12, 16, 20, 24, 28, 32, 36, 40, 45, 49, 52, 57, 61, - 65, 69, 73, 77, 81, 85, 89, 93, 97,101,105,109,113,117,121,125, -130,134,138,142,146,150,154,158,162,166,170,174,178,182,186,190, -194,198,202,207,210,215,219,223,227,231,235,239,243,247,251,255}; - - -/** iXlate functions **********************************************************/ - -ULONG -FASTCALL -EXLATEOBJ_iXlateTrivial(PEXLATEOBJ pexlo, ULONG iColor) -{ - return iColor; -} - -ULONG -FASTCALL -EXLATEOBJ_iXlateToMono(PEXLATEOBJ pexlo, ULONG iColor) -{ - return (iColor == pexlo->xlo.pulXlate[0]); -} - -ULONG -FASTCALL -EXLATEOBJ_iXlateTable(PEXLATEOBJ pexlo, ULONG iColor) -{ - if (iColor >= pexlo->xlo.cEntries) return 0; - return pexlo->xlo.pulXlate[iColor]; -} - -ULONG -FASTCALL -EXLATEOBJ_iXlateRGBtoBGR(PEXLATEOBJ pxlo, ULONG iColor) -{ - ULONG iNewColor; - - /* Copy green */ - iNewColor = iColor & 0xff00ff00; - - /* Mask red and blue */ - iColor &= 0x00ff00ff; - - /* Shift and copy red and blue */ - iNewColor |= iColor >> 16; - iNewColor |= iColor << 16; - - return iNewColor; -} - -ULONG -FASTCALL -EXLATEOBJ_iXlateRGBto555(PEXLATEOBJ pxlo, ULONG iColor) -{ - ULONG iNewColor; - - /* Copy red */ - iColor <<= 7; - iNewColor = iColor & 0x7C00; - - /* Copy green */ - iColor >>= 13; - iNewColor |= iColor & 0x3E0; - - /* Copy blue */ - iColor >>= 13; - iNewColor |= iColor & 0x1F; - - return iNewColor; -} - -ULONG -FASTCALL -EXLATEOBJ_iXlateBGRto555(PEXLATEOBJ pxlo, ULONG iColor) -{ - ULONG iNewColor; - - /* Copy blue */ - iColor >>= 3; - iNewColor = iColor & 0x1f; - - /* Copy green */ - iColor >>= 3; - iNewColor |= (iColor & 0x3E0); - - /* Copy red */ - iColor >>= 3; - iNewColor |= (iColor & 0x7C00); - - return iNewColor; -} - -ULONG -FASTCALL -EXLATEOBJ_iXlateRGBto565(PEXLATEOBJ pxlo, ULONG iColor) -{ - ULONG iNewColor; - - /* Copy red */ - iColor <<= 8; - iNewColor = iColor & 0xF800; - - /* Copy green */ - iColor >>= 13; - iNewColor |= iColor & 0x7E0; - - /* Copy green */ - iColor >>= 14; - iNewColor |= iColor & 0x1F; - - return iNewColor; -} - -ULONG -FASTCALL -EXLATEOBJ_iXlateBGRto565(PEXLATEOBJ pxlo, ULONG iColor) -{ - ULONG iNewColor; - - /* Copy blue */ - iColor >>= 3; - iNewColor = iColor & 0x1f; - - /* Copy green */ - iColor >>= 2; - iNewColor |= (iColor & 0x7E0); - - /* Copy red */ - iColor >>= 3; - iNewColor |= (iColor & 0xF800); - - return iNewColor; -} - -ULONG -FASTCALL -EXLATEOBJ_iXlateRGBtoPal(PEXLATEOBJ pexlo, ULONG iColor) -{ - return PALETTE_ulGetNearestPaletteIndex(pexlo->ppalDst, iColor); -} - -ULONG -FASTCALL -EXLATEOBJ_iXlate555toRGB(PEXLATEOBJ pxlo, ULONG iColor) -{ - ULONG iNewColor; - - /* Copy blue */ - iNewColor = gajXlate5to8[iColor & 0x1F] << 16; - - /* Copy green */ - iColor >>= 5; - iNewColor |= gajXlate5to8[iColor & 0x1F] << 8; - - /* Copy red */ - iColor >>= 5; - iNewColor |= gajXlate5to8[iColor & 0x1F]; - - return iNewColor; -} - -ULONG -FASTCALL -EXLATEOBJ_iXlate555toBGR(PEXLATEOBJ pxlo, ULONG iColor) -{ - ULONG iNewColor; - - /* Copy blue */ - iNewColor = gajXlate5to8[iColor & 0x1F]; - - /* Copy green */ - iColor >>= 5; - iNewColor |= gajXlate5to8[iColor & 0x1F] << 8; - - /* Copy red */ - iColor >>= 5; - iNewColor |= gajXlate5to8[iColor & 0x1F] << 16; - - return iNewColor; -} - -ULONG -FASTCALL -EXLATEOBJ_iXlate555to565(PEXLATEOBJ pxlo, ULONG iColor) -{ - ULONG iNewColor; - - /* Copy blue */ - iNewColor = iColor & 0x1f; - - /* Copy red and green */ - iColor <<= 1; - iNewColor |= iColor & 0xFFC0; - - /* Duplicate highest green bit */ - iColor >>= 5; - iNewColor |= (iColor & 0x20); - - return iNewColor; -} - -ULONG -FASTCALL -EXLATEOBJ_iXlate555toPal(PEXLATEOBJ pexlo, ULONG iColor) -{ - iColor = EXLATEOBJ_iXlate555toRGB(pexlo, iColor); - - return PALETTE_ulGetNearestPaletteIndex(pexlo->ppalDst, iColor); -} - -ULONG -FASTCALL -EXLATEOBJ_iXlate565to555(PEXLATEOBJ pxlo, ULONG iColor) -{ - ULONG iNewColor; - - /* Copy blue */ - iNewColor = iColor & 0x1f; - - /* Copy red and green */ - iColor >>= 1; - iNewColor |= iColor & 0x7FE0; - - return iNewColor; -} - -ULONG -FASTCALL -EXLATEOBJ_iXlate565toRGB(PEXLATEOBJ pexlo, ULONG iColor) -{ - ULONG iNewColor; - - /* Copy blue */ - iNewColor = gajXlate5to8[iColor & 0x1F] << 16; - - /* Copy green */ - iColor >>= 5; - iNewColor |= gajXlate6to8[iColor & 0x3F] << 8; - - /* Copy red */ - iColor >>= 6; - iNewColor |= gajXlate5to8[iColor & 0x1F]; - - return iNewColor; -} - -ULONG -FASTCALL -EXLATEOBJ_iXlate565toBGR(PEXLATEOBJ pexlo, ULONG iColor) -{ - ULONG iNewColor; - - /* Copy blue */ - iNewColor = gajXlate5to8[iColor & 0x1F]; - - /* Copy green */ - iColor >>= 5; - iNewColor |= gajXlate6to8[iColor & 0x3F] << 8; - - /* Copy blue */ - iColor >>= 6; - iNewColor |= gajXlate5to8[iColor & 0x1F] << 16; - - return iNewColor; -} - -ULONG -FASTCALL -EXLATEOBJ_iXlate565toPal(EXLATEOBJ *pexlo, ULONG iColor) -{ - iColor = EXLATEOBJ_iXlate565toRGB(pexlo, iColor); - - return PALETTE_ulGetNearestPaletteIndex(pexlo->ppalDst, iColor); -} - -ULONG -FASTCALL -EXLATEOBJ_iXlateShiftAndMask(PEXLATEOBJ pexlo, ULONG iColor) -{ - ULONG iNewColor; - - iNewColor = _rotl(iColor, pexlo->ulRedShift) & pexlo->ulRedMask; - iNewColor |= _rotl(iColor, pexlo->ulGreenShift) & pexlo->ulGreenMask; - iNewColor |= _rotl(iColor, pexlo->ulBlueShift) & pexlo->ulBlueMask; - - return iNewColor; -} - -ULONG -FASTCALL -EXLATEOBJ_iXlateBitfieldsToPal(PEXLATEOBJ pexlo, ULONG iColor) -{ - /* Convert bitfields to RGB */ - iColor = EXLATEOBJ_iXlateShiftAndMask(pexlo, iColor); - - /* Return nearest index */ - return PALETTE_ulGetNearestPaletteIndex(pexlo->ppalDst, iColor); -} - - -/** Private Functions *********************************************************/ - -VOID -NTAPI -EXLATEOBJ_vInitialize( - PEXLATEOBJ pexlo, - PALETTE *ppalSrc, - PALETTE *ppalDst, - COLORREF crSrcBackColor, - COLORREF crDstBackColor, - COLORREF crDstForeColor) -{ - ULONG cEntries; - ULONG i, ulColor; - - if (!ppalSrc) ppalSrc = &gpalRGB; - if (!ppalDst) ppalDst = &gpalRGB; - - pexlo->xlo.iUniq = InterlockedIncrement((LONG*)&giUniqueXlate); - pexlo->xlo.cEntries = 0; - pexlo->xlo.flXlate = 0; - pexlo->xlo.pulXlate = pexlo->aulXlate; - pexlo->pfnXlate = EXLATEOBJ_iXlateTrivial; - pexlo->hColorTransform = NULL; - pexlo->ppalSrc = ppalSrc; - pexlo->ppalDst = ppalDst; - pexlo->xlo.iSrcType = (USHORT)ppalSrc->flFlags; - pexlo->xlo.iDstType = (USHORT)ppalDst->flFlags; - pexlo->ppalDstDc = &gpalRGB; - - if (ppalDst == ppalSrc) - { - pexlo->xlo.flXlate |= XO_TRIVIAL; - return; - } - - /* Check if both of the pallettes are indexed */ - if (!(ppalSrc->flFlags & PAL_INDEXED) || !(ppalDst->flFlags & PAL_INDEXED)) - { - /* At least one palette is not indexed, calculate shifts/masks */ - ULONG aulMasksSrc[3], aulMasksDst[3]; - - PALETTE_vGetBitMasks(ppalSrc, aulMasksSrc); - PALETTE_vGetBitMasks(ppalDst, aulMasksDst); - - pexlo->ulRedMask = aulMasksDst[0]; - pexlo->ulGreenMask = aulMasksDst[1]; - pexlo->ulBlueMask = aulMasksDst[2]; - - pexlo->ulRedShift = CalculateShift(aulMasksSrc[0], aulMasksDst[0]); - pexlo->ulGreenShift = CalculateShift(aulMasksSrc[1], aulMasksDst[1]); - pexlo->ulBlueShift = CalculateShift(aulMasksSrc[2], aulMasksDst[2]); - } - - if (ppalSrc->flFlags & PAL_MONOCHROME) - { - /* This is a monochrome palette */ - if (!(ppalDst->flFlags & PAL_MONOCHROME)) - { - /* Mono to color, use the dest DC's fore and back color */ - pexlo->pfnXlate = EXLATEOBJ_iXlateTable; - pexlo->xlo.flXlate |= XO_TABLE; - pexlo->xlo.cEntries = 2; - pexlo->xlo.pulXlate[0] = - PALETTE_ulGetNearestIndex(ppalDst, crDstForeColor); - pexlo->xlo.pulXlate[1] = - PALETTE_ulGetNearestIndex(ppalDst, crDstBackColor); - } - } - else if (ppalDst->flFlags & PAL_MONOCHROME) - { - pexlo->pfnXlate = EXLATEOBJ_iXlateToMono; - pexlo->xlo.flXlate |= XO_TO_MONO; - pexlo->xlo.cEntries = 1; - - if (ppalSrc->flFlags & PAL_INDEXED) - { - pexlo->aulXlate[0] = - PALETTE_ulGetNearestPaletteIndex(ppalSrc, crSrcBackColor); - } - else if (ppalSrc->flFlags & PAL_RGB) - { - pexlo->aulXlate[0] = crSrcBackColor; - } - else if (ppalSrc->flFlags & PAL_BGR) - { - pexlo->aulXlate[0] = RGB(GetBValue(crSrcBackColor), - GetGValue(crSrcBackColor), - GetRValue(crSrcBackColor)); - } - else if (ppalSrc->flFlags & PAL_BITFIELDS) - { - PALETTE_vGetBitMasks(ppalSrc, &pexlo->ulRedMask); - pexlo->ulRedShift = CalculateShift(RGB(0xFF,0,0), pexlo->ulRedMask); - pexlo->ulGreenShift = CalculateShift(RGB(0,0xFF,0), pexlo->ulGreenMask); - pexlo->ulBlueShift = CalculateShift(RGB(0,0,0xFF), pexlo->ulBlueMask); - - pexlo->aulXlate[0] = EXLATEOBJ_iXlateShiftAndMask(pexlo, crSrcBackColor); - } - } - else if (ppalSrc->flFlags & PAL_INDEXED) - { - cEntries = ppalSrc->NumColors; - - /* Allocate buffer if needed */ - if (cEntries > 6) - { - pexlo->xlo.pulXlate = EngAllocMem(0, - cEntries * sizeof(ULONG), - GDITAG_PXLATE); - if (!pexlo->xlo.pulXlate) - { - DPRINT1("Could not allocate pulXlate buffer.\n"); - pexlo->pfnXlate = EXLATEOBJ_iXlateTrivial; - pexlo->xlo.flXlate = XO_TRIVIAL; - return; - } - } - - pexlo->pfnXlate = EXLATEOBJ_iXlateTable; - pexlo->xlo.cEntries = cEntries; - pexlo->xlo.flXlate |= XO_TABLE; - - if (ppalDst->flFlags & PAL_INDEXED) - { - ULONG cDiff = 0; - - for (i = 0; i < cEntries; i++) - { - ulColor = RGB(ppalSrc->IndexedColors[i].peRed, - ppalSrc->IndexedColors[i].peGreen, - ppalSrc->IndexedColors[i].peBlue); - - pexlo->xlo.pulXlate[i] = - PALETTE_ulGetNearestPaletteIndex(ppalDst, ulColor); - - if (pexlo->xlo.pulXlate[i] != i) cDiff++; - } - - /* Check if we have only trivial mappings */ - if (cDiff == 0) - { - if (pexlo->xlo.pulXlate != pexlo->aulXlate) - { - EngFreeMem(pexlo->xlo.pulXlate); - pexlo->xlo.pulXlate = pexlo->aulXlate; - } - pexlo->pfnXlate = EXLATEOBJ_iXlateTrivial; - pexlo->xlo.flXlate = XO_TRIVIAL; - pexlo->xlo.cEntries = 0; - return; - } - } - else - { - for (i = 0; i < pexlo->xlo.cEntries; i++) - { - ulColor = RGB(ppalSrc->IndexedColors[i].peRed, - ppalSrc->IndexedColors[i].peGreen, - ppalSrc->IndexedColors[i].peBlue); - pexlo->xlo.pulXlate[i] = PALETTE_ulGetNearestBitFieldsIndex(ppalDst, ulColor); - } - } - } - else if (ppalSrc->flFlags & PAL_RGB) - { - if (ppalDst->flFlags & PAL_INDEXED) - pexlo->pfnXlate = EXLATEOBJ_iXlateRGBtoPal; - - else if (ppalDst->flFlags & PAL_BGR) - pexlo->pfnXlate = EXLATEOBJ_iXlateRGBtoBGR; - - else if (ppalDst->flFlags & PAL_RGB16_555) - pexlo->pfnXlate = EXLATEOBJ_iXlateRGBto555; - - else if (ppalDst->flFlags & PAL_RGB16_565) - pexlo->pfnXlate = EXLATEOBJ_iXlateRGBto565; - - else if (ppalDst->flFlags & PAL_BITFIELDS) - pexlo->pfnXlate = EXLATEOBJ_iXlateShiftAndMask; - } - else if (ppalSrc->flFlags & PAL_BGR) - { - if (ppalDst->flFlags & PAL_INDEXED) - pexlo->pfnXlate = EXLATEOBJ_iXlateBitfieldsToPal; - - else if (ppalDst->flFlags & PAL_RGB) - /* The inverse function works the same */ - pexlo->pfnXlate = EXLATEOBJ_iXlateRGBtoBGR; - - else if (ppalDst->flFlags & PAL_RGB16_555) - pexlo->pfnXlate = EXLATEOBJ_iXlateBGRto555; - - else if (ppalDst->flFlags & PAL_RGB16_565) - pexlo->pfnXlate = EXLATEOBJ_iXlateBGRto565; - - else if (ppalDst->flFlags & PAL_BITFIELDS) - pexlo->pfnXlate = EXLATEOBJ_iXlateShiftAndMask; - } - else if (ppalSrc->flFlags & PAL_RGB16_555) - { - if (ppalDst->flFlags & PAL_INDEXED) - pexlo->pfnXlate = EXLATEOBJ_iXlate555toPal; - - else if (ppalDst->flFlags & PAL_RGB) - pexlo->pfnXlate = EXLATEOBJ_iXlate555toRGB; - - else if (ppalDst->flFlags & PAL_BGR) - pexlo->pfnXlate = EXLATEOBJ_iXlate555toBGR; - - else if (ppalDst->flFlags & PAL_RGB16_565) - pexlo->pfnXlate = EXLATEOBJ_iXlate555to565; - - else if (ppalDst->flFlags & PAL_BITFIELDS) - pexlo->pfnXlate = EXLATEOBJ_iXlateShiftAndMask; - } - else if (ppalSrc->flFlags & PAL_RGB16_565) - { - if (ppalDst->flFlags & PAL_INDEXED) - pexlo->pfnXlate = EXLATEOBJ_iXlate565toPal; - - else if (ppalDst->flFlags & PAL_RGB) - pexlo->pfnXlate = EXLATEOBJ_iXlate565toRGB; - - else if (ppalDst->flFlags & PAL_BGR) - pexlo->pfnXlate = EXLATEOBJ_iXlate565toBGR; - - else if (ppalDst->flFlags & PAL_RGB16_555) - pexlo->pfnXlate = EXLATEOBJ_iXlate565to555; - - else if (ppalDst->flFlags & PAL_BITFIELDS) - pexlo->pfnXlate = EXLATEOBJ_iXlateShiftAndMask; - } - else if (ppalSrc->flFlags & PAL_BITFIELDS) - { - if (ppalDst->flFlags & PAL_INDEXED) - pexlo->pfnXlate = EXLATEOBJ_iXlateBitfieldsToPal; - else - pexlo->pfnXlate = EXLATEOBJ_iXlateShiftAndMask; - } - - /* Check for a trivial shift and mask operation */ - if (pexlo->pfnXlate == EXLATEOBJ_iXlateShiftAndMask && - !pexlo->ulRedShift && !pexlo->ulGreenShift && !pexlo->ulBlueShift) - { - pexlo->pfnXlate = EXLATEOBJ_iXlateTrivial; - } - - /* Check for trivial xlate */ - if (pexlo->pfnXlate == EXLATEOBJ_iXlateTrivial) - pexlo->xlo.flXlate = XO_TRIVIAL; - else - pexlo->xlo.flXlate &= ~XO_TRIVIAL; -} - -VOID -NTAPI -EXLATEOBJ_vInitXlateFromDCs( - EXLATEOBJ* pexlo, - PDC pdcSrc, - PDC pdcDst) -{ - PSURFACE psurfDst, psurfSrc; - - psurfDst = pdcDst->dclevel.pSurface; - psurfSrc = pdcSrc->dclevel.pSurface; - - /* Normal initialisation. No surface means DEFAULT_BITMAP */ - EXLATEOBJ_vInitialize(pexlo, - psurfSrc ? psurfSrc->ppal : gppalMono, - psurfDst ? psurfDst->ppal : gppalMono, - pdcSrc->pdcattr->crBackgroundClr, - pdcDst->pdcattr->crBackgroundClr, - pdcDst->pdcattr->crForegroundClr); - - pexlo->ppalDstDc = pdcDst->dclevel.ppal; -} - -VOID -NTAPI -EXLATEOBJ_vCleanup(PEXLATEOBJ pexlo) -{ - if (pexlo->xlo.pulXlate != pexlo->aulXlate) - { - EngFreeMem(pexlo->xlo.pulXlate); - } - pexlo->xlo.pulXlate = pexlo->aulXlate; -} - -/** Public DDI Functions ******************************************************/ - -#undef XLATEOBJ_iXlate -ULONG -NTAPI -XLATEOBJ_iXlate(XLATEOBJ *pxlo, ULONG iColor) -{ - PEXLATEOBJ pexlo = (PEXLATEOBJ)pxlo; - - if (!pxlo) - return iColor; - - /* Call the iXlate function */ - return pexlo->pfnXlate(pexlo, iColor); -} - -ULONG -NTAPI -XLATEOBJ_cGetPalette(XLATEOBJ *pxlo, ULONG iPal, ULONG cPal, ULONG *pPalOut) -{ - PEXLATEOBJ pexlo = (PEXLATEOBJ)pxlo; - PPALETTE ppal; - ULONG i; - - if (!pxlo) - { - return 0; - } - - if (iPal > 5) - { - DPRINT1("XLATEOBJ_cGetPalette called with wrong iPal: %d\n", iPal); - return 0; - } - - /* Get the requested palette */ - if (iPal == XO_DESTDCPALETTE) - { - ppal = pexlo->ppalDstDc; - } - else if (iPal == XO_SRCPALETTE || iPal == XO_SRCBITFIELDS) - { - ppal = pexlo->ppalSrc; - } - else - { - ppal = pexlo->ppalDst; - } - - /* Verify palette type match */ - if (!ppal || - ((iPal == XO_SRCPALETTE || iPal == XO_DESTPALETTE) - && !(ppal->flFlags & PAL_INDEXED)) || - ((iPal == XO_SRCBITFIELDS || iPal == XO_DESTBITFIELDS) - && !(ppal->flFlags & PAL_BITFIELDS))) - { - return 0; - } - - if(!pPalOut) - { - return ppal->NumColors; - } - - /* Copy the values into the buffer */ - if (ppal->flFlags & PAL_INDEXED) - { - cPal = min(cPal, ppal->NumColors); - for (i = 0; i < cPal; i++) - { - pPalOut[i] = RGB(ppal->IndexedColors[i].peRed, - ppal->IndexedColors[i].peGreen, - ppal->IndexedColors[i].peBlue); - } - } - else - { - // FIXME: should use the above code - pPalOut[0] = ppal->RedMask; - pPalOut[1] = ppal->GreenMask; - pPalOut[2] = ppal->BlueMask; - } - - return cPal; -} - -HANDLE -NTAPI -XLATEOBJ_hGetColorTransform(XLATEOBJ *pxlo) -{ - PEXLATEOBJ pexlo = (PEXLATEOBJ)pxlo; - return pexlo->hColorTransform; -} - -PULONG -NTAPI -XLATEOBJ_piVector(XLATEOBJ *pxlo) -{ - if (pxlo->iSrcType == PAL_INDEXED) - { - return pxlo->pulXlate; - } - - return NULL; -} - -/* EOF */ Modified: trunk/reactos/win32ss/gdi/ntgdi/coord.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/coord.h?… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/coord.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/coord.h [iso-8859-1] Sun Jul 29 11:20:05 2012 @@ -141,14 +141,6 @@ XFORMOBJ_bApplyXform(&xo, XF_LTOL, cNumPoints, pptlDest, pptlSource); } -int APIENTRY IntGdiSetMapMode(PDC, int); - -BOOL NTAPI -IntGdiCombineTransform( - XFORML *pxformDest, - XFORML *pxform1, - XFORML *pxform2); - BOOL NTAPI GreModifyWorldTransform( @@ -157,6 +149,5 @@ DWORD dwMode); VOID FASTCALL IntMirrorWindowOrg(PDC); -void FASTCALL IntFixIsotropicMapping(PDC); -LONG FASTCALL IntCalcFillOrigin(PDC); +int APIENTRY IntGdiSetMapMode(PDC, int); Modified: trunk/reactos/win32ss/gdi/ntgdi/dc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/dc.h?rev… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/dc.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/dc.h [iso-8859-1] Sun Jul 29 11:20:05 2012 @@ -7,34 +7,40 @@ #define DCB_WINDOWMGR 0x8000 /* Queries the Windows bounding rectangle instead of the application's */ /* flFontState */ -#define DC_DIRTYFONT_XFORM 1 -#define DC_DIRTYFONT_LFONT 2 -#define DC_UFI_MAPPING 4 +enum _FONT_STATE +{ + DC_DIRTYFONT_XFORM = 1, + DC_DIRTYFONT_LFONT = 2, + DC_UFI_MAPPING = 4 +}; /* fl */ #define DC_FL_PAL_BACK 1 -#define DC_DISPLAY 1 -#define DC_DIRECT 2 -#define DC_CANCELED 4 -#define DC_PERMANANT 0x08 -#define DC_DIRTY_RAO 0x10 -#define DC_ACCUM_WMGR 0x20 -#define DC_ACCUM_APP 0x40 -#define DC_RESET 0x80 -#define DC_SYNCHRONIZEACCESS 0x100 -#define DC_EPSPRINTINGESCAPE 0x200 -#define DC_TEMPINFODC 0x400 -#define DC_FULLSCREEN 0x800 -#define DC_IN_CLONEPDEV 0x1000 -#define DC_REDIRECTION 0x2000 -#define DC_SHAREACCESS 0x4000 - -typedef enum -{ - DCTYPE_DIRECT = 0, - DCTYPE_MEMORY = 1, - DCTYPE_INFO = 2, +enum _DCFLAGS +{ + DC_DISPLAY = 0x0001, + DC_DIRECT = 0x0002, + DC_CANCELED = 0x0004, + DC_PERMANANT = 0x0008, + DC_DIRTY_RAO = 0x0010, + DC_ACCUM_WMGR = 0x0020, + DC_ACCUM_APP = 0x0040, + DC_RESET = 0x0080, + DC_SYNCHRONIZEACCESS = 0x0100, + DC_EPSPRINTINGESCAPE = 0x0200, + DC_TEMPINFODC = 0x0400, + DC_FULLSCREEN = 0x0800, + DC_IN_CLONEPDEV = 0x1000, + DC_REDIRECTION = 0x2000, + DC_SHAREACCESS = 0x4000 +}; + +typedef enum _DCTYPE +{ + DCTYPE_DIRECT = 0, + DCTYPE_MEMORY = 1, + DCTYPE_INFO = 2, } DCTYPE; Modified: trunk/reactos/win32ss/gdi/ntgdi/device.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/device.c… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/device.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/device.c [iso-8859-1] Sun Jul 29 11:20:05 2012 @@ -34,11 +34,11 @@ /* Attach monitor */ UserAttachMonitor((HDEV)gppdevPrimary); - DPRINT("IntCreatePrimarySurface, pPrimarySurface=%p, pPrimarySurface->pSurface = %p\n", - pPrimarySurface, pPrimarySurface->pSurface); + DPRINT("IntCreatePrimarySurface, gppdevPrimary=%p, gppdevPrimary->pSurface = %p\n", + gppdevPrimary, gppdevPrimary->pSurface); /* Create surface */ - pso = &PDEVOBJ_pSurface(pPrimarySurface)->SurfObj; + pso = &PDEVOBJ_pSurface(gppdevPrimary)->SurfObj; SurfSize = pso->sizlBitmap; /* Put the pointer in the center of the screen */ @@ -48,7 +48,7 @@ co_IntShowDesktop(IntGetActiveDesktop(), SurfSize.cx, SurfSize.cy); // Init Primary Displays Device Capabilities. - PDEVOBJ_vGetDeviceCaps(pPrimarySurface, &GdiHandleTable->DevCaps); + PDEVOBJ_vGetDeviceCaps(gppdevPrimary, &GdiHandleTable->DevCaps); return TRUE; } @@ -64,7 +64,7 @@ { // I guess we will soon have more than one primary surface. // This will do for now. - return pPrimarySurface; + return gppdevPrimary; } Modified: trunk/reactos/win32ss/gdi/ntgdi/gdiobj.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/gdiobj.h… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/gdiobj.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/gdiobj.h [iso-8859-1] Sun Jul 29 11:20:05 2012 @@ -6,7 +6,7 @@ #pragma once /* The first 10 entries are never used in windows, they are empty */ -#define RESERVE_ENTRIES_COUNT 10 +static const unsigned RESERVE_ENTRIES_COUNT = 10; typedef struct _GDI_HANDLE_TABLE { @@ -57,12 +57,15 @@ typedef struct _CLIENTOBJ { - BASEOBJECT BaseObject; + BASEOBJECT BaseObject; } CLIENTOBJ, *PCLIENTOBJ; -#define GDIOBJFLAG_DEFAULT (0x0) -#define GDIOBJFLAG_IGNOREPID (0x1) -#define GDIOBJFLAG_IGNORELOCK (0x2) +enum _GDIOBJLAGS +{ + GDIOBJFLAG_DEFAULT = 0x00, + GDIOBJFLAG_IGNOREPID = 0x01, + GDIOBJFLAG_IGNORELOCK = 0x02 +}; INIT_FUNCTION NTSTATUS Modified: trunk/reactos/win32ss/gdi/ntgdi/palette.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/palette.… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/palette.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/palette.h [iso-8859-1] Sun Jul 29 11:20:05 2012 @@ -1,26 +1,29 @@ #pragma once // Palette mode flags -#ifndef __WINDDI_H // Defined in ddk/winddi.h -#define PAL_INDEXED 0x00000001 // Indexed palette -#define PAL_BITFIELDS 0x00000002 // Bit fields used for DIB, DIB section -#define PAL_RGB 0x00000004 // Red, green, blue -#define PAL_BGR 0x00000008 // Blue, green, red -#define PAL_CMYK 0x00000010 // Cyan, magenta, yellow, black +enum _PALFLAGS +{ +#ifndef _WINDDI_ // Defined in ddk/winddi.h + PAL_INDEXED = 0x00000001, // Indexed palette + PAL_BITFIELDS = 0x00000002, // Bit fields used for DIB, DIB section + PAL_RGB = 0x00000004, // Red, green, blue + PAL_BGR = 0x00000008, // Blue, green, red + PAL_CMYK = 0x00000010, // Cyan, magenta, yellow, black #endif -#define PAL_DC 0x00000100 -#define PAL_FIXED 0x00000200 // Can't be changed -#define PAL_FREE 0x00000400 -#define PAL_MANAGED 0x00000800 -#define PAL_NOSTATIC 0x00001000 -#define PAL_MONOCHROME 0x00002000 // Two colors only -#define PAL_BRUSHHACK 0x00004000 -#define PAL_DIBSECTION 0x00008000 // Used for a DIB section -#define PAL_NOSTATIC256 0x00010000 -#define PAL_HT 0x00100000 // Halftone palette -#define PAL_RGB16_555 0x00200000 // 16-bit RGB in 555 format -#define PAL_RGB16_565 0x00400000 // 16-bit RGB in 565 format -#define PAL_GAMMACORRECTION 0x00800000 // Correct colors + PAL_DC = 0x00000100, + PAL_FIXED = 0x00000200, // Can't be changed + PAL_FREE = 0x00000400, + PAL_MANAGED = 0x00000800, + PAL_NOSTATIC = 0x00001000, + PAL_MONOCHROME = 0x00002000, // Two colors only + PAL_BRUSHHACK = 0x00004000, + PAL_DIBSECTION = 0x00008000, // Used for a DIB section + PAL_NOSTATIC256 = 0x00010000, + PAL_HT = 0x00100000, // Halftone palette + PAL_RGB16_555 = 0x00200000, // 16-bit RGB in 555 format + PAL_RGB16_565 = 0x00400000, // 16-bit RGB in 565 format + PAL_GAMMACORRECTION = 0x00800000, // Correct colors +}; typedef struct _PALETTE { Modified: trunk/reactos/win32ss/gdi/ntgdi/path.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/path.h?r… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/path.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/path.h [iso-8859-1] Sun Jul 29 11:20:05 2012 @@ -1,11 +1,15 @@ #pragma once - /* DCPATH flPath */ -#define DCPATH_ACTIVE 0x0001 -#define DCPATH_SAVE 0x0002 -#define DCPATH_CLOCKWISE 0x0004 -// ReactOS only -#define DCPATH_SAVESTATE 0x80000000 +/* DCPATH flPath */ +enum _DCPATHFLAGS +{ + DCPATH_ACTIVE = 0x0001, + DCPATH_SAVE = 0x0002, + DCPATH_CLOCKWISE = 0x0004, + + /* ReactOS only */ + DCPATH_SAVESTATE = 0x80000000 +}; typedef HGDIOBJ HPATH, *PHPATH; Modified: trunk/reactos/win32ss/user/ntuser/metric.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/metric… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/metric.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/metric.c [iso-8859-1] Sun Jul 29 11:20:05 2012 @@ -34,15 +34,15 @@ } /* FIXME: HACK, due to missing PDEV on first init */ - if (!pPrimarySurface) + if (!gppdevPrimary) { Width = 640; Height = 480; } else { - Width = pPrimarySurface->gdiinfo.ulHorzRes; - Height = pPrimarySurface->gdiinfo.ulVertRes; + Width = gppdevPrimary->gdiinfo.ulHorzRes; + Height = gppdevPrimary->gdiinfo.ulVertRes; } /* Screen sizes */

1 0

[akhaldi] 56978: [GDI32_APITESTS] * Allow warnings when compiling with gcc.
by akhaldi＠svn.reactos.org 29 Jul '12

29 Jul '12

Author: akhaldi Date: Sun Jul 29 02:44:53 2012 New Revision: 56978 URL: http://svn.reactos.org/svn/reactos?rev=56978&view=rev Log: [GDI32_APITESTS] * Allow warnings when compiling with gcc. Modified: trunk/rostests/apitests/gdi32/CMakeLists.txt Modified: trunk/rostests/apitests/gdi32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32/CMakeLists… ============================================================================== --- trunk/rostests/apitests/gdi32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/apitests/gdi32/CMakeLists.txt [iso-8859-1] Sun Jul 29 02:44:53 2012 @@ -61,6 +61,12 @@ init.c testlist.c) +if(NOT MSVC) + # FIXME: http://www.cmake.org/Bug/view.php?id=12998 + #allow_warnings(gdi32_apitest) + set_source_files_properties(${SOURCE} PROPERTIES COMPILE_FLAGS "-Wno-error") +endif() + add_executable(gdi32_apitest ${SOURCE}) target_link_libraries(gdi32_apitest wine ${PSEH_LIB}) set_module_type(gdi32_apitest win32cui)

1 0

[akhaldi] 56977: [VGA_NEW] * Explicitly mark the functions as stdcall.
by akhaldi＠svn.reactos.org 29 Jul '12

29 Jul '12

Author: akhaldi Date: Sun Jul 29 02:38:10 2012 New Revision: 56977 URL: http://svn.reactos.org/svn/reactos?rev=56977&view=rev Log: [VGA_NEW] * Explicitly mark the functions as stdcall. Modified: trunk/reactos/win32ss/drivers/miniport/vga_new/CMakeLists.txt trunk/reactos/win32ss/drivers/miniport/vga_new/modeset.c trunk/reactos/win32ss/drivers/miniport/vga_new/vga.c Modified: trunk/reactos/win32ss/drivers/miniport/vga_new/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/drivers/miniport/v… ============================================================================== --- trunk/reactos/win32ss/drivers/miniport/vga_new/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/win32ss/drivers/miniport/vga_new/CMakeLists.txt [iso-8859-1] Sun Jul 29 02:38:10 2012 @@ -13,12 +13,9 @@ target_link_libraries(vga libcntpr) # FIXME: http://www.cmake.org/Bug/view.php?id=12998 -if(MSVC) - #add_target_compile_flags(vga "/Gz") - set_source_files_properties(${SOURCE} PROPERTIES COMPILE_FLAGS "/Gz") -else() - #add_target_compile_flags(vga "-mrtd -fno-builtin") - set_source_files_properties(${SOURCE} PROPERTIES COMPILE_FLAGS "-mrtd -fno-builtin") +if(NOT MSVC) + #allow_warnings(vga) + set_source_files_properties(${SOURCE} PROPERTIES COMPILE_FLAGS "-Wno-error") endif() set_module_type(vga kernelmodedriver) Modified: trunk/reactos/win32ss/drivers/miniport/vga_new/modeset.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/drivers/miniport/v… ============================================================================== --- trunk/reactos/win32ss/drivers/miniport/vga_new/modeset.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/drivers/miniport/vga_new/modeset.c [iso-8859-1] Sun Jul 29 02:38:10 2012 @@ -10,12 +10,14 @@ #include "vga.h" VP_STATUS +NTAPI VgaInterpretCmdStream( PHW_DEVICE_EXTENSION HwDeviceExtension, PUSHORT pusCmdStream ); VP_STATUS +NTAPI VgaSetMode( PHW_DEVICE_EXTENSION HwDeviceExtension, PVIDEO_MODE Mode, @@ -26,6 +28,7 @@ ); VP_STATUS +NTAPI VgaQueryAvailableModes( PHW_DEVICE_EXTENSION HwDeviceExtension, PVIDEO_MODE_INFORMATION ModeInformation, @@ -34,6 +37,7 @@ ); VP_STATUS +NTAPI VgaQueryNumberOfAvailableModes( PHW_DEVICE_EXTENSION HwDeviceExtension, PVIDEO_NUM_MODES NumModes, @@ -42,6 +46,7 @@ ); VP_STATUS +NTAPI VgaQueryCurrentMode( PHW_DEVICE_EXTENSION HwDeviceExtension, PVIDEO_MODE_INFORMATION ModeInformation, @@ -50,6 +55,7 @@ ); VOID +NTAPI VgaZeroVideoMemory( PHW_DEVICE_EXTENSION HwDeviceExtension ); @@ -64,6 +70,7 @@ //--------------------------------------------------------------------------- VP_STATUS +NTAPI VgaInterpretCmdStream( PHW_DEVICE_EXTENSION HwDeviceExtension, PUSHORT pusCmdStream @@ -349,8 +356,8 @@ } // end VgaInterpretCmdStream() - -VP_STATUS +VP_STATUS +NTAPI VgaSetMode( PHW_DEVICE_EXTENSION HwDeviceExtension, PVIDEO_MODE Mode, @@ -504,8 +511,9 @@ return NO_ERROR; } //end VgaSetMode() - -VP_STATUS + +VP_STATUS +NTAPI VgaQueryAvailableModes( PHW_DEVICE_EXTENSION HwDeviceExtension, PVIDEO_MODE_INFORMATION ModeInformation, @@ -641,8 +649,9 @@ return NO_ERROR; } // end VgaGetAvailableModes() - -VP_STATUS + +VP_STATUS +NTAPI VgaQueryNumberOfAvailableModes( PHW_DEVICE_EXTENSION HwDeviceExtension, PVIDEO_NUM_MODES NumModes, @@ -704,8 +713,9 @@ return NO_ERROR; } // end VgaGetNumberOfAvailableModes() - -VP_STATUS + +VP_STATUS +NTAPI VgaQueryCurrentMode( PHW_DEVICE_EXTENSION HwDeviceExtension, PVIDEO_MODE_INFORMATION ModeInformation, @@ -837,8 +847,8 @@ } // end VgaQueryCurrentMode() - VOID +NTAPI VgaZeroVideoMemory( PHW_DEVICE_EXTENSION HwDeviceExtension ) @@ -886,3 +896,4 @@ VgaInterpretCmdStream(HwDeviceExtension, DisableA000Color); } + Modified: trunk/reactos/win32ss/drivers/miniport/vga_new/vga.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/drivers/miniport/v… ============================================================================== --- trunk/reactos/win32ss/drivers/miniport/vga_new/vga.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/drivers/miniport/vga_new/vga.c [iso-8859-1] Sun Jul 29 02:38:10 2012 @@ -19,6 +19,7 @@ // VP_STATUS +NTAPI VgaFindAdapter( PVOID HwDeviceExtension, PVOID HwContext, @@ -28,11 +29,13 @@ ); BOOLEAN +NTAPI VgaInitialize( PVOID HwDeviceExtension ); BOOLEAN +NTAPI VgaStartIO( PVOID HwDeviceExtension, PVIDEO_REQUEST_PACKET RequestPacket @@ -43,6 +46,7 @@ // VP_STATUS +NTAPI VgaQueryAvailableModes( PHW_DEVICE_EXTENSION HwDeviceExtension, PVIDEO_MODE_INFORMATION ModeInformation, @@ -51,6 +55,7 @@ ); VP_STATUS +NTAPI VgaQueryNumberOfAvailableModes( PHW_DEVICE_EXTENSION HwDeviceExtension, PVIDEO_NUM_MODES NumModes, @@ -59,6 +64,7 @@ ); VP_STATUS +NTAPI VgaQueryCurrentMode( PHW_DEVICE_EXTENSION HwDeviceExtension, PVIDEO_MODE_INFORMATION ModeInformation, @@ -67,6 +73,7 @@ ); VP_STATUS +NTAPI VgaSetMode( PHW_DEVICE_EXTENSION HwDeviceExtension, PVIDEO_MODE Mode, @@ -77,17 +84,20 @@ ); BOOLEAN +NTAPI VgaIsPresent( PHW_DEVICE_EXTENSION HwDeviceExtension ); VOID +NTAPI VgaInterpretCmdStream( PVOID HwDeviceExtension, PUSHORT pusCmdStream ); VP_STATUS +NTAPI VgaSetPaletteReg( PHW_DEVICE_EXTENSION HwDeviceExtension, PVIDEO_PALETTE_DATA PaletteBuffer, @@ -95,6 +105,7 @@ ); VP_STATUS +NTAPI VgaSetColorLookup( PHW_DEVICE_EXTENSION HwDeviceExtension, PVIDEO_CLUT ClutBuffer, @@ -102,6 +113,7 @@ ); VP_STATUS +NTAPI GetDeviceDataCallback( PVOID HwDeviceExtension, PVOID Context, @@ -116,6 +128,7 @@ // eVb: 1.2 [RESOURCE] - Add new function for acquiring VGA resources (I/O, memory) VP_STATUS +NTAPI VgaAcquireResources( PHW_DEVICE_EXTENSION DeviceExtension ); @@ -130,7 +143,6 @@ #pragma alloc_text(PAGE,VgaSetColorLookup) #endif - //--------------------------------------------------------------------------- ULONG // eVb: 1.3 [GCC] - Add NTAPI for GCC support @@ -303,9 +315,10 @@ return initializationStatus; } // end DriverEntry() - + //--------------------------------------------------------------------------- VP_STATUS +NTAPI VgaFindAdapter( PVOID HwDeviceExtension, PVOID HwContext, @@ -485,9 +498,10 @@ } // VgaFindAdapter() - + //--------------------------------------------------------------------------- BOOLEAN +NTAPI VgaInitialize( PVOID HwDeviceExtension ) @@ -527,9 +541,10 @@ return TRUE; } // VgaInitialize() - + //--------------------------------------------------------------------------- BOOLEAN +NTAPI VgaStartIO( PVOID HwDeviceExtension, PVIDEO_REQUEST_PACKET RequestPacket @@ -912,15 +927,14 @@ } // VgaStartIO() - //--------------------------------------------------------------------------- // // private routines // - //--------------------------------------------------------------------------- BOOLEAN +NTAPI VgaIsPresent( PHW_DEVICE_EXTENSION HwDeviceExtension ) @@ -1243,10 +1257,10 @@ return returnStatus; } // VgaIsPresent() - //--------------------------------------------------------------------------- VP_STATUS +NTAPI VgaSetPaletteReg( PHW_DEVICE_EXTENSION HwDeviceExtension, PVIDEO_PALETTE_DATA PaletteBuffer, @@ -1334,9 +1348,9 @@ } // end VgaSetPaletteReg() - //--------------------------------------------------------------------------- VP_STATUS +NTAPI VgaSetColorLookup( PHW_DEVICE_EXTENSION HwDeviceExtension, PVIDEO_CLUT ClutBuffer, @@ -1440,8 +1454,9 @@ return ERROR_INVALID_PARAMETER; } // end VgaSetColorLookup() - + VP_STATUS +NTAPI GetDeviceDataCallback( PVOID HwDeviceExtension, PVOID Context, @@ -1501,6 +1516,7 @@ // eVb: 1.16 [RESOURCE] - Add new function for acquiring VGA resources (I/O, memory) VP_STATUS +NTAPI VgaAcquireResources( PHW_DEVICE_EXTENSION DeviceExtension )

1 0

[akhaldi] 56976: [FBTUSB] * Explicitly mark the functions as stdcall.
by akhaldi＠svn.reactos.org 29 Jul '12

29 Jul '12

Author: akhaldi Date: Sun Jul 29 02:29:12 2012 New Revision: 56976 URL: http://svn.reactos.org/svn/reactos?rev=56976&view=rev Log: [FBTUSB] * Explicitly mark the functions as stdcall. Modified: trunk/reactos/drivers/bluetooth/fbtusb/CMakeLists.txt trunk/reactos/drivers/bluetooth/fbtusb/fbtdev.c trunk/reactos/drivers/bluetooth/fbtusb/fbtpnp.c trunk/reactos/drivers/bluetooth/fbtusb/fbtpwr.c trunk/reactos/drivers/bluetooth/fbtusb/fbtrwr.c trunk/reactos/drivers/bluetooth/fbtusb/fbtwmi.c trunk/reactos/drivers/bluetooth/fbtusb/include/fbtdev.h trunk/reactos/drivers/bluetooth/fbtusb/include/fbtpnp.h trunk/reactos/drivers/bluetooth/fbtusb/include/fbtpwr.h trunk/reactos/drivers/bluetooth/fbtusb/include/fbtrwr.h trunk/reactos/drivers/bluetooth/fbtusb/include/fbtwmi.h Modified: trunk/reactos/drivers/bluetooth/fbtusb/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bluetooth/fbtusb/C… ============================================================================== --- trunk/reactos/drivers/bluetooth/fbtusb/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/drivers/bluetooth/fbtusb/CMakeLists.txt [iso-8859-1] Sun Jul 29 02:29:12 2012 @@ -14,12 +14,9 @@ fbtusb.rc) # FIXME: http://www.cmake.org/Bug/view.php?id=12998 -if(MSVC) - #add_target_compile_flags(fbtusb "/Gz") - set_source_files_properties(${SOURCE} PROPERTIES COMPILE_FLAGS "/Gz") -else() +if(NOT MSVC) #allow_warnings(fbtusb) - set_source_files_properties(${SOURCE} PROPERTIES COMPILE_FLAGS "-Wno-error -mrtd -fno-builtin") + set_source_files_properties(${SOURCE} PROPERTIES COMPILE_FLAGS "-Wno-error") endif() set_module_type(fbtusb kernelmodedriver) Modified: trunk/reactos/drivers/bluetooth/fbtusb/fbtdev.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bluetooth/fbtusb/f… ============================================================================== --- trunk/reactos/drivers/bluetooth/fbtusb/fbtdev.c [iso-8859-1] (original) +++ trunk/reactos/drivers/bluetooth/fbtusb/fbtdev.c [iso-8859-1] Sun Jul 29 02:29:12 2012 @@ -20,7 +20,7 @@ #include "fbtusr.h" // Dispatch routine for CreateHandle -NTSTATUS FreeBT_DispatchCreate(IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp) +NTSTATUS NTAPI FreeBT_DispatchCreate(IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp) { //ULONG i; NTSTATUS ntStatus; @@ -99,7 +99,7 @@ } // Dispatch routine for CloseHandle -NTSTATUS FreeBT_DispatchClose(IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp) +NTSTATUS NTAPI FreeBT_DispatchClose(IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp) { NTSTATUS ntStatus; PFILE_OBJECT fileObject; @@ -132,7 +132,7 @@ } // Called when a HCI Send on the control pipe completes -NTSTATUS FreeBT_HCISendCompletion(IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp, IN PVOID Context) +NTSTATUS NTAPI FreeBT_HCISendCompletion(IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp, IN PVOID Context) { //ULONG stageLength; NTSTATUS ntStatus; @@ -153,7 +153,7 @@ // Called the DeviceIOControl handler to send an HCI command received from the user // HCI Commands are sent on the (default) control pipe -NTSTATUS FreeBT_SendHCICommand(IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp, IN PVOID IoBuffer, IN ULONG InputBufferLength) +NTSTATUS NTAPI FreeBT_SendHCICommand(IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp, IN PVOID IoBuffer, IN ULONG InputBufferLength) { PDEVICE_EXTENSION deviceExtension; //ULONG urbFlags; @@ -281,7 +281,7 @@ } // Called when a HCI Get on the event pipe completes -NTSTATUS FreeBT_HCIEventCompletion(IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp, IN PVOID Context) +NTSTATUS NTAPI FreeBT_HCIEventCompletion(IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp, IN PVOID Context) { //ULONG stageLength; NTSTATUS ntStatus; @@ -307,7 +307,7 @@ } // Called from the DeviceIOControl handler to wait for an event on the interrupt pipe -NTSTATUS FreeBT_GetHCIEvent(IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp, IN PVOID IoBuffer, IN ULONG InputBufferLength) +NTSTATUS NTAPI FreeBT_GetHCIEvent(IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp, IN PVOID IoBuffer, IN ULONG InputBufferLength) { PDEVICE_EXTENSION deviceExtension; PURB urb; @@ -409,7 +409,7 @@ } // DeviceIOControl dispatch -NTSTATUS FreeBT_DispatchDevCtrl(IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp) +NTSTATUS NTAPI FreeBT_DispatchDevCtrl(IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp) { ULONG code; PVOID ioBuffer; @@ -503,7 +503,7 @@ } // Submit URB_FUNCTION_RESET_PIPE -NTSTATUS FreeBT_ResetPipe(IN PDEVICE_OBJECT DeviceObject, IN USBD_PIPE_HANDLE PipeHandle) +NTSTATUS NTAPI FreeBT_ResetPipe(IN PDEVICE_OBJECT DeviceObject, IN USBD_PIPE_HANDLE PipeHandle) { PURB urb; NTSTATUS ntStatus; @@ -543,7 +543,7 @@ } // Call FreeBT_ResetParentPort to reset the device -NTSTATUS FreeBT_ResetDevice(IN PDEVICE_OBJECT DeviceObject) +NTSTATUS NTAPI FreeBT_ResetDevice(IN PDEVICE_OBJECT DeviceObject) { NTSTATUS ntStatus; ULONG portStatus; @@ -562,7 +562,7 @@ } // Read port status from the lower driver (USB class driver) -NTSTATUS FreeBT_GetPortStatus(IN PDEVICE_OBJECT DeviceObject, IN OUT PULONG PortStatus) +NTSTATUS NTAPI FreeBT_GetPortStatus(IN PDEVICE_OBJECT DeviceObject, IN OUT PULONG PortStatus) { NTSTATUS ntStatus; KEVENT event; @@ -614,7 +614,7 @@ } // Sends an IOCTL_INTERNAL_USB_RESET_PORT via the lower driver -NTSTATUS FreeBT_ResetParentPort(IN PDEVICE_OBJECT DeviceObject) +NTSTATUS NTAPI FreeBT_ResetParentPort(IN PDEVICE_OBJECT DeviceObject) { NTSTATUS ntStatus; KEVENT event; @@ -666,7 +666,7 @@ } // Send an idle request to the lower driver -NTSTATUS SubmitIdleRequestIrp(IN PDEVICE_EXTENSION DeviceExtension) +NTSTATUS NTAPI SubmitIdleRequestIrp(IN PDEVICE_EXTENSION DeviceExtension) { PIRP irp; NTSTATUS ntStatus; @@ -883,7 +883,7 @@ } -VOID IdleNotificationCallback(IN PDEVICE_EXTENSION DeviceExtension) +VOID NTAPI IdleNotificationCallback(IN PDEVICE_EXTENSION DeviceExtension) { NTSTATUS ntStatus; POWER_STATE powerState; @@ -978,7 +978,7 @@ } -NTSTATUS IdleNotificationRequestComplete(IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp, IN PDEVICE_EXTENSION DeviceExtension) +NTSTATUS NTAPI IdleNotificationRequestComplete(IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp, IN PDEVICE_EXTENSION DeviceExtension) { NTSTATUS ntStatus; POWER_STATE powerState; @@ -1090,7 +1090,7 @@ } -VOID CancelSelectSuspend(IN PDEVICE_EXTENSION DeviceExtension) +VOID NTAPI CancelSelectSuspend(IN PDEVICE_EXTENSION DeviceExtension) { PIRP irp; KIRQL oldIrql; @@ -1153,7 +1153,7 @@ } -VOID PoIrpCompletionFunc(IN PDEVICE_OBJECT DeviceObject, IN UCHAR MinorFunction, IN POWER_STATE PowerState, IN PVOID Context, IN PIO_STATUS_BLOCK IoStatus) +VOID NTAPI PoIrpCompletionFunc(IN PDEVICE_OBJECT DeviceObject, IN UCHAR MinorFunction, IN POWER_STATE PowerState, IN PVOID Context, IN PIO_STATUS_BLOCK IoStatus) { PIRP_COMPLETION_CONTEXT irpContext; irpContext = NULL; @@ -1176,7 +1176,7 @@ } -VOID PoIrpAsyncCompletionFunc(IN PDEVICE_OBJECT DeviceObject, IN UCHAR MinorFunction, IN POWER_STATE PowerState, IN PVOID Context, IN PIO_STATUS_BLOCK IoStatus) +VOID NTAPI PoIrpAsyncCompletionFunc(IN PDEVICE_OBJECT DeviceObject, IN UCHAR MinorFunction, IN POWER_STATE PowerState, IN PVOID Context, IN PIO_STATUS_BLOCK IoStatus) { PDEVICE_EXTENSION DeviceExtension = (PDEVICE_EXTENSION) Context; FreeBT_DbgPrint(3, ("PoIrpAsyncCompletionFunc::")); @@ -1186,7 +1186,7 @@ } -VOID WWIrpCompletionFunc(IN PDEVICE_OBJECT DeviceObject, IN UCHAR MinorFunction, IN POWER_STATE PowerState, IN PVOID Context, IN PIO_STATUS_BLOCK IoStatus) +VOID NTAPI WWIrpCompletionFunc(IN PDEVICE_OBJECT DeviceObject, IN UCHAR MinorFunction, IN POWER_STATE PowerState, IN PVOID Context, IN PIO_STATUS_BLOCK IoStatus) { PDEVICE_EXTENSION DeviceExtension = (PDEVICE_EXTENSION) Context; Modified: trunk/reactos/drivers/bluetooth/fbtusb/fbtpnp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bluetooth/fbtusb/f… ============================================================================== --- trunk/reactos/drivers/bluetooth/fbtusb/fbtpnp.c [iso-8859-1] (original) +++ trunk/reactos/drivers/bluetooth/fbtusb/fbtpnp.c [iso-8859-1] Sun Jul 29 02:29:12 2012 @@ -21,7 +21,7 @@ #include "fbtusr.h" // Handle PNP events -NTSTATUS FreeBT_DispatchPnP(IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp) +NTSTATUS NTAPI FreeBT_DispatchPnP(IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp) { PIO_STACK_LOCATION irpStack; PDEVICE_EXTENSION deviceExtension; @@ -139,7 +139,7 @@ } -NTSTATUS HandleStartDevice(IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp) +NTSTATUS NTAPI HandleStartDevice(IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp) { KIRQL oldIrql; KEVENT startDeviceEvent; @@ -241,7 +241,7 @@ } -NTSTATUS ReadandSelectDescriptors(IN PDEVICE_OBJECT DeviceObject) +NTSTATUS NTAPI ReadandSelectDescriptors(IN PDEVICE_OBJECT DeviceObject) { PURB urb; ULONG siz; @@ -305,7 +305,7 @@ } -NTSTATUS ConfigureDevice(IN PDEVICE_OBJECT DeviceObject) +NTSTATUS NTAPI ConfigureDevice(IN PDEVICE_OBJECT DeviceObject) { PURB urb; ULONG siz; @@ -443,7 +443,7 @@ } -NTSTATUS SelectInterfaces(IN PDEVICE_OBJECT DeviceObject, IN PUSB_CONFIGURATION_DESCRIPTOR ConfigurationDescriptor) +NTSTATUS NTAPI SelectInterfaces(IN PDEVICE_OBJECT DeviceObject, IN PUSB_CONFIGURATION_DESCRIPTOR ConfigurationDescriptor) { LONG numberOfInterfaces, interfaceNumber, interfaceindex; ULONG i; @@ -665,7 +665,7 @@ } -NTSTATUS DeconfigureDevice(IN PDEVICE_OBJECT DeviceObject) +NTSTATUS NTAPI DeconfigureDevice(IN PDEVICE_OBJECT DeviceObject) { PURB urb; ULONG siz; @@ -698,7 +698,7 @@ } -NTSTATUS CallUSBD(IN PDEVICE_OBJECT DeviceObject, IN PURB Urb) +NTSTATUS NTAPI CallUSBD(IN PDEVICE_OBJECT DeviceObject, IN PURB Urb) { PIRP irp; KEVENT event; @@ -749,7 +749,7 @@ } -NTSTATUS HandleQueryStopDevice(IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp) +NTSTATUS NTAPI HandleQueryStopDevice(IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp) { KIRQL oldIrql; NTSTATUS ntStatus; @@ -788,7 +788,7 @@ } -NTSTATUS HandleCancelStopDevice(IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp) +NTSTATUS NTAPI HandleCancelStopDevice(IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp) { KIRQL oldIrql; KEVENT event; @@ -856,7 +856,7 @@ } -NTSTATUS HandleStopDevice(IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp) +NTSTATUS NTAPI HandleStopDevice(IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp) { KIRQL oldIrql; NTSTATUS ntStatus; @@ -928,7 +928,7 @@ } -NTSTATUS HandleQueryRemoveDevice(IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp) +NTSTATUS NTAPI HandleQueryRemoveDevice(IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp) { KIRQL oldIrql; NTSTATUS ntStatus; @@ -969,7 +969,7 @@ } -NTSTATUS HandleCancelRemoveDevice(IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp) +NTSTATUS NTAPI HandleCancelRemoveDevice(IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp) { KIRQL oldIrql; KEVENT event; @@ -1038,7 +1038,7 @@ } -NTSTATUS HandleSurpriseRemoval(IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp) +NTSTATUS NTAPI HandleSurpriseRemoval(IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp) { KIRQL oldIrql; NTSTATUS ntStatus; @@ -1109,7 +1109,7 @@ } -NTSTATUS HandleRemoveDevice(IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp) +NTSTATUS NTAPI HandleRemoveDevice(IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp) { KIRQL oldIrql; //KEVENT event; @@ -1215,7 +1215,7 @@ } -NTSTATUS HandleQueryCapabilities(IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp) +NTSTATUS NTAPI HandleQueryCapabilities(IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp) { ULONG i; KEVENT event; @@ -1295,7 +1295,7 @@ } -VOID DpcRoutine(IN PKDPC Dpc, IN PVOID DeferredContext, IN PVOID SystemArgument1, IN PVOID SystemArgument2) +VOID NTAPI DpcRoutine(IN PKDPC Dpc, IN PVOID DeferredContext, IN PVOID SystemArgument1, IN PVOID SystemArgument2) /*++ DPC routine triggered by the timer to check the idle state @@ -1349,7 +1349,7 @@ } -VOID IdleRequestWorkerRoutine(IN PDEVICE_OBJECT DeviceObject, IN PVOID Context) +VOID NTAPI IdleRequestWorkerRoutine(IN PDEVICE_OBJECT DeviceObject, IN PVOID Context) { //PIRP irp; NTSTATUS ntStatus; @@ -1388,7 +1388,7 @@ } -VOID ProcessQueuedRequests(IN OUT PDEVICE_EXTENSION DeviceExtension) +VOID NTAPI ProcessQueuedRequests(IN OUT PDEVICE_EXTENSION DeviceExtension) /*++ Routine Description: @@ -1514,7 +1514,7 @@ } -NTSTATUS FreeBT_GetRegistryDword(IN PWCHAR RegPath, IN PWCHAR ValueName, IN OUT PULONG Value) +NTSTATUS NTAPI FreeBT_GetRegistryDword(IN PWCHAR RegPath, IN PWCHAR ValueName, IN OUT PULONG Value) { ULONG defaultData; WCHAR buffer[MAXIMUM_FILENAME_LENGTH]; @@ -1562,7 +1562,7 @@ } -NTSTATUS FreeBT_DispatchClean(IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp) +NTSTATUS NTAPI FreeBT_DispatchClean(IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp) { PDEVICE_EXTENSION deviceExtension; KIRQL oldIrql; @@ -1637,7 +1637,7 @@ } -BOOLEAN CanDeviceSuspend(IN PDEVICE_EXTENSION DeviceExtension) +BOOLEAN NTAPI CanDeviceSuspend(IN PDEVICE_EXTENSION DeviceExtension) { FreeBT_DbgPrint(3, ("FBTUSB: CanDeviceSuspend: Entered\n")); @@ -1648,7 +1648,7 @@ } -NTSTATUS FreeBT_AbortPipes(IN PDEVICE_OBJECT DeviceObject) +NTSTATUS NTAPI FreeBT_AbortPipes(IN PDEVICE_OBJECT DeviceObject) { PURB urb; ULONG i; @@ -1709,7 +1709,7 @@ } // Completion routine for PNP IRPs -NTSTATUS IrpCompletionRoutine(IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp, IN PVOID Context) +NTSTATUS NTAPI IrpCompletionRoutine(IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp, IN PVOID Context) { PKEVENT event = (PKEVENT) Context; KeSetEvent(event, 0, FALSE); @@ -1719,7 +1719,7 @@ } -LONG FreeBT_IoIncrement(IN OUT PDEVICE_EXTENSION DeviceExtension) +LONG NTAPI FreeBT_IoIncrement(IN OUT PDEVICE_EXTENSION DeviceExtension) { LONG result = 0; KIRQL oldIrql; @@ -1739,7 +1739,7 @@ } -LONG FreeBT_IoDecrement(IN OUT PDEVICE_EXTENSION DeviceExtension) +LONG NTAPI FreeBT_IoDecrement(IN OUT PDEVICE_EXTENSION DeviceExtension) { LONG result = 0; KIRQL oldIrql; @@ -1766,7 +1766,7 @@ } -NTSTATUS CanStopDevice(IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp) +NTSTATUS NTAPI CanStopDevice(IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp) { // For the time being, just allow it to be stopped UNREFERENCED_PARAMETER(DeviceObject); @@ -1776,7 +1776,7 @@ } -NTSTATUS CanRemoveDevice(IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp) +NTSTATUS NTAPI CanRemoveDevice(IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp) { // For the time being, just allow it to be removed @@ -1787,7 +1787,7 @@ } -NTSTATUS ReleaseMemory(IN PDEVICE_OBJECT DeviceObject) +NTSTATUS NTAPI ReleaseMemory(IN PDEVICE_OBJECT DeviceObject) { // Disconnect from the interrupt and unmap any I/O ports PDEVICE_EXTENSION deviceExtension; @@ -1828,7 +1828,7 @@ } -PCHAR PnPMinorFunctionString (UCHAR MinorFunction) +PCHAR NTAPI PnPMinorFunctionString (UCHAR MinorFunction) { switch (MinorFunction) { Modified: trunk/reactos/drivers/bluetooth/fbtusb/fbtpwr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bluetooth/fbtusb/f… ============================================================================== --- trunk/reactos/drivers/bluetooth/fbtusb/fbtpwr.c [iso-8859-1] (original) +++ trunk/reactos/drivers/bluetooth/fbtusb/fbtpwr.c [iso-8859-1] Sun Jul 29 02:29:12 2012 @@ -20,7 +20,7 @@ #include "fbtusr.h" // Handle power events -NTSTATUS FreeBT_DispatchPower(IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp) +NTSTATUS NTAPI FreeBT_DispatchPower(IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp) { NTSTATUS ntStatus = STATUS_SUCCESS; PIO_STACK_LOCATION irpStack; @@ -184,7 +184,7 @@ } -NTSTATUS HandleSystemQueryPower(IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp) +NTSTATUS NTAPI HandleSystemQueryPower(IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp) { NTSTATUS ntStatus; PDEVICE_EXTENSION deviceExtension; @@ -243,7 +243,7 @@ } -NTSTATUS HandleSystemSetPower(IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp ) +NTSTATUS NTAPI HandleSystemSetPower(IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp ) { NTSTATUS ntStatus; PDEVICE_EXTENSION deviceExtension; @@ -277,7 +277,7 @@ } -NTSTATUS HandleDeviceQueryPower(PDEVICE_OBJECT DeviceObject, PIRP Irp) +NTSTATUS NTAPI HandleDeviceQueryPower(PDEVICE_OBJECT DeviceObject, PIRP Irp) { NTSTATUS ntStatus; PDEVICE_EXTENSION deviceExtension; @@ -354,7 +354,7 @@ } -NTSTATUS SysPoCompletionRoutine(IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp, IN PDEVICE_EXTENSION DeviceExtension) +NTSTATUS NTAPI SysPoCompletionRoutine(IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp, IN PDEVICE_EXTENSION DeviceExtension) { NTSTATUS ntStatus; PIO_STACK_LOCATION irpStack; @@ -391,7 +391,7 @@ } -VOID SendDeviceIrp(IN PDEVICE_OBJECT DeviceObject, IN PIRP SIrp ) +VOID NTAPI SendDeviceIrp(IN PDEVICE_OBJECT DeviceObject, IN PIRP SIrp ) { NTSTATUS ntStatus; POWER_STATE powState; @@ -460,7 +460,7 @@ } -VOID DevPoCompletionRoutine( +VOID NTAPI DevPoCompletionRoutine( IN PDEVICE_OBJECT DeviceObject, IN UCHAR MinorFunction, IN POWER_STATE PowerState, @@ -492,7 +492,7 @@ } -NTSTATUS HandleDeviceSetPower(IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp) +NTSTATUS NTAPI HandleDeviceSetPower(IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp) { KIRQL oldIrql; NTSTATUS ntStatus; @@ -609,7 +609,7 @@ } -NTSTATUS FinishDevPoUpIrp(IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp, IN PDEVICE_EXTENSION DeviceExtension) +NTSTATUS NTAPI FinishDevPoUpIrp(IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp, IN PDEVICE_EXTENSION DeviceExtension) { NTSTATUS ntStatus; @@ -641,7 +641,7 @@ } -NTSTATUS SetDeviceFunctional(IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp, IN PDEVICE_EXTENSION DeviceExtension) +NTSTATUS NTAPI SetDeviceFunctional(IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp, IN PDEVICE_EXTENSION DeviceExtension) { KIRQL oldIrql; NTSTATUS ntStatus; @@ -688,7 +688,7 @@ } -NTSTATUS FinishDevPoDnIrp(IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp, IN PDEVICE_EXTENSION DeviceExtension) +NTSTATUS NTAPI FinishDevPoDnIrp(IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp, IN PDEVICE_EXTENSION DeviceExtension) { NTSTATUS ntStatus; POWER_STATE newState; @@ -719,7 +719,7 @@ } -NTSTATUS HoldIoRequests(IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp) +NTSTATUS NTAPI HoldIoRequests(IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp) { NTSTATUS ntStatus; @@ -772,7 +772,7 @@ } -VOID HoldIoRequestsWorkerRoutine(IN PDEVICE_OBJECT DeviceObject, IN PVOID Context) +VOID NTAPI HoldIoRequestsWorkerRoutine(IN PDEVICE_OBJECT DeviceObject, IN PVOID Context) { PIRP irp; NTSTATUS ntStatus; @@ -827,7 +827,7 @@ } -NTSTATUS QueueRequest(IN OUT PDEVICE_EXTENSION DeviceExtension, IN PIRP Irp) +NTSTATUS NTAPI QueueRequest(IN OUT PDEVICE_EXTENSION DeviceExtension, IN PIRP Irp) { KIRQL oldIrql; NTSTATUS ntStatus; @@ -852,7 +852,7 @@ } -VOID CancelQueued(IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp) +VOID NTAPI CancelQueued(IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp) { PDEVICE_EXTENSION deviceExtension; KIRQL oldIrql; @@ -884,7 +884,7 @@ } -NTSTATUS IssueWaitWake(IN PDEVICE_EXTENSION DeviceExtension) +NTSTATUS NTAPI IssueWaitWake(IN PDEVICE_EXTENSION DeviceExtension) { POWER_STATE poState; NTSTATUS ntStatus; @@ -920,7 +920,7 @@ } -VOID CancelWaitWake(IN PDEVICE_EXTENSION DeviceExtension) +VOID NTAPI CancelWaitWake(IN PDEVICE_EXTENSION DeviceExtension) { PIRP Irp; @@ -945,7 +945,7 @@ } -NTSTATUS WaitWakeCompletionRoutine(IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp, IN PDEVICE_EXTENSION DeviceExtension) +NTSTATUS NTAPI WaitWakeCompletionRoutine(IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp, IN PDEVICE_EXTENSION DeviceExtension) { FreeBT_DbgPrint(3, ("FBTUSB: WaitWakeCompletionRoutine: Entered\n")); if(Irp->PendingReturned) @@ -982,7 +982,7 @@ } -VOID WaitWakeCallback( +VOID NTAPI WaitWakeCallback( IN PDEVICE_OBJECT DeviceObject, IN UCHAR MinorFunction, IN POWER_STATE PowerState, @@ -1038,7 +1038,7 @@ } -PCHAR PowerMinorFunctionString (IN UCHAR MinorFunction) +PCHAR NTAPI PowerMinorFunctionString (IN UCHAR MinorFunction) { switch (MinorFunction) { Modified: trunk/reactos/drivers/bluetooth/fbtusb/fbtrwr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bluetooth/fbtusb/f… ============================================================================== --- trunk/reactos/drivers/bluetooth/fbtusb/fbtrwr.c [iso-8859-1] (original) +++ trunk/reactos/drivers/bluetooth/fbtusb/fbtrwr.c [iso-8859-1] Sun Jul 29 02:29:12 2012 @@ -20,7 +20,7 @@ #include "fbtusr.h" // Read/Write handler -NTSTATUS FreeBT_DispatchRead(IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp) +NTSTATUS NTAPI FreeBT_DispatchRead(IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp) { PMDL mdl; PURB urb; @@ -204,7 +204,7 @@ } -NTSTATUS FreeBT_ReadCompletion(IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp, IN PVOID Context) +NTSTATUS NTAPI FreeBT_ReadCompletion(IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp, IN PVOID Context) { //ULONG stageLength; NTSTATUS ntStatus; @@ -250,7 +250,7 @@ } // Read/Write handler -NTSTATUS FreeBT_DispatchWrite(IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp) +NTSTATUS NTAPI FreeBT_DispatchWrite(IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp) { PMDL mdl; PURB urb; @@ -444,7 +444,7 @@ } -NTSTATUS FreeBT_WriteCompletion(IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp, IN PVOID Context) +NTSTATUS NTAPI FreeBT_WriteCompletion(IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp, IN PVOID Context) { ULONG stageLength; NTSTATUS ntStatus; Modified: trunk/reactos/drivers/bluetooth/fbtusb/fbtwmi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bluetooth/fbtusb/f… ============================================================================== --- trunk/reactos/drivers/bluetooth/fbtusb/fbtwmi.c [iso-8859-1] (original) +++ trunk/reactos/drivers/bluetooth/fbtusb/fbtwmi.c [iso-8859-1] Sun Jul 29 02:29:12 2012 @@ -34,7 +34,7 @@ }; -NTSTATUS FreeBT_WmiRegistration(IN OUT PDEVICE_EXTENSION DeviceExtension) +NTSTATUS NTAPI FreeBT_WmiRegistration(IN OUT PDEVICE_EXTENSION DeviceExtension) { NTSTATUS ntStatus; @@ -56,14 +56,14 @@ } -NTSTATUS FreeBT_WmiDeRegistration(IN OUT PDEVICE_EXTENSION DeviceExtension) +NTSTATUS NTAPI FreeBT_WmiDeRegistration(IN OUT PDEVICE_EXTENSION DeviceExtension) { PAGED_CODE(); return IoWMIRegistrationControl(DeviceExtension->FunctionalDeviceObject, WMIREG_ACTION_DEREGISTER); } -NTSTATUS FreeBT_DispatchSysCtrl(IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp) +NTSTATUS NTAPI FreeBT_DispatchSysCtrl(IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp) { PDEVICE_EXTENSION deviceExtension; SYSCTL_IRP_DISPOSITION disposition; @@ -144,7 +144,7 @@ } -NTSTATUS FreeBT_QueryWmiRegInfo( +NTSTATUS NTAPI FreeBT_QueryWmiRegInfo( IN PDEVICE_OBJECT DeviceObject, OUT ULONG *RegFlags, OUT PUNICODE_STRING InstanceName, @@ -214,7 +214,7 @@ } -NTSTATUS FreeBT_QueryWmiDataBlock( +NTSTATUS NTAPI FreeBT_QueryWmiDataBlock( IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp, IN ULONG GuidIndex, @@ -324,7 +324,7 @@ } -NTSTATUS FreeBT_SetWmiDataItem( +NTSTATUS NTAPI FreeBT_SetWmiDataItem( IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp, IN ULONG GuidIndex, @@ -424,7 +424,7 @@ } -NTSTATUS FreeBT_SetWmiDataBlock( +NTSTATUS NTAPI FreeBT_SetWmiDataBlock( IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp, IN ULONG GuidIndex, @@ -506,7 +506,7 @@ } -PCHAR WMIMinorFunctionString(UCHAR MinorFunction) +PCHAR NTAPI WMIMinorFunctionString(UCHAR MinorFunction) { switch (MinorFunction) { Modified: trunk/reactos/drivers/bluetooth/fbtusb/include/fbtdev.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bluetooth/fbtusb/i… ============================================================================== --- trunk/reactos/drivers/bluetooth/fbtusb/include/fbtdev.h [iso-8859-1] (original) +++ trunk/reactos/drivers/bluetooth/fbtusb/include/fbtdev.h [iso-8859-1] Sun Jul 29 02:29:12 2012 @@ -17,37 +17,37 @@ extern "C" { #endif -NTSTATUS FreeBT_DispatchCreate(IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp); -NTSTATUS FreeBT_DispatchClose(IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp); -NTSTATUS FreeBT_DispatchDevCtrl(IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp); -NTSTATUS FreeBT_ResetPipe(IN PDEVICE_OBJECT DeviceObject, IN USBD_PIPE_HANDLE PipeInfo); -NTSTATUS FreeBT_ResetDevice(IN PDEVICE_OBJECT DeviceObject); -NTSTATUS FreeBT_GetPortStatus(IN PDEVICE_OBJECT DeviceObject, IN PULONG PortStatus); -NTSTATUS FreeBT_ResetParentPort(IN IN PDEVICE_OBJECT DeviceObject); +NTSTATUS NTAPI FreeBT_DispatchCreate(IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp); +NTSTATUS NTAPI FreeBT_DispatchClose(IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp); +NTSTATUS NTAPI FreeBT_DispatchDevCtrl(IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp); +NTSTATUS NTAPI FreeBT_ResetPipe(IN PDEVICE_OBJECT DeviceObject, IN USBD_PIPE_HANDLE PipeInfo); +NTSTATUS NTAPI FreeBT_ResetDevice(IN PDEVICE_OBJECT DeviceObject); +NTSTATUS NTAPI FreeBT_GetPortStatus(IN PDEVICE_OBJECT DeviceObject, IN PULONG PortStatus); +NTSTATUS NTAPI FreeBT_ResetParentPort(IN IN PDEVICE_OBJECT DeviceObject); -NTSTATUS SubmitIdleRequestIrp(IN PDEVICE_EXTENSION DeviceExtension); -VOID IdleNotificationCallback(IN PDEVICE_EXTENSION DeviceExtension); -NTSTATUS IdleNotificationRequestComplete( +NTSTATUS NTAPI SubmitIdleRequestIrp(IN PDEVICE_EXTENSION DeviceExtension); +VOID NTAPI IdleNotificationCallback(IN PDEVICE_EXTENSION DeviceExtension); +NTSTATUS NTAPI IdleNotificationRequestComplete( IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp, IN PDEVICE_EXTENSION DeviceExtension); -VOID CancelSelectSuspend(IN PDEVICE_EXTENSION DeviceExtension); -VOID PoIrpCompletionFunc( +VOID NTAPI CancelSelectSuspend(IN PDEVICE_EXTENSION DeviceExtension); +VOID NTAPI PoIrpCompletionFunc( IN PDEVICE_OBJECT DeviceObject, IN UCHAR MinorFunction, IN POWER_STATE PowerState, IN PVOID Context, IN PIO_STATUS_BLOCK IoStatus); -VOID PoIrpAsyncCompletionFunc( +VOID NTAPI PoIrpAsyncCompletionFunc( IN PDEVICE_OBJECT DeviceObject, IN UCHAR MinorFunction, IN POWER_STATE PowerState, IN PVOID Context, IN PIO_STATUS_BLOCK IoStatus); -VOID WWIrpCompletionFunc( +VOID NTAPI WWIrpCompletionFunc( IN PDEVICE_OBJECT DeviceObject, IN UCHAR MinorFunction, IN POWER_STATE PowerState, Modified: trunk/reactos/drivers/bluetooth/fbtusb/include/fbtpnp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bluetooth/fbtusb/i… ============================================================================== --- trunk/reactos/drivers/bluetooth/fbtusb/include/fbtpnp.h [iso-8859-1] (original) +++ trunk/reactos/drivers/bluetooth/fbtusb/include/fbtpnp.h [iso-8859-1] Sun Jul 29 02:29:12 2012 @@ -19,40 +19,40 @@ extern "C" { #endif -NTSTATUS FreeBT_DispatchPnP(IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp); -NTSTATUS HandleStartDevice(IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp); -NTSTATUS HandleQueryStopDevice(IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp); -NTSTATUS HandleQueryRemoveDevice(IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp); -NTSTATUS HandleCancelRemoveDevice(IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp); -NTSTATUS HandleSurpriseRemoval(IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp); -NTSTATUS HandleRemoveDevice(IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp); -NTSTATUS HandleCancelStopDevice(IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp); -NTSTATUS HandleStopDevice(IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp); -NTSTATUS HandleQueryCapabilities(IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp); -NTSTATUS ReadandSelectDescriptors(IN PDEVICE_OBJECT DeviceObject); -NTSTATUS ConfigureDevice(IN PDEVICE_OBJECT DeviceObject); -NTSTATUS SelectInterfaces(IN PDEVICE_OBJECT DeviceObject, IN PUSB_CONFIGURATION_DESCRIPTOR ConfigurationDescriptor); -NTSTATUS DeconfigureDevice(IN PDEVICE_OBJECT DeviceObject); -NTSTATUS CallUSBD(IN PDEVICE_OBJECT DeviceObject, IN PURB Urb); -VOID ProcessQueuedRequests(IN OUT PDEVICE_EXTENSION DeviceExtension); -NTSTATUS FreeBT_GetRegistryDword(IN PWCHAR RegPath, IN PWCHAR ValueName, IN OUT PULONG Value); -NTSTATUS FreeBT_DispatchClean(IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp); -VOID DpcRoutine( +NTSTATUS NTAPI FreeBT_DispatchPnP(IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp); +NTSTATUS NTAPI HandleStartDevice(IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp); +NTSTATUS NTAPI HandleQueryStopDevice(IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp); +NTSTATUS NTAPI HandleQueryRemoveDevice(IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp); +NTSTATUS NTAPI HandleCancelRemoveDevice(IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp); +NTSTATUS NTAPI HandleSurpriseRemoval(IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp); +NTSTATUS NTAPI HandleRemoveDevice(IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp); +NTSTATUS NTAPI HandleCancelStopDevice(IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp); +NTSTATUS NTAPI HandleStopDevice(IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp); +NTSTATUS NTAPI HandleQueryCapabilities(IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp); +NTSTATUS NTAPI ReadandSelectDescriptors(IN PDEVICE_OBJECT DeviceObject); +NTSTATUS NTAPI ConfigureDevice(IN PDEVICE_OBJECT DeviceObject); +NTSTATUS NTAPI SelectInterfaces(IN PDEVICE_OBJECT DeviceObject, IN PUSB_CONFIGURATION_DESCRIPTOR ConfigurationDescriptor); +NTSTATUS NTAPI DeconfigureDevice(IN PDEVICE_OBJECT DeviceObject); +NTSTATUS NTAPI CallUSBD(IN PDEVICE_OBJECT DeviceObject, IN PURB Urb); +VOID NTAPI ProcessQueuedRequests(IN OUT PDEVICE_EXTENSION DeviceExtension); +NTSTATUS NTAPI FreeBT_GetRegistryDword(IN PWCHAR RegPath, IN PWCHAR ValueName, IN OUT PULONG Value); +NTSTATUS NTAPI FreeBT_DispatchClean(IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp); +VOID NTAPI DpcRoutine( IN PKDPC Dpc, IN PVOID DeferredContext, IN PVOID SystemArgument1, IN PVOID SystemArgument2); -VOID IdleRequestWorkerRoutine(IN PDEVICE_OBJECT DeviceObject, IN PVOID Context); -NTSTATUS FreeBT_AbortPipes(IN PDEVICE_OBJECT DeviceObject); -NTSTATUS IrpCompletionRoutine(IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp, IN PVOID Context); -NTSTATUS CanStopDevice(IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp); -NTSTATUS CanRemoveDevice(IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp); -NTSTATUS ReleaseMemory(IN PDEVICE_OBJECT DeviceObject); -LONG FreeBT_IoIncrement(IN OUT PDEVICE_EXTENSION DeviceExtension); -LONG FreeBT_IoDecrement(IN OUT PDEVICE_EXTENSION DeviceExtension); -BOOLEAN CanDeviceSuspend(IN PDEVICE_EXTENSION DeviceExtension); -PCHAR PnPMinorFunctionString (IN UCHAR MinorFunction); +VOID NTAPI IdleRequestWorkerRoutine(IN PDEVICE_OBJECT DeviceObject, IN PVOID Context); +NTSTATUS NTAPI FreeBT_AbortPipes(IN PDEVICE_OBJECT DeviceObject); +NTSTATUS NTAPI IrpCompletionRoutine(IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp, IN PVOID Context); +NTSTATUS NTAPI CanStopDevice(IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp); +NTSTATUS NTAPI CanRemoveDevice(IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp); +NTSTATUS NTAPI ReleaseMemory(IN PDEVICE_OBJECT DeviceObject); +LONG NTAPI FreeBT_IoIncrement(IN OUT PDEVICE_EXTENSION DeviceExtension); +LONG NTAPI FreeBT_IoDecrement(IN OUT PDEVICE_EXTENSION DeviceExtension); +BOOLEAN NTAPI CanDeviceSuspend(IN PDEVICE_EXTENSION DeviceExtension); +PCHAR NTAPI PnPMinorFunctionString (IN UCHAR MinorFunction); #ifdef __cplusplus }; Modified: trunk/reactos/drivers/bluetooth/fbtusb/include/fbtpwr.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bluetooth/fbtusb/i… ============================================================================== --- trunk/reactos/drivers/bluetooth/fbtusb/include/fbtpwr.h [iso-8859-1] (original) +++ trunk/reactos/drivers/bluetooth/fbtusb/include/fbtpwr.h [iso-8859-1] Sun Jul 29 02:29:12 2012 @@ -32,13 +32,13 @@ extern "C" { #endif -NTSTATUS FreeBT_DispatchPower(IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp); -NTSTATUS HandleSystemQueryPower(IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp); -NTSTATUS HandleSystemSetPower(IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp); -NTSTATUS HandleDeviceQueryPower(PDEVICE_OBJECT DeviceObject, PIRP Irp); -NTSTATUS SysPoCompletionRoutine(IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp, IN PDEVICE_EXTENSION DeviceExtension); -VOID SendDeviceIrp(IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp); -VOID DevPoCompletionRoutine( +NTSTATUS NTAPI FreeBT_DispatchPower(IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp); +NTSTATUS NTAPI HandleSystemQueryPower(IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp); +NTSTATUS NTAPI HandleSystemSetPower(IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp); +NTSTATUS NTAPI HandleDeviceQueryPower(PDEVICE_OBJECT DeviceObject, PIRP Irp); +NTSTATUS NTAPI SysPoCompletionRoutine(IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp, IN PDEVICE_EXTENSION DeviceExtension); +VOID NTAPI SendDeviceIrp(IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp); +VOID NTAPI DevPoCompletionRoutine( IN PDEVICE_OBJECT DeviceObject, IN UCHAR MinorFunction, IN POWER_STATE PowerState, @@ -46,18 +46,18 @@ IN PIO_STATUS_BLOCK IoStatus ); -NTSTATUS HandleDeviceSetPower(IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp); -NTSTATUS FinishDevPoUpIrp(IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp, IN PDEVICE_EXTENSION DeviceExtension); -NTSTATUS SetDeviceFunctional(IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp, IN PDEVICE_EXTENSION DeviceExtension); -NTSTATUS FinishDevPoDnIrp(IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp, IN PDEVICE_EXTENSION DeviceExtension); -NTSTATUS HoldIoRequests(IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp); -VOID HoldIoRequestsWorkerRoutine(IN PDEVICE_OBJECT DeviceObject, IN PVOID Context); -NTSTATUS QueueRequest(IN OUT PDEVICE_EXTENSION DeviceExtension, IN PIRP Irp); -VOID CancelQueued(IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp); -NTSTATUS WaitWakeCompletionRoutine(IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp, IN PDEVICE_EXTENSION DeviceExtension); -NTSTATUS IssueWaitWake(IN PDEVICE_EXTENSION DeviceExtension); -VOID CancelWaitWake(IN PDEVICE_EXTENSION DeviceExtension); -VOID WaitWakeCallback( +NTSTATUS NTAPI HandleDeviceSetPower(IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp); +NTSTATUS NTAPI FinishDevPoUpIrp(IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp, IN PDEVICE_EXTENSION DeviceExtension); +NTSTATUS NTAPI SetDeviceFunctional(IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp, IN PDEVICE_EXTENSION DeviceExtension); +NTSTATUS NTAPI FinishDevPoDnIrp(IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp, IN PDEVICE_EXTENSION DeviceExtension); +NTSTATUS NTAPI HoldIoRequests(IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp); +VOID NTAPI HoldIoRequestsWorkerRoutine(IN PDEVICE_OBJECT DeviceObject, IN PVOID Context); +NTSTATUS NTAPI QueueRequest(IN OUT PDEVICE_EXTENSION DeviceExtension, IN PIRP Irp); +VOID NTAPI CancelQueued(IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp); +NTSTATUS NTAPI WaitWakeCompletionRoutine(IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp, IN PDEVICE_EXTENSION DeviceExtension); +NTSTATUS NTAPI IssueWaitWake(IN PDEVICE_EXTENSION DeviceExtension); +VOID NTAPI CancelWaitWake(IN PDEVICE_EXTENSION DeviceExtension); +VOID NTAPI WaitWakeCallback( IN PDEVICE_OBJECT DeviceObject, IN UCHAR MinorFunction, IN POWER_STATE PowerState, @@ -65,7 +65,7 @@ IN PIO_STATUS_BLOCK IoStatus ); -PCHAR PowerMinorFunctionString(IN UCHAR MinorFunction); +PCHAR NTAPI PowerMinorFunctionString(IN UCHAR MinorFunction); #ifdef __cplusplus }; Modified: trunk/reactos/drivers/bluetooth/fbtusb/include/fbtrwr.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bluetooth/fbtusb/i… ============================================================================== --- trunk/reactos/drivers/bluetooth/fbtusb/include/fbtrwr.h [iso-8859-1] (original) +++ trunk/reactos/drivers/bluetooth/fbtusb/include/fbtrwr.h [iso-8859-1] Sun Jul 29 02:29:12 2012 @@ -27,10 +27,10 @@ } FREEBT_RW_CONTEXT, * PFREEBT_RW_CONTEXT; -NTSTATUS FreeBT_DispatchRead(IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp); -NTSTATUS FreeBT_ReadCompletion(IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp, IN PVOID Context); -NTSTATUS FreeBT_DispatchWrite(IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp); -NTSTATUS FreeBT_WriteCompletion(IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp, IN PVOID Context); +NTSTATUS NTAPI FreeBT_DispatchRead(IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp); +NTSTATUS NTAPI FreeBT_ReadCompletion(IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp, IN PVOID Context); +NTSTATUS NTAPI FreeBT_DispatchWrite(IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp); +NTSTATUS NTAPI FreeBT_WriteCompletion(IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp, IN PVOID Context); #ifdef __cplusplus }; Modified: trunk/reactos/drivers/bluetooth/fbtusb/include/fbtwmi.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bluetooth/fbtusb/i… ============================================================================== --- trunk/reactos/drivers/bluetooth/fbtusb/include/fbtwmi.h [iso-8859-1] (original) +++ trunk/reactos/drivers/bluetooth/fbtusb/include/fbtwmi.h [iso-8859-1] Sun Jul 29 02:29:12 2012 @@ -15,10 +15,10 @@ //#define ENABLE_WMI -NTSTATUS FreeBT_WmiRegistration(IN OUT PDEVICE_EXTENSION DeviceExtension); -NTSTATUS FreeBT_WmiDeRegistration(IN OUT PDEVICE_EXTENSION DeviceExtension); -NTSTATUS FreeBT_DispatchSysCtrl(IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp); -NTSTATUS FreeBT_QueryWmiRegInfo( +NTSTATUS NTAPI FreeBT_WmiRegistration(IN OUT PDEVICE_EXTENSION DeviceExtension); +NTSTATUS NTAPI FreeBT_WmiDeRegistration(IN OUT PDEVICE_EXTENSION DeviceExtension); +NTSTATUS NTAPI FreeBT_DispatchSysCtrl(IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp); +NTSTATUS NTAPI FreeBT_QueryWmiRegInfo( IN PDEVICE_OBJECT DeviceObject, OUT ULONG *RegFlags, OUT PUNICODE_STRING InstanceName, @@ -26,7 +26,7 @@ OUT PUNICODE_STRING MofResourceName, OUT PDEVICE_OBJECT *Pdo); -NTSTATUS FreeBT_SetWmiDataItem( +NTSTATUS NTAPI FreeBT_SetWmiDataItem( IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp, IN ULONG GuidIndex, @@ -35,7 +35,7 @@ IN ULONG BufferSize, IN PUCHAR Buffer); -NTSTATUS FreeBT_SetWmiDataBlock( +NTSTATUS NTAPI FreeBT_SetWmiDataBlock( IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp, IN ULONG GuidIndex, @@ -43,7 +43,7 @@ IN ULONG BufferSize, IN PUCHAR Buffer); -NTSTATUS FreeBT_QueryWmiDataBlock( +NTSTATUS NTAPI FreeBT_QueryWmiDataBlock( IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp, IN ULONG GuidIndex, @@ -53,6 +53,6 @@ IN ULONG OutBufferSize, OUT PUCHAR Buffer); -PCHAR WMIMinorFunctionString(UCHAR MinorFunction); +PCHAR NTAPI WMIMinorFunctionString(UCHAR MinorFunction); #endif

1 0

[akhaldi] 56975: [CLASSPNP] * Fix some more warnings.
by akhaldi＠svn.reactos.org 29 Jul '12

29 Jul '12

Author: akhaldi Date: Sun Jul 29 02:14:52 2012 New Revision: 56975 URL: http://svn.reactos.org/svn/reactos?rev=56975&view=rev Log: [CLASSPNP] * Fix some more warnings. Modified: trunk/reactos/drivers/storage/classpnp/class.c trunk/reactos/drivers/storage/classpnp/classwmi.c trunk/reactos/drivers/storage/classpnp/obsolete.c trunk/reactos/drivers/storage/classpnp/power.c trunk/reactos/drivers/storage/classpnp/utils.c trunk/reactos/drivers/storage/classpnp/xferpkt.c Modified: trunk/reactos/drivers/storage/classpnp/class.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/classpnp/c… ============================================================================== --- trunk/reactos/drivers/storage/classpnp/class.c [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/classpnp/class.c [iso-8859-1] Sun Jul 29 02:14:52 2012 @@ -425,7 +425,7 @@ ) { PCLASS_DRIVER_EXTENSION driverExtension; - NTSTATUS status; + //NTSTATUS status; PAGED_CODE(); @@ -2658,7 +2658,7 @@ PFUNCTIONAL_DEVICE_EXTENSION fdoExtension = Fdo->DeviceExtension; PCLASS_PRIVATE_FDO_DATA fdoData = fdoExtension->PrivateFdoData; IO_STATUS_BLOCK ioStatus; - ULONG controlType; + //ULONG controlType; PIRP irp; PIO_STACK_LOCATION irpStack; KEVENT event; Modified: trunk/reactos/drivers/storage/classpnp/classwmi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/classpnp/c… ============================================================================== --- trunk/reactos/drivers/storage/classpnp/classwmi.c [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/classpnp/classwmi.c [iso-8859-1] Sun Jul 29 02:14:52 2012 @@ -227,7 +227,7 @@ PGUIDREGINFO guidList; PWMIREGINFOW wmiRegInfo; PWMIREGGUIDW wmiRegGuid; - PDEVICE_OBJECT pdo; + //PDEVICE_OBJECT pdo; PUNICODE_STRING regPath; PWCHAR stringPtr; ULONG retSize; Modified: trunk/reactos/drivers/storage/classpnp/obsolete.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/classpnp/o… ============================================================================== --- trunk/reactos/drivers/storage/classpnp/obsolete.c [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/classpnp/obsolete.c [iso-8859-1] Sun Jul 29 02:14:52 2012 @@ -849,8 +849,8 @@ { PCLASS_PRIVATE_FDO_DATA privateData = FdoExtension->PrivateFdoData; PCOMMON_DEVICE_EXTENSION commonExt = &FdoExtension->CommonExtension; - KIRQL oldIrql; - PIRP blockedIrp; + //KIRQL oldIrql; + //PIRP blockedIrp; // This function is obsolete, but still called by DISK.SYS . // DBGWARN(("ClassFreeOrReuseSrb is OBSOLETE !")); Modified: trunk/reactos/drivers/storage/classpnp/power.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/classpnp/p… ============================================================================== --- trunk/reactos/drivers/storage/classpnp/power.c [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/classpnp/power.c [iso-8859-1] Sun Jul 29 02:14:52 2012 @@ -100,7 +100,7 @@ // don't do anything that would break under either circumstance. // - NTSTATUS status; + //NTSTATUS status; isRemoved = ClassAcquireRemoveLock(DeviceObject, Irp); Modified: trunk/reactos/drivers/storage/classpnp/utils.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/classpnp/u… ============================================================================== --- trunk/reactos/drivers/storage/classpnp/utils.c [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/classpnp/utils.c [iso-8859-1] Sun Jul 29 02:14:52 2012 @@ -221,7 +221,7 @@ PUCHAR productId; PUCHAR productRevision; UCHAR nullString[] = ""; - ULONG j; + //ULONG j; PAGED_CODE(); ASSERT(DeviceList); Modified: trunk/reactos/drivers/storage/classpnp/xferpkt.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/classpnp/x… ============================================================================== --- trunk/reactos/drivers/storage/classpnp/xferpkt.c [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/classpnp/xferpkt.c [iso-8859-1] Sun Jul 29 02:14:52 2012 @@ -326,7 +326,7 @@ PCLASS_PRIVATE_FDO_DATA fdoData = fdoExt->PrivateFdoData; PTRANSFER_PACKET pkt; PSINGLE_LIST_ENTRY slistEntry; - KIRQL oldIrql; + //KIRQL oldIrql; slistEntry = InterlockedPopEntrySList(&fdoData->FreeTransferPacketsList); if (slistEntry){

1 0

[akhaldi] 56974: [DISK_NEW] * Explicitly mark the functions as stdcall. * Fix some warnings.
by akhaldi＠svn.reactos.org 29 Jul '12

29 Jul '12

Author: akhaldi Date: Sun Jul 29 02:05:26 2012 New Revision: 56974 URL: http://svn.reactos.org/svn/reactos?rev=56974&view=rev Log: [DISK_NEW] * Explicitly mark the functions as stdcall. * Fix some warnings. Modified: trunk/reactos/drivers/storage/class/disk_new/CMakeLists.txt trunk/reactos/drivers/storage/class/disk_new/disk.c trunk/reactos/drivers/storage/class/disk_new/disk.h trunk/reactos/drivers/storage/class/disk_new/diskwmi.c trunk/reactos/drivers/storage/class/disk_new/enum.c trunk/reactos/drivers/storage/class/disk_new/geometry.c trunk/reactos/drivers/storage/class/disk_new/part.c trunk/reactos/drivers/storage/class/disk_new/pnp.c Modified: trunk/reactos/drivers/storage/class/disk_new/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/class/disk… ============================================================================== --- trunk/reactos/drivers/storage/class/disk_new/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/class/disk_new/CMakeLists.txt [iso-8859-1] Sun Jul 29 02:05:26 2012 @@ -16,13 +16,9 @@ target_link_libraries(disk_new libcntpr wdmguid) if(ARCH MATCHES i386) # FIXME: http://www.cmake.org/Bug/view.php?id=12998 - if(MSVC) - #add_target_compile_flags(disk_new "/Gz") - set_source_files_properties(${SOURCE} PROPERTIES COMPILE_FLAGS "/Gz") - else() - - #add_target_compile_flags(disk_new "-mrtd -fno-builtin -Wno-unused-variable -Wno-pointer-sign") - set_source_files_properties(${SOURCE} PROPERTIES COMPILE_FLAGS "-mrtd -fno-builtin -Wno-unused-variable -Wno-pointer-sign") + if(NOT MSVC) + #add_target_compile_flags(disk_new "-Wno-format -Wno-pointer-sign") + set_source_files_properties(${SOURCE} PROPERTIES COMPILE_FLAGS "-Wno-format -Wno-pointer-sign") endif() endif() Modified: trunk/reactos/drivers/storage/class/disk_new/disk.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/class/disk… ============================================================================== --- trunk/reactos/drivers/storage/class/disk_new/disk.c [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/class/disk_new/disk.c [iso-8859-1] Sun Jul 29 02:05:26 2012 @@ -31,6 +31,7 @@ #include "ioevent.h" NTSTATUS +NTAPI DiskDetermineMediaTypes( IN PDEVICE_OBJECT Fdo, IN PIRP Irp, @@ -41,18 +42,21 @@ ); PPARTITION_INFORMATION_EX +NTAPI DiskPdoFindPartitionEntry( IN PPHYSICAL_DEVICE_EXTENSION Pdo, IN PDRIVE_LAYOUT_INFORMATION_EX LayoutInfo ); PPARTITION_INFORMATION_EX +NTAPI DiskFindAdjacentPartition( IN PDRIVE_LAYOUT_INFORMATION_EX LayoutInfo, IN PPARTITION_INFORMATION_EX BasePartition ); PPARTITION_INFORMATION_EX +NTAPI DiskFindContainingPartition( IN PDRIVE_LAYOUT_INFORMATION_EX LayoutInfo, IN PPARTITION_INFORMATION_EX BasePartition, @@ -60,72 +64,84 @@ ); NTSTATUS +NTAPI DiskIoctlCreateDisk( IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp ); NTSTATUS +NTAPI DiskIoctlGetDriveLayout( IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp ); NTSTATUS +NTAPI DiskIoctlGetDriveLayoutEx( IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp ); NTSTATUS +NTAPI DiskIoctlSetDriveLayout( IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp ); NTSTATUS +NTAPI DiskIoctlSetDriveLayoutEx( IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp ); NTSTATUS +NTAPI DiskIoctlGetPartitionInfo( IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp ); NTSTATUS +NTAPI DiskIoctlGetPartitionInfoEx( IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp ); NTSTATUS +NTAPI DiskIoctlGetLengthInfo( IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp ); NTSTATUS +NTAPI DiskIoctlSetPartitionInfo( IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp ); NTSTATUS +NTAPI DiskIoctlSetPartitionInfoEx( IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp ); NTSTATUS +NTAPI DiskIoctlSetPartitionInfoEx( IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp ); NTSTATUS +NTAPI DiskIoctlGetDriveGeometryEx( IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp @@ -171,7 +187,6 @@ #define DiskCompareGuid(_First,_Second) \ (memcmp ((_First),(_Second), sizeof (GUID))) - NTSTATUS NTAPI DriverEntry( @@ -342,8 +357,8 @@ } // end DriverEntry() - VOID +NTAPI DiskUnload( IN PDRIVER_OBJECT DriverObject ) @@ -356,8 +371,8 @@ return; } - NTSTATUS +NTAPI DiskCreateFdo( IN PDRIVER_OBJECT DriverObject, IN PDEVICE_OBJECT PhysicalDeviceObject, @@ -393,8 +408,8 @@ { CCHAR ntNameBuffer[MAXIMUM_FILENAME_LENGTH]; - STRING ntNameString; - UNICODE_STRING ntUnicodeString; + //STRING ntNameString; + //UNICODE_STRING ntUnicodeString; PUCHAR deviceName = NULL; @@ -407,8 +422,8 @@ PDEVICE_OBJECT deviceObject = NULL; PFUNCTIONAL_DEVICE_EXTENSION fdoExtension; - STORAGE_PROPERTY_ID propertyId; - PSTORAGE_DEVICE_DESCRIPTOR deviceDescriptor; + //STORAGE_PROPERTY_ID propertyId; + //PSTORAGE_DEVICE_DESCRIPTOR deviceDescriptor; PAGED_CODE(); @@ -628,8 +643,8 @@ return(status); } - NTSTATUS +NTAPI DiskReadWriteVerification( IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp @@ -742,9 +757,8 @@ } // end DiskReadWrite() - - NTSTATUS +NTAPI DiskDetermineMediaTypes( IN PDEVICE_OBJECT Fdo, IN PIRP Irp, @@ -777,8 +791,8 @@ { PFUNCTIONAL_DEVICE_EXTENSION fdoExtension = Fdo->DeviceExtension; - PPHYSICAL_DEVICE_EXTENSION pdoExtension = Fdo->DeviceExtension; - PCOMMON_DEVICE_EXTENSION commonExtension = Fdo->DeviceExtension; + //PPHYSICAL_DEVICE_EXTENSION pdoExtension = Fdo->DeviceExtension; + //PCOMMON_DEVICE_EXTENSION commonExtension = Fdo->DeviceExtension; PIO_STACK_LOCATION irpStack = IoGetCurrentIrpStackLocation(Irp); PGET_MEDIA_TYPES mediaTypes = Irp->AssociatedIrp.SystemBuffer; @@ -1008,8 +1022,8 @@ } - NTSTATUS +NTAPI DiskDeviceControl( PDEVICE_OBJECT DeviceObject, PIRP Irp @@ -1041,7 +1055,7 @@ { PFUNCTIONAL_DEVICE_EXTENSION fdoExtension = DeviceObject->DeviceExtension; - PPHYSICAL_DEVICE_EXTENSION pdoExtension = DeviceObject->DeviceExtension; + //PPHYSICAL_DEVICE_EXTENSION pdoExtension = DeviceObject->DeviceExtension; PCOMMON_DEVICE_EXTENSION commonExtension = DeviceObject->DeviceExtension; PIO_STACK_LOCATION irpStack = IoGetCurrentIrpStackLocation(Irp); @@ -2772,7 +2786,7 @@ PDRIVE_LAYOUT_INFORMATION_EX layoutInfo; PPARTITION_INFORMATION_EX pdoPartition; PPARTITION_INFORMATION_EX containerPartition; - ULONG partitionIndex; + //ULONG partitionIndex; DebugPrint((2, "IOCTL_DISK_GROW_PARTITION to device %p through " "irp %p\n", @@ -2940,16 +2954,16 @@ sibling = commonExtension->ChildList; while(sibling != NULL) { - LARGE_INTEGER sibStoppingOffset; + //LARGE_INTEGER sibStoppingOffset; PCOMMON_DEVICE_EXTENSION siblingExtension; siblingExtension = &(sibling->CommonExtension); ASSERT( siblingExtension ); - sibStoppingOffset.QuadPart = + /* sibStoppingOffset.QuadPart = (siblingExtension->StartingOffset.QuadPart + - siblingExtension->PartitionLength.QuadPart - 1); + siblingExtension->PartitionLength.QuadPart - 1); */ // // Only check the siblings that start beyond the new partition @@ -3267,8 +3281,8 @@ } // end DiskDeviceControl() - NTSTATUS +NTAPI DiskShutdownFlush ( IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp @@ -3457,8 +3471,8 @@ return STATUS_PENDING; } // end DiskShutdown() - NTSTATUS +NTAPI DiskModeSelect( IN PDEVICE_OBJECT Fdo, IN PCHAR ModeSelectBuffer, @@ -3595,11 +3609,11 @@ return status; } // end DiskModeSelect() - // // This routine is structured as a work-item routine // VOID +NTAPI DisableWriteCache( IN PDEVICE_OBJECT Fdo, IN PIO_WORKITEM WorkItem @@ -3667,11 +3681,11 @@ IoFreeWorkItem(WorkItem); } - // // This routine is structured as a work-item routine // VOID +NTAPI DiskIoctlVerify( IN PDEVICE_OBJECT Fdo, IN PDISK_VERIFY_WORKITEM_CONTEXT Context @@ -3785,9 +3799,8 @@ ExFreePool(Context); } - - VOID +NTAPI DiskFdoProcessError( PDEVICE_OBJECT Fdo, PSCSI_REQUEST_BLOCK Srb, @@ -3992,8 +4005,8 @@ return; } - VOID +NTAPI DiskSetSpecialHacks( IN PFUNCTIONAL_DEVICE_EXTENSION FdoExtension, IN ULONG_PTR Data @@ -4095,8 +4108,8 @@ return; } - VOID +NTAPI DiskScanRegistryForSpecial( IN PFUNCTIONAL_DEVICE_EXTENSION FdoExtension ) @@ -4145,8 +4158,8 @@ } } - VOID +NTAPI ResetBus( IN PDEVICE_OBJECT Fdo ) @@ -4255,8 +4268,8 @@ } // end ResetBus() - NTSTATUS +NTAPI DiskQueryPnpCapabilities( IN PDEVICE_OBJECT DeviceObject, IN PDEVICE_CAPABILITIES Capabilities @@ -4264,7 +4277,7 @@ { PCOMMON_DEVICE_EXTENSION commonExtension = DeviceObject->DeviceExtension; - PDISK_DATA diskData = commonExtension->DriverData; + //PDISK_DATA diskData = commonExtension->DriverData; PAGED_CODE(); @@ -4275,8 +4288,7 @@ return STATUS_NOT_IMPLEMENTED; } else { - PPHYSICAL_DEVICE_EXTENSION physicalExtension = - DeviceObject->DeviceExtension; + //PPHYSICAL_DEVICE_EXTENSION physicalExtension = DeviceObject->DeviceExtension; Capabilities->SilentInstall = 1; Capabilities->RawDeviceOK = 1; @@ -4298,8 +4310,8 @@ return STATUS_SUCCESS; } - NTSTATUS +NTAPI DiskGetCacheInformation( IN PFUNCTIONAL_DEVICE_EXTENSION FdoExtension, IN PDISK_CACHE_INFORMATION CacheInfo @@ -4311,7 +4323,7 @@ ULONG length; - NTSTATUS status; + //NTSTATUS status; PAGED_CODE(); @@ -4416,8 +4428,8 @@ return STATUS_SUCCESS; } - NTSTATUS +NTAPI DiskSetCacheInformation( IN PFUNCTIONAL_DEVICE_EXTENSION FdoExtension, IN PDISK_CACHE_INFORMATION CacheInfo @@ -4615,8 +4627,8 @@ return status; } - PPARTITION_INFORMATION_EX +NTAPI DiskPdoFindPartitionEntry( IN PPHYSICAL_DEVICE_EXTENSION Pdo, IN PDRIVE_LAYOUT_INFORMATION_EX LayoutInfo @@ -4679,8 +4691,8 @@ return NULL; } - PPARTITION_INFORMATION_EX +NTAPI DiskFindAdjacentPartition( IN PDRIVE_LAYOUT_INFORMATION_EX LayoutInfo, IN PPARTITION_INFORMATION_EX BasePartition @@ -4751,8 +4763,8 @@ return adjacentPartition; } - PPARTITION_INFORMATION_EX +NTAPI DiskFindContainingPartition( IN PDRIVE_LAYOUT_INFORMATION_EX LayoutInfo, IN PPARTITION_INFORMATION_EX BasePartition, @@ -4846,8 +4858,8 @@ return containerPartition; } - NTSTATUS +NTAPI DiskGetInfoExceptionInformation( IN PFUNCTIONAL_DEVICE_EXTENSION FdoExtension, IN PMODE_INFO_EXCEPTIONS ReturnPageData @@ -4938,8 +4950,8 @@ return(status); } - NTSTATUS +NTAPI DiskSetInfoExceptionInformation( IN PFUNCTIONAL_DEVICE_EXTENSION FdoExtension, IN PMODE_INFO_EXCEPTIONS PageData @@ -4976,7 +4988,7 @@ #if 0 #if defined(_X86_) - + NTSTATUS DiskQuerySuggestedLinkName( IN PDEVICE_OBJECT DeviceObject, @@ -5155,8 +5167,8 @@ #endif #endif - NTSTATUS +NTAPI DiskIoctlCreateDisk( IN OUT PDEVICE_OBJECT DeviceObject, IN OUT PIRP Irp @@ -5186,7 +5198,7 @@ PCOMMON_DEVICE_EXTENSION commonExtension; PFUNCTIONAL_DEVICE_EXTENSION fdoExtension; PIO_STACK_LOCATION irpStack; - PDISK_DATA diskData; + //PDISK_DATA diskData; PCREATE_DISK createDiskInfo; @@ -5203,7 +5215,7 @@ fdoExtension = DeviceObject->DeviceExtension; irpStack = IoGetCurrentIrpStackLocation(Irp); - diskData = (PDISK_DATA)(commonExtension->DriverData); + //diskData = (PDISK_DATA)(commonExtension->DriverData); ASSERT (commonExtension->IsFdo); @@ -5252,9 +5264,8 @@ return status; } - - NTSTATUS +NTAPI DiskIoctlGetDriveLayout( IN OUT PDEVICE_OBJECT DeviceObject, IN OUT PIRP Irp @@ -5288,11 +5299,11 @@ PDRIVE_LAYOUT_INFORMATION partitionList; PDRIVE_LAYOUT_INFORMATION_EX partitionListEx; PFUNCTIONAL_DEVICE_EXTENSION fdoExtension; - PPHYSICAL_DEVICE_EXTENSION pdoExtension; + //PPHYSICAL_DEVICE_EXTENSION pdoExtension; PCOMMON_DEVICE_EXTENSION commonExtension; PIO_STACK_LOCATION irpStack; PDISK_DATA diskData; - BOOLEAN invalidateBusRelations; + //BOOLEAN invalidateBusRelations; PAGED_CODE (); @@ -5408,9 +5419,8 @@ return status; } - - NTSTATUS +NTAPI DiskIoctlGetDriveLayoutEx( IN OUT PDEVICE_OBJECT DeviceObject, IN OUT PIRP Irp @@ -5443,7 +5453,7 @@ ULONG size; PDRIVE_LAYOUT_INFORMATION_EX partitionList; PFUNCTIONAL_DEVICE_EXTENSION fdoExtension; - PPHYSICAL_DEVICE_EXTENSION pdoExtension; + //PPHYSICAL_DEVICE_EXTENSION pdoExtension; PCOMMON_DEVICE_EXTENSION commonExtension; PIO_STACK_LOCATION irpStack; PDISK_DATA diskData; @@ -5460,7 +5470,7 @@ // fdoExtension = DeviceObject->DeviceExtension; - pdoExtension = DeviceObject->DeviceExtension; + //pdoExtension = DeviceObject->DeviceExtension; commonExtension = DeviceObject->DeviceExtension; irpStack = IoGetCurrentIrpStackLocation(Irp); @@ -5532,8 +5542,8 @@ return status; } - NTSTATUS +NTAPI DiskIoctlSetDriveLayout( IN OUT PDEVICE_OBJECT DeviceObject, IN OUT PIRP Irp @@ -5564,11 +5574,11 @@ PDRIVE_LAYOUT_INFORMATION partitionList; PDRIVE_LAYOUT_INFORMATION_EX partitionListEx; PFUNCTIONAL_DEVICE_EXTENSION fdoExtension; - PPHYSICAL_DEVICE_EXTENSION pdoExtension; + //PPHYSICAL_DEVICE_EXTENSION pdoExtension; PCOMMON_DEVICE_EXTENSION commonExtension; PIO_STACK_LOCATION irpStack; PDISK_DATA diskData; - BOOLEAN invalidateBusRelations; + //BOOLEAN invalidateBusRelations; SIZE_T listSize; SIZE_T inputBufferLength; SIZE_T outputBufferLength; @@ -5585,7 +5595,7 @@ partitionListEx = NULL; partitionList = NULL; fdoExtension = DeviceObject->DeviceExtension; - pdoExtension = DeviceObject->DeviceExtension; + //pdoExtension = DeviceObject->DeviceExtension; commonExtension = DeviceObject->DeviceExtension; irpStack = IoGetCurrentIrpStackLocation(Irp); @@ -5691,9 +5701,8 @@ return status; } - - NTSTATUS +NTAPI DiskIoctlSetDriveLayoutEx( IN OUT PDEVICE_OBJECT DeviceObject, IN OUT PIRP Irp @@ -5728,7 +5737,7 @@ PIO_STACK_LOCATION irpStack; PDISK_DATA diskData; - BOOLEAN invalidateBusRelations; + //BOOLEAN invalidateBusRelations; SIZE_T listSize; SIZE_T inputBufferLength; SIZE_T outputBufferLength; @@ -5849,8 +5858,8 @@ return status; } - NTSTATUS +NTAPI DiskIoctlGetPartitionInfo( IN OUT PDEVICE_OBJECT DeviceObject, IN OUT PIRP Irp @@ -6002,8 +6011,8 @@ return status; } - NTSTATUS +NTAPI DiskIoctlGetPartitionInfoEx( IN OUT PDEVICE_OBJECT DeviceObject, IN OUT PIRP Irp @@ -6126,9 +6135,8 @@ return status; } - - NTSTATUS +NTAPI DiskIoctlGetLengthInfo( IN OUT PDEVICE_OBJECT DeviceObject, IN OUT PIRP Irp @@ -6136,7 +6144,7 @@ { NTSTATUS status; PIO_STACK_LOCATION irpStack; - PDISK_DATA diskData; + //PDISK_DATA diskData; PGET_LENGTH_INFORMATION lengthInfo; PFUNCTIONAL_DEVICE_EXTENSION p0Extension; PCOMMON_DEVICE_EXTENSION commonExtension; @@ -6156,7 +6164,7 @@ commonExtension = DeviceObject->DeviceExtension; irpStack = IoGetCurrentIrpStackLocation(Irp); - diskData = (PDISK_DATA)(commonExtension->DriverData); + //diskData = (PDISK_DATA)(commonExtension->DriverData); p0Extension = commonExtension->PartitionZeroExtension; partitionZeroData = ((PDISK_DATA) p0Extension->CommonExtension.DriverData); @@ -6221,9 +6229,8 @@ return status; } - - NTSTATUS +NTAPI DiskIoctlSetPartitionInfo( IN OUT PDEVICE_OBJECT DeviceObject, IN OUT PIRP Irp @@ -6298,8 +6305,8 @@ return status; } - NTSTATUS +NTAPI DiskIoctlSetPartitionInfoEx( IN OUT PDEVICE_OBJECT DeviceObject, IN OUT PIRP Irp @@ -6394,9 +6401,8 @@ } DISK_GEOMETRY_EX_INTERNAL, *PDISK_GEOMETRY_EX_INTERNAL; - - NTSTATUS +NTAPI DiskIoctlGetDriveGeometryEx( IN PDEVICE_OBJECT DeviceObject, IN OUT PIRP Irp @@ -6573,4 +6579,3 @@ return status; } - Modified: trunk/reactos/drivers/storage/class/disk_new/disk.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/class/disk… ============================================================================== --- trunk/reactos/drivers/storage/class/disk_new/disk.h [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/class/disk_new/disk.h [iso-8859-1] Sun Jul 29 02:05:26 2012 @@ -63,7 +63,7 @@ typedef VOID -(*PDISK_UPDATE_PARTITIONS) ( +(NTAPI *PDISK_UPDATE_PARTITIONS) ( IN PDEVICE_OBJECT Fdo, IN OUT PDRIVE_LAYOUT_INFORMATION_EX PartitionList ); @@ -394,69 +394,80 @@ // Routine prototypes. // - -NTSTATUS +NTSTATUS +NTAPI DriverEntry( IN PDRIVER_OBJECT DriverObject, IN PUNICODE_STRING RegistryPath ); VOID +NTAPI DiskUnload( IN PDRIVER_OBJECT DriverObject ); NTSTATUS +NTAPI DiskAddDevice( IN PDRIVER_OBJECT DriverObject, IN PDEVICE_OBJECT Pdo ); NTSTATUS +NTAPI DiskInitFdo( IN PDEVICE_OBJECT Fdo ); NTSTATUS +NTAPI DiskInitPdo( IN PDEVICE_OBJECT Pdo ); NTSTATUS +NTAPI DiskStartFdo( IN PDEVICE_OBJECT Fdo ); NTSTATUS +NTAPI DiskStartPdo( IN PDEVICE_OBJECT Pdo ); NTSTATUS +NTAPI DiskStopDevice( IN PDEVICE_OBJECT DeviceObject, IN UCHAR Type ); NTSTATUS +NTAPI DiskRemoveDevice( IN PDEVICE_OBJECT DeviceObject, IN UCHAR Type ); NTSTATUS +NTAPI DiskReadWriteVerification( IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp ); NTSTATUS +NTAPI DiskDeviceControl( IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp ); VOID +NTAPI DiskFdoProcessError( PDEVICE_OBJECT DeviceObject, PSCSI_REQUEST_BLOCK Srb, @@ -465,36 +476,42 @@ ); NTSTATUS +NTAPI DiskShutdownFlush( IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp ); NTSTATUS +NTAPI DiskGetCacheInformation( IN PFUNCTIONAL_DEVICE_EXTENSION FdoExtension, IN PDISK_CACHE_INFORMATION CacheInfo ); NTSTATUS +NTAPI DiskSetCacheInformation( IN PFUNCTIONAL_DEVICE_EXTENSION FdoExtension, IN PDISK_CACHE_INFORMATION CacheInfo ); VOID +NTAPI DisableWriteCache( IN PDEVICE_OBJECT DeviceObject, IN PIO_WORKITEM WorkItem ); VOID +NTAPI DiskIoctlVerify( IN PDEVICE_OBJECT DeviceObject, IN PDISK_VERIFY_WORKITEM_CONTEXT Context ); NTSTATUS +NTAPI DiskModeSelect( IN PDEVICE_OBJECT DeviceObject, IN PCHAR ModeSelectBuffer, @@ -518,6 +535,7 @@ NTSTATUS +NTAPI DiskPerformSmartCommand( IN PFUNCTIONAL_DEVICE_EXTENSION FdoExtension, IN ULONG SrbControlCode, @@ -530,24 +548,28 @@ ); NTSTATUS +NTAPI DiskGetInfoExceptionInformation( IN PFUNCTIONAL_DEVICE_EXTENSION FdoExtension, OUT PMODE_INFO_EXCEPTIONS ReturnPageData ); NTSTATUS +NTAPI DiskSetInfoExceptionInformation( IN PFUNCTIONAL_DEVICE_EXTENSION FdoExtension, IN PMODE_INFO_EXCEPTIONS PageData ); NTSTATUS +NTAPI DiskDetectFailurePrediction( PFUNCTIONAL_DEVICE_EXTENSION FdoExtension, PFAILURE_PREDICTION_METHOD FailurePredictCapability ); BOOLEAN +NTAPI EnumerateBusKey( IN PFUNCTIONAL_DEVICE_EXTENSION DeviceExtension, HANDLE BusKey, @@ -555,6 +577,7 @@ ); NTSTATUS +NTAPI DiskCreateFdo( IN PDRIVER_OBJECT DriverObject, IN PDEVICE_OBJECT LowerDeviceObject, @@ -563,33 +586,39 @@ ); VOID +NTAPI UpdateDeviceObjects( IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp ); VOID +NTAPI DiskSetSpecialHacks( IN PFUNCTIONAL_DEVICE_EXTENSION FdoExtension, IN ULONG_PTR Data ); VOID +NTAPI DiskScanRegistryForSpecial( IN PFUNCTIONAL_DEVICE_EXTENSION FdoExtension ); VOID +NTAPI ResetBus( IN PDEVICE_OBJECT DeviceObject ); NTSTATUS +NTAPI DiskEnumerateDevice( IN PDEVICE_OBJECT Fdo ); NTSTATUS +NTAPI DiskQueryId( IN PDEVICE_OBJECT Pdo, IN BUS_QUERY_ID_TYPE IdType, @@ -597,12 +626,14 @@ ); NTSTATUS +NTAPI DiskQueryPnpCapabilities( IN PDEVICE_OBJECT DeviceObject, IN PDEVICE_CAPABILITIES Capabilities ); NTSTATUS +NTAPI DiskGenerateDeviceName( IN BOOLEAN IsFdo, IN ULONG DeviceNumber, @@ -613,23 +644,27 @@ ); VOID +NTAPI DiskCreateSymbolicLinks( IN PDEVICE_OBJECT DeviceObject ); VOID +NTAPI DiskUpdatePartitions( IN PDEVICE_OBJECT Fdo, IN OUT PDRIVE_LAYOUT_INFORMATION_EX PartitionList ); VOID +NTAPI DiskUpdateRemovablePartitions( IN PDEVICE_OBJECT Fdo, IN OUT PDRIVE_LAYOUT_INFORMATION_EX PartitionList ); NTSTATUS +NTAPI DiskCreatePdo( IN PDEVICE_OBJECT Fdo, IN ULONG PartitionOrdinal, @@ -639,11 +674,13 @@ ); VOID +NTAPI DiskDeleteSymbolicLinks( IN PDEVICE_OBJECT DeviceObject ); NTSTATUS +NTAPI DiskPdoQueryWmiRegInfo( IN PDEVICE_OBJECT DeviceObject, OUT ULONG *RegFlags, @@ -651,6 +688,7 @@ ); NTSTATUS +NTAPI DiskPdoQueryWmiDataBlock( IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp, @@ -660,6 +698,7 @@ ); NTSTATUS +NTAPI DiskPdoSetWmiDataBlock( IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp, @@ -669,6 +708,7 @@ ); NTSTATUS +NTAPI DiskPdoSetWmiDataItem( IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp, @@ -679,6 +719,7 @@ ); NTSTATUS +NTAPI DiskPdoExecuteWmiMethod( IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp, @@ -690,6 +731,7 @@ ); NTSTATUS +NTAPI DiskFdoQueryWmiRegInfo( IN PDEVICE_OBJECT DeviceObject, OUT ULONG *RegFlags, @@ -697,6 +739,7 @@ ); NTSTATUS +NTAPI DiskFdoQueryWmiRegInfoEx( IN PDEVICE_OBJECT DeviceObject, OUT ULONG *RegFlags, @@ -705,6 +748,7 @@ ); NTSTATUS +NTAPI DiskFdoQueryWmiDataBlock( IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp, @@ -714,6 +758,7 @@ ); NTSTATUS +NTAPI DiskFdoSetWmiDataBlock( IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp, @@ -723,6 +768,7 @@ ); NTSTATUS +NTAPI DiskFdoSetWmiDataItem( IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp, @@ -733,6 +779,7 @@ ); NTSTATUS +NTAPI DiskFdoExecuteWmiMethod( IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp, @@ -744,6 +791,7 @@ ); NTSTATUS +NTAPI DiskWmiFunctionControl( IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp, @@ -753,24 +801,28 @@ ); NTSTATUS +NTAPI DiskReadFailurePredictStatus( PFUNCTIONAL_DEVICE_EXTENSION FdoExtension, PSTORAGE_FAILURE_PREDICT_STATUS DiskSmartStatus ); NTSTATUS +NTAPI DiskReadFailurePredictData( PFUNCTIONAL_DEVICE_EXTENSION FdoExtension, PSTORAGE_FAILURE_PREDICT_DATA DiskSmartData ); NTSTATUS +NTAPI DiskEnableDisableFailurePrediction( PFUNCTIONAL_DEVICE_EXTENSION FdoExtension, BOOLEAN Enable ); NTSTATUS +NTAPI DiskEnableDisableFailurePredictPolling( PFUNCTIONAL_DEVICE_EXTENSION FdoExtension, BOOLEAN Enable, @@ -778,16 +830,18 @@ ); VOID +NTAPI DiskAcquirePartitioningLock( IN PFUNCTIONAL_DEVICE_EXTENSION FdoExtension ); VOID +NTAPI DiskReleasePartitioningLock( IN PFUNCTIONAL_DEVICE_EXTENSION FdoExtension ); -NTSTATUS DiskInitializeReregistration( +NTSTATUS NTAPI DiskInitializeReregistration( void ); @@ -796,6 +850,7 @@ #if defined(_X86_) NTSTATUS +NTAPI DiskReadDriveCapacity( IN PDEVICE_OBJECT Fdo ); @@ -815,16 +870,19 @@ #endif NTSTATUS +NTAPI DiskSaveDetectInfo( PDRIVER_OBJECT DriverObject ); VOID +NTAPI DiskCleanupDetectInfo( IN PDRIVER_OBJECT DriverObject ); VOID +NTAPI DiskDriverReinitialization ( IN PDRIVER_OBJECT DriverObject, IN PVOID Nothing, @@ -834,22 +892,26 @@ #endif VOID +NTAPI DiskConvertPartitionToExtended( IN PPARTITION_INFORMATION Partition, OUT PPARTITION_INFORMATION_EX PartitionEx ); PDRIVE_LAYOUT_INFORMATION_EX +NTAPI DiskConvertLayoutToExtended( IN CONST PDRIVE_LAYOUT_INFORMATION Layout ); PDRIVE_LAYOUT_INFORMATION +NTAPI DiskConvertExtendedToLayout( IN CONST PDRIVE_LAYOUT_INFORMATION_EX LayoutEx ); NTSTATUS +NTAPI DiskReadPartitionTableEx( IN PFUNCTIONAL_DEVICE_EXTENSION Fdo, IN BOOLEAN BypassCache, @@ -857,12 +919,14 @@ ); NTSTATUS +NTAPI DiskWritePartitionTableEx( IN PFUNCTIONAL_DEVICE_EXTENSION Fdo, IN PDRIVE_LAYOUT_INFORMATION_EX DriveLayout ); NTSTATUS +NTAPI DiskSetPartitionInformationEx( IN PFUNCTIONAL_DEVICE_EXTENSION Fdo, IN ULONG PartitionNumber, @@ -870,6 +934,7 @@ ); NTSTATUS +NTAPI DiskSetPartitionInformation( IN PFUNCTIONAL_DEVICE_EXTENSION Fdo, IN ULONG SectorSize, @@ -878,12 +943,14 @@ ); NTSTATUS +NTAPI DiskVerifyPartitionTable( IN PFUNCTIONAL_DEVICE_EXTENSION Fdo, IN BOOLEAN FixErrors ); BOOLEAN +NTAPI DiskInvalidatePartitionTable( IN PFUNCTIONAL_DEVICE_EXTENSION Fdo, IN BOOLEAN PartitionLockHeld @@ -891,12 +958,14 @@ #if defined (_X86_) NTSTATUS +NTAPI DiskGetDetectInfo( IN PFUNCTIONAL_DEVICE_EXTENSION FdoExtension, OUT PDISK_DETECTION_INFO DetectInfo ); NTSTATUS +NTAPI DiskReadSignature( IN PDEVICE_OBJECT Fdo ); Modified: trunk/reactos/drivers/storage/class/disk_new/diskwmi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/class/disk… ============================================================================== --- trunk/reactos/drivers/storage/class/disk_new/diskwmi.c [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/class/disk_new/diskwmi.c [iso-8859-1] Sun Jul 29 02:05:26 2012 @@ -23,30 +23,35 @@ #include "disk.h" NTSTATUS +NTAPI DiskSendFailurePredictIoctl( PFUNCTIONAL_DEVICE_EXTENSION FdoExtension, PSTORAGE_PREDICT_FAILURE checkFailure ); NTSTATUS +NTAPI DiskGetIdentifyInfo( PFUNCTIONAL_DEVICE_EXTENSION FdoExtension, PBOOLEAN SupportSmart ); NTSTATUS +NTAPI DiskDetectFailurePrediction( PFUNCTIONAL_DEVICE_EXTENSION FdoExtension, PFAILURE_PREDICTION_METHOD FailurePredictCapability ); NTSTATUS +NTAPI DiskReadFailurePredictThresholds( PFUNCTIONAL_DEVICE_EXTENSION FdoExtension, PSTORAGE_FAILURE_PREDICT_THRESHOLDS DiskSmartThresholds ); NTSTATUS +NTAPI DiskReadSmartLog( IN PFUNCTIONAL_DEVICE_EXTENSION FdoExtension, IN UCHAR SectorCount, @@ -55,6 +60,7 @@ ); NTSTATUS +NTAPI DiskWriteSmartLog( IN PFUNCTIONAL_DEVICE_EXTENSION FdoExtension, IN UCHAR SectorCount, @@ -62,7 +68,7 @@ IN PUCHAR Buffer ); -void DiskReregWorker( +void NTAPI DiskReregWorker( IN PVOID Context ); @@ -382,6 +388,7 @@ NTSTATUS +NTAPI DiskReadSmartLog( IN PFUNCTIONAL_DEVICE_EXTENSION FdoExtension, IN UCHAR SectorCount, @@ -433,6 +440,7 @@ NTSTATUS +NTAPI DiskWriteSmartLog( IN PFUNCTIONAL_DEVICE_EXTENSION FdoExtension, IN UCHAR SectorCount, @@ -477,8 +485,9 @@ } return(status); } - + NTSTATUS +NTAPI DiskPerformSmartCommand( IN PFUNCTIONAL_DEVICE_EXTENSION FdoExtension, IN ULONG SrbControlCode, @@ -526,8 +535,8 @@ PDISK_DATA diskData = (PDISK_DATA)(commonExtension->DriverData); PUCHAR buffer; PSENDCMDINPARAMS cmdInParameters; - PSENDCMDOUTPARAMS cmdOutParameters; - ULONG outBufferSize; + //PSENDCMDOUTPARAMS cmdOutParameters; + //ULONG outBufferSize; NTSTATUS status; ULONG availableBufferSize; KEVENT event; @@ -549,7 +558,7 @@ buffer += sizeof(SRB_IO_CONTROL); cmdInParameters = (PSENDCMDINPARAMS)buffer; - cmdOutParameters = (PSENDCMDOUTPARAMS)buffer; + //cmdOutParameters = (PSENDCMDOUTPARAMS)buffer; availableBufferSize = *BufferSize - sizeof(SRB_IO_CONTROL); @@ -776,8 +785,8 @@ return status; } - NTSTATUS +NTAPI DiskGetIdentifyInfo( PFUNCTIONAL_DEVICE_EXTENSION FdoExtension, PBOOLEAN SupportSmart @@ -813,12 +822,12 @@ return status; } - // // FP Ioctl specific routines // NTSTATUS +NTAPI DiskSendFailurePredictIoctl( PFUNCTIONAL_DEVICE_EXTENSION FdoExtension, PSTORAGE_PREDICT_FAILURE checkFailure @@ -865,12 +874,12 @@ return status; } - // // FP type independent routines // NTSTATUS +NTAPI DiskEnableDisableFailurePrediction( PFUNCTIONAL_DEVICE_EXTENSION FdoExtension, BOOLEAN Enable @@ -934,6 +943,7 @@ } NTSTATUS +NTAPI DiskEnableDisableFailurePredictPolling( PFUNCTIONAL_DEVICE_EXTENSION FdoExtension, BOOLEAN Enable, @@ -990,8 +1000,8 @@ return status; } - NTSTATUS +NTAPI DiskReadFailurePredictStatus( PFUNCTIONAL_DEVICE_EXTENSION FdoExtension, PSTORAGE_FAILURE_PREDICT_STATUS DiskSmartStatus @@ -1067,6 +1077,7 @@ } NTSTATUS +NTAPI DiskReadFailurePredictData( PFUNCTIONAL_DEVICE_EXTENSION FdoExtension, PSTORAGE_FAILURE_PREDICT_DATA DiskSmartData @@ -1158,6 +1169,7 @@ } NTSTATUS +NTAPI DiskReadFailurePredictThresholds( PFUNCTIONAL_DEVICE_EXTENSION FdoExtension, PSTORAGE_FAILURE_PREDICT_THRESHOLDS DiskSmartThresholds @@ -1239,7 +1251,7 @@ return status; } -void DiskReregWorker( +void NTAPI DiskReregWorker( IN PVOID Context ) { @@ -1284,7 +1296,7 @@ } -NTSTATUS DiskInitializeReregistration( +NTSTATUS NTAPI DiskInitializeReregistration( void ) { @@ -1303,7 +1315,7 @@ return(STATUS_SUCCESS); } -NTSTATUS DiskPostReregisterRequest( +NTSTATUS NTAPI DiskPostReregisterRequest( PDEVICE_OBJECT DeviceObject, PIRP Irp ) @@ -1344,7 +1356,7 @@ return(status); } -NTSTATUS DiskInfoExceptionComplete( +NTSTATUS NTAPI DiskInfoExceptionComplete( PDEVICE_OBJECT DeviceObject, PIRP Irp, PVOID Context @@ -1361,7 +1373,7 @@ ULONG retryInterval; ULONG srbStatus; BOOLEAN freeLockAndIrp = TRUE; - KIRQL oldIrql; + //KIRQL oldIrql; ASSERT(fdoExtension->CommonExtension.IsFdo); @@ -1545,7 +1557,7 @@ } -NTSTATUS DiskInfoExceptionCheck( +NTSTATUS NTAPI DiskInfoExceptionCheck( PFUNCTIONAL_DEVICE_EXTENSION FdoExtension ) { @@ -1760,6 +1772,7 @@ } NTSTATUS +NTAPI DiskDetectFailurePrediction( PFUNCTIONAL_DEVICE_EXTENSION FdoExtension, PFAILURE_PREDICTION_METHOD FailurePredictCapability @@ -1799,7 +1812,7 @@ NTSTATUS status; STORAGE_PREDICT_FAILURE checkFailure; STORAGE_FAILURE_PREDICT_STATUS diskSmartStatus; - BOOLEAN logErr; + //BOOLEAN logErr; PAGED_CODE(); @@ -1881,8 +1894,8 @@ return(STATUS_SUCCESS); } - NTSTATUS +NTAPI DiskWmiFunctionControl( IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp, @@ -1931,10 +1944,10 @@ --*/ { NTSTATUS status = STATUS_SUCCESS; - PCOMMON_DEVICE_EXTENSION commonExtension = DeviceObject->DeviceExtension; + //PCOMMON_DEVICE_EXTENSION commonExtension = DeviceObject->DeviceExtension; PFUNCTIONAL_DEVICE_EXTENSION fdoExtension = DeviceObject->DeviceExtension; - PDISK_DATA diskData = (PDISK_DATA)(commonExtension->DriverData); - ULONG enableCount; + //PDISK_DATA diskData = (PDISK_DATA)(commonExtension->DriverData); + //ULONG enableCount; PAGED_CODE(); @@ -1994,9 +2007,8 @@ return status; } - - NTSTATUS +NTAPI DiskFdoQueryWmiRegInfo( IN PDEVICE_OBJECT DeviceObject, OUT ULONG *RegFlags, @@ -2036,10 +2048,10 @@ --*/ { - PFUNCTIONAL_DEVICE_EXTENSION fdoExtension = DeviceObject->DeviceExtension; + //PFUNCTIONAL_DEVICE_EXTENSION fdoExtension = DeviceObject->DeviceExtension; PCOMMON_DEVICE_EXTENSION commonExtension = DeviceObject->DeviceExtension; PDISK_DATA diskData = (PDISK_DATA)(commonExtension->DriverData); - NTSTATUS status; + //NTSTATUS status; PAGED_CODE(); @@ -2094,6 +2106,7 @@ } NTSTATUS +NTAPI DiskFdoQueryWmiRegInfoEx( IN PDEVICE_OBJECT DeviceObject, OUT ULONG *RegFlags, @@ -2150,8 +2163,8 @@ return(status); } - NTSTATUS +NTAPI DiskFdoQueryWmiDataBlock( IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp, @@ -2383,6 +2396,7 @@ } NTSTATUS +NTAPI DiskFdoSetWmiDataBlock( IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp, @@ -2487,6 +2501,7 @@ } NTSTATUS +NTAPI DiskFdoSetWmiDataItem( IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp, @@ -2554,8 +2569,8 @@ return status; } - NTSTATUS +NTAPI DiskFdoExecuteWmiMethod( IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp, @@ -3018,11 +3033,11 @@ return status; } - #if 0 // // Enable this to add WMI support for PDOs NTSTATUS +NTAPI DiskPdoQueryWmiRegInfo( IN PDEVICE_OBJECT DeviceObject, OUT ULONG *RegFlags, @@ -3088,6 +3103,7 @@ } NTSTATUS +NTAPI DiskPdoQueryWmiDataBlock( IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp, @@ -3169,6 +3185,7 @@ } NTSTATUS +NTAPI DiskPdoSetWmiDataBlock( IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp, @@ -3248,6 +3265,7 @@ } NTSTATUS +NTAPI DiskPdoSetWmiDataItem( IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp, @@ -3328,8 +3346,8 @@ return status; } - NTSTATUS +NTAPI DiskPdoExecuteWmiMethod( IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp, @@ -3429,6 +3447,3 @@ return status; } #endif - - - Modified: trunk/reactos/drivers/storage/class/disk_new/enum.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/class/disk… ============================================================================== --- trunk/reactos/drivers/storage/class/disk_new/enum.c [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/class/disk_new/enum.c [iso-8859-1] Sun Jul 29 02:05:26 2012 @@ -36,6 +36,7 @@ #endif PDRIVE_LAYOUT_INFORMATION +NTAPI DiskConvertExtendedToLayout( IN CONST PDRIVE_LAYOUT_INFORMATION_EX LayoutEx ) @@ -97,6 +98,7 @@ } VOID +NTAPI DiskConvertPartitionToExtended( IN PPARTITION_INFORMATION Partition, OUT PPARTITION_INFORMATION_EX PartitionEx @@ -140,8 +142,8 @@ PartitionEx->Mbr.HiddenSectors = Partition->HiddenSectors; } - -PDRIVE_LAYOUT_INFORMATION_EX +PDRIVE_LAYOUT_INFORMATION_EX +NTAPI DiskConvertLayoutToExtended( IN CONST PDRIVE_LAYOUT_INFORMATION Layout ) @@ -163,7 +165,7 @@ be freed by the callee using ExFreePool. --*/ - + { ULONG i; ULONG size; @@ -216,9 +218,8 @@ return layoutEx; } - - NTSTATUS +NTAPI DiskEnumerateDevice( IN PDEVICE_OBJECT Fdo ) @@ -249,13 +250,13 @@ PCOMMON_DEVICE_EXTENSION commonExtension = Fdo->DeviceExtension; PFUNCTIONAL_DEVICE_EXTENSION fdoExtension = Fdo->DeviceExtension; - PPHYSICAL_DEVICE_EXTENSION pdoExtension = NULL; + //PPHYSICAL_DEVICE_EXTENSION pdoExtension = NULL; PDISK_DATA diskData = (PDISK_DATA) commonExtension->DriverData; - PDEVICE_OBJECT pdo = NULL; - - ULONG numberListElements = 0; + //PDEVICE_OBJECT pdo = NULL; + + //ULONG numberListElements = 0; PDRIVE_LAYOUT_INFORMATION_EX partitionList; @@ -358,8 +359,8 @@ } // end DiskEnumerateDevice() - VOID +NTAPI DiskUpdateRemovablePartitions( IN PDEVICE_OBJECT Fdo, IN OUT PDRIVE_LAYOUT_INFORMATION_EX PartitionList @@ -395,7 +396,7 @@ ULONG partitionNumber; ULONG partitionOrdinal = 0; - ULONG newPartitionNumber; + //ULONG newPartitionNumber; PDISK_DATA pdoData; NTSTATUS status; @@ -586,8 +587,8 @@ return; } - VOID +NTAPI DiskUpdatePartitions( IN PDEVICE_OBJECT Fdo, IN OUT PDRIVE_LAYOUT_INFORMATION_EX PartitionList @@ -828,7 +829,7 @@ } else { - PDEVICE_OBJECT nextPdo; + //PDEVICE_OBJECT nextPdo; DebugPrint ((1, "DiskUpdatePartitions: Deleting %wZ\n", &pdoExtension->CommonExtension.DeviceName)); @@ -1019,8 +1020,8 @@ return; } - NTSTATUS +NTAPI DiskCreatePdo( IN PDEVICE_OBJECT Fdo, IN ULONG PartitionOrdinal, @@ -1208,11 +1209,8 @@ return status; } - - - - VOID +NTAPI DiskAcquirePartitioningLock( IN PFUNCTIONAL_DEVICE_EXTENSION FdoExtension ) @@ -1231,8 +1229,8 @@ return; } - VOID +NTAPI DiskReleasePartitioningLock( IN PFUNCTIONAL_DEVICE_EXTENSION FdoExtension ) Modified: trunk/reactos/drivers/storage/class/disk_new/geometry.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/class/disk… ============================================================================== --- trunk/reactos/drivers/storage/class/disk_new/geometry.c [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/class/disk_new/geometry.c [iso-8859-1] Sun Jul 29 02:05:26 2012 @@ -28,22 +28,26 @@ #if defined (_X86_) DISK_GEOMETRY_SOURCE +NTAPI DiskUpdateGeometry( IN PFUNCTIONAL_DEVICE_EXTENSION DeviceExtension ); NTSTATUS +NTAPI DiskUpdateRemovableGeometry ( IN PFUNCTIONAL_DEVICE_EXTENSION FdoExtension ); VOID +NTAPI DiskScanBusDetectInfo( IN PDRIVER_OBJECT DriverObject, IN HANDLE BusKey ); NTSTATUS +NTAPI DiskSaveBusDetectInfo( IN PDRIVER_OBJECT DriverObject, IN HANDLE TargetKey, @@ -51,12 +55,14 @@ ); NTSTATUS +NTAPI DiskSaveGeometryDetectInfo( IN PDRIVER_OBJECT DriverObject, IN HANDLE HardwareKey ); NTSTATUS +NTAPI DiskGetPortGeometry( IN PFUNCTIONAL_DEVICE_EXTENSION FdoExtension, OUT PDISK_GEOMETRY Geometry @@ -94,8 +100,8 @@ #endif - NTSTATUS +NTAPI DiskSaveDetectInfo( PDRIVER_OBJECT DriverObject ) @@ -208,8 +214,8 @@ return STATUS_SUCCESS; } - VOID +NTAPI DiskCleanupDetectInfo( IN PDRIVER_OBJECT DriverObject ) @@ -237,8 +243,8 @@ return; } - NTSTATUS +NTAPI DiskSaveGeometryDetectInfo( IN PDRIVER_OBJECT DriverObject, IN HANDLE HardwareKey @@ -363,8 +369,8 @@ return STATUS_SUCCESS; } - VOID +NTAPI DiskScanBusDetectInfo( IN PDRIVER_OBJECT DriverObject, IN HANDLE BusKey @@ -520,8 +526,8 @@ return; } - NTSTATUS +NTAPI DiskSaveBusDetectInfo( IN PDRIVER_OBJECT DriverObject, IN HANDLE TargetKey, @@ -681,8 +687,8 @@ return STATUS_SUCCESS; } - DISK_GEOMETRY_SOURCE +NTAPI DiskUpdateGeometry( IN PFUNCTIONAL_DEVICE_EXTENSION FdoExtension ) @@ -769,7 +775,7 @@ ULONG sectorsPerTrack; ULONG tracksPerCylinder; - ULONG sectors; + //ULONG sectors; ULONG length; // @@ -882,8 +888,8 @@ return diskData->GeometrySource; } - NTSTATUS +NTAPI DiskUpdateRemovableGeometry ( IN PFUNCTIONAL_DEVICE_EXTENSION FdoExtension ) @@ -941,8 +947,8 @@ return status; } - NTSTATUS +NTAPI DiskGetPortGeometry( IN PFUNCTIONAL_DEVICE_EXTENSION FdoExtension, OUT PDISK_GEOMETRY Geometry @@ -1019,9 +1025,8 @@ return status; } - - NTSTATUS +NTAPI DiskReadDriveCapacity( IN PDEVICE_OBJECT Fdo ) @@ -1049,8 +1054,8 @@ { PFUNCTIONAL_DEVICE_EXTENSION fdoExtension = Fdo->DeviceExtension; - PDISK_DATA diskData = fdoExtension->CommonExtension.DriverData; - DISK_GEOMETRY_SOURCE diskGeometrySource = DiskGeometryUnknown; + //PDISK_DATA diskData = fdoExtension->CommonExtension.DriverData; + //DISK_GEOMETRY_SOURCE diskGeometrySource = DiskGeometryUnknown; NTSTATUS status; ASSERT_FDO(Fdo); @@ -1058,7 +1063,7 @@ if (TEST_FLAG(Fdo->Characteristics, FILE_REMOVABLE_MEDIA)) { DiskUpdateRemovableGeometry(fdoExtension); } else { - diskGeometrySource = DiskUpdateGeometry(fdoExtension); + /* diskGeometrySource =*/ DiskUpdateGeometry(fdoExtension); } status = ClassReadDriveCapacity(Fdo); @@ -1066,9 +1071,8 @@ return status; } - - VOID +NTAPI DiskDriverReinitialization( IN PDRIVER_OBJECT DriverObject, IN PVOID Nothing, @@ -1238,7 +1242,7 @@ ULONG sectorsPerTrack; ULONG tracksPerCylinder; - ULONG sectors; + //ULONG sectors; ULONG length; // @@ -1321,8 +1325,8 @@ return; } - NTSTATUS +NTAPI DiskGetDetectInfo( IN PFUNCTIONAL_DEVICE_EXTENSION FdoExtension, OUT PDISK_DETECTION_INFO DetectInfo @@ -1408,8 +1412,8 @@ return (found ? STATUS_SUCCESS : STATUS_UNSUCCESSFUL); } - NTSTATUS +NTAPI DiskReadSignature( IN PDEVICE_OBJECT Fdo ) @@ -1466,5 +1470,3 @@ } #endif // defined(_X86_) - - Modified: trunk/reactos/drivers/storage/class/disk_new/part.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/class/disk… ============================================================================== --- trunk/reactos/drivers/storage/class/disk_new/part.c [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/class/disk_new/part.c [iso-8859-1] Sun Jul 29 02:05:26 2012 @@ -45,6 +45,7 @@ #endif NTSTATUS +NTAPI DiskReadPartitionTableEx( IN PFUNCTIONAL_DEVICE_EXTENSION Fdo, IN BOOLEAN BypassCache, @@ -193,8 +194,8 @@ return status; } - -NTSTATUS +NTSTATUS +NTAPI DiskWritePartitionTableEx( IN PFUNCTIONAL_DEVICE_EXTENSION Fdo, IN PDRIVE_LAYOUT_INFORMATION_EX DriveLayout @@ -240,6 +241,7 @@ } NTSTATUS +NTAPI DiskSetPartitionInformationEx( IN PFUNCTIONAL_DEVICE_EXTENSION Fdo, IN ULONG PartitionNumber, @@ -264,6 +266,7 @@ } NTSTATUS +NTAPI DiskSetPartitionInformation( IN PFUNCTIONAL_DEVICE_EXTENSION Fdo, IN ULONG SectorSize, @@ -284,6 +287,7 @@ } BOOLEAN +NTAPI DiskInvalidatePartitionTable( IN PFUNCTIONAL_DEVICE_EXTENSION Fdo, IN BOOLEAN PartitionLockHeld @@ -309,6 +313,7 @@ } NTSTATUS +NTAPI DiskVerifyPartitionTable( IN PFUNCTIONAL_DEVICE_EXTENSION Fdo, IN BOOLEAN FixErrors @@ -324,4 +329,3 @@ return IoVerifyPartitionTable(Fdo->DeviceObject, FixErrors); } - Modified: trunk/reactos/drivers/storage/class/disk_new/pnp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/class/disk… ============================================================================== --- trunk/reactos/drivers/storage/class/disk_new/pnp.c [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/class/disk_new/pnp.c [iso-8859-1] Sun Jul 29 02:05:26 2012 @@ -39,8 +39,8 @@ #endif - NTSTATUS +NTAPI DiskAddDevice( IN PDRIVER_OBJECT DriverObject, IN PDEVICE_OBJECT PhysicalDeviceObject @@ -185,9 +185,8 @@ } // end DiskAddDevice() - - NTSTATUS +NTAPI DiskInitFdo( IN PDEVICE_OBJECT Fdo ) @@ -214,16 +213,16 @@ PDISK_DATA diskData = (PDISK_DATA) fdoExtension->CommonExtension.DriverData; - ULONG srbFlags = 0; + //ULONG srbFlags = 0; ULONG timeOut = 0; ULONG bytesPerSector; - UCHAR sectorShift; - - BOOLEAN dmActive = FALSE; + //UCHAR sectorShift; + + //BOOLEAN dmActive = FALSE; PULONG dmSkew; - ULONG dmByteSkew; + //ULONG dmByteSkew; NTSTATUS status; @@ -279,7 +278,7 @@ DiskScanRegistryForSpecial(fdoExtension); - srbFlags = fdoExtension->SrbFlags; + //srbFlags = fdoExtension->SrbFlags; // // Clear buffer for drive geometry. @@ -413,7 +412,7 @@ bytesPerSector = fdoExtension->DiskGeometry.BytesPerSector = 512; } - sectorShift = fdoExtension->SectorShift; + //sectorShift = fdoExtension->SectorShift; // // Determine is DM Driver is loaded on an IDE drive that is @@ -443,8 +442,8 @@ // blown away. // - dmActive = TRUE; - dmByteSkew = fdoExtension->DMByteSkew; + //dmActive = TRUE; + //dmByteSkew = fdoExtension->DMByteSkew; } @@ -557,8 +556,8 @@ } // end DiskInitFdo() - NTSTATUS +NTAPI DiskInitPdo( IN PDEVICE_OBJECT Pdo ) @@ -615,8 +614,8 @@ return STATUS_SUCCESS; } - NTSTATUS +NTAPI DiskStartPdo( IN PDEVICE_OBJECT Pdo ) @@ -637,6 +636,7 @@ } NTSTATUS +NTAPI DiskStopDevice( IN PDEVICE_OBJECT DeviceObject, IN UCHAR Type @@ -654,8 +654,8 @@ return STATUS_SUCCESS; } - NTSTATUS +NTAPI DiskQueryId( IN PDEVICE_OBJECT Pdo, IN BUS_QUERY_ID_TYPE IdType, @@ -695,7 +695,7 @@ { ANSI_STRING ansiIdString; - NTSTATUS status; + //NTSTATUS status; PAGED_CODE(); ASSERT_PDO(Pdo); @@ -715,7 +715,7 @@ if(IdType == BusQueryInstanceID) { - PPHYSICAL_DEVICE_EXTENSION pdoExtension = Pdo->DeviceExtension; + //PPHYSICAL_DEVICE_EXTENSION pdoExtension = Pdo->DeviceExtension; PCOMMON_DEVICE_EXTENSION commonExtension = Pdo->DeviceExtension; PDISK_DATA diskData = commonExtension->PartitionZeroExtension->CommonExtension.DriverData; @@ -778,8 +778,8 @@ return STATUS_NOT_IMPLEMENTED; } - NTSTATUS +NTAPI DiskGenerateDeviceName( IN BOOLEAN IsFdo, IN ULONG DeviceNumber, @@ -859,8 +859,8 @@ return STATUS_SUCCESS; } - VOID +NTAPI DiskCreateSymbolicLinks( IN PDEVICE_OBJECT DeviceObject ) @@ -983,8 +983,8 @@ return; } - VOID +NTAPI DiskDeleteSymbolicLinks( IN PDEVICE_OBJECT DeviceObject ) @@ -1049,8 +1049,8 @@ return; } - NTSTATUS +NTAPI DiskRemoveDevice( IN PDEVICE_OBJECT DeviceObject, IN UCHAR Type @@ -1132,7 +1132,7 @@ } else { - PPHYSICAL_DEVICE_EXTENSION pdoExtension = DeviceObject->DeviceExtension; + //PPHYSICAL_DEVICE_EXTENSION pdoExtension = DeviceObject->DeviceExtension; } @@ -1157,8 +1157,8 @@ return STATUS_SUCCESS; } - NTSTATUS +NTAPI DiskStartFdo( IN PDEVICE_OBJECT Fdo ) @@ -1400,4 +1400,3 @@ return STATUS_SUCCESS; } // end DiskStartFdo() -

1 0

[akhaldi] 56973: [CLASSPNP] * Explicitly mark the functions as stdcall (NTAPI).. -mrtd changes the default calling convention, but name-decoration isn't affected by this. The -mrtd feature has its ...
by akhaldi＠svn.reactos.org 29 Jul '12

29 Jul '12

Author: akhaldi Date: Sun Jul 29 01:49:24 2012 New Revision: 56973 URL: http://svn.reactos.org/svn/reactos?rev=56973&view=rev Log: [CLASSPNP] * Explicitly mark the functions as stdcall (NTAPI).. -mrtd changes the default calling convention, but name-decoration isn't affected by this. The -mrtd feature has its origin in some older linux-code-mode, and it's considered for removal in GCC 4.8. * Fix some warnings. Modified: trunk/reactos/drivers/storage/classpnp/CMakeLists.txt trunk/reactos/drivers/storage/classpnp/autorun.c trunk/reactos/drivers/storage/classpnp/class.c trunk/reactos/drivers/storage/classpnp/classp.h trunk/reactos/drivers/storage/classpnp/classwmi.c trunk/reactos/drivers/storage/classpnp/clntirp.c trunk/reactos/drivers/storage/classpnp/create.c trunk/reactos/drivers/storage/classpnp/dictlib.c trunk/reactos/drivers/storage/classpnp/lock.c trunk/reactos/drivers/storage/classpnp/obsolete.c trunk/reactos/drivers/storage/classpnp/power.c trunk/reactos/drivers/storage/classpnp/retry.c trunk/reactos/drivers/storage/classpnp/utils.c trunk/reactos/drivers/storage/classpnp/xferpkt.c Modified: trunk/reactos/drivers/storage/classpnp/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/classpnp/C… ============================================================================== --- trunk/reactos/drivers/storage/classpnp/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/classpnp/CMakeLists.txt [iso-8859-1] Sun Jul 29 01:49:24 2012 @@ -38,9 +38,7 @@ #add_target_compile_flags(classpnp "/Gz") set_source_files_properties(${SOURCE} PROPERTIES COMPILE_FLAGS "/Gz") else() - - #add_target_compile_flags(classpnp "-mrtd -fno-builtin -w") - set_source_files_properties(${SOURCE} PROPERTIES COMPILE_FLAGS "-mrtd -fno-builtin -w") + set_source_files_properties(${SOURCE} PROPERTIES COMPILE_FLAGS "-w") endif() endif() Modified: trunk/reactos/drivers/storage/classpnp/autorun.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/classpnp/a… ============================================================================== --- trunk/reactos/drivers/storage/classpnp/autorun.c [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/classpnp/autorun.c [iso-8859-1] Sun Jul 29 01:49:24 2012 @@ -55,24 +55,28 @@ (! fdoExtension->PowerDownInProgress) ) BOOLEAN +NTAPI ClasspIsMediaChangeDisabledDueToHardwareLimitation( IN PFUNCTIONAL_DEVICE_EXTENSION FdoExtension, IN PUNICODE_STRING RegistryPath ); NTSTATUS +NTAPI ClasspMediaChangeDeviceInstanceOverride( IN PFUNCTIONAL_DEVICE_EXTENSION FdoExtension, OUT PBOOLEAN Enabled ); BOOLEAN +NTAPI ClasspIsMediaChangeDisabledForClass( IN PFUNCTIONAL_DEVICE_EXTENSION FdoExtension, IN PUNICODE_STRING RegistryPath ); VOID +NTAPI ClasspSetMediaChangeStateEx( IN PFUNCTIONAL_DEVICE_EXTENSION FdoExtension, IN MEDIA_CHANGE_DETECTION_STATE NewState, @@ -81,6 +85,7 @@ ); NTSTATUS +NTAPI ClasspMediaChangeRegistryCallBack( IN PWSTR ValueName, IN ULONG ValueType, @@ -91,6 +96,7 @@ ); VOID +NTAPI ClasspSendMediaStateIrp( IN PFUNCTIONAL_DEVICE_EXTENSION FdoExtension, IN PMEDIA_CHANGE_DETECTION_INFO Info, @@ -98,12 +104,14 @@ ); VOID +NTAPI ClasspFailurePredict( IN PDEVICE_OBJECT DeviceObject, IN PFAILURE_PREDICTION_INFO Info ); NTSTATUS +NTAPI ClasspInitializePolling( IN PFUNCTIONAL_DEVICE_EXTENSION FdoExtension, IN BOOLEAN AllowDriveToSleep @@ -131,6 +139,7 @@ // ISSUE -- make this public? VOID +NTAPI ClassSendEjectionNotification( IN PFUNCTIONAL_DEVICE_EXTENSION FdoExtension ) @@ -163,8 +172,8 @@ return; } - VOID +NTAPI ClasspSendNotification( IN PFUNCTIONAL_DEVICE_EXTENSION FdoExtension, IN const GUID * Guid, @@ -219,9 +228,6 @@ notification = NULL; return; } - - - /*++//////////////////////////////////////////////////////////////////////////// @@ -280,6 +286,7 @@ --*/ VOID +NTAPI ClasspInterpretGesnData( IN PFUNCTIONAL_DEVICE_EXTENSION FdoExtension, IN PNOTIFICATION_EVENT_STATUS_HEADER Header, @@ -555,7 +562,7 @@ } // end switch on notification class return; } - + /*++//////////////////////////////////////////////////////////////////////////// ClasspInternalSetMediaChangeState() @@ -584,6 +591,7 @@ --*/ VOID +NTAPI ClasspInternalSetMediaChangeState( IN PFUNCTIONAL_DEVICE_EXTENSION FdoExtension, IN MEDIA_CHANGE_DETECTION_STATE NewState, @@ -596,7 +604,7 @@ MEDIA_CHANGE_DETECTION_STATE oldMediaState; PMEDIA_CHANGE_DETECTION_INFO info = FdoExtension->MediaChangeDetectionInfo; ULONG data; - NTSTATUS status; + //NTSTATUS status; ASSERT((NewState >= MediaUnknown) && (NewState <= MediaNotPresent)); @@ -676,7 +684,7 @@ return; } // end ClasspInternalSetMediaChangeState() - + /*++//////////////////////////////////////////////////////////////////////////// ClassSetMediaChangeState() @@ -708,6 +716,7 @@ --*/ VOID +NTAPI ClasspSetMediaChangeStateEx( IN PFUNCTIONAL_DEVICE_EXTENSION FdoExtension, IN MEDIA_CHANGE_DETECTION_STATE NewState, @@ -769,7 +778,9 @@ return; } // end ClassSetMediaChangeStateEx() + VOID +NTAPI ClassSetMediaChangeState( IN PFUNCTIONAL_DEVICE_EXTENSION FdoExtension, IN MEDIA_CHANGE_DETECTION_STATE NewState, @@ -779,7 +790,7 @@ ClasspSetMediaChangeStateEx(FdoExtension, NewState, Wait, FALSE); return; } - + /*++//////////////////////////////////////////////////////////////////////////// ClasspMediaChangeDetectionCompletion() @@ -803,6 +814,7 @@ --*/ NTSTATUS +NTAPI ClasspMediaChangeDetectionCompletion( PDEVICE_OBJECT DeviceObject, PIRP Irp, @@ -812,7 +824,7 @@ PFUNCTIONAL_DEVICE_EXTENSION fdoExtension; PCLASS_PRIVATE_FDO_DATA fdoData; PMEDIA_CHANGE_DETECTION_INFO info; - PIO_STACK_LOCATION nextIrpStack; + //PIO_STACK_LOCATION nextIrpStack; NTSTATUS status; BOOLEAN retryImmediately = FALSE; @@ -1004,7 +1016,7 @@ return STATUS_MORE_PROCESSING_REQUIRED; } - + /*++//////////////////////////////////////////////////////////////////////////// ClasspSendTestUnitIrp() - ISSUE-2000/02/20-henrygab - not documented @@ -1023,6 +1035,7 @@ --*/ PIRP +NTAPI ClasspPrepareMcnIrp( IN PFUNCTIONAL_DEVICE_EXTENSION FdoExtension, IN PMEDIA_CHANGE_DETECTION_INFO Info, @@ -1183,7 +1196,7 @@ return irp; } - + /*++//////////////////////////////////////////////////////////////////////////// ClasspSendMediaStateIrp() - ISSUE-2000/02/20-henrygab - not documented @@ -1201,6 +1214,7 @@ --*/ VOID +NTAPI ClasspSendMediaStateIrp( IN PFUNCTIONAL_DEVICE_EXTENSION FdoExtension, IN PMEDIA_CHANGE_DETECTION_INFO Info, @@ -1209,8 +1223,8 @@ { BOOLEAN requestPending = FALSE; LONG irpInUse; - LARGE_INTEGER zero; - NTSTATUS status; + //LARGE_INTEGER zero; + //NTSTATUS status; DBGTRACE(ClassDebugMCN, ("> ClasspSendMediaStateIrp")); @@ -1368,7 +1382,7 @@ return; } // end ClasspSendMediaStateIrp() - + /*++//////////////////////////////////////////////////////////////////////////// ClassCheckMediaState() @@ -1389,6 +1403,7 @@ --*/ VOID +NTAPI ClassCheckMediaState( IN PFUNCTIONAL_DEVICE_EXTENSION FdoExtension ) @@ -1421,7 +1436,7 @@ return; } // end ClassCheckMediaState() - + /*++//////////////////////////////////////////////////////////////////////////// ClassResetMediaChangeTimer() @@ -1440,6 +1455,7 @@ --*/ VOID +NTAPI ClassResetMediaChangeTimer( IN PFUNCTIONAL_DEVICE_EXTENSION FdoExtension ) @@ -1452,7 +1468,7 @@ } return; } // end ClassResetMediaChangeTimer() - + /*++//////////////////////////////////////////////////////////////////////////// ClasspInitializePolling() - ISSUE-2000/02/20-henrygab - not documented @@ -1470,15 +1486,16 @@ --*/ NTSTATUS +NTAPI ClasspInitializePolling( IN PFUNCTIONAL_DEVICE_EXTENSION FdoExtension, IN BOOLEAN AllowDriveToSleep ) { PDEVICE_OBJECT fdo = FdoExtension->DeviceObject; - PCLASS_PRIVATE_FDO_DATA fdoData = FdoExtension->PrivateFdoData; - - ULONG size; + //PCLASS_PRIVATE_FDO_DATA fdoData = FdoExtension->PrivateFdoData; + + //ULONG size; PMEDIA_CHANGE_DETECTION_INFO info; PIRP irp; @@ -1519,7 +1536,7 @@ if (buffer != NULL) { PIO_STACK_LOCATION irpStack; PSCSI_REQUEST_BLOCK srb; - PCDB cdb; + //PCDB cdb; srb = &(info->MediaChangeSrb); info->MediaChangeIrp = irp; @@ -1648,8 +1665,9 @@ return STATUS_INSUFFICIENT_RESOURCES; } // end ClasspInitializePolling() - + NTSTATUS +NTAPI ClasspInitializeGesn( IN PFUNCTIONAL_DEVICE_EXTENSION FdoExtension, IN PMEDIA_CHANGE_DETECTION_INFO Info @@ -2004,6 +2022,7 @@ --*/ NTSTATUS +NTAPI ClassInitializeTestUnitPolling( IN PFUNCTIONAL_DEVICE_EXTENSION FdoExtension, IN BOOLEAN AllowDriveToSleep @@ -2011,7 +2030,7 @@ { return ClasspInitializePolling(FdoExtension, AllowDriveToSleep); } // end ClassInitializeTestUnitPolling() - + /*++//////////////////////////////////////////////////////////////////////////// ClassInitializeMediaChangeDetection() @@ -2038,6 +2057,7 @@ --*/ VOID +NTAPI ClassInitializeMediaChangeDetection( IN PFUNCTIONAL_DEVICE_EXTENSION FdoExtension, IN PUCHAR EventPrefix @@ -2120,7 +2140,7 @@ return; } // end ClassInitializeMediaChangeDetection() - + /*++//////////////////////////////////////////////////////////////////////////// ClasspMediaChangeDeviceInstanceOverride() @@ -2144,6 +2164,7 @@ --*/ NTSTATUS +NTAPI ClasspMediaChangeDeviceInstanceOverride( IN PFUNCTIONAL_DEVICE_EXTENSION FdoExtension, OUT PBOOLEAN Enabled @@ -2289,7 +2310,7 @@ return status; } // end ClasspMediaChangeDeviceInstanceOverride() - + /*++//////////////////////////////////////////////////////////////////////////// ClasspIsMediaChangeDisabledDueToHardwareLimitation() @@ -2315,6 +2336,7 @@ --*/ BOOLEAN +NTAPI ClasspIsMediaChangeDisabledDueToHardwareLimitation( IN PFUNCTIONAL_DEVICE_EXTENSION FdoExtension, IN PUNICODE_STRING RegistryPath @@ -2519,7 +2541,7 @@ return FALSE; } // end ClasspIsMediaChangeDisabledDueToHardwareLimitation() - + /*++//////////////////////////////////////////////////////////////////////////// ClasspIsMediaChangeDisabledForClass() @@ -2546,12 +2568,13 @@ --*/ BOOLEAN +NTAPI ClasspIsMediaChangeDisabledForClass( IN PFUNCTIONAL_DEVICE_EXTENSION FdoExtension, IN PUNICODE_STRING RegistryPath ) { - PSTORAGE_DEVICE_DESCRIPTOR deviceDescriptor = FdoExtension->DeviceDescriptor; + //PSTORAGE_DEVICE_DESCRIPTOR deviceDescriptor = FdoExtension->DeviceDescriptor; OBJECT_ATTRIBUTES objectAttributes; HANDLE serviceKey = NULL; @@ -2559,8 +2582,8 @@ RTL_QUERY_REGISTRY_TABLE parameters[3]; UNICODE_STRING paramStr; - UNICODE_STRING deviceUnicodeString; - ANSI_STRING deviceString; + //UNICODE_STRING deviceUnicodeString; + //ANSI_STRING deviceString; // // Default to ENABLING MediaChangeNotification (!) @@ -2675,7 +2698,7 @@ return (BOOLEAN)(!mcnRegistryValue); } // end ClasspIsMediaChangeDisabledForClass() - + /*++//////////////////////////////////////////////////////////////////////////// ClassEnableMediaChangeDetection() ISSUE-2000/02/20-henrygab - why public? @@ -2694,6 +2717,7 @@ --*/ VOID +NTAPI ClassEnableMediaChangeDetection( IN PFUNCTIONAL_DEVICE_EXTENSION FdoExtension ) @@ -2757,7 +2781,7 @@ return; } // end ClassEnableMediaChangeDetection() - + /*++//////////////////////////////////////////////////////////////////////////// ClassDisableMediaChangeDetection() ISSUE-2000/02/20-henrygab - why public? @@ -2778,6 +2802,7 @@ ULONG BreakOnMcnDisable = FALSE; VOID +NTAPI ClassDisableMediaChangeDetection( IN PFUNCTIONAL_DEVICE_EXTENSION FdoExtension ) @@ -2806,7 +2831,7 @@ return; } // end ClassDisableMediaChangeDetection() - + /*++//////////////////////////////////////////////////////////////////////////// ClassCleanupMediaChangeDetection() ISSUE-2000/02/20-henrygab - why public?! @@ -2823,6 +2848,7 @@ --*/ VOID +NTAPI ClassCleanupMediaChangeDetection( IN PFUNCTIONAL_DEVICE_EXTENSION FdoExtension ) @@ -2845,7 +2871,7 @@ ExFreePool(info); return; } // end ClassCleanupMediaChangeDetection() - + /*++//////////////////////////////////////////////////////////////////////////// ClasspMcnControl() - ISSUE-2000/02/20-henrygab - not documented @@ -2863,6 +2889,7 @@ --*/ NTSTATUS +NTAPI ClasspMcnControl( IN PFUNCTIONAL_DEVICE_EXTENSION FdoExtension, IN PIRP Irp, @@ -2942,7 +2969,7 @@ } return status; } // end ClasspMcnControl( - + /*++//////////////////////////////////////////////////////////////////////////// ClasspMediaChangeRegistryCallBack() @@ -2970,6 +2997,7 @@ --*/ NTSTATUS +NTAPI ClasspMediaChangeRegistryCallBack( IN PWSTR ValueName, IN ULONG ValueType, @@ -3039,7 +3067,7 @@ return STATUS_SUCCESS; } // end ClasspMediaChangeRegistryCallBack() - + /*++//////////////////////////////////////////////////////////////////////////// ClasspTimerTick() - ISSUE-2000/02/20-henrygab - not documented @@ -3057,6 +3085,7 @@ --*/ VOID +NTAPI ClasspTimerTick( PDEVICE_OBJECT DeviceObject, PVOID Context @@ -3105,7 +3134,7 @@ if ((info != NULL) && (info->Method != FailurePredictionNone)) { ULONG countDown; - ULONG active; + //ULONG active; if (ClasspCanSendPollingIrp(fdoExtension)) { @@ -3186,7 +3215,7 @@ ClassReleaseRemoveLock(DeviceObject, (PIRP)ClasspTimerTick); } // end ClasspTimerTick() - + /*++//////////////////////////////////////////////////////////////////////////// ClasspEnableTimer() - ISSUE-2000/02/20-henrygab - not documented @@ -3204,6 +3233,7 @@ --*/ NTSTATUS +NTAPI ClasspEnableTimer( PDEVICE_OBJECT DeviceObject ) @@ -3236,7 +3266,7 @@ return status; } // end ClasspEnableTimer() - + /*++//////////////////////////////////////////////////////////////////////////// ClasspDisableTimer() - ISSUE-2000/02/20-henrygab - not documented @@ -3254,15 +3284,16 @@ --*/ NTSTATUS +NTAPI ClasspDisableTimer( PDEVICE_OBJECT DeviceObject ) { - PFUNCTIONAL_DEVICE_EXTENSION fdoExtension = DeviceObject->DeviceExtension; - PCOMMON_DEVICE_EXTENSION commonExtension = DeviceObject->DeviceExtension; - PMEDIA_CHANGE_DETECTION_INFO mCDInfo = fdoExtension->MediaChangeDetectionInfo; - PFAILURE_PREDICTION_INFO fPInfo = fdoExtension->FailurePredictionInfo; - NTSTATUS status; + //PFUNCTIONAL_DEVICE_EXTENSION fdoExtension = DeviceObject->DeviceExtension; + //PCOMMON_DEVICE_EXTENSION commonExtension = DeviceObject->DeviceExtension; + //PMEDIA_CHANGE_DETECTION_INFO mCDInfo = fdoExtension->MediaChangeDetectionInfo; + //PFAILURE_PREDICTION_INFO fPInfo = fdoExtension->FailurePredictionInfo; + //NTSTATUS status; PAGED_CODE(); @@ -3289,7 +3320,7 @@ return STATUS_SUCCESS; } // end ClasspDisableTimer() - + /*++//////////////////////////////////////////////////////////////////////////// ClasspFailurePredict() - ISSUE-2000/02/20-henrygab - not documented @@ -3309,6 +3340,7 @@ so it must be PAGE LOCKED. --*/ VOID +NTAPI ClasspFailurePredict( IN PDEVICE_OBJECT DeviceObject, IN PFAILURE_PREDICTION_INFO Info @@ -3421,7 +3453,7 @@ IoFreeWorkItem(workItem); return; } // end ClasspFailurePredict() - + /*++//////////////////////////////////////////////////////////////////////////// ClassNotifyFailurePredicted() ISSUE-alanwar-2000/02/20 - not documented @@ -3434,6 +3466,7 @@ --*/ VOID +NTAPI ClassNotifyFailurePredicted( PFUNCTIONAL_DEVICE_EXTENSION FdoExtension, PUCHAR Buffer, @@ -3492,7 +3525,7 @@ } } } // end ClassNotifyFailurePredicted() - + /*++//////////////////////////////////////////////////////////////////////////// ClassSetFailurePredictionPoll() @@ -3517,6 +3550,7 @@ --*/ NTSTATUS +NTAPI ClassSetFailurePredictionPoll( PFUNCTIONAL_DEVICE_EXTENSION FdoExtension, FAILURE_PREDICTION_METHOD FailurePredictionMethod, @@ -3525,7 +3559,7 @@ { PFAILURE_PREDICTION_INFO info; NTSTATUS status; - DEVICE_POWER_STATE powerState; + //DEVICE_POWER_STATE powerState; PAGED_CODE(); @@ -3608,4 +3642,3 @@ return status; } // end ClassSetFailurePredictionPoll() - Modified: trunk/reactos/drivers/storage/classpnp/class.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/classpnp/c… ============================================================================== --- trunk/reactos/drivers/storage/classpnp/class.c [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/classpnp/class.c [iso-8859-1] Sun Jul 29 01:49:24 2012 @@ -92,9 +92,6 @@ return STATUS_SUCCESS; } - - - /*++//////////////////////////////////////////////////////////////////////////// ClassInitialize() @@ -116,6 +113,7 @@ --*/ ULONG +NTAPI ClassInitialize( IN PVOID Argument1, IN PVOID Argument2, @@ -328,7 +326,7 @@ status = STATUS_SUCCESS; return status; } // end ClassInitialize() - + /*++//////////////////////////////////////////////////////////////////////////// ClassInitializeEx() @@ -362,6 +360,7 @@ --*/ ULONG +NTAPI ClassInitializeEx( IN PDRIVER_OBJECT DriverObject, IN LPGUID Guid, @@ -402,7 +401,7 @@ return(status); } // end ClassInitializeEx() - + /*++//////////////////////////////////////////////////////////////////////////// ClassUnload() @@ -420,6 +419,7 @@ --*/ VOID +NTAPI ClassUnload( IN PDRIVER_OBJECT DriverObject ) @@ -459,7 +459,7 @@ return; } // end ClassUnload() - + /*++//////////////////////////////////////////////////////////////////////////// ClassAddDevice() @@ -484,6 +484,7 @@ --*/ NTSTATUS +NTAPI ClassAddDevice( IN PDRIVER_OBJECT DriverObject, IN PDEVICE_OBJECT PhysicalDeviceObject @@ -502,7 +503,7 @@ PhysicalDeviceObject); return status; } // end ClassAddDevice() - + /*++//////////////////////////////////////////////////////////////////////////// ClassDispatchPnp() @@ -524,6 +525,7 @@ --*/ NTSTATUS +NTAPI ClassDispatchPnp( IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp @@ -1240,7 +1242,7 @@ return status; } // end ClassDispatchPnp() - + /*++//////////////////////////////////////////////////////////////////////////// ClassPnpStartDevice() @@ -1261,7 +1263,7 @@ none --*/ -NTSTATUS ClassPnpStartDevice(IN PDEVICE_OBJECT DeviceObject) +NTSTATUS NTAPI ClassPnpStartDevice(IN PDEVICE_OBJECT DeviceObject) { PCLASS_DRIVER_EXTENSION driverExtension; PCLASS_INIT_DATA initData; @@ -1273,7 +1275,7 @@ BOOLEAN isFdo = commonExtension->IsFdo; BOOLEAN isMountedDevice = TRUE; - UNICODE_STRING interfaceName; + //UNICODE_STRING interfaceName; BOOLEAN timerStarted; @@ -1570,12 +1572,12 @@ NT Status --*/ -NTSTATUS ClassReadWrite(IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp) +NTSTATUS NTAPI ClassReadWrite(IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp) { PCOMMON_DEVICE_EXTENSION commonExtension = DeviceObject->DeviceExtension; PDEVICE_OBJECT lowerDeviceObject = commonExtension->LowerDeviceObject; PIO_STACK_LOCATION currentIrpStack = IoGetCurrentIrpStackLocation(Irp); - LARGE_INTEGER startingOffset = currentIrpStack->Parameters.Read.ByteOffset; + //LARGE_INTEGER startingOffset = currentIrpStack->Parameters.Read.ByteOffset; ULONG transferByteCount = currentIrpStack->Parameters.Read.Length; ULONG isRemoved; NTSTATUS status; @@ -1725,7 +1727,7 @@ Status is returned. --*/ -NTSTATUS ClassReadDriveCapacity(IN PDEVICE_OBJECT Fdo) +NTSTATUS NTAPI ClassReadDriveCapacity(IN PDEVICE_OBJECT Fdo) { READ_CAPACITY_DATA readCapacityBuffer = {0}; NTSTATUS status; @@ -1738,7 +1740,7 @@ if (pkt){ PFUNCTIONAL_DEVICE_EXTENSION fdoExt = Fdo->DeviceExtension; KEVENT event; - NTSTATUS pktStatus; + //NTSTATUS pktStatus; IRP pseudoIrp = {0}; /* @@ -2009,6 +2011,7 @@ --*/ VOID +NTAPI ClassSendStartUnit( IN PDEVICE_OBJECT Fdo ) @@ -2135,7 +2138,7 @@ return; } // end StartUnit() - + /*++//////////////////////////////////////////////////////////////////////////// ClassAsynchronousCompletion() ISSUE-2000/02/18-henrygab - why public?! @@ -2162,6 +2165,7 @@ --*/ NTSTATUS +NTAPI ClassAsynchronousCompletion( PDEVICE_OBJECT DeviceObject, PIRP Irp, @@ -2239,15 +2243,13 @@ return STATUS_MORE_PROCESSING_REQUIRED; } // end ClassAsynchronousCompletion() - - - -VOID ServiceTransferRequest(PDEVICE_OBJECT Fdo, PIRP Irp) + +VOID NTAPI ServiceTransferRequest(PDEVICE_OBJECT Fdo, PIRP Irp) { - PCOMMON_DEVICE_EXTENSION commonExt = Fdo->DeviceExtension; + //PCOMMON_DEVICE_EXTENSION commonExt = Fdo->DeviceExtension; PFUNCTIONAL_DEVICE_EXTENSION fdoExt = Fdo->DeviceExtension; PCLASS_PRIVATE_FDO_DATA fdoData = fdoExt->PrivateFdoData; - PSTORAGE_ADAPTER_DESCRIPTOR adapterDesc = commonExt->PartitionZeroExtension->AdapterDescriptor; + //PSTORAGE_ADAPTER_DESCRIPTOR adapterDesc = commonExt->PartitionZeroExtension->AdapterDescriptor; PIO_STACK_LOCATION currentSp = IoGetCurrentIrpStackLocation(Irp); ULONG entireXferLen = currentSp->Parameters.Read.Length; PUCHAR bufPtr = MmGetMdlVirtualAddress(Irp->MdlAddress); @@ -2256,7 +2258,7 @@ SINGLE_LIST_ENTRY pktList; PSINGLE_LIST_ENTRY slistEntry; ULONG numPackets; - KIRQL oldIrql; + //KIRQL oldIrql; ULONG i; /* @@ -2397,7 +2399,6 @@ } - /*++//////////////////////////////////////////////////////////////////////////// ClassIoComplete() @@ -2428,6 +2429,7 @@ --*/ NTSTATUS +NTAPI ClassIoComplete( IN PDEVICE_OBJECT Fdo, IN PIRP Irp, @@ -2611,7 +2613,6 @@ } // end ClassIoComplete() - /*++//////////////////////////////////////////////////////////////////////////// ClassSendSrbSynchronous() @@ -2644,6 +2645,7 @@ --*/ NTSTATUS +NTAPI ClassSendSrbSynchronous( PDEVICE_OBJECT Fdo, PSCSI_REQUEST_BLOCK Srb, @@ -2960,7 +2962,6 @@ return status; } - /*++//////////////////////////////////////////////////////////////////////////// ClassInterpretSenseInfo() @@ -2990,6 +2991,7 @@ --*/ BOOLEAN +NTAPI ClassInterpretSenseInfo( IN PDEVICE_OBJECT Fdo, IN PSCSI_REQUEST_BLOCK Srb, @@ -3443,7 +3445,7 @@ case SCSI_SENSE_UNIT_ATTENTION: { - PVPB vpb; + //PVPB vpb; ULONG count; // @@ -4095,8 +4097,6 @@ } // end ClassInterpretSenseInfo() - - /*++//////////////////////////////////////////////////////////////////////////// ClassModeSense() @@ -4121,7 +4121,7 @@ Length of the transferred data is returned. --*/ -ULONG ClassModeSense( IN PDEVICE_OBJECT Fdo, +ULONG NTAPI ClassModeSense( IN PDEVICE_OBJECT Fdo, IN PCHAR ModeSenseBuffer, IN ULONG Length, IN UCHAR PageMode) @@ -4137,7 +4137,7 @@ TRANSFER_PACKET *pkt = DequeueFreeTransferPacket(Fdo, TRUE); if (pkt){ KEVENT event; - NTSTATUS pktStatus; + //NTSTATUS pktStatus; IRP pseudoIrp = {0}; /* @@ -4182,7 +4182,6 @@ return lengthTransferred; } - /*++//////////////////////////////////////////////////////////////////////////// ClassFindModePage() @@ -4208,6 +4207,7 @@ --*/ PVOID +NTAPI ClassFindModePage( IN PCHAR ModeSenseBuffer, IN ULONG Length, @@ -4279,7 +4279,7 @@ return result; } // end ClassFindModePage() - + /*++//////////////////////////////////////////////////////////////////////////// ClassSendSrbAsynchronous() @@ -4319,6 +4319,7 @@ --*/ NTSTATUS +NTAPI ClassSendSrbAsynchronous( PDEVICE_OBJECT Fdo, PSCSI_REQUEST_BLOCK Srb, @@ -4506,7 +4507,7 @@ return STATUS_PENDING; } // end ClassSendSrbAsynchronous() - + /*++//////////////////////////////////////////////////////////////////////////// ClassDeviceControlDispatch() @@ -4529,6 +4530,7 @@ --*/ NTSTATUS +NTAPI ClassDeviceControlDispatch( PDEVICE_OBJECT DeviceObject, PIRP Irp @@ -4559,7 +4561,6 @@ return commonExtension->DevInfo->ClassDeviceControl(DeviceObject,Irp); } // end ClassDeviceControlDispatch() - /*++//////////////////////////////////////////////////////////////////////////// ClassDeviceControl() @@ -4587,6 +4588,7 @@ --*/ NTSTATUS +NTAPI ClassDeviceControl( PDEVICE_OBJECT DeviceObject, PIRP Irp @@ -4613,7 +4615,7 @@ if ((controlCode == IOCTL_SCSI_PASS_THROUGH) || (controlCode == IOCTL_SCSI_PASS_THROUGH_DIRECT)) { - PSCSI_PASS_THROUGH scsiPass; + //PSCSI_PASS_THROUGH scsiPass; // // Validiate the user buffer. @@ -5585,7 +5587,7 @@ return status; } // end ClassDeviceControl() - + /*++//////////////////////////////////////////////////////////////////////////// ClassShutdownFlush() @@ -5609,6 +5611,7 @@ --*/ NTSTATUS +NTAPI ClassShutdownFlush( IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp @@ -5618,7 +5621,7 @@ ULONG isRemoved; - NTSTATUS status; + //NTSTATUS status; isRemoved = ClassAcquireRemoveLock(DeviceObject, Irp); @@ -5653,7 +5656,7 @@ return STATUS_INVALID_DEVICE_REQUEST; } // end ClassShutdownFlush() - + /*++//////////////////////////////////////////////////////////////////////////// ClassCreateDeviceObject() @@ -5682,6 +5685,7 @@ --*/ NTSTATUS +NTAPI ClassCreateDeviceObject( IN PDRIVER_OBJECT DriverObject, IN PCCHAR ObjectNameBuffer, @@ -5693,7 +5697,7 @@ BOOLEAN isPartitionable; STRING ntNameString; UNICODE_STRING ntUnicodeString; - NTSTATUS status, status2; + NTSTATUS status; PDEVICE_OBJECT deviceObject = NULL; ULONG characteristics; @@ -5956,7 +5960,7 @@ return status; } // end ClassCreateDeviceObject() - + /*++//////////////////////////////////////////////////////////////////////////// ClassClaimDevice() @@ -5979,6 +5983,7 @@ --*/ NTSTATUS +NTAPI ClassClaimDevice( IN PDEVICE_OBJECT LowerDeviceObject, IN BOOLEAN Release @@ -6079,7 +6084,7 @@ return status; } // end ClassClaimDevice() - + /*++//////////////////////////////////////////////////////////////////////////// ClassInternalIoControl() @@ -6110,6 +6115,7 @@ --*/ NTSTATUS +NTAPI ClassInternalIoControl( IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp @@ -6161,7 +6167,7 @@ return IoCallDriver(commonExtension->LowerDeviceObject, Irp); } // end ClassInternalIoControl() - + /*++//////////////////////////////////////////////////////////////////////////// ClassQueryTimeOutRegistryValue() @@ -6182,6 +6188,7 @@ --*/ ULONG +NTAPI ClassQueryTimeOutRegistryValue( IN PDEVICE_OBJECT DeviceObject ) @@ -6264,7 +6271,7 @@ return timeOut; } // end ClassQueryTimeOutRegistryValue() - + /*++//////////////////////////////////////////////////////////////////////////// ClassCheckVerifyComplete() ISSUE-2000/02/18-henrygab - why public?! @@ -6289,6 +6296,7 @@ --*/ NTSTATUS +NTAPI ClassCheckVerifyComplete( IN PDEVICE_OBJECT Fdo, IN PIRP Irp, @@ -6328,7 +6336,7 @@ return STATUS_MORE_PROCESSING_REQUIRED; } // end ClassCheckVerifyComplete() - + /*++//////////////////////////////////////////////////////////////////////////// ClassGetDescriptor() @@ -6354,6 +6362,7 @@ --*/ NTSTATUS +NTAPI ClassGetDescriptor( IN PDEVICE_OBJECT DeviceObject, IN PSTORAGE_PROPERTY_ID PropertyId, @@ -6366,7 +6375,7 @@ PSTORAGE_DESCRIPTOR_HEADER descriptor = NULL; ULONG length; - UCHAR pass = 0; + //UCHAR pass = 0; PAGED_CODE(); @@ -6477,7 +6486,7 @@ *Descriptor = descriptor; return ioStatus.Status; } // end ClassGetDescriptor() - + /*++//////////////////////////////////////////////////////////////////////////// ClassSignalCompletion() @@ -6503,6 +6512,7 @@ --*/ NTSTATUS +NTAPI ClassSignalCompletion( IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp, @@ -6513,7 +6523,7 @@ return STATUS_MORE_PROCESSING_REQUIRED; } // end ClassSignalCompletion() - + /*++//////////////////////////////////////////////////////////////////////////// ClassPnpQueryFdoRelations() @@ -6537,6 +6547,7 @@ --*/ NTSTATUS +NTAPI ClassPnpQueryFdoRelations( IN PDEVICE_OBJECT Fdo, IN PIRP Irp @@ -6569,7 +6580,7 @@ return Irp->IoStatus.Status; } // end ClassPnpQueryFdoRelations() - + /*++//////////////////////////////////////////////////////////////////////////// ClassMarkChildrenMissing() @@ -6590,6 +6601,7 @@ --*/ VOID +NTAPI ClassMarkChildrenMissing( IN PFUNCTIONAL_DEVICE_EXTENSION Fdo ) @@ -6615,7 +6627,7 @@ ClassReleaseChildLock(Fdo); return; } // end ClassMarkChildrenMissing() - + /*++//////////////////////////////////////////////////////////////////////////// ClassMarkChildMissing() @@ -6642,6 +6654,7 @@ --*/ BOOLEAN +NTAPI ClassMarkChildMissing( IN PPHYSICAL_DEVICE_EXTENSION Child, IN BOOLEAN AcquireChildLock @@ -6668,7 +6681,7 @@ return returnValue; } // end ClassMarkChildMissing() - + /*++//////////////////////////////////////////////////////////////////////////// ClassRetrieveDeviceRelations() @@ -6693,6 +6706,7 @@ --*/ NTSTATUS +NTAPI ClassRetrieveDeviceRelations( IN PDEVICE_OBJECT Fdo, IN DEVICE_RELATION_TYPE RelationType, @@ -6782,7 +6796,7 @@ ClassReleaseChildLock(fdoExtension); return STATUS_SUCCESS; } // end ClassRetrieveDeviceRelations() - + /*++//////////////////////////////////////////////////////////////////////////// ClassGetPdoId() @@ -6807,6 +6821,7 @@ --*/ NTSTATUS +NTAPI ClassGetPdoId( IN PDEVICE_OBJECT Pdo, IN BUS_QUERY_ID_TYPE IdType, @@ -6824,7 +6839,7 @@ return driverExtension->InitData.ClassQueryId( Pdo, IdType, IdString); } // end ClassGetPdoId() - + /*++//////////////////////////////////////////////////////////////////////////// ClassQueryPnpCapabilities() @@ -6845,6 +6860,7 @@ --*/ NTSTATUS +NTAPI ClassQueryPnpCapabilities( IN PDEVICE_OBJECT DeviceObject, IN PDEVICE_CAPABILITIES Capabilities @@ -6874,7 +6890,7 @@ return STATUS_NOT_IMPLEMENTED; } } // end ClassQueryPnpCapabilities() - + /*++//////////////////////////////////////////////////////////////////////////// ClassInvalidateBusRelations() @@ -6896,6 +6912,7 @@ --*/ VOID +NTAPI ClassInvalidateBusRelations( IN PDEVICE_OBJECT Fdo ) @@ -6927,7 +6944,7 @@ return; } // end ClassInvalidateBusRelations() - + /*++//////////////////////////////////////////////////////////////////////////// ClassRemoveDevice() ISSUE-2000/02/18-henrygab - why public?! @@ -6951,6 +6968,7 @@ --*/ NTSTATUS +NTAPI ClassRemoveDevice( IN PDEVICE_OBJECT DeviceObject, IN UCHAR RemoveType @@ -7072,7 +7090,7 @@ status = STATUS_SUCCESS; if (commonExtension->IsFdo){ - PDEVICE_OBJECT pdo; + //PDEVICE_OBJECT pdo; PFUNCTIONAL_DEVICE_EXTENSION fdoExtension = DeviceObject->DeviceExtension; ClasspDisableTimer(fdoExtension->DeviceObject); @@ -7196,7 +7214,7 @@ return STATUS_SUCCESS; } // end ClassRemoveDevice() - + /*++//////////////////////////////////////////////////////////////////////////// ClassGetDriverExtension() @@ -7215,13 +7233,14 @@ --*/ PCLASS_DRIVER_EXTENSION +NTAPI ClassGetDriverExtension( IN PDRIVER_OBJECT DriverObject ) { return IoGetDriverObjectExtension(DriverObject, CLASS_DRIVER_EXTENSION_KEY); } // end ClassGetDriverExtension() - + /*++//////////////////////////////////////////////////////////////////////////// ClasspStartIo() @@ -7240,6 +7259,7 @@ --*/ VOID +NTAPI ClasspStartIo( IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp @@ -7270,7 +7290,7 @@ return; } // ClasspStartIo() - + /*++//////////////////////////////////////////////////////////////////////////// ClassUpdateInformationInRegistry() @@ -7299,6 +7319,7 @@ --*/ VOID +NTAPI ClassUpdateInformationInRegistry( IN PDEVICE_OBJECT Fdo, IN PCHAR DeviceName, @@ -7477,7 +7498,7 @@ } } // end ClassUpdateInformationInRegistry() - + /*++//////////////////////////////////////////////////////////////////////////// ClasspSendSynchronousCompletion() @@ -7501,6 +7522,7 @@ --*/ NTSTATUS +NTAPI ClasspSendSynchronousCompletion( IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp, @@ -7539,13 +7561,14 @@ return STATUS_MORE_PROCESSING_REQUIRED; } // end ClasspSendSynchronousCompletion() - + /*++ ISSUE-2000/02/20-henrygab Not documented ClasspRegisterMountedDeviceInterface --*/ VOID +NTAPI ClasspRegisterMountedDeviceInterface( IN PDEVICE_OBJECT DeviceObject ) @@ -7598,7 +7621,7 @@ } return; } // end ClasspRegisterMountedDeviceInterface() - + /*++//////////////////////////////////////////////////////////////////////////// ClassSendDeviceIoControlSynchronous() @@ -7636,6 +7659,7 @@ --*/ VOID +NTAPI ClassSendDeviceIoControlSynchronous( IN ULONG IoControlCode, IN PDEVICE_OBJECT TargetDeviceObject, @@ -7874,7 +7898,7 @@ return; } // end ClassSendDeviceIoControlSynchronous() - + /*++//////////////////////////////////////////////////////////////////////////// ClassForwardIrpSynchronous() @@ -7893,6 +7917,7 @@ --*/ NTSTATUS +NTAPI ClassForwardIrpSynchronous( IN PCOMMON_DEVICE_EXTENSION CommonExtension, IN PIRP Irp @@ -7901,7 +7926,7 @@ IoCopyCurrentIrpStackLocationToNext(Irp); return ClassSendIrpSynchronous(CommonExtension->LowerDeviceObject, Irp); } // end ClassForwardIrpSynchronous() - + /*++//////////////////////////////////////////////////////////////////////////// ClassSendIrpSynchronous() @@ -7922,6 +7947,7 @@ --*/ NTSTATUS +NTAPI ClassSendIrpSynchronous( IN PDEVICE_OBJECT TargetDeviceObject, IN PIRP Irp @@ -7999,7 +8025,7 @@ return status; } // end ClassSendIrpSynchronous() - + /*++//////////////////////////////////////////////////////////////////////////// ClassGetVpb() @@ -8021,25 +8047,27 @@ --*/ PVPB +NTAPI ClassGetVpb( IN PDEVICE_OBJECT DeviceObject ) { return DeviceObject->Vpb; } // end ClassGetVpb() - + /*++ ISSUE-2000/02/20-henrygab Not documented ClasspAllocateReleaseRequest --*/ NTSTATUS +NTAPI ClasspAllocateReleaseRequest( IN PDEVICE_OBJECT Fdo ) { PFUNCTIONAL_DEVICE_EXTENSION fdoExtension = Fdo->DeviceExtension; - PIO_STACK_LOCATION irpStack; + //PIO_STACK_LOCATION irpStack; KeInitializeSpinLock(&(fdoExtension->ReleaseQueueSpinLock)); @@ -8062,13 +8090,14 @@ return STATUS_SUCCESS; } // end ClasspAllocateReleaseRequest() - + /*++ ISSUE-2000/02/20-henrygab Not documented ClasspFreeReleaseRequest --*/ VOID +NTAPI ClasspFreeReleaseRequest( IN PDEVICE_OBJECT Fdo ) @@ -8105,7 +8134,7 @@ return; } // end ClasspFreeReleaseRequest() - + /*++//////////////////////////////////////////////////////////////////////////// ClassReleaseQueue() @@ -8130,6 +8159,7 @@ --*/ VOID +NTAPI ClassReleaseQueue( IN PDEVICE_OBJECT Fdo ) @@ -8137,7 +8167,7 @@ ClasspReleaseQueue(Fdo, NULL); return; } // end ClassReleaseQueue() - + /*++//////////////////////////////////////////////////////////////////////////// ClasspAllocateReleaseQueueIrp() @@ -8162,11 +8192,12 @@ --*/ NTSTATUS +NTAPI ClasspAllocateReleaseQueueIrp( PFUNCTIONAL_DEVICE_EXTENSION FdoExtension ) { - KIRQL oldIrql; + //KIRQL oldIrql; UCHAR lowerStackSize; // @@ -8205,7 +8236,6 @@ return STATUS_SUCCESS; } - /*++//////////////////////////////////////////////////////////////////////////// @@ -8238,6 +8268,7 @@ --*/ VOID +NTAPI ClasspReleaseQueue( IN PDEVICE_OBJECT Fdo, IN PIRP ReleaseQueueIrp OPTIONAL @@ -8353,7 +8384,7 @@ return; } // end ClassReleaseQueue() - + /*++//////////////////////////////////////////////////////////////////////////// ClassReleaseQueueCompletion() @@ -8380,6 +8411,7 @@ --*/ NTSTATUS +NTAPI ClassReleaseQueueCompletion( PDEVICE_OBJECT DeviceObject, PIRP Irp, @@ -8429,7 +8461,7 @@ return STATUS_MORE_PROCESSING_REQUIRED; } // ClassAsynchronousCompletion() - + /*++//////////////////////////////////////////////////////////////////////////// ClassAcquireChildLock() @@ -8450,6 +8482,7 @@ --*/ VOID +NTAPI ClassAcquireChildLock( IN PFUNCTIONAL_DEVICE_EXTENSION FdoExtension ) @@ -8472,7 +8505,7 @@ FdoExtension->ChildLockAcquisitionCount++; return; } - + /*++//////////////////////////////////////////////////////////////////////////// ClassReleaseChildLock() ISSUE-2000/02/18-henrygab - not documented @@ -8492,6 +8525,7 @@ --*/ VOID +NTAPI ClassReleaseChildLock( IN PFUNCTIONAL_DEVICE_EXTENSION FdoExtension ) @@ -8508,7 +8542,7 @@ return; } // end ClassReleaseChildLock( - + /*++//////////////////////////////////////////////////////////////////////////// ClassAddChild() @@ -8531,6 +8565,7 @@ --*/ VOID +NTAPI ClassAddChild( IN PFUNCTIONAL_DEVICE_EXTENSION Parent, IN PPHYSICAL_DEVICE_EXTENSION Child, @@ -8565,7 +8600,7 @@ } return; } // end ClassAddChild() - + /*++//////////////////////////////////////////////////////////////////////////// ClassRemoveChild() @@ -8592,6 +8627,7 @@ --*/ PPHYSICAL_DEVICE_EXTENSION +NTAPI ClassRemoveChild( IN PFUNCTIONAL_DEVICE_EXTENSION Parent, IN PPHYSICAL_DEVICE_EXTENSION Child, @@ -8659,13 +8695,13 @@ return Child; } // end ClassRemoveChild() - /*++ ISSUE-2000/02/20-henrygab Not documented ClasspRetryRequestDpc --*/ VOID +NTAPI ClasspRetryRequestDpc( IN PKDPC Dpc, IN PDEVICE_OBJECT DeviceObject, @@ -8735,13 +8771,14 @@ return; } // end ClasspRetryRequestDpc() - + /*++ ISSUE-2000/02/20-henrygab Not documented ClassRetryRequest --*/ VOID +NTAPI ClassRetryRequest( IN PDEVICE_OBJECT SelfDeviceObject, IN PIRP Irp, @@ -8751,7 +8788,7 @@ PFUNCTIONAL_DEVICE_EXTENSION fdoExtension; PCLASS_PRIVATE_FDO_DATA fdoData; PCLASS_RETRY_INFO retryInfo; - PCLASS_RETRY_INFO *previousNext; + //PCLASS_RETRY_INFO *previousNext; LARGE_INTEGER delta; KIRQL irql; @@ -8867,13 +8904,14 @@ } // end ClassRetryRequest() - + /*++ ISSUE-2000/02/20-henrygab Not documented ClasspRetryDpcTimer --*/ VOID +NTAPI ClasspRetryDpcTimer( IN PCLASS_PRIVATE_FDO_DATA FdoData ) @@ -8922,8 +8960,9 @@ return; } // end ClasspRetryDpcTimer() - + NTSTATUS +NTAPI ClasspInitializeHotplugInfo( IN PFUNCTIONAL_DEVICE_EXTENSION FdoExtension ) @@ -9040,8 +9079,9 @@ return STATUS_SUCCESS; } - + VOID +NTAPI ClasspScanForClassHacks( IN PFUNCTIONAL_DEVICE_EXTENSION FdoExtension, IN ULONG_PTR Data @@ -9057,8 +9097,9 @@ SET_FLAG(FdoExtension->PrivateFdoData->HackFlags, Data); return; } - + VOID +NTAPI ClasspScanForSpecialInRegistry( IN PFUNCTIONAL_DEVICE_EXTENSION FdoExtension ) @@ -9177,7 +9218,3 @@ return; } - - - - Modified: trunk/reactos/drivers/storage/classpnp/classp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/classpnp/c… ============================================================================== --- trunk/reactos/drivers/storage/classpnp/classp.h [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/classpnp/classp.h [iso-8859-1] Sun Jul 29 01:49:24 2012 @@ -509,34 +509,40 @@ } NTSTATUS +NTAPI DriverEntry( IN PDRIVER_OBJECT DriverObject, IN PUNICODE_STRING RegistryPath ); VOID +NTAPI ClassUnload( IN PDRIVER_OBJECT DriverObject ); NTSTATUS +NTAPI ClassCreateClose( IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp ); NTSTATUS +NTAPI ClasspCreateClose( IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp ); VOID +NTAPI ClasspCleanupProtectedLocks( IN PFILE_OBJECT_EXTENSION FsContext ); NTSTATUS +NTAPI ClasspEjectionControl( IN PDEVICE_OBJECT Fdo, IN PIRP Irp, @@ -545,63 +551,59 @@ ); NTSTATUS +NTAPI ClassReadWrite( IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp ); NTSTATUS +NTAPI ClassDeviceControlDispatch( PDEVICE_OBJECT DeviceObject, PIRP Irp ); NTSTATUS -ClassDeviceControl( - PDEVICE_OBJECT DeviceObject, - PIRP Irp - ); - -NTSTATUS +NTAPI ClassDispatchPnp( PDEVICE_OBJECT DeviceObject, PIRP Irp ); NTSTATUS +NTAPI ClassPnpStartDevice( IN PDEVICE_OBJECT DeviceObject ); NTSTATUS -ClassInternalIoControl ( +NTAPI +ClassShutdownFlush( IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp ); NTSTATUS -ClassShutdownFlush( +NTAPI +ClassSystemControl( IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp ); -NTSTATUS -ClassSystemControl( - IN PDEVICE_OBJECT DeviceObject, - IN PIRP Irp - ); - // // Class internal routines // NTSTATUS +NTAPI ClassAddDevice( IN PDRIVER_OBJECT DriverObject, IN OUT PDEVICE_OBJECT PhysicalDeviceObject ); NTSTATUS +NTAPI ClasspSendSynchronousCompletion( IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp, @@ -609,6 +611,7 @@ ); VOID +NTAPI RetryRequest( PDEVICE_OBJECT DeviceObject, PIRP Irp, @@ -618,6 +621,7 @@ ); NTSTATUS +NTAPI ClassIoCompletion( IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp, @@ -625,12 +629,14 @@ ); NTSTATUS +NTAPI ClassPnpQueryFdoRelations( IN PDEVICE_OBJECT Fdo, IN PIRP Irp ); NTSTATUS +NTAPI ClassRetrieveDeviceRelations( IN PDEVICE_OBJECT Fdo, IN DEVICE_RELATION_TYPE RelationType, @@ -638,6 +644,7 @@ ); NTSTATUS +NTAPI ClassGetPdoId( IN PDEVICE_OBJECT Pdo, IN BUS_QUERY_ID_TYPE IdType, @@ -645,18 +652,21 @@ ); NTSTATUS +NTAPI ClassQueryPnpCapabilities( IN PDEVICE_OBJECT PhysicalDeviceObject, IN PDEVICE_CAPABILITIES Capabilities ); VOID +NTAPI ClasspStartIo( IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp ); NTSTATUS +NTAPI ClasspPagingNotificationCompletion( IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp, @@ -664,6 +674,7 @@ ); NTSTATUS +NTAPI ClasspMediaChangeCompletion( PDEVICE_OBJECT DeviceObject, PIRP Irp, @@ -671,12 +682,14 @@ ); PFILE_OBJECT_EXTENSION +NTAPI ClasspGetFsContext( IN PCOMMON_DEVICE_EXTENSION CommonExtension, IN PFILE_OBJECT FileObject ); NTSTATUS +NTAPI ClasspMcnControl( IN PFUNCTIONAL_DEVICE_EXTENSION FdoExtension, IN PIRP Irp, @@ -684,16 +697,19 @@ ); VOID +NTAPI ClasspRegisterMountedDeviceInterface( IN PDEVICE_OBJECT DeviceObject ); NTSTATUS +NTAPI ClasspDisableTimer( PDEVICE_OBJECT DeviceObject ); NTSTATUS +NTAPI ClasspEnableTimer( PDEVICE_OBJECT DeviceObject ); @@ -703,16 +719,19 @@ // VOID +NTAPI InitializeDictionary( IN PDICTIONARY Dictionary ); BOOLEAN +NTAPI TestDictionarySignature( IN PDICTIONARY Dictionary ); NTSTATUS +NTAPI AllocateDictionaryEntry( IN PDICTIONARY Dictionary, IN ULONGLONG Key, @@ -722,12 +741,14 @@ ); PVOID +NTAPI GetDictionaryEntry( IN PDICTIONARY Dictionary, IN ULONGLONG Key ); VOID +NTAPI FreeDictionaryEntry( IN PDICTIONARY Dictionary, IN PVOID Entry @@ -735,16 +756,19 @@ NTSTATUS +NTAPI ClasspAllocateReleaseRequest( IN PDEVICE_OBJECT Fdo ); VOID +NTAPI ClasspFreeReleaseRequest( IN PDEVICE_OBJECT Fdo ); NTSTATUS +NTAPI ClassReleaseQueueCompletion( IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp, @@ -752,12 +776,14 @@ ); VOID +NTAPI ClasspReleaseQueue( IN PDEVICE_OBJECT DeviceObject, IN PIRP ReleaseQueueIrp ); VOID +NTAPI ClasspDisablePowerNotification( PFUNCTIONAL_DEVICE_EXTENSION FdoExtension ); @@ -767,12 +793,14 @@ // NTSTATUS +NTAPI ClassDispatchPower( IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp ); NTSTATUS +NTAPI ClassMinimalPowerHandler( IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp @@ -783,6 +811,7 @@ // VOID +NTAPI ClassAddChild( IN PFUNCTIONAL_DEVICE_EXTENSION Parent, IN PPHYSICAL_DEVICE_EXTENSION Child, @@ -790,6 +819,7 @@ ); PPHYSICAL_DEVICE_EXTENSION +NTAPI ClassRemoveChild( IN PFUNCTIONAL_DEVICE_EXTENSION Parent, IN PPHYSICAL_DEVICE_EXTENSION Child, @@ -797,11 +827,13 @@ ); VOID +NTAPI ClasspRetryDpcTimer( IN PCLASS_PRIVATE_FDO_DATA FdoData ); VOID +NTAPI ClasspRetryRequestDpc( IN PKDPC Dpc, IN PDEVICE_OBJECT DeviceObject, @@ -810,12 +842,14 @@ ); VOID +NTAPI ClassFreeOrReuseSrb( IN PFUNCTIONAL_DEVICE_EXTENSION FdoExtension, IN PSCSI_REQUEST_BLOCK Srb ); VOID +NTAPI ClassRetryRequest( IN PDEVICE_OBJECT SelfDeviceObject, IN PIRP Irp, @@ -823,6 +857,7 @@ ); VOID +NTAPI ClasspBuildRequestEx( IN PFUNCTIONAL_DEVICE_EXTENSION Fdo, IN PIRP Irp, @@ -830,17 +865,20 @@ ); NTSTATUS +NTAPI ClasspAllocateReleaseQueueIrp( IN PFUNCTIONAL_DEVICE_EXTENSION FdoExtension ); NTSTATUS +NTAPI ClasspInitializeGesn( IN PFUNCTIONAL_DEVICE_EXTENSION FdoExtension, IN PMEDIA_CHANGE_DETECTION_INFO Info ); VOID +NTAPI ClasspSendNotification( IN PFUNCTIONAL_DEVICE_EXTENSION FdoExtension, IN const GUID * Guid, @@ -849,60 +887,60 @@ ); VOID +NTAPI ClassSendEjectionNotification( IN PFUNCTIONAL_DEVICE_EXTENSION FdoExtension ); VOID +NTAPI ClasspScanForSpecialInRegistry( IN PFUNCTIONAL_DEVICE_EXTENSION FdoExtension ); VOID +NTAPI ClasspScanForClassHacks( IN PFUNCTIONAL_DEVICE_EXTENSION FdoExtension, IN ULONG_PTR Data ); NTSTATUS +NTAPI ClasspInitializeHotplugInfo( IN PFUNCTIONAL_DEVICE_EXTENSION FdoExtension ); VOID +NTAPI ClasspPerfIncrementErrorCount( IN PFUNCTIONAL_DEVICE_EXTENSION FdoExtension ); VOID +NTAPI ClasspPerfIncrementSuccessfulIo( IN PFUNCTIONAL_DEVICE_EXTENSION FdoExtension ); - -PTRANSFER_PACKET NewTransferPacket(PDEVICE_OBJECT Fdo); -VOID DestroyTransferPacket(PTRANSFER_PACKET Pkt); -VOID EnqueueFreeTransferPacket(PDEVICE_OBJECT Fdo, PTRANSFER_PACKET Pkt); -PTRANSFER_PACKET DequeueFreeTransferPacket(PDEVICE_OBJECT Fdo, BOOLEAN AllocIfNeeded); -VOID SetupReadWriteTransferPacket(PTRANSFER_PACKET pkt, PVOID Buf, ULONG Len, LARGE_INTEGER DiskLocation, PIRP OriginalIrp); -VOID SubmitTransferPacket(PTRANSFER_PACKET Pkt); -NTSTATUS TransferPktComplete(IN PDEVICE_OBJECT NullFdo, IN PIRP Irp, IN PVOID Context); -VOID ServiceTransferRequest(PDEVICE_OBJECT Fdo, PIRP Irp); -VOID TransferPacketRetryTimerDpc(IN PKDPC Dpc, IN PVOID DeferredContext, IN PVOID SystemArgument1, IN PVOID SystemArgument2); -BOOLEAN InterpretTransferPacketError(PTRANSFER_PACKET Pkt); -BOOLEAN RetryTransferPacket(PTRANSFER_PACKET Pkt); -VOID EnqueueDeferredClientIrp(PCLASS_PRIVATE_FDO_DATA FdoData, PIRP Irp); -PIRP DequeueDeferredClientIrp(PCLASS_PRIVATE_FDO_DATA FdoData); -VOID InitLowMemRetry(PTRANSFER_PACKET Pkt, PVOID BufPtr, ULONG Len, LARGE_INTEGER TargetLocation); -BOOLEAN StepLowMemRetry(PTRANSFER_PACKET Pkt); -VOID SetupEjectionTransferPacket(TRANSFER_PACKET *Pkt, BOOLEAN PreventMediaRemoval, PKEVENT SyncEventPtr, PIRP OriginalIrp); -VOID SetupModeSenseTransferPacket(TRANSFER_PACKET *Pkt, PKEVENT SyncEventPtr, PVOID ModeSenseBuffer, UCHAR ModeSenseBufferLen, UCHAR PageMode, PIRP OriginalIrp); -VOID SetupDriveCapacityTransferPacket(TRANSFER_PACKET *Pkt, PVOID ReadCapacityBuffer, ULONG ReadCapacityBufferLen, PKEVENT SyncEventPtr, PIRP OriginalIrp); -PMDL BuildDeviceInputMdl(PVOID Buffer, ULONG BufferLen); -VOID FreeDeviceInputMdl(PMDL Mdl); -NTSTATUS InitializeTransferPackets(PDEVICE_OBJECT Fdo); -VOID DestroyAllTransferPackets(PDEVICE_OBJECT Fdo); - - - - - +PTRANSFER_PACKET NTAPI NewTransferPacket(PDEVICE_OBJECT Fdo); +VOID NTAPI DestroyTransferPacket(PTRANSFER_PACKET Pkt); +VOID NTAPI EnqueueFreeTransferPacket(PDEVICE_OBJECT Fdo, PTRANSFER_PACKET Pkt); +PTRANSFER_PACKET NTAPI DequeueFreeTransferPacket(PDEVICE_OBJECT Fdo, BOOLEAN AllocIfNeeded); +VOID NTAPI SetupReadWriteTransferPacket(PTRANSFER_PACKET pkt, PVOID Buf, ULONG Len, LARGE_INTEGER DiskLocation, PIRP OriginalIrp); +VOID NTAPI SubmitTransferPacket(PTRANSFER_PACKET Pkt); +NTSTATUS NTAPI TransferPktComplete(IN PDEVICE_OBJECT NullFdo, IN PIRP Irp, IN PVOID Context); +VOID NTAPI ServiceTransferRequest(PDEVICE_OBJECT Fdo, PIRP Irp); +VOID NTAPI TransferPacketRetryTimerDpc(IN PKDPC Dpc, IN PVOID DeferredContext, IN PVOID SystemArgument1, IN PVOID SystemArgument2); +BOOLEAN NTAPI InterpretTransferPacketError(PTRANSFER_PACKET Pkt); +BOOLEAN NTAPI RetryTransferPacket(PTRANSFER_PACKET Pkt); +VOID NTAPI EnqueueDeferredClientIrp(PCLASS_PRIVATE_FDO_DATA FdoData, PIRP Irp); +PIRP NTAPI DequeueDeferredClientIrp(PCLASS_PRIVATE_FDO_DATA FdoData); +VOID NTAPI InitLowMemRetry(PTRANSFER_PACKET Pkt, PVOID BufPtr, ULONG Len, LARGE_INTEGER TargetLocation); +BOOLEAN NTAPI StepLowMemRetry(PTRANSFER_PACKET Pkt); +VOID NTAPI SetupEjectionTransferPacket(TRANSFER_PACKET *Pkt, BOOLEAN PreventMediaRemoval, PKEVENT SyncEventPtr, PIRP OriginalIrp); +VOID NTAPI SetupModeSenseTransferPacket(TRANSFER_PACKET *Pkt, PKEVENT SyncEventPtr, PVOID ModeSenseBuffer, UCHAR ModeSenseBufferLen, UCHAR PageMode, PIRP OriginalIrp); +VOID NTAPI SetupDriveCapacityTransferPacket(TRANSFER_PACKET *Pkt, PVOID ReadCapacityBuffer, ULONG ReadCapacityBufferLen, PKEVENT SyncEventPtr, PIRP OriginalIrp); +PMDL NTAPI BuildDeviceInputMdl(PVOID Buffer, ULONG BufferLen); +VOID NTAPI FreeDeviceInputMdl(PMDL Mdl); +NTSTATUS NTAPI InitializeTransferPackets(PDEVICE_OBJECT Fdo); +VOID NTAPI DestroyAllTransferPackets(PDEVICE_OBJECT Fdo); Modified: trunk/reactos/drivers/storage/classpnp/classwmi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/classpnp/c… ============================================================================== --- trunk/reactos/drivers/storage/classpnp/classwmi.c [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/classpnp/classwmi.c [iso-8859-1] Sun Jul 29 01:49:24 2012 @@ -24,6 +24,7 @@ #include "classp.h" NTSTATUS +NTAPI ClassSystemControl( IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp @@ -121,6 +122,7 @@ --*/ NTSTATUS +NTAPI ClassSystemControl( IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp @@ -551,6 +553,7 @@ --*/ SCSIPORTAPI NTSTATUS +NTAPI ClassWmiCompleteRequest( IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp, @@ -561,7 +564,7 @@ { PCOMMON_DEVICE_EXTENSION commonExtension = DeviceObject->DeviceExtension; PIO_STACK_LOCATION irpStack = IoGetCurrentIrpStackLocation(Irp); - UCHAR MinorFunction; + //UCHAR MinorFunction; PUCHAR buffer; ULONG retSize; UCHAR minorFunction; @@ -715,6 +718,7 @@ --*/ NTSTATUS +NTAPI ClassWmiFireEvent( IN PDEVICE_OBJECT DeviceObject, IN LPGUID Guid, Modified: trunk/reactos/drivers/storage/classpnp/clntirp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/classpnp/c… ============================================================================== --- trunk/reactos/drivers/storage/classpnp/clntirp.c [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/classpnp/clntirp.c [iso-8859-1] Sun Jul 29 01:49:24 2012 @@ -24,13 +24,12 @@ #include "classp.h" #include "debug.h" - /* * EnqueueDeferredClientIrp * * Note: we currently do not support Cancel for storage irps. */ -VOID EnqueueDeferredClientIrp(PCLASS_PRIVATE_FDO_DATA FdoData, PIRP Irp) +VOID NTAPI EnqueueDeferredClientIrp(PCLASS_PRIVATE_FDO_DATA FdoData, PIRP Irp) { KIRQL oldIrql; @@ -44,7 +43,7 @@ * DequeueDeferredClientIrp * */ -PIRP DequeueDeferredClientIrp(PCLASS_PRIVATE_FDO_DATA FdoData) +PIRP NTAPI DequeueDeferredClientIrp(PCLASS_PRIVATE_FDO_DATA FdoData) { KIRQL oldIrql; PLIST_ENTRY listEntry; @@ -69,6 +68,3 @@ return irp; } - - - Modified: trunk/reactos/drivers/storage/classpnp/create.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/classpnp/c… ============================================================================== --- trunk/reactos/drivers/storage/classpnp/create.c [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/classpnp/create.c [iso-8859-1] Sun Jul 29 01:49:24 2012 @@ -35,16 +35,18 @@ PFILE_OBJECT_EXTENSION +NTAPI ClasspGetFsContext( IN PCOMMON_DEVICE_EXTENSION CommonExtension, IN PFILE_OBJECT FileObject ); VOID +NTAPI ClasspCleanupDisableMcn( IN PFILE_OBJECT_EXTENSION FsContext ); - + #ifdef ALLOC_PRAGMA #pragma alloc_text(PAGE, ClassCreateClose) #pragma alloc_text(PAGE, ClasspCreateClose) @@ -55,6 +57,7 @@ #endif NTSTATUS +NTAPI ClassCreateClose( IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp @@ -119,8 +122,8 @@ return status; } - NTSTATUS +NTAPI ClasspCreateClose( IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp @@ -292,8 +295,8 @@ return status; } - VOID +NTAPI ClasspCleanupProtectedLocks( IN PFILE_OBJECT_EXTENSION FsContext ) @@ -403,8 +406,8 @@ return; } - VOID +NTAPI ClasspCleanupDisableMcn( IN PFILE_OBJECT_EXTENSION FsContext ) @@ -438,7 +441,6 @@ return; } - #if 1 /* @@ -447,6 +449,7 @@ * are resolved. */ NTSTATUS +NTAPI ClasspEjectionControl( IN PDEVICE_OBJECT Fdo, IN PIRP Irp, @@ -738,7 +741,8 @@ * HOWEVER, it seems to cause pagefile initialization to fail during boot * for some reason. Need to resolve this before switching to this function. */ -NTSTATUS +NTSTATUS +NTAPI ClasspEjectionControl( IN PDEVICE_OBJECT Fdo, IN PIRP Irp, @@ -965,6 +969,7 @@ #endif PFILE_OBJECT_EXTENSION +NTAPI ClasspGetFsContext( IN PCOMMON_DEVICE_EXTENSION CommonExtension, IN PFILE_OBJECT FileObject @@ -974,4 +979,3 @@ return GetDictionaryEntry(&(CommonExtension->FileObjectDictionary), (ULONGLONG) FileObject); } - Modified: trunk/reactos/drivers/storage/classpnp/dictlib.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/classpnp/d… ============================================================================== --- trunk/reactos/drivers/storage/classpnp/dictlib.c [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/classpnp/dictlib.c [iso-8859-1] Sun Jul 29 01:49:24 2012 @@ -35,6 +35,7 @@ VOID +NTAPI InitializeDictionary( IN PDICTIONARY Dictionary ) @@ -45,8 +46,8 @@ return; } - BOOLEAN +NTAPI TestDictionarySignature( IN PDICTIONARY Dictionary ) @@ -55,6 +56,7 @@ } NTSTATUS +NTAPI AllocateDictionaryEntry( IN PDICTIONARY Dictionary, IN ULONGLONG Key, @@ -132,8 +134,8 @@ return status; } - PVOID +NTAPI GetDictionaryEntry( IN PDICTIONARY Dictionary, IN ULONGLONG Key @@ -164,8 +166,8 @@ return data; } - VOID +NTAPI FreeDictionaryEntry( IN PDICTIONARY Dictionary, IN PVOID Entry @@ -208,5 +210,3 @@ return; } - - Modified: trunk/reactos/drivers/storage/classpnp/lock.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/classpnp/l… ============================================================================== --- trunk/reactos/drivers/storage/classpnp/lock.c [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/classpnp/lock.c [iso-8859-1] Sun Jul 29 01:49:24 2012 @@ -79,6 +79,7 @@ --*/ ULONG +NTAPI ClassAcquireRemoveLockEx( IN PDEVICE_OBJECT DeviceObject, IN OPTIONAL PVOID Tag, @@ -209,6 +210,7 @@ --*/ VOID +NTAPI ClassReleaseRemoveLock( IN PDEVICE_OBJECT DeviceObject, IN OPTIONAL PIRP Tag @@ -372,6 +374,7 @@ --*/ VOID +NTAPI ClassCompleteRequest( IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp, Modified: trunk/reactos/drivers/storage/classpnp/obsolete.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/classpnp/o… ============================================================================== --- trunk/reactos/drivers/storage/classpnp/obsolete.c [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/classpnp/obsolete.c [iso-8859-1] Sun Jul 29 01:49:24 2012 @@ -26,8 +26,8 @@ #include "classp.h" #include "debug.h" -PIRP ClassRemoveCScanList(IN PCSCAN_LIST List); -VOID ClasspInitializeCScanList(IN PCSCAN_LIST List); +PIRP NTAPI ClassRemoveCScanList(IN PCSCAN_LIST List); +VOID NTAPI ClasspInitializeCScanList(IN PCSCAN_LIST List); #ifdef ALLOC_PRAGMA #pragma alloc_text(PAGE, ClassDeleteSrbLookasideList) @@ -38,10 +38,6 @@ LIST_ENTRY Entry; ULONGLONG BlockNumber; } CSCAN_LIST_ENTRY, *PCSCAN_LIST_ENTRY; - - - - /* * ClassSplitRequest @@ -51,7 +47,7 @@ * StartIo routine when the transfer size is too large for the hardware. * We map it to our new read/write handler. */ -VOID ClassSplitRequest(IN PDEVICE_OBJECT Fdo, IN PIRP Irp, IN ULONG MaximumBytes) +VOID NTAPI ClassSplitRequest(IN PDEVICE_OBJECT Fdo, IN PIRP Irp, IN ULONG MaximumBytes) { PFUNCTIONAL_DEVICE_EXTENSION fdoExt = Fdo->DeviceExtension; PCLASS_PRIVATE_FDO_DATA fdoData = fdoExt->PrivateFdoData; @@ -69,7 +65,6 @@ ServiceTransferRequest(Fdo, Irp); } - /*++//////////////////////////////////////////////////////////////////////////// @@ -100,6 +95,7 @@ --*/ NTSTATUS +NTAPI ClassIoCompleteAssociated( IN PDEVICE_OBJECT Fdo, IN PIRP Irp, @@ -313,7 +309,6 @@ } // end ClassIoCompleteAssociated() - /*++//////////////////////////////////////////////////////////////////////////// RetryRequest() @@ -342,6 +337,7 @@ --*/ VOID +NTAPI RetryRequest( PDEVICE_OBJECT DeviceObject, PIRP Irp, @@ -443,7 +439,6 @@ return; } // end RetryRequest() - /*++ ClassBuildRequest() @@ -477,6 +472,7 @@ --*/ NTSTATUS +NTAPI ClassBuildRequest( PDEVICE_OBJECT Fdo, PIRP Irp @@ -504,8 +500,8 @@ } // end ClassBuildRequest() - VOID +NTAPI ClasspBuildRequestEx( IN PFUNCTIONAL_DEVICE_EXTENSION FdoExtension, IN PIRP Irp, @@ -731,8 +727,7 @@ } - -VOID ClasspInsertCScanList(IN PLIST_ENTRY ListHead, IN PCSCAN_LIST_ENTRY Entry) +VOID NTAPI ClasspInsertCScanList(IN PLIST_ENTRY ListHead, IN PCSCAN_LIST_ENTRY Entry) { PCSCAN_LIST_ENTRY t; @@ -776,8 +771,7 @@ } - -VOID ClassInsertCScanList(IN PCSCAN_LIST List, IN PIRP Irp, IN ULONGLONG BlockNumber, IN BOOLEAN LowPriority) +VOID NTAPI ClassInsertCScanList(IN PCSCAN_LIST List, IN PIRP Irp, IN ULONGLONG BlockNumber, IN BOOLEAN LowPriority) /*++ Routine Description: @@ -829,11 +823,8 @@ return; } - - - -VOID ClassFreeOrReuseSrb( IN PFUNCTIONAL_DEVICE_EXTENSION FdoExtension, - IN PSCSI_REQUEST_BLOCK Srb) +VOID NTAPI ClassFreeOrReuseSrb(IN PFUNCTIONAL_DEVICE_EXTENSION FdoExtension, + IN PSCSI_REQUEST_BLOCK Srb) /*++ Routine Description: @@ -887,7 +878,6 @@ } } - /*++//////////////////////////////////////////////////////////////////////////// ClassDeleteSrbLookasideList() @@ -909,7 +899,7 @@ None --*/ -VOID ClassDeleteSrbLookasideList(IN PCOMMON_DEVICE_EXTENSION CommonExtension) +VOID NTAPI ClassDeleteSrbLookasideList(IN PCOMMON_DEVICE_EXTENSION CommonExtension) { PAGED_CODE(); @@ -924,7 +914,6 @@ DBGWARN(("ClassDeleteSrbLookasideList: attempt to delete uninitialized or freed srblookasidelist")); } } - /*++//////////////////////////////////////////////////////////////////////////// @@ -952,8 +941,8 @@ --*/ -VOID ClassInitializeSrbLookasideList( IN PCOMMON_DEVICE_EXTENSION CommonExtension, - IN ULONG NumberElements) +VOID NTAPI ClassInitializeSrbLookasideList(IN PCOMMON_DEVICE_EXTENSION CommonExtension, + IN ULONG NumberElements) { PAGED_CODE(); @@ -976,10 +965,7 @@ } - - - -VOID ClasspInitializeCScanList(IN PCSCAN_LIST List) +VOID NTAPI ClasspInitializeCScanList(IN PCSCAN_LIST List) { PAGED_CODE(); RtlZeroMemory(List, sizeof(CSCAN_LIST)); @@ -987,9 +973,7 @@ InitializeListHead(&(List->NextSweep)); } - - -VOID ClasspStartNextSweep(PCSCAN_LIST List) +VOID NTAPI ClasspStartNextSweep(PCSCAN_LIST List) { ASSERT(IsListEmpty(&(List->CurrentSweep)) == TRUE); @@ -1024,9 +1008,7 @@ return; } - - -PIRP ClassRemoveCScanList(IN PCSCAN_LIST List) +PIRP NTAPI ClassRemoveCScanList(IN PCSCAN_LIST List) { PCSCAN_LIST_ENTRY entry; @@ -1057,4 +1039,3 @@ return CONTAINING_RECORD(entry, IRP, Tail.Overlay.DriverContext); } - Modified: trunk/reactos/drivers/storage/classpnp/power.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/classpnp/p… ============================================================================== --- trunk/reactos/drivers/storage/classpnp/power.c [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/classpnp/power.c [iso-8859-1] Sun Jul 29 01:49:24 2012 @@ -26,6 +26,7 @@ #define CLASS_TAG_POWER 'WLcS' NTSTATUS +NTAPI ClasspPowerHandler( IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp, @@ -33,6 +34,7 @@ ); NTSTATUS +NTAPI ClasspPowerDownCompletion( IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp, @@ -40,6 +42,7 @@ ); NTSTATUS +NTAPI ClasspPowerUpCompletion( IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp, @@ -47,6 +50,7 @@ ); VOID +NTAPI RetryPowerRequest( PDEVICE_OBJECT DeviceObject, PIRP Irp, @@ -54,13 +58,14 @@ ); NTSTATUS +NTAPI ClasspStartNextPowerIrpCompletion( IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp, IN PVOID Context ); - + /*++//////////////////////////////////////////////////////////////////////////// ClassDispatchPower() @@ -79,6 +84,7 @@ --*/ NTSTATUS +NTAPI ClassDispatchPower( IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp @@ -108,7 +114,7 @@ return commonExtension->DevInfo->ClassPowerDevice(DeviceObject, Irp); } // end ClassDispatchPower() - + /*++//////////////////////////////////////////////////////////////////////////// ClasspPowerUpCompletion() @@ -149,6 +155,7 @@ --*/ NTSTATUS +NTAPI ClasspPowerUpCompletion( IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp, @@ -476,7 +483,7 @@ return STATUS_MORE_PROCESSING_REQUIRED; } // end ClasspPowerUpCompletion() - + /*++//////////////////////////////////////////////////////////////////////////// ClasspPowerDownCompletion() @@ -517,6 +524,7 @@ --*/ NTSTATUS +NTAPI ClasspPowerDownCompletion( IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp, @@ -974,7 +982,7 @@ return STATUS_MORE_PROCESSING_REQUIRED; } // end ClasspPowerDownCompletion() - + /*++//////////////////////////////////////////////////////////////////////////// ClasspPowerHandler() @@ -998,6 +1006,7 @@ --*/ NTSTATUS +NTAPI ClasspPowerHandler( IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp, @@ -1278,7 +1287,7 @@ TRUE); return PoCallDriver(lowerDevice, Irp); } // end ClasspPowerHandler() - + /*++//////////////////////////////////////////////////////////////////////////// ClassMinimalPowerHandler() @@ -1290,6 +1299,7 @@ --*/ NTSTATUS +NTAPI ClassMinimalPowerHandler( IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp @@ -1355,7 +1365,7 @@ return status; } } // end ClassMinimalPowerHandler() - + /*++//////////////////////////////////////////////////////////////////////////// ClassSpinDownPowerHandler() @@ -1383,6 +1393,7 @@ --*/ NTSTATUS +NTAPI ClassSpinDownPowerHandler( IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp @@ -1434,7 +1445,7 @@ return ClasspPowerHandler(DeviceObject, Irp, options); } // end ClassSpinDownPowerHandler() - + /*++//////////////////////////////////////////////////////////////////////////// ClassStopUnitPowerHandler() @@ -1450,6 +1461,7 @@ --*/ NTSTATUS +NTAPI ClassStopUnitPowerHandler( IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp @@ -1475,7 +1487,7 @@ return ClassSpinDownPowerHandler(DeviceObject, Irp); } // end ClassStopUnitPowerHandler() - + /*++//////////////////////////////////////////////////////////////////////////// RetryPowerRequest() @@ -1499,6 +1511,7 @@ --*/ VOID +NTAPI RetryPowerRequest( PDEVICE_OBJECT DeviceObject, PIRP Irp, @@ -1574,7 +1587,7 @@ return; } // end RetryRequest() - + /*++//////////////////////////////////////////////////////////////////////////// ClasspStartNextPowerIrpCompletion() @@ -1586,6 +1599,7 @@ --*/ NTSTATUS +NTAPI ClasspStartNextPowerIrpCompletion( IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp, @@ -1599,4 +1613,3 @@ PoStartNextPowerIrp(Irp); return STATUS_SUCCESS; } // end ClasspStartNextPowerIrpCompletion() - Modified: trunk/reactos/drivers/storage/classpnp/retry.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/classpnp/r… ============================================================================== --- trunk/reactos/drivers/storage/classpnp/retry.c [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/classpnp/retry.c [iso-8859-1] Sun Jul 29 01:49:24 2012 @@ -24,8 +24,6 @@ #include "classp.h" #include "debug.h" - - /* * InterpretTransferPacketError * @@ -34,7 +32,7 @@ * * Return TRUE iff packet should be retried. */ -BOOLEAN InterpretTransferPacketError(PTRANSFER_PACKET Pkt) +BOOLEAN NTAPI InterpretTransferPacketError(PTRANSFER_PACKET Pkt) { BOOLEAN shouldRetry = FALSE; PCDB pCdb = (PCDB)Pkt->Srb.Cdb; @@ -172,7 +170,6 @@ return shouldRetry; } - /* * RetryTransferPacket * @@ -181,7 +178,7 @@ * Return TRUE iff the packet is complete. * (if so the status in pkt->irp is the final status). */ -BOOLEAN RetryTransferPacket(PTRANSFER_PACKET Pkt) +BOOLEAN NTAPI RetryTransferPacket(PTRANSFER_PACKET Pkt) { BOOLEAN packetDone; @@ -278,18 +275,16 @@ return packetDone; } - -VOID TransferPacketRetryTimerDpc( IN PKDPC Dpc, - IN PVOID DeferredContext, - IN PVOID SystemArgument1, - IN PVOID SystemArgument2) +VOID NTAPI TransferPacketRetryTimerDpc(IN PKDPC Dpc, + IN PVOID DeferredContext, + IN PVOID SystemArgument1, + IN PVOID SystemArgument2) { PTRANSFER_PACKET pkt = (PTRANSFER_PACKET)DeferredContext; SubmitTransferPacket(pkt); } - -VOID InitLowMemRetry(PTRANSFER_PACKET Pkt, PVOID BufPtr, ULONG Len, LARGE_INTEGER TargetLocation) +VOID NTAPI InitLowMemRetry(PTRANSFER_PACKET Pkt, PVOID BufPtr, ULONG Len, LARGE_INTEGER TargetLocation) { ASSERT(Len > 0); ASSERT(!Pkt->InLowMemRetry); @@ -299,7 +294,6 @@ Pkt->LowMemRetry_nextChunkTargetLocation = TargetLocation; } - /* * StepLowMemRetry * @@ -308,7 +302,7 @@ * * Returns TRUE iff the packet is done. */ -BOOLEAN StepLowMemRetry(PTRANSFER_PACKET Pkt) +BOOLEAN NTAPI StepLowMemRetry(PTRANSFER_PACKET Pkt) { BOOLEAN packetDone; @@ -346,4 +340,3 @@ return packetDone; } - Modified: trunk/reactos/drivers/storage/classpnp/utils.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/classpnp/u… ============================================================================== --- trunk/reactos/drivers/storage/classpnp/utils.c [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/classpnp/utils.c [iso-8859-1] Sun Jul 29 01:49:24 2012 @@ -23,8 +23,6 @@ #include "classp.h" #include "debug.h" - - #ifdef ALLOC_PRAGMA #pragma alloc_text(PAGE, ClassGetDeviceParameter) @@ -32,10 +30,8 @@ #pragma alloc_text(PAGE, ClassSetDeviceParameter) #endif - - // custom string match -- careful! -BOOLEAN ClasspMyStringMatches(IN PCHAR StringToMatch OPTIONAL, IN PCHAR TargetString) +BOOLEAN NTAPI ClasspMyStringMatches(IN PCHAR StringToMatch OPTIONAL, IN PCHAR TargetString) { ULONG length; // strlen returns an int, not size_t (!) PAGED_CODE(); @@ -54,8 +50,7 @@ return (strncmp(StringToMatch, TargetString, length) == 0); } - -VOID ClassGetDeviceParameter( +VOID NTAPI ClassGetDeviceParameter( IN PFUNCTIONAL_DEVICE_EXTENSION FdoExtension, IN PWSTR SubkeyName OPTIONAL, IN PWSTR ParameterName, @@ -139,8 +134,7 @@ } // end ClassGetDeviceParameter() - -NTSTATUS ClassSetDeviceParameter( +NTSTATUS NTAPI ClassSetDeviceParameter( IN PFUNCTIONAL_DEVICE_EXTENSION FdoExtension, IN PWSTR SubkeyName OPTIONAL, IN PWSTR ParameterName, @@ -210,7 +204,6 @@ } // end ClassSetDeviceParameter() - /* * ClassScanForSpecial * @@ -218,7 +211,7 @@ * hardware based upon id strings. it does not check the registry. */ -VOID ClassScanForSpecial( +VOID NTAPI ClassScanForSpecial( IN PFUNCTIONAL_DEVICE_EXTENSION FdoExtension, IN CLASSPNP_SCAN_FOR_SPECIAL_INFO DeviceList[], IN PCLASS_SCAN_FOR_SPECIAL_HANDLER Function) @@ -311,7 +304,6 @@ return; } // end ClasspScanForSpecialByInquiry() - // // In order to provide better performance without the need to reboot, @@ -338,6 +330,7 @@ // VOID +NTAPI ClasspPerfIncrementErrorCount( IN PFUNCTIONAL_DEVICE_EXTENSION FdoExtension ) @@ -389,6 +382,7 @@ } VOID +NTAPI ClasspPerfIncrementSuccessfulIo( IN PFUNCTIONAL_DEVICE_EXTENSION FdoExtension ) @@ -484,8 +478,7 @@ return; } - -PMDL BuildDeviceInputMdl(PVOID Buffer, ULONG BufferLen) +PMDL NTAPI BuildDeviceInputMdl(PVOID Buffer, ULONG BufferLen) { PMDL mdl; @@ -514,13 +507,11 @@ return mdl; } - -VOID FreeDeviceInputMdl(PMDL Mdl) +VOID NTAPI FreeDeviceInputMdl(PMDL Mdl) { MmUnlockPages(Mdl); IoFreeMdl(Mdl); } - #if 0 VOID @@ -561,5 +552,3 @@ return; } #endif - - Modified: trunk/reactos/drivers/storage/classpnp/xferpkt.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/classpnp/x… ============================================================================== --- trunk/reactos/drivers/storage/classpnp/xferpkt.c [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/classpnp/xferpkt.c [iso-8859-1] Sun Jul 29 01:49:24 2012 @@ -41,7 +41,7 @@ * * Allocate/initialize TRANSFER_PACKETs and related resources. */ -NTSTATUS InitializeTransferPackets(PDEVICE_OBJECT Fdo) +NTSTATUS NTAPI InitializeTransferPackets(PDEVICE_OBJECT Fdo) { PCOMMON_DEVICE_EXTENSION commonExt = Fdo->DeviceExtension; PFUNCTIONAL_DEVICE_EXTENSION fdoExt = Fdo->DeviceExtension; @@ -132,8 +132,7 @@ return status; } - -VOID DestroyAllTransferPackets(PDEVICE_OBJECT Fdo) +VOID NTAPI DestroyAllTransferPackets(PDEVICE_OBJECT Fdo) { PFUNCTIONAL_DEVICE_EXTENSION fdoExt = Fdo->DeviceExtension; PCLASS_PRIVATE_FDO_DATA fdoData = fdoExt->PrivateFdoData; @@ -151,8 +150,7 @@ ASSERT(fdoData->NumTotalTransferPackets == 0); } - -PTRANSFER_PACKET NewTransferPacket(PDEVICE_OBJECT Fdo) +PTRANSFER_PACKET NTAPI NewTransferPacket(PDEVICE_OBJECT Fdo) { PFUNCTIONAL_DEVICE_EXTENSION fdoExt = Fdo->DeviceExtension; PCLASS_PRIVATE_FDO_DATA fdoData = fdoExt->PrivateFdoData; @@ -188,12 +186,11 @@ return newPkt; } - /* * DestroyTransferPacket * */ -VOID DestroyTransferPacket(PTRANSFER_PACKET Pkt) +VOID NTAPI DestroyTransferPacket(PTRANSFER_PACKET Pkt) { PFUNCTIONAL_DEVICE_EXTENSION fdoExt = Pkt->Fdo->DeviceExtension; PCLASS_PRIVATE_FDO_DATA fdoData = fdoExt->PrivateFdoData; @@ -218,8 +215,7 @@ ExFreePool(Pkt); } - -VOID EnqueueFreeTransferPacket(PDEVICE_OBJECT Fdo, PTRANSFER_PACKET Pkt) +VOID NTAPI EnqueueFreeTransferPacket(PDEVICE_OBJECT Fdo, PTRANSFER_PACKET Pkt) { PFUNCTIONAL_DEVICE_EXTENSION fdoExt = Fdo->DeviceExtension; PCLASS_PRIVATE_FDO_DATA fdoData = fdoExt->PrivateFdoData; @@ -324,8 +320,7 @@ } - -PTRANSFER_PACKET DequeueFreeTransferPacket(PDEVICE_OBJECT Fdo, BOOLEAN AllocIfNeeded) +PTRANSFER_PACKET NTAPI DequeueFreeTransferPacket(PDEVICE_OBJECT Fdo, BOOLEAN AllocIfNeeded) { PFUNCTIONAL_DEVICE_EXTENSION fdoExt = Fdo->DeviceExtension; PCLASS_PRIVATE_FDO_DATA fdoData = fdoExt->PrivateFdoData; @@ -365,8 +360,6 @@ return pkt; } - - /* * SetupReadWriteTransferPacket * @@ -377,11 +370,11 @@ * The Irp is set up in SubmitTransferPacket because it must be reset * for each packet submission. */ -VOID SetupReadWriteTransferPacket( PTRANSFER_PACKET Pkt, - PVOID Buf, - ULONG Len, - LARGE_INTEGER DiskLocation, - PIRP OriginalIrp) +VOID NTAPI SetupReadWriteTransferPacket(PTRANSFER_PACKET Pkt, + PVOID Buf, + ULONG Len, + LARGE_INTEGER DiskLocation, + PIRP OriginalIrp) { PFUNCTIONAL_DEVICE_EXTENSION fdoExt = Pkt->Fdo->DeviceExtension; PCLASS_PRIVATE_FDO_DATA fdoData = fdoExt->PrivateFdoData; @@ -460,13 +453,12 @@ Pkt->CompleteOriginalIrpWhenLastPacketCompletes = TRUE; } - /* * SubmitTransferPacket * * Set up the IRP for the TRANSFER_PACKET submission and send it down. */ -VOID SubmitTransferPacket(PTRANSFER_PACKET Pkt) +VOID NTAPI SubmitTransferPacket(PTRANSFER_PACKET Pkt) { PCOMMON_DEVICE_EXTENSION commonExtension = Pkt->Fdo->DeviceExtension; PDEVICE_OBJECT nextDevObj = commonExtension->LowerDeviceObject; @@ -508,8 +500,7 @@ IoCallDriver(nextDevObj, Pkt->Irp); } - -NTSTATUS TransferPktComplete(IN PDEVICE_OBJECT NullFdo, IN PIRP Irp, IN PVOID Context) +NTSTATUS NTAPI TransferPktComplete(IN PDEVICE_OBJECT NullFdo, IN PIRP Irp, IN PVOID Context) { PTRANSFER_PACKET pkt = (PTRANSFER_PACKET)Context; PFUNCTIONAL_DEVICE_EXTENSION fdoExt = pkt->Fdo->DeviceExtension; @@ -718,13 +709,12 @@ return STATUS_MORE_PROCESSING_REQUIRED; } - /* * SetupEjectionTransferPacket * * Set up a transferPacket for a synchronous Ejection Control transfer. */ -VOID SetupEjectionTransferPacket( TRANSFER_PACKET *Pkt, +VOID NTAPI SetupEjectionTransferPacket( TRANSFER_PACKET *Pkt, BOOLEAN PreventMediaRemoval, PKEVENT SyncEventPtr, PIRP OriginalIrp) @@ -762,14 +752,13 @@ Pkt->SyncEventPtr = SyncEventPtr; Pkt->CompleteOriginalIrpWhenLastPacketCompletes = FALSE; } - /* * SetupModeSenseTransferPacket * * Set up a transferPacket for a synchronous Mode Sense transfer. */ -VOID SetupModeSenseTransferPacket( TRANSFER_PACKET *Pkt, +VOID NTAPI SetupModeSenseTransferPacket(TRANSFER_PACKET *Pkt, PKEVENT SyncEventPtr, PVOID ModeSenseBuffer, UCHAR ModeSenseBufferLen, @@ -814,17 +803,16 @@ Pkt->CompleteOriginalIrpWhenLastPacketCompletes = FALSE; } - /* * SetupDriveCapacityTransferPacket * * Set up a transferPacket for a synchronous Drive Capacity transfer. */ -VOID SetupDriveCapacityTransferPacket( TRANSFER_PACKET *Pkt, - PVOID ReadCapacityBuffer, - ULONG ReadCapacityBufferLen, - PKEVENT SyncEventPtr, - PIRP OriginalIrp) +VOID NTAPI SetupDriveCapacityTransferPacket(TRANSFER_PACKET *Pkt, + PVOID ReadCapacityBuffer, + ULONG ReadCapacityBufferLen, + PKEVENT SyncEventPtr, + PIRP OriginalIrp) { PFUNCTIONAL_DEVICE_EXTENSION fdoExt = Pkt->Fdo->DeviceExtension; PCLASS_PRIVATE_FDO_DATA fdoData = fdoExt->PrivateFdoData; @@ -860,7 +848,6 @@ Pkt->CompleteOriginalIrpWhenLastPacketCompletes = FALSE; } - #if 0 /* * SetupSendStartUnitTransferPacket @@ -907,5 +894,3 @@ Pkt->CompleteOriginalIrpWhenLastPacketCompletes = FALSE; } #endif - -

1 0

[akhaldi] 56972: * We've been waiting, for a long time, for the mighty GCC version upgrade, but that was easier said than done, for the Windows build at least. Many have tried, to no avail, so Amin...
by akhaldi＠svn.reactos.org 29 Jul '12

29 Jul '12

Author: akhaldi Date: Sun Jul 29 00:47:58 2012 New Revision: 56972 URL: http://svn.reactos.org/svn/reactos?rev=56972&view=rev Log: * We've been waiting, for a long time, for the mighty GCC version upgrade, but that was easier said than done, for the Windows build at least. Many have tried, to no avail, so Amine finally decided to step up, to give it a shot.. he went on and learned the dark arts of compiling GCC... and he succeeded ! * In the journey of running his GCC 4.7.1 compiled bootcd, two issues were revealed. Thomas kindly investigated them and fixed them, and as a result the bootcd boots to shell ! [CSRSRV] * Fix the output parameter of ProcessLUIDDeviceMapsEnabled case in NtQueryInformationProcess() to be ULONG instead of BOOLEAN (as required). * ASSERT that the function succeeds. [SMSS] * Move this condition up to the commented-out part (where it belongs). Modified: trunk/reactos/base/system/smss2/sminit.c trunk/reactos/subsystems/win32/csrss/csrsrv/api/wapi.c Modified: trunk/reactos/base/system/smss2/sminit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/smss2/sminit.c… ============================================================================== --- trunk/reactos/base/system/smss2/sminit.c [iso-8859-1] (original) +++ trunk/reactos/base/system/smss2/sminit.c [iso-8859-1] Sun Jul 29 00:47:58 2012 @@ -1402,8 +1402,8 @@ NTSTATUS Status, Status1; PLIST_ENTRY NextEntry; PSMP_REGISTRY_VALUE RegEntry; - ULONG_PTR ErrorParameters[3]; - UNICODE_STRING ErrorResponse; + //ULONG_PTR ErrorParameters[3]; + //UNICODE_STRING ErrorResponse; IO_STATUS_BLOCK IoStatusBlock; SECURITY_DESCRIPTOR_CONTROL OldFlag = 0; USHORT ImageCharacteristics; @@ -1545,7 +1545,6 @@ SmpTerminate(ErrorParameters, 5, RTL_NUMBER_OF(ErrorParameters)); } else -#endif if (!(ImageCharacteristics & IMAGE_FILE_DLL)) { /* An invalid known DLL entry will also kill SMSS */ @@ -1556,6 +1555,7 @@ ErrorParameters[2] = (ULONG)&RegEntry->Value; SmpTerminate(ErrorParameters, 5, RTL_NUMBER_OF(ErrorParameters)); } +#endif /* Temporarily hack the SD to use a default DACL for this section */ if (SmpLiberalSecurityDescriptor) Modified: trunk/reactos/subsystems/win32/csrss/csrsrv/api/wapi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/csr… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/csrsrv/api/wapi.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrss/csrsrv/api/wapi.c [iso-8859-1] Sun Jul 29 00:47:58 2012 @@ -500,7 +500,7 @@ PSECURITY_DESCRIPTOR BnoSd; HANDLE SymHandle; UNICODE_STRING DirectoryName, SymlinkName; - BOOLEAN LuidEnabled; + ULONG LuidEnabled; RTL_QUERY_REGISTRY_TABLE BaseServerRegistryConfigurationTable[2] = { { @@ -674,11 +674,12 @@ } /* Check if LUID device maps are enabled */ - NtQueryInformationProcess(NtCurrentProcess(), - ProcessLUIDDeviceMapsEnabled, - &LuidEnabled, - sizeof(LuidEnabled), - NULL); + Status = NtQueryInformationProcess(NtCurrentProcess(), + ProcessLUIDDeviceMapsEnabled, + &LuidEnabled, + sizeof(LuidEnabled), + NULL); + ASSERT(NT_SUCCESS(Status)); BaseStaticServerData->LUIDDeviceMapsEnabled = LuidEnabled; if (!BaseStaticServerData->LUIDDeviceMapsEnabled) {

1 0

[akhaldi] 56971: [NEWINFLIB] * Back out r56969 for MSVC compatibility, a better approach is coming up soon.
by akhaldi＠svn.reactos.org 28 Jul '12

28 Jul '12

Author: akhaldi Date: Sat Jul 28 23:03:40 2012 New Revision: 56971 URL: http://svn.reactos.org/svn/reactos?rev=56971&view=rev Log: [NEWINFLIB] * Back out r56969 for MSVC compatibility, a better approach is coming up soon. Modified: trunk/reactos/lib/newinflib/CMakeLists.txt Modified: trunk/reactos/lib/newinflib/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/newinflib/CMakeLists.t… ============================================================================== --- trunk/reactos/lib/newinflib/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/lib/newinflib/CMakeLists.txt [iso-8859-1] Sat Jul 28 23:03:40 2012 @@ -20,8 +20,7 @@ infhostput.c infhostrtl.c) - add_definitions(-D__NO_CTYPE_INLINES -DINFLIB_HOST) - + add_definitions(-D__NO_CTYPE_INLINES -DINFLIB_HOST -D_CRT_NON_CONFORMING_SWPRINTFS) add_library(inflibhost ${GLOBAL_FILES} ${SOURCE}) if(NOT MSVC) add_target_compile_flags(inflibhost "-Wpointer-arith -Wwrite-strings")

1 0

← Newer
1
2
3
4
5
6
7
...
20
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs July 2012