Ros-diffs December 2010

ros-diffs@reactos.org

20 participants
369 discussions

[evb] 50027: - fix now palette.c for vga, by copy logPalVGA/VGALOGPALETTE from NT4 DDK VGA sample drv and turn off codes for allocate 256 color pallette, instead use fix 16 color logPalVGA - fix he...

by evb＠svn.reactos.org

Author: evb Date: Tue Dec 14 03:27:51 2010 New Revision: 50027 URL: http://svn.reactos.org/svn/reactos?rev=50027&view=rev Log: - fix now palette.c for vga, by copy logPalVGA/VGALOGPALETTE from NT4 DDK VGA sample drv and turn off codes for allocate 256 color pallette, instead use fix 16 color logPalVGA - fix header of debug.c Modified: trunk/reactos/drivers/video/displays/vga_new/debug.c trunk/reactos/drivers/video/displays/vga_new/palette.c Modified: trunk/reactos/drivers/video/displays/vga_new/debug.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/video/displays/vga… ============================================================================== --- trunk/reactos/drivers/video/displays/vga_new/debug.c [iso-8859-1] (original) +++ trunk/reactos/drivers/video/displays/vga_new/debug.c [iso-8859-1] Tue Dec 14 03:27:51 2010 @@ -1,7 +1,7 @@ /* - * PROJECT: ReactOS Framebuffer Display Driver + * PROJECT: ReactOS VGA Display Driver * LICENSE: Microsoft NT4 DDK Sample Code License - * FILE: boot/drivers/video/displays/framebuf/debug.c + * FILE: boot/drivers/video/displays/vga/debug.c * PURPOSE: Debug Support * PROGRAMMERS: Copyright (c) 1992-1995 Microsoft Corporation */ Modified: trunk/reactos/drivers/video/displays/vga_new/palette.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/video/displays/vga… ============================================================================== --- trunk/reactos/drivers/video/displays/vga_new/palette.c [iso-8859-1] (original) +++ trunk/reactos/drivers/video/displays/vga_new/palette.c [iso-8859-1] Tue Dec 14 03:27:51 2010 @@ -1,18 +1,36 @@ /* * PROJECT: ReactOS Framebuffer Display Driver * LICENSE: Microsoft NT4 DDK Sample Code License - * FILE: boot/drivers/video/displays/framebuf/palette.c + * FILE: boot/drivers/video/displays/vga/palette.c * PURPOSE: Palette Support * PROGRAMMERS: Copyright (c) 1992-1995 Microsoft Corporation */ #include "driver.h" -// Global Table defining the 20 Window Default Colors. For 256 color -// palettes the first 10 must be put at the beginning of the palette -// and the last 10 at the end of the palette. - -const PALETTEENTRY BASEPALETTE[20] = +// eVb: 4.1 [VGARISC Change] - Add static 16-color VGA palette from VGA NT4 DDK Sample + +/******************************Public*Data*Struct*************************\ +* LOGPALETTE +* +* This is the palette for the VGA. +* +\**************************************************************************/ + +// Little bit of hacking to get this to compile happily. + +typedef struct _VGALOGPALETTE +{ + USHORT ident; + USHORT NumEntries; + PALETTEENTRY palPalEntry[16]; +} VGALOGPALETTE; + +const VGALOGPALETTE logPalVGA = +{ + +0x400, // driver version +16, // num entries { { 0, 0, 0, 0 }, // 0 { 0x80,0, 0, 0 }, // 1 @@ -21,20 +39,19 @@ { 0, 0, 0x80,0 }, // 4 { 0x80,0, 0x80,0 }, // 5 { 0, 0x80,0x80,0 }, // 6 - { 0xC0,0xC0,0xC0,0 }, // 7 - { 192, 220, 192, 0 }, // 8 - { 166, 202, 240, 0 }, // 9 - { 255, 251, 240, 0 }, // 10 - { 160, 160, 164, 0 }, // 11 - { 0x80,0x80,0x80,0 }, // 12 - { 0xFF,0, 0 ,0 }, // 13 - { 0, 0xFF,0 ,0 }, // 14 - { 0xFF,0xFF,0 ,0 }, // 15 - { 0 ,0, 0xFF,0 }, // 16 - { 0xFF,0, 0xFF,0 }, // 17 - { 0, 0xFF,0xFF,0 }, // 18 - { 0xFF,0xFF,0xFF,0 }, // 19 + { 0x80,0x80,0x80,0 }, // 7 + + { 0xC0,0xC0,0xC0,0 }, // 8 + { 0xFF,0, 0, 0 }, // 9 + { 0, 0xFF,0, 0 }, // 10 + { 0xFF,0xFF,0, 0 }, // 11 + { 0, 0, 0xFF,0 }, // 12 + { 0xFF,0, 0xFF,0 }, // 13 + { 0, 0xFF,0xFF,0 }, // 14 + { 0xFF,0xFF,0xFF,0 } // 15 +} }; +// eVb: 4.1 [END] BOOL bInitDefaultPalette(PPDEV ppdev, DEVINFO *pDevInfo); @@ -72,8 +89,12 @@ ppdev->hpalDefault = (HPALETTE) 0; } +// eVb: 4.2 [VGARISC Change] - VGA Palette is static, no need to free +#if 0 if (ppdev->pPal != (PPALETTEENTRY)NULL) EngFreeMem((PVOID)ppdev->pPal); +#endif +// eVb: 4.2 [END] } /******************************Public*Routine******************************\ @@ -85,6 +106,8 @@ BOOL bInitDefaultPalette(PPDEV ppdev, DEVINFO *pDevInfo) { +// eVb: 4.3 [VGARISC Change] - VGA Palette is static, no need to build +#if 0 if (ppdev->ulBitCount == 8) { ULONG ulLoop; @@ -141,20 +164,26 @@ ppdev->pPal[246 + ulLoop] = BASEPALETTE[ulLoop+10]; } +#endif +// eVb: 4.3 [END] // // Create handle for palette. // ppdev->hpalDefault = pDevInfo->hpalDefault = EngCreatePalette(PAL_INDEXED, - 256, - (PULONG) ppdev->pPal, +// eVb: 4.4 [VGARISC Change] - VGA Palette is 16 colors, not 256, and static + 16, + (PULONG) &logPalVGA.palPalEntry, +// eVb: 4.4 [END] 0,0,0); if (ppdev->hpalDefault == (HPALETTE) 0) { RIP("DISP bInitDefaultPalette failed EngCreatePalette\n"); - EngFreeMem(ppdev->pPal); +// eVb: 4.5 [VGARISC Change] - VGA Palette is static, no need to free + //EngFreeMem(ppdev->pPal); +// eVb: 4.5 [END] return(FALSE); } @@ -164,6 +193,8 @@ return(TRUE); +// eVb: 4.6 [VGARISC Change] - VGA Palette is static, no bitfield palette needed +#if 0 } else { ppdev->hpalDefault = @@ -181,6 +212,8 @@ } return(TRUE); +#endif +// eVb: 4.6 [END] } /******************************Public*Routine******************************\

13 years, 9 months

[evb] 50026: - Add the new vga miniport to build - Replace the framebuf_new spec rc rbuild with vga_new spec rc rbuild - Delete pointer.c - Start make changes, driver.h new fields for VGA, change d...

by evb＠svn.reactos.org

Author: evb Date: Tue Dec 14 03:17:29 2010 New Revision: 50026 URL: http://svn.reactos.org/svn/reactos?rev=50026&view=rev Log: - Add the new vga miniport to build - Replace the framebuf_new spec rc rbuild with vga_new spec rc rbuild - Delete pointer.c - Start make changes, driver.h new fields for VGA, change driver short/long name/tag, add macros and in enable.c remove hw pointer support Added: trunk/reactos/drivers/video/displays/vga_new/vga_new.rbuild (with props) trunk/reactos/drivers/video/displays/vga_new/vga_new.rc (with props) trunk/reactos/drivers/video/displays/vga_new/vga_new.spec (with props) Removed: trunk/reactos/drivers/video/displays/vga_new/framebuf_new.rbuild trunk/reactos/drivers/video/displays/vga_new/framebuf_new.rc trunk/reactos/drivers/video/displays/vga_new/framebuf_new.spec trunk/reactos/drivers/video/displays/vga_new/pointer.c Modified: trunk/reactos/drivers/video/displays/directory.rbuild trunk/reactos/drivers/video/displays/vga_new/debug.h trunk/reactos/drivers/video/displays/vga_new/driver.h trunk/reactos/drivers/video/displays/vga_new/enable.c Modified: trunk/reactos/drivers/video/displays/directory.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/video/displays/dir… ============================================================================== --- trunk/reactos/drivers/video/displays/directory.rbuild [iso-8859-1] (original) +++ trunk/reactos/drivers/video/displays/directory.rbuild [iso-8859-1] Tue Dec 14 03:17:29 2010 @@ -7,6 +7,9 @@ <directory name="vga"> <xi:include href="vga/vgaddi.rbuild" /> </directory> + <directory name="vga_new"> + <xi:include href="vga_new/vga_new.rbuild" /> + </directory> <directory name="framebuf_new"> <xi:include href="framebuf_new/framebuf_new.rbuild" /> </directory> Modified: trunk/reactos/drivers/video/displays/vga_new/debug.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/video/displays/vga… ============================================================================== --- trunk/reactos/drivers/video/displays/vga_new/debug.h [iso-8859-1] (original) +++ trunk/reactos/drivers/video/displays/vga_new/debug.h [iso-8859-1] Tue Dec 14 03:17:29 2010 @@ -1,7 +1,7 @@ /* - * PROJECT: ReactOS Framebuffer Display Driver + * PROJECT: ReactOS VGA Display Driver * LICENSE: Microsoft NT4 DDK Sample Code License - * FILE: boot/drivers/video/displays/framebuf/debug.h + * FILE: boot/drivers/video/displays/vga/debug.h * PURPOSE: Debug Support Header * PROGRAMMERS: Copyright (c) 1992-1995 Microsoft Corporation */ Modified: trunk/reactos/drivers/video/displays/vga_new/driver.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/video/displays/vga… ============================================================================== --- trunk/reactos/drivers/video/displays/vga_new/driver.h [iso-8859-1] (original) +++ trunk/reactos/drivers/video/displays/vga_new/driver.h [iso-8859-1] Tue Dec 14 03:17:29 2010 @@ -48,6 +48,10 @@ // eVb: 3.1 [DDK Change] - Support new VGA Miniport behavior w.r.t updated framebuffer remapping LONG flHooks; // eVb: 3.1 [END] +// eVb: 3.1 [VGARISC Change] - Add new fields for VGA support + SURFOBJ* pso; + UCHAR* pjBase; +// eVb: 3.1 [END] } PDEV, *PPDEV; DWORD getAvailableModes(HANDLE, PVIDEO_MODE_INFORMATION *, DWORD *); @@ -68,8 +72,35 @@ #define DRIVER_EXTRA_SIZE 0 -#define DLL_NAME L"framebuf" // Name of the DLL in UNICODE -#define STANDARD_DEBUG_PREFIX "FRAMEBUF: " // All debug output is prefixed -#define ALLOC_TAG 'bfDD' // Four byte tag (characters in +// eVb: 3.2 [VGARISC Change] - Transform into VGA driver +#define DLL_NAME L"vga" // Name of the DLL in UNICODE +#define STANDARD_DEBUG_PREFIX "Vga risc: " // All debug output is prefixed +#define ALLOC_TAG 'rgvD' // Four byte tag (characters in // reverse order) used for memory // allocations +// eVb: 3.2 [END] + +// eVb: 3.3 [VGARISC Change] - Add new macros for VGA usage +// +// Each pixel in 4BPP being a nibble, the color data for that pixel is thus +// located at the xth bit within the nibble, where x is the plane number [0-3]. +// Each nibble being 4 bytes, the color data is thus at the (nibble * 4 + x). +// That color data is then taken from its linear position and shifted to the +// correct position within the 16-bit planar buffer word. +// +#define VAL(data, px, pl, pos) ((data) >> (((px) * 4) + (pl)) & 1) << (pos) + +// +// This figures out which pixel in the planar word data corresponds to which pixel +// in the 4BPP linear data. +// +#define SET_PLANE_DATA(x, y, a, b) \ + (x) |= VAL(y, (((-1 + ((((b) % 8) % 2) << 1) - (((b) % 8) + 1) + 8))), a, b) + +/* Alignment Macros */ +#define ALIGN_DOWN_BY(size, align) \ + ((ULONG_PTR)(size) & ~((ULONG_PTR)(align) - 1)) + +#define ALIGN_UP_BY(size, align) \ + (ALIGN_DOWN_BY(((ULONG_PTR)(size) + align - 1), align)) +// eVb: 3.3 [END] Modified: trunk/reactos/drivers/video/displays/vga_new/enable.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/video/displays/vga… ============================================================================== --- trunk/reactos/drivers/video/displays/vga_new/enable.c [iso-8859-1] (original) +++ trunk/reactos/drivers/video/displays/vga_new/enable.c [iso-8859-1] Tue Dec 14 03:17:29 2010 @@ -20,8 +20,12 @@ { INDEX_DrvDisableSurface, (PFN) DrvDisableSurface }, { INDEX_DrvAssertMode, (PFN) DrvAssertMode }, { INDEX_DrvSetPalette, (PFN) DrvSetPalette }, +// eVb: 1.1 [VGARISC Change] - Disable hardware pointer support +#if 0 { INDEX_DrvMovePointer, (PFN) DrvMovePointer }, { INDEX_DrvSetPointerShape, (PFN) DrvSetPointerShape }, +#endif +// eVb: 1.1 [END] { INDEX_DrvGetModes, (PFN) DrvGetModes } }; @@ -126,6 +130,8 @@ goto error_free; } +// eVb: 1.2 [VGARISC Change] - Disable hardware pointer support +#if 0 // Initialize the cursor information. if (!bInitPointer(ppdev, &DevInfo)) @@ -134,6 +140,8 @@ DISPDBG((0, "DrvEnablePDEV failed bInitPointer\n")); } +#endif +// eVb: 1.2 [END] // Initialize palette information. if (!bInitPaletteInfo(ppdev, &DevInfo)) Removed: trunk/reactos/drivers/video/displays/vga_new/framebuf_new.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/video/displays/vga… ============================================================================== --- trunk/reactos/drivers/video/displays/vga_new/framebuf_new.rbuild [iso-8859-1] (original) +++ trunk/reactos/drivers/video/displays/vga_new/framebuf_new.rbuild (removed) @@ -1,21 +1,0 @@ -<?xml version="1.0"?> -<!DOCTYPE module SYSTEM "../../../../tools/rbuild/project.dtd"> -<module name="framebuf_new" type="kernelmodedll" entrypoint="DrvEnableDriver@12" installbase="system32" installname="framebuf_new.dll" crt="libcntpr"> - <importlibrary definition="framebuf_new.spec" /> - <include base="framebuf_new">.</include> - <library>win32k</library> - <file>debug.c</file> - <file>enable.c</file> - <file>palette.c</file> - <file>pointer.c</file> - <file>screen.c</file> - <file>framebuf_new.rc</file> - <if property="ARCH" value="i386"> - <group compilerset="gcc"> - <compilerflag>-mrtd</compilerflag> - <compilerflag>-fno-builtin</compilerflag> - <compilerflag>-Wno-unused-variable</compilerflag> - </group> - </if> - <pch>driver.h</pch> -</module> Removed: trunk/reactos/drivers/video/displays/vga_new/framebuf_new.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/video/displays/vga… ============================================================================== --- trunk/reactos/drivers/video/displays/vga_new/framebuf_new.rc [iso-8859-1] (original) +++ trunk/reactos/drivers/video/displays/vga_new/framebuf_new.rc (removed) @@ -1,5 +1,0 @@ -#define REACTOS_VERSION_DLL -#define REACTOS_STR_FILE_DESCRIPTION "Framebuffer Display Driver\0" -#define REACTOS_STR_INTERNAL_NAME "framebuf\0" -#define REACTOS_STR_ORIGINAL_FILENAME "framebuf.dll\0" -#include <reactos/version.rc> Removed: trunk/reactos/drivers/video/displays/vga_new/framebuf_new.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/video/displays/vga… ============================================================================== --- trunk/reactos/drivers/video/displays/vga_new/framebuf_new.spec [iso-8859-1] (original) +++ trunk/reactos/drivers/video/displays/vga_new/framebuf_new.spec (removed) @@ -1,1 +1,0 @@ -@ stdcall DrvEnableDriver(long long ptr) Removed: trunk/reactos/drivers/video/displays/vga_new/pointer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/video/displays/vga… ============================================================================== --- trunk/reactos/drivers/video/displays/vga_new/pointer.c [iso-8859-1] (original) +++ trunk/reactos/drivers/video/displays/vga_new/pointer.c (removed) @@ -1,455 +1,0 @@ -/* - * PROJECT: ReactOS Framebuffer Display Driver - * LICENSE: Microsoft NT4 DDK Sample Code License - * FILE: boot/drivers/video/displays/framebuf/pointer.c - * PURPOSE: Hardware Pointer Support - * PROGRAMMERS: Copyright (c) 1992-1995 Microsoft Corporation - */ - -#include "driver.h" - -BOOL bCopyColorPointer( -PPDEV ppdev, -SURFOBJ *psoMask, -SURFOBJ *psoColor, -XLATEOBJ *pxlo); - -BOOL bCopyMonoPointer( -PPDEV ppdev, -SURFOBJ *psoMask); - -BOOL bSetHardwarePointerShape( -SURFOBJ *pso, -SURFOBJ *psoMask, -SURFOBJ *psoColor, -XLATEOBJ *pxlo, -LONG x, -LONG y, -FLONG fl); - -/******************************Public*Routine******************************\ -* DrvMovePointer -* -* Moves the hardware pointer to a new position. -* -\**************************************************************************/ - -VOID DrvMovePointer -( - SURFOBJ *pso, - LONG x, - LONG y, - RECTL *prcl -) -{ - PPDEV ppdev = (PPDEV) pso->dhpdev; - DWORD returnedDataLength; - VIDEO_POINTER_POSITION NewPointerPosition; - - // We don't use the exclusion rectangle because we only support - // hardware Pointers. If we were doing our own Pointer simulations - // we would want to update prcl so that the engine would call us - // to exclude out pointer before drawing to the pixels in prcl. - - UNREFERENCED_PARAMETER(prcl); - - if (x == -1) - { - // - // A new position of (-1,-1) means hide the pointer. - // - - if (EngDeviceIoControl(ppdev->hDriver, - IOCTL_VIDEO_DISABLE_POINTER, - NULL, - 0, - NULL, - 0, - &returnedDataLength)) - { - // - // Not the end of the world, print warning in checked build. - // - - DISPDBG((1, "DISP vMoveHardwarePointer failed IOCTL_VIDEO_DISABLE_POINTER\n")); - } - } - else - { - NewPointerPosition.Column = (SHORT) x - (SHORT) (ppdev->ptlHotSpot.x); - NewPointerPosition.Row = (SHORT) y - (SHORT) (ppdev->ptlHotSpot.y); - - // - // Call miniport driver to move Pointer. - // - - if (EngDeviceIoControl(ppdev->hDriver, - IOCTL_VIDEO_SET_POINTER_POSITION, - &NewPointerPosition, - sizeof(VIDEO_POINTER_POSITION), - NULL, - 0, - &returnedDataLength)) - { - // - // Not the end of the world, print warning in checked build. - // - - DISPDBG((1, "DISP vMoveHardwarePointer failed IOCTL_VIDEO_SET_POINTER_POSITION\n")); - } - } -} - -/******************************Public*Routine******************************\ -* DrvSetPointerShape -* -* Sets the new pointer shape. -* -\**************************************************************************/ - -ULONG DrvSetPointerShape -( - SURFOBJ *pso, - SURFOBJ *psoMask, - SURFOBJ *psoColor, - XLATEOBJ *pxlo, - LONG xHot, - LONG yHot, - LONG x, - LONG y, - RECTL *prcl, - FLONG fl -) -{ - PPDEV ppdev = (PPDEV) pso->dhpdev; - DWORD returnedDataLength; - - // We don't use the exclusion rectangle because we only support - // hardware Pointers. If we were doing our own Pointer simulations - // we would want to update prcl so that the engine would call us - // to exclude out pointer before drawing to the pixels in prcl. - UNREFERENCED_PARAMETER(prcl); - - if (ppdev->pPointerAttributes == (PVIDEO_POINTER_ATTRIBUTES) NULL) - { - // Mini-port has no hardware Pointer support. - return(SPS_ERROR); - } - - // See if we are being asked to hide the pointer - - if (psoMask == (SURFOBJ *) NULL) - { - if (EngDeviceIoControl(ppdev->hDriver, - IOCTL_VIDEO_DISABLE_POINTER, - NULL, - 0, - NULL, - 0, - &returnedDataLength)) - { - // - // It should never be possible to fail. - // Message supplied for debugging. - // - - DISPDBG((1, "DISP bSetHardwarePointerShape failed IOCTL_VIDEO_DISABLE_POINTER\n")); - } - - return(TRUE); - } - - ppdev->ptlHotSpot.x = xHot; - ppdev->ptlHotSpot.y = yHot; - - if (!bSetHardwarePointerShape(pso,psoMask,psoColor,pxlo,x,y,fl)) - { - if (ppdev->fHwCursorActive) { - ppdev->fHwCursorActive = FALSE; - - if (EngDeviceIoControl(ppdev->hDriver, - IOCTL_VIDEO_DISABLE_POINTER, - NULL, - 0, - NULL, - 0, - &returnedDataLength)) { - - DISPDBG((1, "DISP bSetHardwarePointerShape failed IOCTL_VIDEO_DISABLE_POINTER\n")); - } - } - - // - // Mini-port declines to realize this Pointer - // - - return(SPS_DECLINE); - } - else - { - ppdev->fHwCursorActive = TRUE; - } - - return(SPS_ACCEPT_NOEXCLUDE); -} - -/******************************Public*Routine******************************\ -* bSetHardwarePointerShape -* -* Changes the shape of the Hardware Pointer. -* -* Returns: True if successful, False if Pointer shape can't be hardware. -* -\**************************************************************************/ - -BOOL bSetHardwarePointerShape( -SURFOBJ *pso, -SURFOBJ *psoMask, -SURFOBJ *psoColor, -XLATEOBJ *pxlo, -LONG x, -LONG y, -FLONG fl) -{ - PPDEV ppdev = (PPDEV) pso->dhpdev; - PVIDEO_POINTER_ATTRIBUTES pPointerAttributes = ppdev->pPointerAttributes; - DWORD returnedDataLength; - - if (psoColor != (SURFOBJ *) NULL) - { - if ((ppdev->PointerCapabilities.Flags & VIDEO_MODE_COLOR_POINTER) && - bCopyColorPointer(ppdev, psoMask, psoColor, pxlo)) - { - pPointerAttributes->Flags |= VIDEO_MODE_COLOR_POINTER; - } else { - return(FALSE); - } - - } else { - - if ((ppdev->PointerCapabilities.Flags & VIDEO_MODE_MONO_POINTER) && - bCopyMonoPointer(ppdev, psoMask)) - { - pPointerAttributes->Flags |= VIDEO_MODE_MONO_POINTER; - } else { - return(FALSE); - } - } - - // - // Initialize Pointer attributes and position - // - - pPointerAttributes->Enable = 1; - - // - // if x,y = -1,-1 then pass them directly to the miniport so that - // the cursor will be disabled - - pPointerAttributes->Column = (SHORT)(x); - pPointerAttributes->Row = (SHORT)(y); - - if ((x != -1) || (y != -1)) { - pPointerAttributes->Column -= (SHORT)(ppdev->ptlHotSpot.x); - pPointerAttributes->Row -= (SHORT)(ppdev->ptlHotSpot.y); - } - - // - // set animate flags - // - - if (fl & SPS_ANIMATESTART) { - pPointerAttributes->Flags |= VIDEO_MODE_ANIMATE_START; - } else if (fl & SPS_ANIMATEUPDATE) { - pPointerAttributes->Flags |= VIDEO_MODE_ANIMATE_UPDATE; - } - - // - // Set the new Pointer shape. - // - - if (EngDeviceIoControl(ppdev->hDriver, - IOCTL_VIDEO_SET_POINTER_ATTR, - pPointerAttributes, - ppdev->cjPointerAttributes, - NULL, - 0, - &returnedDataLength)) { - - DISPDBG((1, "DISP:Failed IOCTL_VIDEO_SET_POINTER_ATTR call\n")); - return(FALSE); - } - - return(TRUE); -} - -/******************************Public*Routine******************************\ -* bCopyMonoPointer -* -* Copies two monochrome masks into a buffer of the maximum size handled by the -* miniport, with any extra bits set to 0. The masks are converted to topdown -* form if they aren't already. Returns TRUE if we can handle this pointer in -* hardware, FALSE if not. -* -\**************************************************************************/ - -BOOL bCopyMonoPointer( - PPDEV ppdev, - SURFOBJ *pso) -{ - ULONG cy; - PBYTE pjSrcAnd, pjSrcXor; - LONG lDeltaSrc, lDeltaDst; - LONG lSrcWidthInBytes; - ULONG cxSrc = pso->sizlBitmap.cx; - ULONG cySrc = pso->sizlBitmap.cy; - ULONG cxSrcBytes; - PVIDEO_POINTER_ATTRIBUTES pPointerAttributes = ppdev->pPointerAttributes; - PBYTE pjDstAnd = pPointerAttributes->Pixels; - PBYTE pjDstXor = pPointerAttributes->Pixels; - - // Make sure the new pointer isn't too big to handle - // (*2 because both masks are in there) - if ((cxSrc > ppdev->PointerCapabilities.MaxWidth) || - (cySrc > (ppdev->PointerCapabilities.MaxHeight * 2))) - { - return(FALSE); - } - - pjDstXor += ((ppdev->PointerCapabilities.MaxWidth + 7) / 8) * - ppdev->pPointerAttributes->Height; - - // set the desk and mask to 0xff - RtlFillMemory(pjDstAnd, ppdev->pPointerAttributes->WidthInBytes * - ppdev->pPointerAttributes->Height, 0xFF); - - // Zero the dest XOR mask - RtlZeroMemory(pjDstXor, ppdev->pPointerAttributes->WidthInBytes * - ppdev->pPointerAttributes->Height); - - cxSrcBytes = (cxSrc + 7) / 8; - - if ((lDeltaSrc = pso->lDelta) < 0) - { - lSrcWidthInBytes = -lDeltaSrc; - } else { - lSrcWidthInBytes = lDeltaSrc; - } - - pjSrcAnd = (PBYTE) pso->pvBits; - - // If the incoming pointer bitmap is bottomup, we'll flip it to topdown to - // save the miniport some work - if (!(pso->fjBitmap & BMF_TOPDOWN)) - { - // Copy from the bottom - pjSrcAnd += lSrcWidthInBytes * (cySrc - 1); - } - - // Height of just AND mask - cySrc = cySrc / 2; - - // Point to XOR mask - pjSrcXor = pjSrcAnd + (cySrc * lDeltaSrc); - - // Offset from end of one dest scan to start of next - lDeltaDst = ppdev->pPointerAttributes->WidthInBytes; - - for (cy = 0; cy < cySrc; ++cy) - { - RtlCopyMemory(pjDstAnd, pjSrcAnd, cxSrcBytes); - RtlCopyMemory(pjDstXor, pjSrcXor, cxSrcBytes); - - // Point to next source and dest scans - pjSrcAnd += lDeltaSrc; - pjSrcXor += lDeltaSrc; - pjDstAnd += lDeltaDst; - pjDstXor += lDeltaDst; - } - - return(TRUE); -} - -/******************************Public*Routine******************************\ -* bCopyColorPointer -* -* Copies the mono and color masks into the buffer of maximum size -* handled by the miniport with any extra bits set to 0. Color translation -* is handled at this time. The masks are converted to topdown form if they -* aren't already. Returns TRUE if we can handle this pointer in hardware, -* FALSE if not. -* -\**************************************************************************/ -BOOL bCopyColorPointer( -PPDEV ppdev, -SURFOBJ *psoMask, -SURFOBJ *psoColor, -XLATEOBJ *pxlo) -{ - return(FALSE); -} - - -/******************************Public*Routine******************************\ -* bInitPointer -* -* Initialize the Pointer attributes. -* -\**************************************************************************/ - -BOOL bInitPointer(PPDEV ppdev, DEVINFO *pdevinfo) -{ - DWORD returnedDataLength; - - ppdev->pPointerAttributes = (PVIDEO_POINTER_ATTRIBUTES) NULL; - ppdev->cjPointerAttributes = 0; // initialized in screen.c - - // - // Ask the miniport whether it provides pointer support. - // - - if (EngDeviceIoControl(ppdev->hDriver, - IOCTL_VIDEO_QUERY_POINTER_CAPABILITIES, - &ppdev->ulMode, - sizeof(PVIDEO_MODE), - &ppdev->PointerCapabilities, - sizeof(ppdev->PointerCapabilities), - &returnedDataLength)) - { - return(FALSE); - } - - // - // If neither mono nor color hardware pointer is supported, there's no - // hardware pointer support and we're done. - // - - if ((!(ppdev->PointerCapabilities.Flags & VIDEO_MODE_MONO_POINTER)) && - (!(ppdev->PointerCapabilities.Flags & VIDEO_MODE_COLOR_POINTER))) - { - return(TRUE); - } - - // - // Note: The buffer itself is allocated after we set the - // mode. At that time we know the pixel depth and we can - // allocate the correct size for the color pointer if supported. - // - - // - // Set the asynchronous support status (async means miniport is capable of - // drawing the Pointer at any time, with no interference with any ongoing - // drawing operation) - // - - if (ppdev->PointerCapabilities.Flags & VIDEO_MODE_ASYNC_POINTER) - { - pdevinfo->flGraphicsCaps |= GCAPS_ASYNCMOVE; - } - else - { - pdevinfo->flGraphicsCaps &= ~GCAPS_ASYNCMOVE; - } - - return(TRUE); -} Added: trunk/reactos/drivers/video/displays/vga_new/vga_new.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/video/displays/vga… ============================================================================== --- trunk/reactos/drivers/video/displays/vga_new/vga_new.rbuild (added) +++ trunk/reactos/drivers/video/displays/vga_new/vga_new.rbuild [iso-8859-1] Tue Dec 14 03:17:29 2010 @@ -1,0 +1,20 @@ +<?xml version="1.0"?> +<!DOCTYPE module SYSTEM "../../../../tools/rbuild/project.dtd"> +<module name="vga_new" type="kernelmodedll" entrypoint="DrvEnableDriver@12" installbase="system32" installname="vga_new.dll" crt="libcntpr"> + <importlibrary definition="vga_new.spec" /> + <include base="vga_new">.</include> + <library>win32k</library> + <file>debug.c</file> + <file>enable.c</file> + <file>palette.c</file> + <file>screen.c</file> + <file>vga_new.rc</file> + <if property="ARCH" value="i386"> + <group compilerset="gcc"> + <compilerflag>-mrtd</compilerflag> + <compilerflag>-fno-builtin</compilerflag> + <compilerflag>-Wno-unused-variable</compilerflag> + </group> + </if> + <pch>driver.h</pch> +</module> Propchange: trunk/reactos/drivers/video/displays/vga_new/vga_new.rbuild ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/drivers/video/displays/vga_new/vga_new.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/video/displays/vga… ============================================================================== --- trunk/reactos/drivers/video/displays/vga_new/vga_new.rc (added) +++ trunk/reactos/drivers/video/displays/vga_new/vga_new.rc [iso-8859-1] Tue Dec 14 03:17:29 2010 @@ -1,0 +1,5 @@ +#define REACTOS_VERSION_DLL +#define REACTOS_STR_FILE_DESCRIPTION "VGA Display Driver\0" +#define REACTOS_STR_INTERNAL_NAME "vga\0" +#define REACTOS_STR_ORIGINAL_FILENAME "vga.dll\0" +#include <reactos/version.rc> Propchange: trunk/reactos/drivers/video/displays/vga_new/vga_new.rc ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/drivers/video/displays/vga_new/vga_new.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/video/displays/vga… ============================================================================== --- trunk/reactos/drivers/video/displays/vga_new/vga_new.spec (added) +++ trunk/reactos/drivers/video/displays/vga_new/vga_new.spec [iso-8859-1] Tue Dec 14 03:17:29 2010 @@ -1,0 +1,1 @@ +@ stdcall DrvEnableDriver(long long ptr) Propchange: trunk/reactos/drivers/video/displays/vga_new/vga_new.spec ------------------------------------------------------------------------------ svn:eol-style = native

13 years, 9 months

[evb] 50025: - commit base for new vga display miniport driver, is svn copy of framebuf_new as many codes identical - Will than commit and document differences to make into vga driver

by evb＠svn.reactos.org

Author: evb Date: Tue Dec 14 03:03:30 2010 New Revision: 50025 URL: http://svn.reactos.org/svn/reactos?rev=50025&view=rev Log: - commit base for new vga display miniport driver, is svn copy of framebuf_new as many codes identical - Will than commit and document differences to make into vga driver Added: trunk/reactos/drivers/video/displays/vga_new/ - copied from r49988, trunk/reactos/drivers/video/displays/framebuf_new/

13 years, 9 months

[pschweitzer] 50024: [NTOSKRNL] Silent FstubEx* debug prints on popular demand (ie, Timo)

by pschweitzer＠svn.reactos.org

Author: pschweitzer Date: Mon Dec 13 22:24:49 2010 New Revision: 50024 URL: http://svn.reactos.org/svn/reactos?rev=50024&view=rev Log: [NTOSKRNL] Silent FstubEx* debug prints on popular demand (ie, Timo) Modified: trunk/reactos/ntoskrnl/fstub/fstubex.c Modified: trunk/reactos/ntoskrnl/fstub/fstubex.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/fstub/fstubex.c?r… ============================================================================== --- trunk/reactos/ntoskrnl/fstub/fstubex.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/fstub/fstubex.c [iso-8859-1] Mon Dec 13 22:24:49 2010 @@ -558,16 +558,16 @@ CHAR Guid[38]; PAGED_CODE(); - DPRINT1("FSTUB: DRIVE_LAYOUT_INFORMATION_EX: %p\n", DriveLayout); + DPRINT("FSTUB: DRIVE_LAYOUT_INFORMATION_EX: %p\n", DriveLayout); switch (DriveLayout->PartitionStyle) { case PARTITION_STYLE_MBR: if (DriveLayout->PartitionCount % 4 != 0) { - DPRINT1("Warning: Partition count isn't a 4-factor: %ld!\n", DriveLayout->PartitionCount); + DPRINT("Warning: Partition count isn't a 4-factor: %ld!\n", DriveLayout->PartitionCount); } - DPRINT1("Signature: %8.8x\n", DriveLayout->Mbr.Signature); + DPRINT("Signature: %8.8x\n", DriveLayout->Mbr.Signature); for (i = 0; i < DriveLayout->PartitionCount; i++) { FstubDbgPrintPartitionEx(DriveLayout->PartitionEntry, i); @@ -576,10 +576,10 @@ break; case PARTITION_STYLE_GPT: FstubDbgGuidToString(&(DriveLayout->Gpt.DiskId), Guid); - DPRINT1("DiskId: %s\n", Guid); - DPRINT1("StartingUsableOffset: %I64x\n", DriveLayout->Gpt.StartingUsableOffset.QuadPart); - DPRINT1("UsableLength: %I64x\n", DriveLayout->Gpt.UsableLength.QuadPart); - DPRINT1("MaxPartitionCount: %ld\n", DriveLayout->Gpt.MaxPartitionCount); + DPRINT("DiskId: %s\n", Guid); + DPRINT("StartingUsableOffset: %I64x\n", DriveLayout->Gpt.StartingUsableOffset.QuadPart); + DPRINT("UsableLength: %I64x\n", DriveLayout->Gpt.UsableLength.QuadPart); + DPRINT("MaxPartitionCount: %ld\n", DriveLayout->Gpt.MaxPartitionCount); for (i = 0; i < DriveLayout->PartitionCount; i++) { FstubDbgPrintPartitionEx(DriveLayout->PartitionEntry, i); @@ -587,7 +587,7 @@ break; default: - DPRINT1("Unsupported partition style: %ld\n", DriveLayout->PartitionStyle); + DPRINT("Unsupported partition style: %ld\n", DriveLayout->PartitionStyle); } } @@ -599,34 +599,34 @@ CHAR Guid[38]; PAGED_CODE(); - DPRINT1("Printing partition %ld\n", PartitionNumber); + DPRINT("Printing partition %ld\n", PartitionNumber); switch (PartitionEntry[PartitionNumber].PartitionStyle) { case PARTITION_STYLE_MBR: - DPRINT1(" StartingOffset: %I64x\n", PartitionEntry[PartitionNumber].StartingOffset.QuadPart); - DPRINT1(" PartitionLength: %I64x\n", PartitionEntry[PartitionNumber].PartitionLength.QuadPart); - DPRINT1(" RewritePartition: %d\n", PartitionEntry[PartitionNumber].RewritePartition); - DPRINT1(" PartitionType: %02x\n", PartitionEntry[PartitionNumber].Mbr.PartitionType); - DPRINT1(" BootIndicator: %d\n", PartitionEntry[PartitionNumber].Mbr.BootIndicator); - DPRINT1(" RecognizedPartition: %d\n", PartitionEntry[PartitionNumber].Mbr.RecognizedPartition); - DPRINT1(" HiddenSectors: %ld\n", PartitionEntry[PartitionNumber].Mbr.HiddenSectors); + DPRINT(" StartingOffset: %I64x\n", PartitionEntry[PartitionNumber].StartingOffset.QuadPart); + DPRINT(" PartitionLength: %I64x\n", PartitionEntry[PartitionNumber].PartitionLength.QuadPart); + DPRINT(" RewritePartition: %d\n", PartitionEntry[PartitionNumber].RewritePartition); + DPRINT(" PartitionType: %02x\n", PartitionEntry[PartitionNumber].Mbr.PartitionType); + DPRINT(" BootIndicator: %d\n", PartitionEntry[PartitionNumber].Mbr.BootIndicator); + DPRINT(" RecognizedPartition: %d\n", PartitionEntry[PartitionNumber].Mbr.RecognizedPartition); + DPRINT(" HiddenSectors: %ld\n", PartitionEntry[PartitionNumber].Mbr.HiddenSectors); break; case PARTITION_STYLE_GPT: - DPRINT1(" StartingOffset: %I64x\n", PartitionEntry[PartitionNumber].StartingOffset.QuadPart); - DPRINT1(" PartitionLength: %I64x\n", PartitionEntry[PartitionNumber].PartitionLength.QuadPart); - DPRINT1(" RewritePartition: %d\n", PartitionEntry[PartitionNumber].RewritePartition); + DPRINT(" StartingOffset: %I64x\n", PartitionEntry[PartitionNumber].StartingOffset.QuadPart); + DPRINT(" PartitionLength: %I64x\n", PartitionEntry[PartitionNumber].PartitionLength.QuadPart); + DPRINT(" RewritePartition: %d\n", PartitionEntry[PartitionNumber].RewritePartition); FstubDbgGuidToString(&(PartitionEntry[PartitionNumber].Gpt.PartitionType), Guid); - DPRINT1(" PartitionType: %s\n", Guid); + DPRINT(" PartitionType: %s\n", Guid); FstubDbgGuidToString(&(PartitionEntry[PartitionNumber].Gpt.PartitionId), Guid); - DPRINT1(" PartitionId: %s\n", Guid); - DPRINT1(" Attributes: %16x\n", PartitionEntry[PartitionNumber].Gpt.Attributes); - DPRINT1(" Name: %ws\n", PartitionEntry[PartitionNumber].Gpt.Name); + DPRINT(" PartitionId: %s\n", Guid); + DPRINT(" Attributes: %16x\n", PartitionEntry[PartitionNumber].Gpt.Attributes); + DPRINT(" Name: %ws\n", PartitionEntry[PartitionNumber].Gpt.Name); break; default: - DPRINT1(" Unsupported partition style: %ld\n", PartitionEntry[PartitionNumber].PartitionStyle); + DPRINT(" Unsupported partition style: %ld\n", PartitionEntry[PartitionNumber].PartitionStyle); } } @@ -638,25 +638,25 @@ CHAR Guid[38]; PAGED_CODE(); - DPRINT1("FSTUB: SET_PARTITION_INFORMATION_EX: %p\n", PartitionEntry); - DPRINT1("Modifying partition %ld\n", PartitionNumber); + DPRINT("FSTUB: SET_PARTITION_INFORMATION_EX: %p\n", PartitionEntry); + DPRINT("Modifying partition %ld\n", PartitionNumber); switch (PartitionEntry->PartitionStyle) { case PARTITION_STYLE_MBR: - DPRINT1(" PartitionType: %02x\n", PartitionEntry->Mbr.PartitionType); + DPRINT(" PartitionType: %02x\n", PartitionEntry->Mbr.PartitionType); break; case PARTITION_STYLE_GPT: FstubDbgGuidToString(&(PartitionEntry->Gpt.PartitionType), Guid); - DPRINT1(" PartitionType: %s\n", Guid); + DPRINT(" PartitionType: %s\n", Guid); FstubDbgGuidToString(&(PartitionEntry->Gpt.PartitionId), Guid); - DPRINT1(" PartitionId: %s\n", Guid); - DPRINT1(" Attributes: %16x\n", PartitionEntry->Gpt.Attributes); - DPRINT1(" Name: %ws\n", PartitionEntry->Gpt.Name); + DPRINT(" PartitionId: %s\n", Guid); + DPRINT(" Attributes: %16x\n", PartitionEntry->Gpt.Attributes); + DPRINT(" Name: %ws\n", PartitionEntry->Gpt.Name); break; default: - DPRINT1(" Unsupported partition style: %ld\n", PartitionEntry[PartitionNumber].PartitionStyle); + DPRINT(" Unsupported partition style: %ld\n", PartitionEntry[PartitionNumber].PartitionStyle); } }

13 years, 9 months

[akhaldi] 50023: [CMAKE] - Fix winspool import lib target. - Improve some modules.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Mon Dec 13 12:25:51 2010 New Revision: 50023 URL: http://svn.reactos.org/svn/reactos?rev=50023&view=rev Log: [CMAKE] - Fix winspool import lib target. - Improve some modules. Modified: branches/cmake-bringup/dll/win32/ole32/CMakeLists.txt branches/cmake-bringup/dll/win32/oleaut32/CMakeLists.txt branches/cmake-bringup/dll/win32/rpcrt4/CMakeLists.txt branches/cmake-bringup/dll/win32/winspool/CMakeLists.txt Modified: branches/cmake-bringup/dll/win32/ole32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/ole32/C… ============================================================================== --- branches/cmake-bringup/dll/win32/ole32/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/ole32/CMakeLists.txt [iso-8859-1] Mon Dec 13 12:25:51 2010 @@ -1,3 +1,4 @@ + list(APPEND SOURCE antimoniker.c bindctx.c @@ -40,15 +41,18 @@ remove_definitions(-D_WIN32_WINNT=0x502) add_definitions(-D_WIN32_WINNT=0x600) -add_definitions(-D__WINESRC__) -add_definitions(-D_OLE32_) -add_definitions(-DENTRY_PREFIX=OLE32_) -add_definitions(-DPROXY_CLSID=CLSID_PSFactoryBuffer) -add_definitions(-DREGISTER_PROXY_DLL) -add_definitions(-DCOM_NO_WINDOWS_H) -include_directories(${CMAKE_CURRENT_BINARY_DIR}) -include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) +add_definitions( + -D__WINESRC__ + -D_OLE32_ + -DENTRY_PREFIX=OLE32_ + -DPROXY_CLSID=CLSID_PSFactoryBuffer + -DREGISTER_PROXY_DLL + -DCOM_NO_WINDOWS_H) + +include_directories( + ${CMAKE_CURRENT_BINARY_DIR} + ${REACTOS_SOURCE_DIR}/include/reactos/wine) ADD_INTERFACE_DEFINITIONS(ole32idl dcom.idl irot.idl) rpcproxy(ole32 @@ -74,4 +78,4 @@ add_dependencies(ole32 ole32idl) add_cab_target(ole32 1) -add_importlib_target(ole32.spec) +add_importlib_target(ole32.spec) Modified: branches/cmake-bringup/dll/win32/oleaut32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/oleaut3… ============================================================================== --- branches/cmake-bringup/dll/win32/oleaut32/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/oleaut32/CMakeLists.txt [iso-8859-1] Mon Dec 13 12:25:51 2010 @@ -1,3 +1,4 @@ + list(APPEND SOURCE connpt.c dispatch.c @@ -23,24 +24,28 @@ remove_definitions(-D_WIN32_WINNT=0x502) add_definitions(-D_WIN32_WINNT=0x600) -add_definitions(-D__WINESRC__) + #FIXME: this should be quotes enclosed add_definitions(-DPROXY_CLSID_IS={0xb196b286,0xbab4,0x101a,{0xb6,0x9c,0x00,0xaa,0x00,0x34,0x1d,0x07}}) #add_definitions(-DPROXY_CLSID_IS="{0xb196b286,0xbab4,0x101a,{0xb6,0x9c,0x00,0xaa,0x00,0x34,0x1d,0x07}}") -add_definitions(-DCOM_NO_WINDOWS_H) -add_definitions(-D_OLEAUT32_) -add_definitions(-DPROXY_DELEGATION) -add_definitions(-DREGISTER_PROXY_DLL) -add_definitions(-DENTRY_PREFIX=OLEAUTPS_) +add_definitions( + -D__WINESRC__ + -DCOM_NO_WINDOWS_H + -D_OLEAUT32_ + -DPROXY_DELEGATION + -DREGISTER_PROXY_DLL + -DENTRY_PREFIX=OLEAUTPS_) + if(MSC) # seems to work, but is this correct ? # <compilerflag compilerset="msc">/FIwine/typeof.h</compilerflag> add_definitions(/FIwine/typeof.h) endif(MSC) -include_directories(${REACTOS_SOURCE_DIR}/include/reactos/libs/libjpeg) -include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) +include_directories( + ${REACTOS_SOURCE_DIR}/include/reactos/libs/libjpeg + ${REACTOS_SOURCE_DIR}/include/reactos/wine) spec2def(oleaut32.dll oleaut32.spec) @@ -57,7 +62,6 @@ add_importlibs(oleaut32 windowscodecs ole32 rpcrt4 user32 gdi32 advapi32 comctl32 urlmon msvcrt kernel32 ntdll) - rpcproxy(oleaut32 oleaut32_oaidl.idl oleaut32_ocidl.idl) add_cab_target(oleaut32 1) Modified: branches/cmake-bringup/dll/win32/rpcrt4/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/rpcrt4/… ============================================================================== --- branches/cmake-bringup/dll/win32/rpcrt4/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/rpcrt4/CMakeLists.txt [iso-8859-1] Mon Dec 13 12:25:51 2010 @@ -24,9 +24,11 @@ remove_definitions(-D_WIN32_WINNT=0x502) add_definitions(-D_WIN32_WINNT=0x600) -add_definitions(-D_RPCRT4_) -add_definitions(-DCOM_NO_WINDOWS_H) -add_definitions(-DMSWMSG) + +add_definitions( + -D_RPCRT4_ + -DCOM_NO_WINDOWS_H + -DMSWMSG) spec2def(rpcrt4.dll rpcrt4.spec) @@ -34,8 +36,10 @@ set_module_type(rpcrt4 win32dll) -include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) -include_directories(${REACTOS_BINARY_DIR}/include/reactos/wine) +include_directories( + ${REACTOS_SOURCE_DIR}/include/reactos/wine + ${REACTOS_BINARY_DIR}/include/reactos/wine) + target_link_libraries(rpcrt4 wine uuid @@ -46,4 +50,3 @@ add_dependencies(rpcrt4 winesdk) add_cab_target(rpcrt4 1) add_importlib_target(rpcrt4.spec) - Modified: branches/cmake-bringup/dll/win32/winspool/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/winspoo… ============================================================================== --- branches/cmake-bringup/dll/win32/winspool/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/winspool/CMakeLists.txt [iso-8859-1] Mon Dec 13 12:25:51 2010 @@ -23,4 +23,4 @@ add_importlibs(winspool advapi32 shlwapi msvcrt kernel32 ntdll) add_cab_target(winspool 1) -add_importlib_target(winspool.spec) +add_importlib_target(winspool.spec winspool.drv)

13 years, 9 months

[pschweitzer] 50022: [NTOSKRNL] Merge some changes from r50021 to FsRtlIsNameInExpression() to make code easier to read and understand...

by pschweitzer＠svn.reactos.org

Author: pschweitzer Date: Mon Dec 13 11:33:29 2010 New Revision: 50022 URL: http://svn.reactos.org/svn/reactos?rev=50022&view=rev Log: [NTOSKRNL] Merge some changes from r50021 to FsRtlIsNameInExpression() to make code easier to read and understand... Modified: trunk/reactos/ntoskrnl/fsrtl/name.c Modified: trunk/reactos/ntoskrnl/fsrtl/name.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/fsrtl/name.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/fsrtl/name.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/fsrtl/name.c [iso-8859-1] Mon Dec 13 11:33:29 2010 @@ -22,63 +22,63 @@ IN BOOLEAN IgnoreCase, IN PWCHAR UpcaseTable OPTIONAL) { - ULONG i = 0, j, k = 0; + USHORT ExpressionPosition = 0, NamePosition = 0, MatchingChars; PAGED_CODE(); ASSERT(!IgnoreCase || UpcaseTable); - while (i < Name->Length / sizeof(WCHAR) && k < Expression->Length / sizeof(WCHAR)) - { - if ((Expression->Buffer[k] == (IgnoreCase ? UpcaseTable[Name->Buffer[i]] : Name->Buffer[i])) || - (Expression->Buffer[k] == L'?') || (Expression->Buffer[k] == DOS_QM) || - (Expression->Buffer[k] == DOS_DOT && Name->Buffer[i] == L'.')) - { - i++; - k++; - } - else if (Expression->Buffer[k] == L'*') - { - if (k < (Expression->Length / sizeof(WCHAR) - 1)) - { - if (Expression->Buffer[k+1] != L'*' && Expression->Buffer[k+1] != L'?' && - Expression->Buffer[k+1] != DOS_DOT && Expression->Buffer[k+1] != DOS_QM && - Expression->Buffer[k+1] != DOS_STAR) + while (NamePosition < Name->Length / sizeof(WCHAR) && ExpressionPosition < Expression->Length / sizeof(WCHAR)) + { + if ((Expression->Buffer[ExpressionPosition] == (IgnoreCase ? UpcaseTable[Name->Buffer[NamePosition]] : Name->Buffer[NamePosition])) || + (Expression->Buffer[ExpressionPosition] == L'?') || (Expression->Buffer[ExpressionPosition] == DOS_QM) || + (Expression->Buffer[ExpressionPosition] == DOS_DOT && Name->Buffer[NamePosition] == L'.')) + { + NamePosition++; + ExpressionPosition++; + } + else if (Expression->Buffer[ExpressionPosition] == L'*') + { + if (ExpressionPosition < (Expression->Length / sizeof(WCHAR) - 1)) + { + if (Expression->Buffer[ExpressionPosition+1] != L'*' && Expression->Buffer[ExpressionPosition+1] != L'?' && + Expression->Buffer[ExpressionPosition+1] != DOS_DOT && Expression->Buffer[ExpressionPosition+1] != DOS_QM && + Expression->Buffer[ExpressionPosition+1] != DOS_STAR) { - while ((IgnoreCase ? UpcaseTable[Name->Buffer[i]] : Name->Buffer[i]) != Expression->Buffer[k+1] && - i < Name->Length / sizeof(WCHAR)) i++; + while ((IgnoreCase ? UpcaseTable[Name->Buffer[NamePosition]] : Name->Buffer[NamePosition]) != Expression->Buffer[ExpressionPosition+1] && + NamePosition < Name->Length / sizeof(WCHAR)) NamePosition++; } } else { - i = Name->Length / sizeof(WCHAR); - } - k++; - } - else if (Expression->Buffer[k] == DOS_STAR) - { - j = i; - while (j < Name->Length / sizeof(WCHAR)) - { - if (Name->Buffer[j] == L'.') + NamePosition = Name->Length / sizeof(WCHAR); + } + ExpressionPosition++; + } + else if (Expression->Buffer[ExpressionPosition] == DOS_STAR) + { + MatchingChars = NamePosition; + while (MatchingChars < Name->Length / sizeof(WCHAR)) + { + if (Name->Buffer[MatchingChars] == L'.') { - i = j; + NamePosition = MatchingChars; } - j++; - } - k++; + MatchingChars++; + } + ExpressionPosition++; } else { - i = Name->Length / sizeof(WCHAR); - } - } - if (k + 1 == Expression->Length / sizeof(WCHAR) && i == Name->Length / sizeof(WCHAR) && - Expression->Buffer[k] == DOS_DOT) - { - k++; - } - - return (k == Expression->Length / sizeof(WCHAR) && i == Name->Length / sizeof(WCHAR)); + NamePosition = Name->Length / sizeof(WCHAR); + } + } + if (ExpressionPosition + 1 == Expression->Length / sizeof(WCHAR) && NamePosition == Name->Length / sizeof(WCHAR) && + Expression->Buffer[ExpressionPosition] == DOS_DOT) + { + ExpressionPosition++; + } + + return (ExpressionPosition == Expression->Length / sizeof(WCHAR) && NamePosition == Name->Length / sizeof(WCHAR)); } /* PUBLIC FUNCTIONS **********************************************************/

13 years, 9 months

[pschweitzer] 50021: [NTOSKRNL] Rewritten FsRtlIsDbcsInExpression() using FsRtlIsNameInExpression() pattern. This fixes all failing tests from kmtest.sys and make this function definitely tastier t...

by pschweitzer＠svn.reactos.org

Author: pschweitzer Date: Mon Dec 13 11:24:52 2010 New Revision: 50021 URL: http://svn.reactos.org/svn/reactos?rev=50021&view=rev Log: [NTOSKRNL] Rewritten FsRtlIsDbcsInExpression() using FsRtlIsNameInExpression() pattern. This fixes all failing tests from kmtest.sys and make this function definitely tastier to MS fastfat.sys Modified: trunk/reactos/ntoskrnl/fsrtl/dbcsname.c Modified: trunk/reactos/ntoskrnl/fsrtl/dbcsname.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/fsrtl/dbcsname.c?… ============================================================================== --- trunk/reactos/ntoskrnl/fsrtl/dbcsname.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/fsrtl/dbcsname.c [iso-8859-1] Mon Dec 13 11:24:52 2010 @@ -160,55 +160,66 @@ FsRtlIsDbcsInExpression(IN PANSI_STRING Expression, IN PANSI_STRING Name) { - ULONG ExpressionPosition, NamePosition, MatchingChars = 0; + USHORT ExpressionPosition = 0, NamePosition = 0, MatchingChars; PAGED_CODE(); ASSERT(Name->Length); ASSERT(Expression->Length); ASSERT(!FsRtlDoesDbcsContainWildCards(Name)); - /* One can't be null, both can be */ - if (!Expression->Length || !Name->Length) - { - return !(Expression->Length ^ Name->Length); - } - - for (ExpressionPosition = 0; ExpressionPosition < Expression->Length; ExpressionPosition++) - { - if ((Expression->Buffer[ExpressionPosition] == Name->Buffer[MatchingChars]) || - (Expression->Buffer[ExpressionPosition] == '?') || - (Expression->Buffer[ExpressionPosition] == ANSI_DOS_QM) || - (Expression->Buffer[ExpressionPosition] == ANSI_DOS_DOT && - (Name->Buffer[MatchingChars] == '.' || Name->Buffer[MatchingChars] == '0'))) - { - MatchingChars++; + while (NamePosition < Name->Length && ExpressionPosition < Expression->Length) + { + if ((Expression->Buffer[ExpressionPosition] == Name->Buffer[NamePosition]) || + (Expression->Buffer[ExpressionPosition] == '?') || (Expression->Buffer[ExpressionPosition] == ANSI_DOS_QM) || + (Expression->Buffer[ExpressionPosition] == ANSI_DOS_DOT && Name->Buffer[NamePosition] == '.')) + { + NamePosition++; + ExpressionPosition++; } else if (Expression->Buffer[ExpressionPosition] == '*') { - MatchingChars = Name->Length; + if (ExpressionPosition < (Expression->Length - 1)) + { + if (Expression->Buffer[ExpressionPosition+1] != '*' && Expression->Buffer[ExpressionPosition+1] != '?' && + Expression->Buffer[ExpressionPosition+1] != ANSI_DOS_DOT && + Expression->Buffer[ExpressionPosition+1] != ANSI_DOS_QM && + Expression->Buffer[ExpressionPosition+1] != ANSI_DOS_STAR) + { + while (Name->Buffer[NamePosition] != Expression->Buffer[ExpressionPosition+1] && + NamePosition < Name->Length) NamePosition++; + } + } + else + { + NamePosition = Name->Length; + } + ExpressionPosition++; } else if (Expression->Buffer[ExpressionPosition] == ANSI_DOS_STAR) { - for (NamePosition = MatchingChars; NamePosition < Name->Length; NamePosition++) - { - if (Name->Buffer[NamePosition] == '.') + MatchingChars = NamePosition; + while (MatchingChars < Name->Length) + { + if (Name->Buffer[MatchingChars] == '.') { - MatchingChars = NamePosition; - break; + NamePosition = MatchingChars; } - } + MatchingChars++; + } + ExpressionPosition++; } else { - MatchingChars = 0; - } - if (MatchingChars == Name->Length) - { - return TRUE; - } - } - - return FALSE; + NamePosition = Name->Length; + } + } + if (ExpressionPosition + 1 == Expression->Length && NamePosition == Name->Length && + Expression->Buffer[ExpressionPosition] == ANSI_DOS_DOT) + { + ExpressionPosition++; + } + + return (ExpressionPosition == Expression->Length && NamePosition == Name->Length); } /*++

13 years, 9 months

[pschweitzer] 50020: [KMTEST] Added testcases for FsRtlIsDbcsInExpression()

by pschweitzer＠svn.reactos.org

Author: pschweitzer Date: Mon Dec 13 11:06:57 2010 New Revision: 50020 URL: http://svn.reactos.org/svn/reactos?rev=50020&view=rev Log: [KMTEST] Added testcases for FsRtlIsDbcsInExpression() Modified: trunk/rostests/drivers/kmtest/ntos_fsrtl.c Modified: trunk/rostests/drivers/kmtest/ntos_fsrtl.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/drivers/kmtest/ntos_fsrtl… ============================================================================== --- trunk/rostests/drivers/kmtest/ntos_fsrtl.c [iso-8859-1] (original) +++ trunk/rostests/drivers/kmtest/ntos_fsrtl.c [iso-8859-1] Mon Dec 13 11:06:57 2010 @@ -137,12 +137,121 @@ ok(FsRtlIsNameInExpression(&Expression, &Name, FALSE, NULL) == TRUE, "expected TRUE, got FALSE"); } +VOID FsRtlIsDbcsInExpressionTest() +{ + ANSI_STRING Expression, Name; + + RtlInitAnsiString(&Expression, "*"); + RtlInitAnsiString(&Name, ""); + ok(FsRtlIsDbcsInExpression(&Expression, &Name) == FALSE, "expected FALSE, got TRUE"); + RtlInitAnsiString(&Expression, ""); + ok(FsRtlIsDbcsInExpression(&Expression, &Name) == TRUE, "expected TRUE, got FALSE"); + + RtlInitAnsiString(&Expression, "ntdll.dll"); + RtlInitAnsiString(&Name, "."); + ok(FsRtlIsDbcsInExpression(&Expression, &Name) == FALSE, "expected FALSE, got TRUE"); + RtlInitAnsiString(&Name, "~1"); + ok(FsRtlIsDbcsInExpression(&Expression, &Name) == FALSE, "expected FALSE, got TRUE"); + RtlInitAnsiString(&Name, ".."); + ok(FsRtlIsDbcsInExpression(&Expression, &Name) == FALSE, "expected FALSE, got TRUE"); + RtlInitAnsiString(&Name, "ntdll.dll"); + ok(FsRtlIsDbcsInExpression(&Expression, &Name) == TRUE, "expected TRUE, got FALSE"); + + RtlInitAnsiString(&Expression, "smss.exe"); + RtlInitAnsiString(&Name, "."); + ok(FsRtlIsDbcsInExpression(&Expression, &Name) == FALSE, "expected FALSE, got TRUE"); + RtlInitAnsiString(&Name, "~1"); + ok(FsRtlIsDbcsInExpression(&Expression, &Name) == FALSE, "expected FALSE, got TRUE"); + RtlInitAnsiString(&Name, ".."); + ok(FsRtlIsDbcsInExpression(&Expression, &Name) == FALSE, "expected FALSE, got TRUE"); + RtlInitAnsiString(&Name, "ntdll.dll"); + ok(FsRtlIsDbcsInExpression(&Expression, &Name) == FALSE, "expected FALSE, got TRUE"); + RtlInitAnsiString(&Name, "NTDLL.dll"); + ok(FsRtlIsDbcsInExpression(&Expression, &Name) == FALSE, "expected FALSE, got TRUE"); + + RtlInitAnsiString(&Expression, "nt??krnl.???"); + RtlInitAnsiString(&Name, "ntoskrnl.exe"); + ok(FsRtlIsDbcsInExpression(&Expression, &Name) == TRUE, "expected TRUE, got FALSE"); + + RtlInitAnsiString(&Expression, "he*o"); + RtlInitAnsiString(&Name, "hello"); + ok(FsRtlIsDbcsInExpression(&Expression, &Name) == TRUE, "expected TRUE, got FALSE"); + RtlInitAnsiString(&Name, "helo"); + ok(FsRtlIsDbcsInExpression(&Expression, &Name) == TRUE, "expected TRUE, got FALSE"); + RtlInitAnsiString(&Name, "hella"); + ok(FsRtlIsDbcsInExpression(&Expression, &Name) == FALSE, "expected FALSE, got TRUE"); + + RtlInitAnsiString(&Expression, "he*"); + RtlInitAnsiString(&Name, "hello"); + ok(FsRtlIsDbcsInExpression(&Expression, &Name) == TRUE, "expected TRUE, got FALSE"); + RtlInitAnsiString(&Name, "helo"); + ok(FsRtlIsDbcsInExpression(&Expression, &Name) == TRUE, "expected TRUE, got FALSE"); + RtlInitAnsiString(&Name, "hella"); + ok(FsRtlIsDbcsInExpression(&Expression, &Name) == TRUE, "expected TRUE, got FALSE"); + + RtlInitAnsiString(&Expression, "*.cpl"); + RtlInitAnsiString(&Name, "kdcom.dll"); + ok(FsRtlIsDbcsInExpression(&Expression, &Name) == FALSE, "expected FALSE, got TRUE"); + RtlInitAnsiString(&Name, "bootvid.dll"); + ok(FsRtlIsDbcsInExpression(&Expression, &Name) == FALSE, "expected FALSE, got TRUE"); + RtlInitAnsiString(&Name, "ntoskrnl.exe"); + ok(FsRtlIsDbcsInExpression(&Expression, &Name) == FALSE, "expected FALSE, got TRUE"); + + RtlInitAnsiString(&Expression, "."); + RtlInitAnsiString(&Name, "NTDLL.DLL"); + ok(FsRtlIsDbcsInExpression(&Expression, &Name) == FALSE, "expected FALSE, got TRUE"); + + RtlInitAnsiString(&Expression, "F0_*.*"); + RtlInitAnsiString(&Name, "."); + ok(FsRtlIsDbcsInExpression(&Expression, &Name) == FALSE, "expected FALSE, got TRUE"); + RtlInitAnsiString(&Name, ".."); + ok(FsRtlIsDbcsInExpression(&Expression, &Name) == FALSE, "expected FALSE, got TRUE"); + RtlInitAnsiString(&Name, "SETUP.EXE"); + ok(FsRtlIsDbcsInExpression(&Expression, &Name) == FALSE, "expected FALSE, got TRUE"); + RtlInitAnsiString(&Name, "F0_001"); + ok(FsRtlIsDbcsInExpression(&Expression, &Name) == FALSE, "expected FALSE, got TRUE"); + + RtlInitAnsiString(&Expression, "*.TTF"); + RtlInitAnsiString(&Name, "."); + ok(FsRtlIsDbcsInExpression(&Expression, &Name) == FALSE, "expected FALSE, got TRUE"); + RtlInitAnsiString(&Name, ".."); + ok(FsRtlIsDbcsInExpression(&Expression, &Name) == FALSE, "expected FALSE, got TRUE"); + RtlInitAnsiString(&Name, "SETUP.INI"); + ok(FsRtlIsDbcsInExpression(&Expression, &Name) == FALSE, "expected FALSE, got TRUE"); + + RtlInitAnsiString(&Expression, "*"); + RtlInitAnsiString(&Name, "."); + ok(FsRtlIsDbcsInExpression(&Expression, &Name) == TRUE, "expected TRUE, got FALSE"); + RtlInitAnsiString(&Name, ".."); + ok(FsRtlIsDbcsInExpression(&Expression, &Name) == TRUE, "expected TRUE, got FALSE"); + RtlInitAnsiString(&Name, "SETUP.INI"); + ok(FsRtlIsDbcsInExpression(&Expression, &Name) == TRUE, "expected TRUE, got FALSE"); + + RtlInitAnsiString(&Expression, "\"ntoskrnl.exe"); + RtlInitAnsiString(&Name, "ntoskrnl.exe"); + ok(FsRtlIsDbcsInExpression(&Expression, &Name) == FALSE, "expected FALSE, got TRUE"); + RtlInitAnsiString(&Expression, "ntoskrnl\"exe"); + ok(FsRtlIsDbcsInExpression(&Expression, &Name) == TRUE, "expected TRUE, got FALSE"); + RtlInitAnsiString(&Expression, "ntoskrn\".exe"); + ok(FsRtlIsDbcsInExpression(&Expression, &Name) == FALSE, "expected FALSE, got TRUE"); + RtlInitAnsiString(&Expression, "ntoskrn\"\"exe"); + ok(FsRtlIsDbcsInExpression(&Expression, &Name) == FALSE, "expected FALSE, got TRUE"); + RtlInitAnsiString(&Expression, "ntoskrnl.\"exe"); + ok(FsRtlIsDbcsInExpression(&Expression, &Name) == FALSE, "expected FALSE, got TRUE"); + RtlInitAnsiString(&Expression, "ntoskrnl.exe\""); + RtlInitAnsiString(&Name, "ntoskrnl.exe"); + ok(FsRtlIsDbcsInExpression(&Expression, &Name) == TRUE, "expected TRUE, got FALSE"); + RtlInitAnsiString(&Name, "ntoskrnl.exe."); + ok(FsRtlIsDbcsInExpression(&Expression, &Name) == TRUE, "expected TRUE, got FALSE"); +} + /* PUBLIC FUNCTIONS ***********************************************************/ VOID NtoskrnlFsRtlTest(HANDLE KeyHandle) { FsRtlIsNameInExpressionTest(); + FsRtlIsDbcsInExpressionTest(); FinishTest(KeyHandle, L"FsRtlTest"); }

13 years, 9 months

[pschweitzer] 50019: [NTOSKRNL] Fixed FsRtlIsNameInExpression() according to r50018 tests

by pschweitzer＠svn.reactos.org

Author: pschweitzer Date: Sun Dec 12 22:17:45 2010 New Revision: 50019 URL: http://svn.reactos.org/svn/reactos?rev=50019&view=rev Log: [NTOSKRNL] Fixed FsRtlIsNameInExpression() according to r50018 tests Modified: trunk/reactos/ntoskrnl/fsrtl/name.c Modified: trunk/reactos/ntoskrnl/fsrtl/name.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/fsrtl/name.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/fsrtl/name.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/fsrtl/name.c [iso-8859-1] Sun Dec 12 22:17:45 2010 @@ -29,55 +29,53 @@ while (i < Name->Length / sizeof(WCHAR) && k < Expression->Length / sizeof(WCHAR)) { - if ((Expression->Buffer[k] == (IgnoreCase ? UpcaseTable[Name->Buffer[i]] : Name->Buffer[i])) || - (Expression->Buffer[k] == L'?') || (Expression->Buffer[k] == DOS_QM) || - (Expression->Buffer[k] == DOS_DOT && (Name->Buffer[i] == L'.' || Name->Buffer[i] == L'0'))) - { - i++; + if ((Expression->Buffer[k] == (IgnoreCase ? UpcaseTable[Name->Buffer[i]] : Name->Buffer[i])) || + (Expression->Buffer[k] == L'?') || (Expression->Buffer[k] == DOS_QM) || + (Expression->Buffer[k] == DOS_DOT && Name->Buffer[i] == L'.')) + { + i++; + k++; + } + else if (Expression->Buffer[k] == L'*') + { + if (k < (Expression->Length / sizeof(WCHAR) - 1)) + { + if (Expression->Buffer[k+1] != L'*' && Expression->Buffer[k+1] != L'?' && + Expression->Buffer[k+1] != DOS_DOT && Expression->Buffer[k+1] != DOS_QM && + Expression->Buffer[k+1] != DOS_STAR) + { + while ((IgnoreCase ? UpcaseTable[Name->Buffer[i]] : Name->Buffer[i]) != Expression->Buffer[k+1] && + i < Name->Length / sizeof(WCHAR)) i++; + } + } + else + { + i = Name->Length / sizeof(WCHAR); + } + k++; + } + else if (Expression->Buffer[k] == DOS_STAR) + { + j = i; + while (j < Name->Length / sizeof(WCHAR)) + { + if (Name->Buffer[j] == L'.') + { + i = j; + } + j++; + } + k++; + } + else + { + i = Name->Length / sizeof(WCHAR); + } + } + if (k + 1 == Expression->Length / sizeof(WCHAR) && i == Name->Length / sizeof(WCHAR) && + Expression->Buffer[k] == DOS_DOT) + { k++; - } - else if (Expression->Buffer[k] == L'*') - { - if (k < (Expression->Length / sizeof(WCHAR) - 1)) - { - if (Expression->Buffer[k+1] != L'*' && Expression->Buffer[k+1] != L'?' && - Expression->Buffer[k+1] != DOS_DOT && Expression->Buffer[k+1] != DOS_QM && - Expression->Buffer[k+1] != DOS_STAR) - { - while ((IgnoreCase ? UpcaseTable[Name->Buffer[i]] : Name->Buffer[i]) != Expression->Buffer[k+1] && - i < Name->Length / sizeof(WCHAR)) i++; - } - else - { - if (!(Expression->Buffer[k+1] != DOS_DOT && (Name->Buffer[i] == L'.' || Name->Buffer[i] == L'0'))) - { - i++; - } - } - } - else - { - i = Name->Length / sizeof(WCHAR); - } - k++; - } - else if (Expression->Buffer[k] == DOS_STAR) - { - j = i; - while (j < Name->Length / sizeof(WCHAR)) - { - if (Name->Buffer[j] == L'.') - { - i = j; - } - j++; - } - k++; - } - else - { - i = Name->Length / sizeof(WCHAR); - } } return (k == Expression->Length / sizeof(WCHAR) && i == Name->Length / sizeof(WCHAR));

13 years, 9 months

[pschweitzer] 50018: [KMTEST] Added more testcases for FsRtlIsNameInExpression()

by pschweitzer＠svn.reactos.org

Author: pschweitzer Date: Sun Dec 12 22:09:35 2010 New Revision: 50018 URL: http://svn.reactos.org/svn/reactos?rev=50018&view=rev Log: [KMTEST] Added more testcases for FsRtlIsNameInExpression() Modified: trunk/rostests/drivers/kmtest/ntos_fsrtl.c Modified: trunk/rostests/drivers/kmtest/ntos_fsrtl.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/drivers/kmtest/ntos_fsrtl… ============================================================================== --- trunk/rostests/drivers/kmtest/ntos_fsrtl.c [iso-8859-1] (original) +++ trunk/rostests/drivers/kmtest/ntos_fsrtl.c [iso-8859-1] Sun Dec 12 22:09:35 2010 @@ -32,6 +32,12 @@ VOID FsRtlIsNameInExpressionTest() { UNICODE_STRING Expression, Name; + + RtlInitUnicodeString(&Expression, L"*"); + RtlInitUnicodeString(&Name, L""); + ok(FsRtlIsNameInExpression(&Expression, &Name, FALSE, NULL) == FALSE, "expected FALSE, got TRUE"); + RtlInitUnicodeString(&Expression, L""); + ok(FsRtlIsNameInExpression(&Expression, &Name, FALSE, NULL) == TRUE, "expected TRUE, got FALSE"); RtlInitUnicodeString(&Expression, L"ntdll.dll"); RtlInitUnicodeString(&Name, L"."); @@ -112,6 +118,23 @@ ok(FsRtlIsNameInExpression(&Expression, &Name, FALSE, NULL) == TRUE, "expected TRUE, got FALSE"); RtlInitUnicodeString(&Name, L"SETUP.INI"); ok(FsRtlIsNameInExpression(&Expression, &Name, FALSE, NULL) == TRUE, "expected TRUE, got FALSE"); + + RtlInitUnicodeString(&Expression, L"\"ntoskrnl.exe"); + RtlInitUnicodeString(&Name, L"ntoskrnl.exe"); + ok(FsRtlIsNameInExpression(&Expression, &Name, FALSE, NULL) == FALSE, "expected FALSE, got TRUE"); + RtlInitUnicodeString(&Expression, L"ntoskrnl\"exe"); + ok(FsRtlIsNameInExpression(&Expression, &Name, FALSE, NULL) == TRUE, "expected TRUE, got FALSE"); + RtlInitUnicodeString(&Expression, L"ntoskrn\".exe"); + ok(FsRtlIsNameInExpression(&Expression, &Name, FALSE, NULL) == FALSE, "expected FALSE, got TRUE"); + RtlInitUnicodeString(&Expression, L"ntoskrn\"\"exe"); + ok(FsRtlIsNameInExpression(&Expression, &Name, FALSE, NULL) == FALSE, "expected FALSE, got TRUE"); + RtlInitUnicodeString(&Expression, L"ntoskrnl.\"exe"); + ok(FsRtlIsNameInExpression(&Expression, &Name, FALSE, NULL) == FALSE, "expected FALSE, got TRUE"); + RtlInitUnicodeString(&Expression, L"ntoskrnl.exe\""); + RtlInitUnicodeString(&Name, L"ntoskrnl.exe"); + ok(FsRtlIsNameInExpression(&Expression, &Name, FALSE, NULL) == TRUE, "expected TRUE, got FALSE"); + RtlInitUnicodeString(&Name, L"ntoskrnl.exe."); + ok(FsRtlIsNameInExpression(&Expression, &Name, FALSE, NULL) == TRUE, "expected TRUE, got FALSE"); } /* PUBLIC FUNCTIONS ***********************************************************/

13 years, 9 months

← Newer
1
...
20
21
22
23
24
25
26
...
37
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs December 2010