Ros-diffs April 2009

ros-diffs@reactos.org

25 participants
476 discussions

[gschneider] 40392: - Remove error case shortcut, allows results to be computed correctly - Fixes two oleaut32 vartest winetests
by gschneider＠svn.reactos.org 06 Apr '09

06 Apr '09

Author: gschneider Date: Mon Apr 6 15:39:53 2009 New Revision: 40392 URL: http://svn.reactos.org/svn/reactos?rev=40392&view=rev Log: - Remove error case shortcut, allows results to be computed correctly - Fixes two oleaut32 vartest winetests Modified: trunk/reactos/lib/sdk/crt/math/i386/pow_asm.s Modified: trunk/reactos/lib/sdk/crt/math/i386/pow_asm.s URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/math/i386/pow_… ============================================================================== --- trunk/reactos/lib/sdk/crt/math/i386/pow_asm.s [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/math/i386/pow_asm.s [iso-8859-1] Mon Apr 6 15:39:53 2009 @@ -76,8 +76,7 @@ and ah, 0b10111010 // Turn off CF, PF and ZF or ah,al // Set new CF, PF and ZF sahf // Store AH into Flags - ja __fpow2 // Re-direct if y > 0 - jmp __fpow4 // End of case + jmp __fpow2 // Re-direct __fpow1: fxch // Put y on top of stack fld st // Duplicate y as st(1) frndint // Round to integer

1 0

[dgoette] 40391: * get Rank and Help into class structure * resolve some variables
by dgoette＠svn.reactos.org 06 Apr '09

06 Apr '09

1 0

[tkreuzer] 40390: [FORMATTING] - fix indentation - remove the large file header, fix the small one
by tkreuzer＠svn.reactos.org 06 Apr '09

06 Apr '09

Author: tkreuzer Date: Mon Apr 6 07:20:25 2009 New Revision: 40390 URL: http://svn.reactos.org/svn/reactos?rev=40390&view=rev Log: [FORMATTING] - fix indentation - remove the large file header, fix the small one Modified: trunk/reactos/subsystems/win32/win32k/eng/mouse.c Modified: trunk/reactos/subsystems/win32/win32k/eng/mouse.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/en… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/eng/mouse.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/eng/mouse.c [iso-8859-1] Mon Apr 6 07:20:25 2009 @@ -1,26 +1,7 @@ -/* - * ReactOS W32 Subsystem - * Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003 ReactOS Team - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - */ -/* $Id$ - * - * PROJECT: ReactOS kernel - * PURPOSE: Mouse - * FILE: subsys/win32k/eng/mouse.c +/* + * PROJECT: ReactOS win32 subsystem + * PURPOSE: Mouse pointer functions + * FILE: subsystems/win32k/eng/mouse.c * PROGRAMER: Casper S. Hornstrup (chorns(a)users.sourceforge.net) * REVISION HISTORY: * 06-06-2001 CSH Created @@ -34,495 +15,481 @@ /* FUNCTIONS *****************************************************************/ -INT INTERNAL_CALL -MouseSafetyOnDrawStart(SURFOBJ *SurfObj, LONG HazardX1, - LONG HazardY1, LONG HazardX2, LONG HazardY2) /* * FUNCTION: Notify the mouse driver that drawing is about to begin in * a rectangle on a particular surface. */ -{ - LONG tmp; - PDEVOBJ *ppdev; - GDIPOINTER *pgp; - - ASSERT(SurfObj != NULL); - - ppdev = GDIDEV(SurfObj); - - if(ppdev == NULL) - { - return(FALSE); - } - - pgp = &ppdev->Pointer; - - if (SPS_ACCEPT_NOEXCLUDE == pgp->Status || - pgp->Exclude.right == -1) - { - return(FALSE); - } - - if (HazardX1 > HazardX2) - { - tmp = HazardX2; HazardX2 = HazardX1; HazardX1 = tmp; - } - if (HazardY1 > HazardY2) - { - tmp = HazardY2; HazardY2 = HazardY1; HazardY1 = tmp; - } - - if (ppdev->SafetyRemoveLevel != 0) - { - ppdev->SafetyRemoveCount++; - return FALSE; - } - - ppdev->SafetyRemoveCount++; - - if (pgp->Exclude.right >= HazardX1 - && pgp->Exclude.left <= HazardX2 - && pgp->Exclude.bottom >= HazardY1 - && pgp->Exclude.top <= HazardY2) - { - ppdev->SafetyRemoveLevel = ppdev->SafetyRemoveCount; - if (pgp->MovePointer) - pgp->MovePointer(SurfObj, -1, -1, NULL); - else - EngMovePointer(SurfObj, -1, -1, NULL); - } - - return(TRUE); -} - INT INTERNAL_CALL -MouseSafetyOnDrawEnd(SURFOBJ *SurfObj) +MouseSafetyOnDrawStart( + SURFOBJ *SurfObj, + LONG HazardX1, + LONG HazardY1, + LONG HazardX2, + LONG HazardY2) +{ + LONG tmp; + PDEVOBJ *ppdev; + GDIPOINTER *pgp; + + ASSERT(SurfObj != NULL); + + ppdev = GDIDEV(SurfObj); + if (ppdev == NULL) + { + return(FALSE); + } + + pgp = &ppdev->Pointer; + + if (SPS_ACCEPT_NOEXCLUDE == pgp->Status || + pgp->Exclude.right == -1) + { + return(FALSE); + } + + if (HazardX1 > HazardX2) + { + tmp = HazardX2; + HazardX2 = HazardX1; + HazardX1 = tmp; + } + if (HazardY1 > HazardY2) + { + tmp = HazardY2; + HazardY2 = HazardY1; + HazardY1 = tmp; + } + + if (ppdev->SafetyRemoveLevel != 0) + { + ppdev->SafetyRemoveCount++; + return FALSE; + } + + ppdev->SafetyRemoveCount++; + + if (pgp->Exclude.right >= HazardX1 + && pgp->Exclude.left <= HazardX2 + && pgp->Exclude.bottom >= HazardY1 + && pgp->Exclude.top <= HazardY2) + { + ppdev->SafetyRemoveLevel = ppdev->SafetyRemoveCount; + if (pgp->MovePointer) + pgp->MovePointer(SurfObj, -1, -1, NULL); + else + EngMovePointer(SurfObj, -1, -1, NULL); + } + + return(TRUE); +} + /* * FUNCTION: Notify the mouse driver that drawing has finished on a surface. */ -{ - PDEVOBJ *ppdev; - GDIPOINTER *pgp; - - ASSERT(SurfObj != NULL); - - ppdev = GDIDEV(SurfObj); - - if(ppdev == NULL) - { - return(FALSE); - } - - pgp = &ppdev->Pointer; - - if(SPS_ACCEPT_NOEXCLUDE == pgp->Status || - pgp->Exclude.right == -1) - { - return FALSE; - } - - if (--ppdev->SafetyRemoveCount >= ppdev->SafetyRemoveLevel) - { - return FALSE; - } - if (pgp->MovePointer) - pgp->MovePointer(SurfObj, gpsi->ptCursor.x, gpsi->ptCursor.y, &pgp->Exclude); - else - EngMovePointer(SurfObj, gpsi->ptCursor.x, gpsi->ptCursor.y, &pgp->Exclude); - - ppdev->SafetyRemoveLevel = 0; - - return(TRUE); +INT INTERNAL_CALL +MouseSafetyOnDrawEnd( + SURFOBJ *SurfObj) +{ + PDEVOBJ *ppdev; + GDIPOINTER *pgp; + + ASSERT(SurfObj != NULL); + + ppdev = GDIDEV(SurfObj); + + if (ppdev == NULL) + { + return(FALSE); + } + + pgp = &ppdev->Pointer; + + if (SPS_ACCEPT_NOEXCLUDE == pgp->Status || + pgp->Exclude.right == -1) + { + return FALSE; + } + + if (--ppdev->SafetyRemoveCount >= ppdev->SafetyRemoveLevel) + { + return FALSE; + } + if (pgp->MovePointer) + pgp->MovePointer(SurfObj, gpsi->ptCursor.x, gpsi->ptCursor.y, &pgp->Exclude); + else + EngMovePointer(SurfObj, gpsi->ptCursor.x, gpsi->ptCursor.y, &pgp->Exclude); + + ppdev->SafetyRemoveLevel = 0; + + return(TRUE); } /* SOFTWARE MOUSE POINTER IMPLEMENTATION **************************************/ VOID INTERNAL_CALL -IntHideMousePointer(PDEVOBJ *ppdev, SURFOBJ *psoDest) -{ - GDIPOINTER *pgp; - POINTL pt; - - ASSERT(ppdev); - ASSERT(psoDest); - - pgp = &ppdev->Pointer; - - if (!pgp->Enabled) - { - return; - } - - - - pgp->Enabled = FALSE; - - /* - * The mouse is hide from ShowCours and it is frist ?? - */ - if (pgp->ShowPointer < 0) - { - return ; - } - - - /* - * Hide the cours - */ - pt.x = gpsi->ptCursor.x - pgp->HotSpot.x; - pt.y = gpsi->ptCursor.y - pgp->HotSpot.y; - - - if (pgp->SaveSurface != NULL) - { - RECTL DestRect; - POINTL SrcPoint; - SURFOBJ *SaveSurface; - SURFOBJ *MaskSurface; - - DestRect.left = max(pt.x, 0); - DestRect.top = max(pt.y, 0); - DestRect.right = min( - pt.x + pgp->Size.cx, - psoDest->sizlBitmap.cx); - DestRect.bottom = min( - pt.y + pgp->Size.cy, - psoDest->sizlBitmap.cy); - - SrcPoint.x = max(-pt.x, 0); - SrcPoint.y = max(-pt.y, 0); - - if((SaveSurface = EngLockSurface(pgp->SaveSurface))) - { - if((MaskSurface = EngLockSurface(pgp->MaskSurface))) - { - IntEngBitBltEx(psoDest, SaveSurface, MaskSurface, NULL, NULL, - &DestRect, &SrcPoint, &SrcPoint, NULL, NULL, - ROP3_TO_ROP4(SRCCOPY), FALSE); - EngUnlockSurface(MaskSurface); - } - EngUnlockSurface(SaveSurface); - } - } +IntHideMousePointer( + PDEVOBJ *ppdev, + SURFOBJ *psoDest) +{ + GDIPOINTER *pgp; + POINTL pt; + + ASSERT(ppdev); + ASSERT(psoDest); + + pgp = &ppdev->Pointer; + + if (!pgp->Enabled) + { + return; + } + + pgp->Enabled = FALSE; + + /* The mouse is hide from ShowCours and it is frist ?? */ + if (pgp->ShowPointer < 0) + { + return ; + } + + /* Hide the cours */ + pt.x = gpsi->ptCursor.x - pgp->HotSpot.x; + pt.y = gpsi->ptCursor.y - pgp->HotSpot.y; + + + if (pgp->SaveSurface != NULL) + { + RECTL DestRect; + POINTL SrcPoint; + SURFOBJ *SaveSurface; + SURFOBJ *MaskSurface; + + DestRect.left = max(pt.x, 0); + DestRect.top = max(pt.y, 0); + DestRect.right = min( + pt.x + pgp->Size.cx, + psoDest->sizlBitmap.cx); + DestRect.bottom = min( + pt.y + pgp->Size.cy, + psoDest->sizlBitmap.cy); + + SrcPoint.x = max(-pt.x, 0); + SrcPoint.y = max(-pt.y, 0); + + if ((SaveSurface = EngLockSurface(pgp->SaveSurface))) + { + if ((MaskSurface = EngLockSurface(pgp->MaskSurface))) + { + IntEngBitBltEx(psoDest, SaveSurface, MaskSurface, NULL, NULL, + &DestRect, &SrcPoint, &SrcPoint, NULL, NULL, + ROP3_TO_ROP4(SRCCOPY), FALSE); + EngUnlockSurface(MaskSurface); + } + EngUnlockSurface(SaveSurface); + } + } } VOID INTERNAL_CALL IntShowMousePointer(PDEVOBJ *ppdev, SURFOBJ *psoDest) { - GDIPOINTER *pgp; - SURFOBJ *SaveSurface; - POINTL pt; - - ASSERT(ppdev); - ASSERT(psoDest); - - pgp = &ppdev->Pointer; - - if (pgp->Enabled) - { - return; - } - - pgp->Enabled = TRUE; - - /* - * Do not blt the mouse if it in hide - */ - if (pgp->ShowPointer < 0) - { - return ; - } - - pt.x = gpsi->ptCursor.x - pgp->HotSpot.x; - pt.y = gpsi->ptCursor.y - pgp->HotSpot.y; - - /* - * Copy the pixels under the cursor to temporary surface. - */ - - if (pgp->SaveSurface != NULL && - (SaveSurface = EngLockSurface(pgp->SaveSurface))) - { - RECTL DestRect; - POINTL SrcPoint; - - SrcPoint.x = max(pt.x, 0); - SrcPoint.y = max(pt.y, 0); - - DestRect.left = SrcPoint.x - pt.x; - DestRect.top = SrcPoint.y - pt.y; - DestRect.right = min( - pgp->Size.cx, - psoDest->sizlBitmap.cx - pt.x); - DestRect.bottom = min( - pgp->Size.cy, - psoDest->sizlBitmap.cy - pt.y); - - IntEngBitBltEx(SaveSurface, psoDest, NULL, NULL, NULL, - &DestRect, &SrcPoint, NULL, NULL, NULL, - ROP3_TO_ROP4(SRCCOPY), FALSE); - EngUnlockSurface(SaveSurface); - } - - - /* - * Blit the cursor on the screen. - */ - - { - RECTL DestRect; - POINTL SrcPoint; - SURFOBJ *psoColor; - SURFOBJ *psoMask = NULL; - - DestRect.left = max(pt.x, 0); - DestRect.top = max(pt.y, 0); - DestRect.right = min( - pt.x + pgp->Size.cx, - psoDest->sizlBitmap.cx); - DestRect.bottom = min( - pt.y + pgp->Size.cy, - psoDest->sizlBitmap.cy); - - SrcPoint.x = max(-pt.x, 0); - SrcPoint.y = max(-pt.y, 0); - - - if (pgp->MaskSurface) - psoMask = EngLockSurface(pgp->MaskSurface); - - if (psoMask != NULL) - { - if (pgp->ColorSurface != NULL) - { - if((psoColor = EngLockSurface(pgp->ColorSurface))) - { - IntEngBitBltEx(psoDest, psoColor, psoMask, NULL, - pgp->XlateObject, &DestRect, &SrcPoint, &SrcPoint, - NULL, NULL, R4_MASK, FALSE); - EngUnlockSurface(psoColor); - } - } - else - { - IntEngBitBltEx(psoDest, psoMask, NULL, NULL, pgp->XlateObject, - &DestRect, &SrcPoint, NULL, NULL, NULL, - ROP3_TO_ROP4(SRCAND), FALSE); - SrcPoint.y += pgp->Size.cy; - IntEngBitBltEx(psoDest, psoMask, NULL, NULL, pgp->XlateObject, - &DestRect, &SrcPoint, NULL, NULL, NULL, - ROP3_TO_ROP4(SRCINVERT), FALSE); - } - EngUnlockSurface(psoMask); - } - } + GDIPOINTER *pgp; + SURFOBJ *SaveSurface; + POINTL pt; + + ASSERT(ppdev); + ASSERT(psoDest); + + pgp = &ppdev->Pointer; + + if (pgp->Enabled) + { + return; + } + + pgp->Enabled = TRUE; + + /* Do not blt the mouse if it in hide */ + if (pgp->ShowPointer < 0) + { + return ; + } + + pt.x = gpsi->ptCursor.x - pgp->HotSpot.x; + pt.y = gpsi->ptCursor.y - pgp->HotSpot.y; + + /* Copy the pixels under the cursor to temporary surface. */ + if (pgp->SaveSurface != NULL && + (SaveSurface = EngLockSurface(pgp->SaveSurface))) + { + RECTL DestRect; + POINTL SrcPoint; + + SrcPoint.x = max(pt.x, 0); + SrcPoint.y = max(pt.y, 0); + + DestRect.left = SrcPoint.x - pt.x; + DestRect.top = SrcPoint.y - pt.y; + DestRect.right = min( + pgp->Size.cx, + psoDest->sizlBitmap.cx - pt.x); + DestRect.bottom = min( + pgp->Size.cy, + psoDest->sizlBitmap.cy - pt.y); + + IntEngBitBltEx(SaveSurface, psoDest, NULL, NULL, NULL, + &DestRect, &SrcPoint, NULL, NULL, NULL, + ROP3_TO_ROP4(SRCCOPY), FALSE); + EngUnlockSurface(SaveSurface); + } + + + /* Blit the cursor on the screen. */ + { + RECTL DestRect; + POINTL SrcPoint; + SURFOBJ *psoColor; + SURFOBJ *psoMask = NULL; + + DestRect.left = max(pt.x, 0); + DestRect.top = max(pt.y, 0); + DestRect.right = min( + pt.x + pgp->Size.cx, + psoDest->sizlBitmap.cx); + DestRect.bottom = min( + pt.y + pgp->Size.cy, + psoDest->sizlBitmap.cy); + + SrcPoint.x = max(-pt.x, 0); + SrcPoint.y = max(-pt.y, 0); + + if (pgp->MaskSurface) + psoMask = EngLockSurface(pgp->MaskSurface); + + if (psoMask != NULL) + { + if (pgp->ColorSurface != NULL) + { + if ((psoColor = EngLockSurface(pgp->ColorSurface))) + { + IntEngBitBltEx(psoDest, psoColor, psoMask, NULL, + pgp->XlateObject, &DestRect, &SrcPoint, &SrcPoint, + NULL, NULL, R4_MASK, FALSE); + EngUnlockSurface(psoColor); + } + } + else + { + IntEngBitBltEx(psoDest, psoMask, NULL, NULL, pgp->XlateObject, + &DestRect, &SrcPoint, NULL, NULL, NULL, + ROP3_TO_ROP4(SRCAND), FALSE); + SrcPoint.y += pgp->Size.cy; + IntEngBitBltEx(psoDest, psoMask, NULL, NULL, pgp->XlateObject, + &DestRect, &SrcPoint, NULL, NULL, NULL, + ROP3_TO_ROP4(SRCINVERT), FALSE); + } + EngUnlockSurface(psoMask); + } + } } /* * @implemented */ - ULONG APIENTRY EngSetPointerShape( - IN SURFOBJ *pso, - IN SURFOBJ *psoMask, - IN SURFOBJ *psoColor, - IN XLATEOBJ *pxlo, - IN LONG xHot, - IN LONG yHot, - IN LONG x, - IN LONG y, - IN RECTL *prcl, - IN FLONG fl) -{ - PDEVOBJ *ppdev; - SURFOBJ *psoTemp; - GDIPOINTER *pgp; - - ASSERT(pso); - - ppdev = GDIDEV(pso); - pgp = &ppdev->Pointer; - - IntHideMousePointer(ppdev, pso); - - if (pgp->ColorSurface != NULL) - { - /* FIXME: Is this really needed? */ - if((psoTemp = EngLockSurface(pgp->ColorSurface))) - { - EngFreeMem(psoTemp->pvBits); - psoTemp->pvBits = 0; - EngUnlockSurface(psoTemp); - } - - EngDeleteSurface(pgp->ColorSurface); - pgp->MaskSurface = NULL; - } - - if (pgp->MaskSurface != NULL) - { - /* FIXME: Is this really needed? */ - if((psoTemp = EngLockSurface(pgp->MaskSurface))) - { - EngFreeMem(psoTemp->pvBits); - psoTemp->pvBits = 0; - EngUnlockSurface(psoTemp); - } - - EngDeleteSurface(pgp->MaskSurface); - pgp->MaskSurface = NULL; - } - - if (pgp->SaveSurface != NULL) - { - EngDeleteSurface(pgp->SaveSurface); - pgp->SaveSurface = NULL; - } - - if (pgp->XlateObject != NULL) - { - EngDeleteXlate(pgp->XlateObject); - pgp->XlateObject = NULL; - } - - /* - * See if we are being asked to hide the pointer. - */ - - if (psoMask == NULL) - { - return SPS_ACCEPT_NOEXCLUDE; - } - - pgp->HotSpot.x = xHot; - pgp->HotSpot.y = yHot; - - /* Actually this should be set by 'the other side', but it would be - * done right after this. It helps IntShowMousePointer. */ - if (x != -1) - { - gpsi->ptCursor.x = x; - gpsi->ptCursor.y = y; - } - - pgp->Size.cx = abs(psoMask->lDelta) << 3; - pgp->Size.cy = (psoMask->cjBits / abs(psoMask->lDelta)) >> 1; - - if (psoColor != NULL) - { - PBYTE Bits; - - Bits = EngAllocMem(0, psoColor->cjBits, TAG_MOUSE); - if (Bits == NULL) - { - return SPS_ERROR; - } - - memcpy(Bits, psoColor->pvBits, psoColor->cjBits); - - pgp->ColorSurface = (HSURF)EngCreateBitmap(pgp->Size, - psoColor->lDelta, psoColor->iBitmapFormat, - psoColor->lDelta < 0 ? 0 : BMF_TOPDOWN, Bits); - } - else - { - pgp->ColorSurface = NULL; - } - - { - SIZEL Size; - PBYTE Bits; - - Size.cx = pgp->Size.cx; - Size.cy = pgp->Size.cy << 1; - Bits = EngAllocMem(0, psoMask->cjBits, TAG_MOUSE); - if (Bits == NULL) - { - return SPS_ERROR; - } - - memcpy(Bits, psoMask->pvBits, psoMask->cjBits); - - pgp->MaskSurface = (HSURF)EngCreateBitmap(Size, - psoMask->lDelta, psoMask->iBitmapFormat, - psoMask->lDelta < 0 ? 0 : BMF_TOPDOWN, Bits); - } - - /* - * Create an XLATEOBJ that will be used for drawing masks. - * FIXME: We should get this in pxlo parameter! - */ - - if (pxlo == NULL) - { - HPALETTE BWPalette, DestPalette; - ULONG BWColors[] = {0, 0xFFFFFF}; - - BWPalette = EngCreatePalette(PAL_INDEXED, sizeof(BWColors) / sizeof(ULONG), - BWColors, 0, 0, 0); - - DestPalette = ppdev->DevInfo.hpalDefault; - pgp->XlateObject = IntEngCreateXlate(0, PAL_INDEXED, - DestPalette, BWPalette); - EngDeletePalette(BWPalette); - } - else - { - pgp->XlateObject = pxlo; - } - - /* - * Create surface for saving the pixels under the cursor. - */ - - { - LONG lDelta; - - switch (pso->iBitmapFormat) - { - case BMF_1BPP: - lDelta = pgp->Size.cx >> 3; - break; - case BMF_4BPP: - lDelta = pgp->Size.cx >> 1; - break; - case BMF_8BPP: - lDelta = pgp->Size.cx; - break; - case BMF_16BPP: - lDelta = pgp->Size.cx << 1; - break; - case BMF_24BPP: - lDelta = pgp->Size.cx * 3; - break; - case BMF_32BPP: - lDelta = pgp->Size.cx << 2; - break; - default: - lDelta = 0; - break; - } - - pgp->SaveSurface = (HSURF)EngCreateBitmap( - pgp->Size, lDelta, pso->iBitmapFormat, BMF_TOPDOWN | BMF_NOZEROINIT, NULL); - } - - if(x != -1) - { - IntShowMousePointer(ppdev, pso); - - if (prcl != NULL) - { - prcl->left = x - pgp->HotSpot.x; - prcl->top = y - pgp->HotSpot.x; - prcl->right = prcl->left + pgp->Size.cx; - prcl->bottom = prcl->top + pgp->Size.cy; - } - } else if (prcl != NULL) - prcl->left = prcl->top = prcl->right = prcl->bottom = -1; - - return SPS_ACCEPT_EXCLUDE; + IN SURFOBJ *pso, + IN SURFOBJ *psoMask, + IN SURFOBJ *psoColor, + IN XLATEOBJ *pxlo, + IN LONG xHot, + IN LONG yHot, + IN LONG x, + IN LONG y, + IN RECTL *prcl, + IN FLONG fl) +{ + PDEVOBJ *ppdev; + SURFOBJ *psoTemp; + GDIPOINTER *pgp; + + ASSERT(pso); + + ppdev = GDIDEV(pso); + pgp = &ppdev->Pointer; + + IntHideMousePointer(ppdev, pso); + + if (pgp->ColorSurface != NULL) + { + /* FIXME: Is this really needed? */ + if ((psoTemp = EngLockSurface(pgp->ColorSurface))) + { + EngFreeMem(psoTemp->pvBits); + psoTemp->pvBits = 0; + EngUnlockSurface(psoTemp); + } + + EngDeleteSurface(pgp->ColorSurface); + pgp->MaskSurface = NULL; + } + + if (pgp->MaskSurface != NULL) + { + /* FIXME: Is this really needed? */ + if ((psoTemp = EngLockSurface(pgp->MaskSurface))) + { + EngFreeMem(psoTemp->pvBits); + psoTemp->pvBits = 0; + EngUnlockSurface(psoTemp); + } + + EngDeleteSurface(pgp->MaskSurface); + pgp->MaskSurface = NULL; + } + + if (pgp->SaveSurface != NULL) + { + EngDeleteSurface(pgp->SaveSurface); + pgp->SaveSurface = NULL; + } + + if (pgp->XlateObject != NULL) + { + EngDeleteXlate(pgp->XlateObject); + pgp->XlateObject = NULL; + } + + /* See if we are being asked to hide the pointer. */ + if (psoMask == NULL) + { + return SPS_ACCEPT_NOEXCLUDE; + } + + pgp->HotSpot.x = xHot; + pgp->HotSpot.y = yHot; + + /* Actually this should be set by 'the other side', but it would be + * done right after this. It helps IntShowMousePointer. */ + if (x != -1) + { + gpsi->ptCursor.x = x; + gpsi->ptCursor.y = y; + } + + pgp->Size.cx = abs(psoMask->lDelta) << 3; + pgp->Size.cy = (psoMask->cjBits / abs(psoMask->lDelta)) >> 1; + + if (psoColor != NULL) + { + PBYTE Bits; + + Bits = EngAllocMem(0, psoColor->cjBits, TAG_MOUSE); + if (Bits == NULL) + { + return SPS_ERROR; + } + + memcpy(Bits, psoColor->pvBits, psoColor->cjBits); + + pgp->ColorSurface = (HSURF)EngCreateBitmap(pgp->Size, + psoColor->lDelta, psoColor->iBitmapFormat, + psoColor->lDelta < 0 ? 0 : BMF_TOPDOWN, Bits); + } + else + { + pgp->ColorSurface = NULL; + } + + { + SIZEL Size; + PBYTE Bits; + + Size.cx = pgp->Size.cx; + Size.cy = pgp->Size.cy << 1; + Bits = EngAllocMem(0, psoMask->cjBits, TAG_MOUSE); + if (Bits == NULL) + { + return SPS_ERROR; + } + + memcpy(Bits, psoMask->pvBits, psoMask->cjBits); + + pgp->MaskSurface = (HSURF)EngCreateBitmap(Size, + psoMask->lDelta, psoMask->iBitmapFormat, + psoMask->lDelta < 0 ? 0 : BMF_TOPDOWN, Bits); + } + + /* Create an XLATEOBJ that will be used for drawing masks. + * FIXME: We should get this in pxlo parameter! */ + if (pxlo == NULL) + { + HPALETTE BWPalette, DestPalette; + ULONG BWColors[] = {0, 0xFFFFFF}; + + BWPalette = EngCreatePalette(PAL_INDEXED, sizeof(BWColors) / sizeof(ULONG), + BWColors, 0, 0, 0); + + DestPalette = ppdev->DevInfo.hpalDefault; + pgp->XlateObject = IntEngCreateXlate(0, PAL_INDEXED, + DestPalette, BWPalette); + EngDeletePalette(BWPalette); + } + else + { + pgp->XlateObject = pxlo; + } + + /* Create surface for saving the pixels under the cursor. */ + { + LONG lDelta; + + switch (pso->iBitmapFormat) + { + case BMF_1BPP: + lDelta = pgp->Size.cx >> 3; + break; + case BMF_4BPP: + lDelta = pgp->Size.cx >> 1; + break; + case BMF_8BPP: + lDelta = pgp->Size.cx; + break; + case BMF_16BPP: + lDelta = pgp->Size.cx << 1; + break; + case BMF_24BPP: + lDelta = pgp->Size.cx * 3; + break; + case BMF_32BPP: + lDelta = pgp->Size.cx << 2; + break; + default: + lDelta = 0; + break; + } + + pgp->SaveSurface = (HSURF)EngCreateBitmap(pgp->Size, + lDelta, + pso->iBitmapFormat, + BMF_TOPDOWN | BMF_NOZEROINIT, NULL); + } + + if (x != -1) + { + IntShowMousePointer(ppdev, pso); + + if (prcl != NULL) + { + prcl->left = x - pgp->HotSpot.x; + prcl->top = y - pgp->HotSpot.x; + prcl->right = prcl->left + pgp->Size.cx; + prcl->bottom = prcl->top + pgp->Size.cy; + } + } else if (prcl != NULL) + prcl->left = prcl->top = prcl->right = prcl->bottom = -1; + + return SPS_ACCEPT_EXCLUDE; } /* @@ -531,61 +498,61 @@ VOID APIENTRY EngMovePointer( - IN SURFOBJ *pso, - IN LONG x, - IN LONG y, - IN RECTL *prcl) -{ - PDEVOBJ *ppdev; - GDIPOINTER *pgp; - - ASSERT(pso); - - ppdev = GDIDEV(pso); - - ASSERT(ppdev); - - pgp = &ppdev->Pointer; - - IntHideMousePointer(ppdev, pso); - if (x != -1) - { - /* Actually this should be set by 'the other side', but it would be - * done right after this. It helps IntShowMousePointer. */ - gpsi->ptCursor.x = x; - gpsi->ptCursor.y = y; - IntShowMousePointer(ppdev, pso); - if (prcl != NULL) - { - prcl->left = x - pgp->HotSpot.x; - prcl->top = y - pgp->HotSpot.x; - prcl->right = prcl->left + pgp->Size.cx; - prcl->bottom = prcl->top + pgp->Size.cy; - } - } else if (prcl != NULL) - prcl->left = prcl->top = prcl->right = prcl->bottom = -1; + IN SURFOBJ *pso, + IN LONG x, + IN LONG y, + IN RECTL *prcl) +{ + PDEVOBJ *ppdev; + GDIPOINTER *pgp; + + ASSERT(pso); + + ppdev = GDIDEV(pso); + + ASSERT(ppdev); + + pgp = &ppdev->Pointer; + + IntHideMousePointer(ppdev, pso); + if (x != -1) + { + /* Actually this should be set by 'the other side', but it would be + * done right after this. It helps IntShowMousePointer. */ + gpsi->ptCursor.x = x; + gpsi->ptCursor.y = y; + IntShowMousePointer(ppdev, pso); + if (prcl != NULL) + { + prcl->left = x - pgp->HotSpot.x; + prcl->top = y - pgp->HotSpot.x; + prcl->right = prcl->left + pgp->Size.cx; + prcl->bottom = prcl->top + pgp->Size.cy; + } + } else if (prcl != NULL) + prcl->left = prcl->top = prcl->right = prcl->bottom = -1; } VOID APIENTRY IntEngMovePointer( - IN SURFOBJ *pso, - IN LONG x, - IN LONG y, - IN RECTL *prcl) -{ - SURFACE *psurf = CONTAINING_RECORD(pso, SURFACE, SurfObj); - - SURFACE_LockBitmapBits(psurf); - if (GDIDEV(pso)->Pointer.MovePointer) - { - GDIDEV(pso)->Pointer.MovePointer(pso, x, y, prcl); - } - else - { - EngMovePointer(pso, x, y, prcl); - } - SURFACE_UnlockBitmapBits(psurf); + IN SURFOBJ *pso, + IN LONG x, + IN LONG y, + IN RECTL *prcl) +{ + SURFACE *psurf = CONTAINING_RECORD(pso, SURFACE, SurfObj); + + SURFACE_LockBitmapBits(psurf); + if (GDIDEV(pso)->Pointer.MovePointer) + { + GDIDEV(pso)->Pointer.MovePointer(pso, x, y, prcl); + } + else + { + EngMovePointer(pso, x, y, prcl); + } + SURFACE_UnlockBitmapBits(psurf); } /* EOF */

1 0

[tkreuzer] 40389: Improve tests for NtGdiDeleteObjectApp
by tkreuzer＠svn.reactos.org 06 Apr '09

06 Apr '09

Author: tkreuzer Date: Mon Apr 6 06:49:47 2009 New Revision: 40389 URL: http://svn.reactos.org/svn/reactos?rev=40389&view=rev Log: Improve tests for NtGdiDeleteObjectApp Modified: trunk/rostests/apitests/w32knapi/ntgdi/NtGdiDeleteObjectApp.c Modified: trunk/rostests/apitests/w32knapi/ntgdi/NtGdiDeleteObjectApp.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/w32knapi/ntgdi/N… ============================================================================== --- trunk/rostests/apitests/w32knapi/ntgdi/NtGdiDeleteObjectApp.c [iso-8859-1] (original) +++ trunk/rostests/apitests/w32knapi/ntgdi/NtGdiDeleteObjectApp.c [iso-8859-1] Mon Apr 6 06:49:47 2009 @@ -5,12 +5,10 @@ HDC hdc; HBITMAP hbmp; HBRUSH hbrush; - BOOL ret; /* Try to delete 0 */ SetLastError(0); - ret = NtGdiDeleteObjectApp(0); - TEST(ret == 0); + TEST(NtGdiDeleteObjectApp(0) == 0); TEST(GetLastError() == 0); /* Try to delete something with a stockbit */ @@ -21,40 +19,32 @@ /* Delete a DC */ SetLastError(0); hdc = CreateCompatibleDC(NULL); - ASSERT(hdc); - TEST(IsHandleValid(hdc) == 1); - ret = NtGdiDeleteObjectApp(hdc); - TEST(ret == 1); + ASSERT(IsHandleValid(hdc) == 1); + TEST(NtGdiDeleteObjectApp(hdc) == 1); TEST(GetLastError() == 0); TEST(IsHandleValid(hdc) == 0); /* Delete a brush */ SetLastError(0); hbrush = CreateSolidBrush(0x123456); - ASSERT(hbrush); - TEST(IsHandleValid(hbrush) == 1); - ret = NtGdiDeleteObjectApp(hbrush); - TEST(ret == 1); + ASSERT(IsHandleValid(hbrush) == 1); + TEST(NtGdiDeleteObjectApp(hbrush) == 1); TEST(GetLastError() == 0); TEST(IsHandleValid(hbrush) == 0); /* Try to delete a stock brush */ SetLastError(0); hbrush = GetStockObject(BLACK_BRUSH); - ASSERT(hbrush); - TEST(IsHandleValid(hbrush) == 1); - ret = NtGdiDeleteObjectApp(hbrush); - TEST(ret == 1); + ASSERT(IsHandleValid(hbrush) == 1); + TEST(NtGdiDeleteObjectApp(hbrush) == 1); TEST(GetLastError() == 0); TEST(IsHandleValid(hbrush) == 1); /* Delete a bitmap */ SetLastError(0); hbmp = CreateBitmap(10, 10, 1, 1, NULL); - ASSERT(hbmp); - TEST(IsHandleValid(hbmp) == 1); - ret = NtGdiDeleteObjectApp(hbmp); - TEST(ret == 1); + ASSERT(IsHandleValid(hbmp) == 1); + TEST(NtGdiDeleteObjectApp(hbmp) == 1); TEST(GetLastError() == 0); TEST(IsHandleValid(hbmp) == 0); @@ -65,23 +55,19 @@ /* Try to delete a brush that is selected into a DC */ SetLastError(0); hbrush = CreateSolidBrush(0x123456); - ASSERT(hbrush); - TEST(IsHandleValid(hbrush) == 1); + ASSERT(IsHandleValid(hbrush) == 1); TEST(NtGdiSelectBrush(hdc, hbrush)); - ret = NtGdiDeleteObjectApp(hbrush); - TEST(ret == 1); + TEST(NtGdiDeleteObjectApp(hbrush) == 1); TEST(GetLastError() == 0); TEST(IsHandleValid(hbrush) == 1); /* Try to delete a bitmap that is selected into a DC */ SetLastError(0); hbmp = CreateBitmap(10, 10, 1, 1, NULL); - ASSERT(hbmp); - TEST(IsHandleValid(hbmp) == 1); + ASSERT(IsHandleValid(hbmp) == 1); TEST(NtGdiSelectBitmap(hdc, hbmp)); - ret = NtGdiDeleteObjectApp(hbmp); - TEST(ret == 1); + TEST(NtGdiDeleteObjectApp(hbmp) == 1); TEST(GetLastError() == 0); TEST(IsHandleValid(hbmp) == 1); @@ -89,11 +75,19 @@ NtGdiSelectBitmap(hdc, GetStockObject(DEFAULT_BITMAP)); TEST(IsHandleValid(hbmp) == 0); - ret = NtGdiDeleteObjectApp(hbmp); - TEST(ret == 1); + TEST(NtGdiDeleteObjectApp(hbmp) == 1); TEST(GetLastError() == 0); TEST(IsHandleValid(hbmp) == 0); + /* Try to delete a brush that is selected into a DC */ + SetLastError(0); + hbrush = CreateSolidBrush(123); + ASSERT(IsHandleValid(hbrush) == 1); + TEST(NtGdiSelectBrush(hdc, hbrush)); + + TEST(NtGdiDeleteObjectApp(hbrush) == 1); + TEST(GetLastError() == 0); + TEST(IsHandleValid(hbrush) == 1); return APISTATUS_NORMAL; }

1 0

[tkreuzer] 40388: revert miniport.h changes for now
by tkreuzer＠svn.reactos.org 06 Apr '09

06 Apr '09

Author: tkreuzer Date: Mon Apr 6 06:28:53 2009 New Revision: 40388 URL: http://svn.reactos.org/svn/reactos?rev=40388&view=rev Log: revert miniport.h changes for now Modified: trunk/reactos/include/ddk/miniport.h Modified: trunk/reactos/include/ddk/miniport.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/miniport.h?rev… ============================================================================== --- trunk/reactos/include/ddk/miniport.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/miniport.h [iso-8859-1] Mon Apr 6 06:28:53 2009 @@ -23,45 +23,9 @@ #ifndef _MINIPORT_ #define _MINIPORT_ -#include <ntdef.h> -#include <stddef.h> -#include <basetsd.h> -#include <sdkddkver.h> -#include <guiddef.h> - - #ifdef __cplusplus extern "C" { #endif - -typedef enum _INTERFACE_TYPE -{ - InterfaceTypeUndefined = -1, - Internal, - Isa, - Eisa, - MicroChannel, - TurboChannel, - PCIBus, - VMEBus, - NuBus, - PCMCIABus, - CBus, - MPIBus, - MPSABus, - ProcessorInternal, - InternalPowerBus, - PNPISABus, - PNPBus, - Vmcs, - MaximumInterfaceType -} INTERFACE_TYPE, *PINTERFACE_TYPE; - -typedef enum _KINTERRUPT_MODE -{ - LevelSensitive, - Latched -} KINTERRUPT_MODE, *PKINTERRUPT_MODE; #define EMULATOR_READ_ACCESS 0x01 #define EMULATOR_WRITE_ACCESS 0x02 @@ -71,6 +35,7 @@ Ushort, Ulong } EMULATOR_PORT_ACCESS_TYPE, *PEMULATOR_PORT_ACCESS_TYPE; + typedef struct _EMULATOR_ACCESS_ENTRY { ULONG BasePort; @@ -93,170 +58,6 @@ } VIDEO_ACCESS_RANGE, *PVIDEO_ACCESS_RANGE; #endif -typedef VOID (*PINTERFACE_REFERENCE)(PVOID Context); -typedef VOID (*PINTERFACE_DEREFERENCE)(PVOID Context); - -typedef struct _INTERFACE -{ - USHORT Size; - USHORT Version; - PVOID Context; - PINTERFACE_REFERENCE InterfaceReference; - PINTERFACE_DEREFERENCE InterfaceDereference; -} INTERFACE, *PINTERFACE; - -typedef enum _IRQ_DEVICE_POLICY -{ - IrqPolicyMachineDefault = 0, - IrqPolicyAllCloseProcessors, - IrqPolicyOneCloseProcessor, - IrqPolicyAllProcessorsInMachine, - IrqPolicySpecifiedProcessors, - IrqPolicySpreadMessagesAcrossAllProcessors -} IRQ_DEVICE_POLICY, *PIRQ_DEVICE_POLICY; - -typedef enum _IRQ_PRIORITY -{ - IrqPriorityUndefined = 0, - IrqPriorityLow, - IrqPriorityNormal, - IrqPriorityHigh -} IRQ_PRIORITY, *PIRQ_PRIORITY; - -typedef enum _DMA_WIDTH -{ - Width8Bits, - Width16Bits, - Width32Bits, - MaximumDmaWidth -} DMA_WIDTH, *PDMA_WIDTH; - -typedef enum _DMA_SPEED -{ - Compatible, - TypeA, - TypeB, - TypeC, - TypeF, - MaximumDmaSpeed -} DMA_SPEED, *PDMA_SPEED; - -#pragma pack(push,4) -typedef enum _BUS_DATA_TYPE -{ - ConfigurationSpaceUndefined = -1, - Cmos, - EisaConfiguration, - Pos, - CbusConfiguration, - PCIConfiguration, - VMEConfiguration, - NuBusConfiguration, - PCMCIAConfiguration, - MPIConfiguration, - MPSAConfiguration, - PNPISAConfiguration, - SgiInternalConfiguration, - MaximumBusDataType -} BUS_DATA_TYPE, *PBUS_DATA_TYPE; -#pragma pack(pop) - -typedef struct _IO_RESOURCE_DESCRIPTOR -{ - UCHAR Option; - UCHAR Type; - UCHAR ShareDisposition; - UCHAR Spare1; - USHORT Flags; - USHORT Spare2; - - union - { - struct - { - ULONG Length; - ULONG Alignment; - PHYSICAL_ADDRESS MinimumAddress; - PHYSICAL_ADDRESS MaximumAddress; - } Port; - - struct - { - ULONG Length; - ULONG Alignment; - PHYSICAL_ADDRESS MinimumAddress; - PHYSICAL_ADDRESS MaximumAddress; - } Memory; - - struct - { - ULONG MinimumVector; - ULONG MaximumVector; - IRQ_DEVICE_POLICY AffinityPolicy; - IRQ_PRIORITY PriorityPolicy; - KAFFINITY TargetedProcessors; - } Interrupt; - - struct - { - ULONG MinimumChannel; - ULONG MaximumChannel; - } Dma; - - struct - { - ULONG Length; - ULONG Alignment; - PHYSICAL_ADDRESS MinimumAddress; - PHYSICAL_ADDRESS MaximumAddress; - } Generic; - - struct - { - ULONG Data[3]; - } DevicePrivate; - - struct - { - ULONG Length; - ULONG MinBusNumber; - ULONG MaxBusNumber; - ULONG Reserved; - } BusNumber; - - struct - { - ULONG Priority; - ULONG Reserved1; - ULONG Reserved2; - } ConfigData; - - struct - { - ULONG Length40; - ULONG Alignment40; - PHYSICAL_ADDRESS MinimumAddress; - PHYSICAL_ADDRESS MaximumAddress; - } Memory40; - - struct - { - ULONG Length48; - ULONG Alignment48; - PHYSICAL_ADDRESS MinimumAddress; - PHYSICAL_ADDRESS MaximumAddress; - } Memory48; - - struct - { - ULONG Length64; - ULONG Alignment64; - PHYSICAL_ADDRESS MinimumAddress; - PHYSICAL_ADDRESS MaximumAddress; - } Memory64; - } u; -} IO_RESOURCE_DESCRIPTOR, *PIO_RESOURCE_DESCRIPTOR; - typedef VOID DDKAPI (*PBANKED_SECTION_ROUTINE)( IN ULONG ReadBank,

1 0

[cgutman] 40387: - Drivers must use DelayedWorkQueue (part 2)
by cgutman＠svn.reactos.org 06 Apr '09

06 Apr '09

Author: cgutman Date: Mon Apr 6 06:15:43 2009 New Revision: 40387 URL: http://svn.reactos.org/svn/reactos?rev=40387&view=rev Log: - Drivers must use DelayedWorkQueue (part 2) Modified: trunk/reactos/lib/drivers/chew/workqueue.c Modified: trunk/reactos/lib/drivers/chew/workqueue.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/chew/workqueue… ============================================================================== --- trunk/reactos/lib/drivers/chew/workqueue.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/chew/workqueue.c [iso-8859-1] Mon Apr 6 06:15:43 2009 @@ -87,7 +87,7 @@ ExInterlockedInsertTailList ( &WorkQueue, &Item->Entry, &WorkQueueLock ); IoQueueWorkItem - ( Item->WorkItem, ChewWorkItem, CriticalWorkQueue, Item ); + ( Item->WorkItem, ChewWorkItem, DelayedWorkQueue, Item ); if( ItemPtr ) *ItemPtr = Item;

1 0

[tkreuzer] 40386: fix include guard, use winddi types instead of ros specific function pointer types, add a bunch of static asserts to make sure the DRIVRE_FUNCTIONS structure matches the array.
by tkreuzer＠svn.reactos.org 06 Apr '09

06 Apr '09

Author: tkreuzer Date: Mon Apr 6 06:13:44 2009 New Revision: 40386 URL: http://svn.reactos.org/svn/reactos?rev=40386&view=rev Log: fix include guard, use winddi types instead of ros specific function pointer types, add a bunch of static asserts to make sure the DRIVRE_FUNCTIONS structure matches the array. Modified: trunk/reactos/include/reactos/win32k/ntgdityp.h trunk/reactos/subsystems/win32/win32k/include/dc.h trunk/reactos/subsystems/win32/win32k/include/driver.h trunk/reactos/subsystems/win32/win32k/misc/driver.c trunk/reactos/subsystems/win32/win32k/objects/device.c Modified: trunk/reactos/include/reactos/win32k/ntgdityp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/win32k/ntg… ============================================================================== --- trunk/reactos/include/reactos/win32k/ntgdityp.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/win32k/ntgdityp.h [iso-8859-1] Mon Apr 6 06:13:44 2009 @@ -216,7 +216,7 @@ typedef PVOID KERNEL_PVOID; typedef PVOID PUMDHPDEV; typedef D3DNTHAL_CONTEXTCREATEDATA D3DNTHAL_CONTEXTCREATEI; -#if !defined(__WINDDI_H) +#if !defined(_WINDDI_) typedef LONG FIX; #endif @@ -534,77 +534,10 @@ } GDIBSOBJECT, *PGDIBSOBJECT; // -// Driver Functions -// -typedef BOOL (NTAPI *PGD_ENABLEDRIVER)(ULONG, ULONG, PDRVENABLEDATA); -typedef DHPDEV (NTAPI *PGD_ENABLEPDEV)(DEVMODEW *, LPWSTR, ULONG, HSURF *, ULONG, ULONG *, ULONG, DEVINFO *, LPWSTR, LPWSTR, HANDLE); -typedef VOID (NTAPI *PGD_COMPLETEPDEV)(DHPDEV, HDEV); -typedef VOID (NTAPI *PGD_DISABLEPDEV)(DHPDEV); -typedef HSURF (NTAPI *PGD_ENABLESURFACE)(DHPDEV); -typedef VOID (NTAPI *PGD_DISABLESURFACE)(DHPDEV); -typedef BOOL (NTAPI *PGD_ASSERTMODE)(DHPDEV, BOOL); -typedef BOOL (NTAPI *PGD_OFFSET)(SURFOBJ*, LONG, LONG, FLONG); -typedef BOOL (NTAPI *PGD_RESETPDEV)(DHPDEV, DHPDEV); -typedef VOID (NTAPI *PGD_DISABLEDRIVER)(VOID); -typedef HBITMAP (NTAPI *PGD_CREATEDEVICEBITMAP)(DHPDEV, SIZEL, ULONG); -typedef VOID (NTAPI *PGD_DELETEDEVICEBITMAP)(DHSURF); -typedef BOOL (NTAPI *PGD_ALPHABLEND)(SURFOBJ*, SURFOBJ*, CLIPOBJ*, XLATEOBJ*, RECTL*, RECTL*, BLENDOBJ*); -typedef BOOL (NTAPI *PGD_REALIZEBRUSH)(BRUSHOBJ*, SURFOBJ*, SURFOBJ*, SURFOBJ*, XLATEOBJ*, ULONG); -typedef ULONG (NTAPI *PGD_DITHERCOLOR)(DHPDEV, ULONG, ULONG, PULONG); -typedef BOOL (NTAPI *PGD_STROKEPATH)(SURFOBJ*, PATHOBJ*, CLIPOBJ*, XFORMOBJ*, BRUSHOBJ*, POINTL*, PLINEATTRS, MIX); -typedef BOOL (NTAPI *PGD_FILLPATH)(SURFOBJ*, PATHOBJ*, CLIPOBJ*, BRUSHOBJ*, POINTL*, MIX, ULONG); -typedef BOOL (NTAPI *PGD_STROKEANDFILLPATH)(SURFOBJ*, PATHOBJ*, CLIPOBJ*, XFORMOBJ*, BRUSHOBJ*, PLINEATTRS, BRUSHOBJ*, POINTL*, MIX, ULONG); -typedef BOOL (NTAPI *PGD_PAINT)(SURFOBJ*, CLIPOBJ*, BRUSHOBJ*, POINTL*, MIX); -typedef BOOL (NTAPI *PGD_BITBLT)(SURFOBJ*, SURFOBJ*, SURFOBJ*, CLIPOBJ*, XLATEOBJ*, RECTL*, POINTL*, POINTL*, BRUSHOBJ*, POINTL*, ROP4); -typedef BOOL (NTAPI *PGD_TRANSPARENTBLT)(SURFOBJ*, SURFOBJ*, CLIPOBJ*, XLATEOBJ*, RECTL*, RECTL*, ULONG, ULONG); -typedef BOOL (NTAPI *PGD_COPYBITS)(SURFOBJ*, SURFOBJ*, CLIPOBJ*, XLATEOBJ*, RECTL*, POINTL*); -typedef BOOL (NTAPI *PGD_STRETCHBLT)(SURFOBJ*, SURFOBJ*, SURFOBJ*, CLIPOBJ*, XLATEOBJ*, COLORADJUSTMENT*, POINTL*, RECTL*, RECTL*, POINTL*, ULONG); -typedef BOOL (NTAPI *PGD_STRETCHBLTROP)(SURFOBJ*, SURFOBJ*, SURFOBJ*, CLIPOBJ*, XLATEOBJ*, COLORADJUSTMENT*, POINTL*, RECTL*, RECTL*, POINTL*, ULONG, BRUSHOBJ*, DWORD); -typedef BOOL (NTAPI *PGD_SETPALETTE)(DHPDEV, PALOBJ*, ULONG, ULONG, ULONG); -typedef BOOL (NTAPI *PGD_TEXTOUT)(SURFOBJ*, STROBJ*, FONTOBJ*, CLIPOBJ*, RECTL*, RECTL*, BRUSHOBJ*, BRUSHOBJ*, POINTL*, MIX); -typedef ULONG (NTAPI *PGD_ESCAPE)(SURFOBJ*, ULONG, ULONG, PVOID *, ULONG, PVOID *); -typedef ULONG (NTAPI *PGD_DRAWESCAPE)(SURFOBJ*, ULONG, CLIPOBJ*, RECTL*, ULONG, PVOID *); -typedef PIFIMETRICS (NTAPI *PGD_QUERYFONT)(DHPDEV, ULONG, ULONG, PULONG); -typedef PVOID (NTAPI *PGD_QUERYFONTTREE)(DHPDEV, ULONG, ULONG, ULONG, PULONG); -typedef LONG (NTAPI *PGD_QUERYFONTDATA)(DHPDEV, FONTOBJ*, ULONG, HGLYPH, GLYPHDATA*, PVOID, ULONG); -typedef ULONG (NTAPI *PGD_SETPOINTERSHAPE)(SURFOBJ*, SURFOBJ*, SURFOBJ*, XLATEOBJ*, LONG, LONG, LONG, LONG, RECTL*, ULONG); -typedef VOID (NTAPI *PGD_MOVEPOINTER)(SURFOBJ*, LONG, LONG, RECTL*); -typedef BOOL (NTAPI *PGD_LINETO)(SURFOBJ*, CLIPOBJ*, BRUSHOBJ*, LONG, LONG, LONG, LONG, RECTL*, MIX); -typedef BOOL (NTAPI *PGD_SENDPAGE)(SURFOBJ*); -typedef BOOL (NTAPI *PGD_STARTPAGE)(SURFOBJ*); -typedef BOOL (NTAPI *PGD_ENDDOC)(SURFOBJ*, ULONG); -typedef BOOL (NTAPI *PGD_STARTDOC)(SURFOBJ*, PWSTR, DWORD); -typedef ULONG (NTAPI *PGD_GETGLYPHMODE)(DHPDEV, FONTOBJ*); -typedef VOID (NTAPI *PGD_SYNCHRONIZE)(DHPDEV, RECTL*); -typedef ULONG (NTAPI *PGD_SAVESCREENBITS)(SURFOBJ*, ULONG, ULONG, RECTL*); -typedef ULONG (NTAPI *PGD_GETMODES)(HANDLE, ULONG, PDEVMODEW); -typedef VOID (NTAPI *PGD_FREE)(PVOID, ULONG); -typedef VOID (NTAPI *PGD_DESTROYFONT)(FONTOBJ*); -typedef LONG (NTAPI *PGD_QUERYFONTCAPS)(ULONG, PULONG); -typedef ULONG (NTAPI *PGD_LOADFONTFILE)(ULONG, PVOID, ULONG, ULONG); -typedef BOOL (NTAPI *PGD_UNLOADFONTFILE)(ULONG); -typedef ULONG (NTAPI *PGD_FONTMANAGEMENT)(SURFOBJ*, FONTOBJ*, ULONG, ULONG, PVOID, ULONG, PVOID); -typedef LONG (NTAPI *PGD_QUERYTRUETYPETABLE)(ULONG, ULONG, ULONG, PTRDIFF, ULONG, PBYTE); -typedef LONG (NTAPI *PGD_QUERYTRUETYPEOUTLINE)(DHPDEV, FONTOBJ*, HGLYPH, BOOL, GLYPHDATA*, ULONG, TTPOLYGONHEADER*); -typedef PVOID (NTAPI *PGD_GETTRUETYPEFILE)(ULONG, PULONG); -typedef LONG (NTAPI *PGD_QUERYFONTFILE)(ULONG, ULONG, ULONG, PULONG); -typedef BOOL (NTAPI *PGD_QUERYADVANCEWIDTHS)(DHPDEV, FONTOBJ*, ULONG, HGLYPH *, PVOID *, ULONG); -typedef BOOL (NTAPI *PGD_SETPIXELFORMAT)(SURFOBJ*, LONG, ULONG); -typedef LONG (NTAPI *PGD_DESCRIBEPIXELFORMAT)(DHPDEV, LONG, ULONG, PPIXELFORMATDESCRIPTOR); -typedef BOOL (NTAPI *PGD_SWAPBUFFERS)(SURFOBJ*, PWNDOBJ); -typedef BOOL (NTAPI *PGD_STARTBANDING)(SURFOBJ*, POINTL*); -typedef BOOL (NTAPI *PGD_NEXTBAND)(SURFOBJ*, POINTL*); -typedef BOOL (NTAPI *PGD_GETDIRECTDRAWINFO)(DHPDEV, PDD_HALINFO, PDWORD, VIDEOMEMORY*, PDWORD, PDWORD); -typedef BOOL (NTAPI *PGD_ENABLEDIRECTDRAW)(DHPDEV, PDD_CALLBACKS, PDD_SURFACECALLBACKS, PDD_PALETTECALLBACKS); -typedef VOID (NTAPI *PGD_DISABLEDIRECTDRAW)(DHPDEV); -typedef LONG (NTAPI *PGD_QUERYSPOOLTYPE)(DHPDEV, LPWSTR); -typedef BOOL (NTAPI *PGD_GRADIENTFILL)(SURFOBJ*, CLIPOBJ*, XLATEOBJ*, TRIVERTEX*, ULONG, PVOID, ULONG, RECTL*, POINTL*, ULONG); -typedef VOID (NTAPI *PGD_SYNCHRONIZESURFACE)(SURFOBJ*, RECTL *, FLONG); - -// // Declarations missing in ddk/winddi.h // typedef VOID (APIENTRY *PFN_DrvMovePanning)(LONG, LONG, FLONG); +//typedef BOOL (APIENTRY *PFN_DrvOffset)(SURFOBJ*, LONG, LONG, FLONG); // @@ -612,81 +545,81 @@ // typedef struct _DRIVER_FUNCTIONS { - PGD_ENABLEPDEV EnablePDEV; - PGD_COMPLETEPDEV CompletePDEV; - PGD_DISABLEPDEV DisablePDEV; - PGD_ENABLESURFACE EnableSurface; - PGD_DISABLESURFACE DisableSurface; - PGD_ASSERTMODE AssertMode; - PGD_OFFSET Offset; - PGD_RESETPDEV ResetPDEV; - PGD_DISABLEDRIVER DisableDriver; + PFN_DrvEnablePDEV EnablePDEV; + PFN_DrvCompletePDEV CompletePDEV; + PFN_DrvDisablePDEV DisablePDEV; + PFN_DrvEnableSurface EnableSurface; + PFN_DrvDisableSurface DisableSurface; + PFN_DrvAssertMode AssertMode; + PFN_DrvOffset Offset; + PFN_DrvResetDevice ResetPDEV; + PFN_DrvDisableDriver DisableDriver; PVOID Unknown1; - PGD_CREATEDEVICEBITMAP CreateDeviceBitmap; - PGD_DELETEDEVICEBITMAP DeleteDeviceBitmap; - PGD_REALIZEBRUSH RealizeBrush; - PGD_DITHERCOLOR DitherColor; - PGD_STROKEPATH StrokePath; - PGD_FILLPATH FillPath; - PGD_STROKEANDFILLPATH StrokeAndFillPath; - PGD_PAINT Paint; - PGD_BITBLT BitBlt; - PGD_COPYBITS CopyBits; - PGD_STRETCHBLT StretchBlt; + PFN_DrvCreateDeviceBitmap CreateDeviceBitmap; + PFN_DrvDeleteDeviceBitmap DeleteDeviceBitmap; + PFN_DrvRealizeBrush RealizeBrush; + PFN_DrvDitherColor DitherColor; + PFN_DrvStrokePath StrokePath; + PFN_DrvFillPath FillPath; + PFN_DrvStrokeAndFillPath StrokeAndFillPath; + PFN_DrvPaint Paint; + PFN_DrvBitBlt BitBlt; + PFN_DrvCopyBits CopyBits; + PFN_DrvStretchBlt StretchBlt; PVOID Unknown2; - PGD_SETPALETTE SetPalette; - PGD_TEXTOUT TextOut; - PGD_ESCAPE Escape; - PGD_DRAWESCAPE DrawEscape; - PGD_QUERYFONT QueryFont; - PGD_QUERYFONTTREE QueryFontTree; - PGD_QUERYFONTDATA QueryFontData; - PGD_SETPOINTERSHAPE SetPointerShape; - PGD_MOVEPOINTER MovePointer; - PGD_LINETO LineTo; - PGD_SENDPAGE SendPage; - PGD_STARTPAGE StartPage; - PGD_ENDDOC EndDoc; - PGD_STARTDOC StartDoc; + PFN_DrvSetPalette SetPalette; + PFN_DrvTextOut TextOut; + PFN_DrvEscape Escape; + PFN_DrvDrawEscape DrawEscape; + PFN_DrvQueryFont QueryFont; + PFN_DrvQueryFontTree QueryFontTree; + PFN_DrvQueryFontData QueryFontData; + PFN_DrvSetPointerShape SetPointerShape; + PFN_DrvMovePointer MovePointer; + PFN_DrvLineTo LineTo; + PFN_DrvSendPage SendPage; + PFN_DrvStartPage StartPage; + PFN_DrvEndDoc EndDoc; + PFN_DrvStartDoc StartDoc; PVOID Unknown3; - PGD_GETGLYPHMODE GetGlyphMode; - PGD_SYNCHRONIZE Synchronize; + PFN_DrvGetGlyphMode GetGlyphMode; + PFN_DrvSynchronize Synchronize; PVOID Unknown4; - PGD_SAVESCREENBITS SaveScreenBits; - PGD_GETMODES GetModes; - PGD_FREE Free; - PGD_DESTROYFONT DestroyFont; - PGD_QUERYFONTCAPS QueryFontCaps; - PGD_LOADFONTFILE LoadFontFile; - PGD_UNLOADFONTFILE UnloadFontFile; - PGD_FONTMANAGEMENT FontManagement; - PGD_QUERYTRUETYPETABLE QueryTrueTypeTable; - PGD_QUERYTRUETYPEOUTLINE QueryTrueTypeOutline; - PGD_GETTRUETYPEFILE GetTrueTypeFile; - PGD_QUERYFONTFILE QueryFontFile; + PFN_DrvSaveScreenBits SaveScreenBits; + PFN_DrvGetModes GetModes; + PFN_DrvFree Free; + PFN_DrvDestroyFont DestroyFont; + PFN_DrvQueryFontCaps QueryFontCaps; + PFN_DrvLoadFontFile LoadFontFile; + PFN_DrvUnloadFontFile UnloadFontFile; + PFN_DrvFontManagement FontManagement; + PFN_DrvQueryTrueTypeTable QueryTrueTypeTable; + PFN_DrvQueryTrueTypeOutline QueryTrueTypeOutline; + PFN_DrvGetTrueTypeFile GetTrueTypeFile; + PFN_DrvQueryFontFile QueryFontFile; PFN_DrvMovePanning MovePanning; - PGD_QUERYADVANCEWIDTHS QueryAdvanceWidths; - PGD_SETPIXELFORMAT SetPixelFormat; - PGD_DESCRIBEPIXELFORMAT DescribePixelFormat; - PGD_SWAPBUFFERS SwapBuffers; - PGD_STARTBANDING StartBanding; - PGD_NEXTBAND NextBand; - PGD_GETDIRECTDRAWINFO GetDirectDrawInfo; - PGD_ENABLEDIRECTDRAW EnableDirectDraw; - PGD_DISABLEDIRECTDRAW DisableDirectDraw; - PGD_QUERYSPOOLTYPE QuerySpoolType; + PFN_DrvQueryAdvanceWidths QueryAdvanceWidths; + PFN_DrvSetPixelFormat SetPixelFormat; + PFN_DrvDescribePixelFormat DescribePixelFormat; + PFN_DrvSwapBuffers SwapBuffers; + PFN_DrvStartBanding StartBanding; + PFN_DrvNextBand NextBand; + PFN_DrvGetDirectDrawInfo GetDirectDrawInfo; + PFN_DrvEnableDirectDraw EnableDirectDraw; + PFN_DrvDisableDirectDraw DisableDirectDraw; + PFN_DrvQuerySpoolType QuerySpoolType; PVOID Unknown5; PFN_DrvIcmCreateColorTransform IcmCreateColorTransform; PFN_DrvIcmDeleteColorTransform IcmDeleteColorTransform; PFN_DrvIcmCheckBitmapBits IcmCheckBitmapBits; PFN_DrvIcmSetDeviceGammaRamp IcmSetDeviceGammaRamp; - PGD_GRADIENTFILL GradientFill; - PGD_STRETCHBLTROP StretchBltROP; + PFN_DrvGradientFill GradientFill; + PFN_DrvStretchBltROP StretchBltROP; PFN_DrvPlgBlt PlgBlt; - PGD_ALPHABLEND AlphaBlend; + PFN_DrvAlphaBlend AlphaBlend; PVOID SynthesizeFont; PVOID GetSynthesizedFontFiles; - PGD_TRANSPARENTBLT TransparentBlt; + PFN_DrvTransparentBlt TransparentBlt; PFN_DrvQueryPerBandInfo QueryPerBandInfo; PFN_DrvQueryDeviceSupport QueryDeviceSupport; PVOID Reserved1; @@ -700,14 +633,102 @@ PFN_DrvDeriveSurface DeriveSurface; PFN_DrvQueryGlyphAttrs QueryGlyphAttrs; PFN_DrvNotify Notify; - PGD_SYNCHRONIZESURFACE SynchronizeSurface; + PFN_DrvSynchronizeSurface SynchronizeSurface; PFN_DrvResetDevice ResetDevice; PVOID Reserved9; PVOID Reserved10; PVOID Reserved11; /* 92 */ /* ReactOS specify */ - PGD_ENABLEDRIVER EnableDriver; //ReactOS Extra + PFN_DrvEnableDriver EnableDriver; //ReactOS Extra } DRIVER_FUNCTIONS, *PDRIVER_FUNCTIONS; +#define ASSERT_PFN(pfn) \ + C_ASSERT(FIELD_OFFSET(DRIVER_FUNCTIONS, pfn) == sizeof(PVOID) * INDEX_Drv##pfn) + +ASSERT_PFN(EnablePDEV); +ASSERT_PFN(CompletePDEV); +ASSERT_PFN(DisablePDEV); +ASSERT_PFN(EnableSurface); +ASSERT_PFN(DisableSurface); +ASSERT_PFN(AssertMode); +ASSERT_PFN(Offset); +ASSERT_PFN(ResetPDEV); +ASSERT_PFN(DisableDriver); +ASSERT_PFN(CreateDeviceBitmap); +ASSERT_PFN(DeleteDeviceBitmap); +ASSERT_PFN(RealizeBrush); +ASSERT_PFN(DitherColor); +ASSERT_PFN(StrokePath); +ASSERT_PFN(FillPath); +ASSERT_PFN(StrokeAndFillPath); +ASSERT_PFN(Paint); +ASSERT_PFN(BitBlt); +ASSERT_PFN(CopyBits); +ASSERT_PFN(StretchBlt); +ASSERT_PFN(SetPalette); +ASSERT_PFN(TextOut); +ASSERT_PFN(Escape); +ASSERT_PFN(DrawEscape); +ASSERT_PFN(QueryFont); +ASSERT_PFN(QueryFontTree); +ASSERT_PFN(QueryFontData); +ASSERT_PFN(SetPointerShape); +ASSERT_PFN(MovePointer); +ASSERT_PFN(LineTo); +ASSERT_PFN(SendPage); +ASSERT_PFN(StartPage); +ASSERT_PFN(EndDoc); +ASSERT_PFN(StartDoc); +ASSERT_PFN(GetGlyphMode); +ASSERT_PFN(Synchronize); +ASSERT_PFN(SaveScreenBits); +ASSERT_PFN(GetModes); +ASSERT_PFN(Free); +ASSERT_PFN(DestroyFont); +ASSERT_PFN(QueryFontCaps); +ASSERT_PFN(LoadFontFile); +ASSERT_PFN(UnloadFontFile); +ASSERT_PFN(FontManagement); +ASSERT_PFN(QueryTrueTypeTable); +ASSERT_PFN(QueryTrueTypeOutline); +ASSERT_PFN(GetTrueTypeFile); +ASSERT_PFN(QueryFontFile); +ASSERT_PFN(MovePanning); +ASSERT_PFN(QueryAdvanceWidths); +ASSERT_PFN(SetPixelFormat); +ASSERT_PFN(DescribePixelFormat); +ASSERT_PFN(SwapBuffers); +ASSERT_PFN(StartBanding); +ASSERT_PFN(NextBand); +ASSERT_PFN(GetDirectDrawInfo); +ASSERT_PFN(EnableDirectDraw); +ASSERT_PFN(DisableDirectDraw); +ASSERT_PFN(QuerySpoolType); +ASSERT_PFN(IcmCreateColorTransform); +ASSERT_PFN(IcmDeleteColorTransform); +ASSERT_PFN(IcmCheckBitmapBits); +ASSERT_PFN(IcmSetDeviceGammaRamp); +ASSERT_PFN(GradientFill); +ASSERT_PFN(StretchBltROP); +ASSERT_PFN(PlgBlt); +ASSERT_PFN(AlphaBlend); +ASSERT_PFN(SynthesizeFont); +ASSERT_PFN(GetSynthesizedFontFiles); +ASSERT_PFN(TransparentBlt); +ASSERT_PFN(QueryPerBandInfo); +ASSERT_PFN(QueryDeviceSupport); +ASSERT_PFN(Reserved1); +ASSERT_PFN(Reserved2); +ASSERT_PFN(Reserved3); +ASSERT_PFN(Reserved4); +ASSERT_PFN(Reserved5); +ASSERT_PFN(Reserved6); +ASSERT_PFN(Reserved7); +ASSERT_PFN(Reserved8); +ASSERT_PFN(DeriveSurface); +ASSERT_PFN(QueryGlyphAttrs); +ASSERT_PFN(Notify); +ASSERT_PFN(SynchronizeSurface); + #endif Modified: trunk/reactos/subsystems/win32/win32k/include/dc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/dc.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/include/dc.h [iso-8859-1] Mon Apr 6 06:13:44 2009 @@ -44,7 +44,7 @@ /* public pointer information */ RECTL Exclude; /* required publicly for SPS_ACCEPT_EXCLUDE */ - PGD_MOVEPOINTER MovePointer; + PFN_DrvMovePointer MovePointer; ULONG Status; } GDIPOINTER, *PGDIPOINTER; Modified: trunk/reactos/subsystems/win32/win32k/include/driver.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/driver.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/include/driver.h [iso-8859-1] Mon Apr 6 06:13:44 2009 @@ -10,9 +10,9 @@ -BOOL DRIVER_RegisterDriver(LPCWSTR Name, PGD_ENABLEDRIVER EnableDriver); -PGD_ENABLEDRIVER DRIVER_FindExistingDDIDriver(LPCWSTR Name); -PGD_ENABLEDRIVER DRIVER_FindDDIDriver(LPCWSTR Name); +BOOL DRIVER_RegisterDriver(LPCWSTR Name, PFN_DrvEnableDriver EnableDriver); +PFN_DrvEnableDriver DRIVER_FindExistingDDIDriver(LPCWSTR Name); +PFN_DrvEnableDriver DRIVER_FindDDIDriver(LPCWSTR Name); PFILE_OBJECT DRIVER_FindMPDriver(ULONG DisplayNumber); BOOL DRIVER_BuildDDIFunctions(PDRVENABLEDATA DED, PDRIVER_FUNCTIONS DF); Modified: trunk/reactos/subsystems/win32/win32k/misc/driver.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/mi… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/misc/driver.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/misc/driver.c [iso-8859-1] Mon Apr 6 06:13:44 2009 @@ -35,7 +35,7 @@ typedef struct _GRAPHICS_DRIVER { PWSTR Name; - PGD_ENABLEDRIVER EnableDriver; + PFN_DrvEnableDriver EnableDriver; int ReferenceCount; struct _GRAPHICS_DRIVER *Next; } GRAPHICS_DRIVER, *PGRAPHICS_DRIVER; @@ -43,7 +43,7 @@ static PGRAPHICS_DRIVER DriverList; static PGRAPHICS_DRIVER GenericDriver = NULL; -BOOL DRIVER_RegisterDriver(LPCWSTR Name, PGD_ENABLEDRIVER EnableDriver) +BOOL DRIVER_RegisterDriver(LPCWSTR Name, PFN_DrvEnableDriver EnableDriver) { PGRAPHICS_DRIVER Driver; @@ -79,7 +79,7 @@ return TRUE; } -PGD_ENABLEDRIVER DRIVER_FindExistingDDIDriver(LPCWSTR Name) +PFN_DrvEnableDriver DRIVER_FindExistingDDIDriver(LPCWSTR Name) { GRAPHICS_DRIVER *Driver = DriverList; while (Driver && Name) @@ -94,11 +94,11 @@ return NULL; } -PGD_ENABLEDRIVER DRIVER_FindDDIDriver(LPCWSTR Name) +PFN_DrvEnableDriver DRIVER_FindDDIDriver(LPCWSTR Name) { static WCHAR DefaultPath[] = L"\\SystemRoot\\System32\\"; static WCHAR DefaultExtension[] = L".DLL"; - PGD_ENABLEDRIVER ExistingDriver; + PFN_DrvEnableDriver ExistingDriver; SYSTEM_GDI_DRIVER_INFORMATION GdiDriverInfo; NTSTATUS Status; LPWSTR FullName; @@ -174,7 +174,7 @@ DRIVER_RegisterDriver( L"DISPLAY", GdiDriverInfo.EntryPoint); DRIVER_RegisterDriver( FullName, GdiDriverInfo.EntryPoint); ExFreePoolWithTag(FullName, TAG_DRIVER); - return (PGD_ENABLEDRIVER)GdiDriverInfo.EntryPoint; + return (PFN_DrvEnableDriver)GdiDriverInfo.EntryPoint; } #define BEGIN_FUNCTION_MAP() \ Modified: trunk/reactos/subsystems/win32/win32k/objects/device.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/device.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/device.c [iso-8859-1] Mon Apr 6 06:13:44 2009 @@ -204,7 +204,7 @@ static BOOL FASTCALL IntPrepareDriver() { - PGD_ENABLEDRIVER GDEnableDriver; + PFN_DrvEnableDriver GDEnableDriver; DRVENABLEDATA DED; UNICODE_STRING DriverFileNames; PWSTR CurrentName; @@ -326,7 +326,7 @@ HS_DDI_MAX, PrimarySurface.FillPatterns, sizeof(PrimarySurface.GDIInfo), - (ULONG *) &PrimarySurface.GDIInfo, + &PrimarySurface.GDIInfo, sizeof(PrimarySurface.DevInfo), &PrimarySurface.DevInfo, NULL, @@ -353,7 +353,7 @@ HS_DDI_MAX, PrimarySurface.FillPatterns, sizeof(PrimarySurface.GDIInfo), - (ULONG *) &PrimarySurface.GDIInfo, + &PrimarySurface.GDIInfo, sizeof(PrimarySurface.DevInfo), &PrimarySurface.DevInfo, NULL, @@ -1552,8 +1552,8 @@ CurrentName += wcslen(CurrentName) + 1) { INT i; - PGD_ENABLEDRIVER GDEnableDriver; - PGD_GETMODES GetModes = NULL; + PFN_DrvEnableDriver GDEnableDriver; + PFN_DrvGetModes GetModes = NULL; INT SizeNeeded, SizeUsed; /* Get the DDI driver's entry point */ @@ -1583,7 +1583,7 @@ if (DrvFn->iFunc == INDEX_DrvGetModes) { - GetModes = (PGD_GETMODES)DrvFn->pfn; + GetModes = (PFN_DrvGetModes)DrvFn->pfn; break; } }

1 0

[cgutman] 40385: - Drivers must use DelayedWorkQueue
by cgutman＠svn.reactos.org 06 Apr '09

06 Apr '09

Author: cgutman Date: Mon Apr 6 06:13:32 2009 New Revision: 40385 URL: http://svn.reactos.org/svn/reactos?rev=40385&view=rev Log: - Drivers must use DelayedWorkQueue Modified: trunk/reactos/drivers/network/ndis/ndis/miniport.c trunk/reactos/drivers/network/ndis/ndis/misc.c trunk/reactos/drivers/network/ndis/ndis/workitem.c trunk/reactos/drivers/network/tcpip/tcpip/main.c Modified: trunk/reactos/drivers/network/ndis/ndis/miniport.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/ndis/ndis/… ============================================================================== --- trunk/reactos/drivers/network/ndis/ndis/miniport.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/ndis/ndis/miniport.c [iso-8859-1] Mon Apr 6 06:13:32 2009 @@ -773,7 +773,7 @@ IoWorkItem = IoAllocateWorkItem(Adapter->NdisMiniportBlock.DeviceObject); if (IoWorkItem) - IoQueueWorkItem(IoWorkItem, MiniportWorker, CriticalWorkQueue, IoWorkItem); + IoQueueWorkItem(IoWorkItem, MiniportWorker, DelayedWorkQueue, IoWorkItem); KeReleaseSpinLock(&Adapter->NdisMiniportBlock.Lock, OldIrql); } Modified: trunk/reactos/drivers/network/ndis/ndis/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/ndis/ndis/… ============================================================================== --- trunk/reactos/drivers/network/ndis/ndis/misc.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/ndis/ndis/misc.c [iso-8859-1] Mon Apr 6 06:13:32 2009 @@ -398,7 +398,7 @@ { PWORK_QUEUE_ITEM pntWorkItem = (PWORK_QUEUE_ITEM)pWorkItem->WrapperReserved; ExInitializeWorkItem(pntWorkItem, ndisProcWorkItemHandler, pWorkItem); - ExQueueWorkItem(pntWorkItem, CriticalWorkQueue); + ExQueueWorkItem(pntWorkItem, DelayedWorkQueue); return NDIS_STATUS_SUCCESS; } Modified: trunk/reactos/drivers/network/ndis/ndis/workitem.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/ndis/ndis/… ============================================================================== --- trunk/reactos/drivers/network/ndis/ndis/workitem.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/ndis/ndis/workitem.c [iso-8859-1] Mon Apr 6 06:13:32 2009 @@ -29,7 +29,7 @@ IoQueueWorkItem(WorkItem, Routine, - CriticalWorkQueue, + DelayedWorkQueue, WorkItemContext); } Modified: trunk/reactos/drivers/network/tcpip/tcpip/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/tcpip/tcpi… ============================================================================== --- trunk/reactos/drivers/network/tcpip/tcpip/main.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/tcpip/tcpip/main.c [iso-8859-1] Mon Apr 6 06:13:32 2009 @@ -695,7 +695,7 @@ */ { if( !IpWorkItemQueued ) { - ExQueueWorkItem( &IpWorkItem, CriticalWorkQueue ); + ExQueueWorkItem( &IpWorkItem, DelayedWorkQueue ); IpWorkItemQueued = TRUE; } }

1 0

[cgutman] 40384: - Report to drivers that we are NDIS 5.0
by cgutman＠svn.reactos.org 06 Apr '09

06 Apr '09

Author: cgutman Date: Mon Apr 6 06:06:33 2009 New Revision: 40384 URL: http://svn.reactos.org/svn/reactos?rev=40384&view=rev Log: - Report to drivers that we are NDIS 5.0 Modified: trunk/reactos/drivers/network/ndis/ndis/config.c Modified: trunk/reactos/drivers/network/ndis/ndis/config.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/ndis/ndis/… ============================================================================== --- trunk/reactos/drivers/network/ndis/ndis/config.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/ndis/ndis/config.c [iso-8859-1] Mon Apr 6 06:06:33 2009 @@ -33,7 +33,7 @@ #include "ndissys.h" -#define NDIS_VERSION 0x00040000 /* the version of NDIS we claim to be to miniport drivers */ +#define NDIS_VERSION 0x00050000 /* the version of NDIS we claim to be to miniport drivers */ #define PARAMETERS_KEY L"Parameters" /* The parameters subkey under the device-specific key */ /*

1 0

[tkreuzer] 40383: DDK update - Add devioctl.h - miniport.h: fix include guard and add more stuff - video.h: fix include guard, remove VideoDebugprint prototype - videoagp.h: fix include guard -winddi.h: fix include guard, add some defines and some function pointer types - guiddef.h: add definition of EXTERN_C
by tkreuzer＠svn.reactos.org 06 Apr '09

06 Apr '09

Author: tkreuzer Date: Mon Apr 6 05:21:04 2009 New Revision: 40383 URL: http://svn.reactos.org/svn/reactos?rev=40383&view=rev Log: DDK update - Add devioctl.h - miniport.h: fix include guard and add more stuff - video.h: fix include guard, remove VideoDebugprint prototype - videoagp.h: fix include guard -winddi.h: fix include guard, add some defines and some function pointer types - guiddef.h: add definition of EXTERN_C Added: trunk/reactos/include/ddk/devioctl.h (with props) Modified: trunk/reactos/include/ddk/miniport.h trunk/reactos/include/ddk/video.h trunk/reactos/include/ddk/videoagp.h trunk/reactos/include/ddk/winddi.h trunk/reactos/include/psdk/guiddef.h Added: trunk/reactos/include/ddk/devioctl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/devioctl.h?rev… ============================================================================== --- trunk/reactos/include/ddk/devioctl.h (added) +++ trunk/reactos/include/ddk/devioctl.h [iso-8859-1] Mon Apr 6 05:21:04 2009 @@ -1,0 +1,106 @@ +/* + * devioctl.h + * + * IOCTL definitions + * + * This file is part of the ReactOS ddk. + * + * THIS SOFTWARE IS NOT COPYRIGHTED + * + * This source code is offered for use in the public domain. You may + * use, modify or distribute it freely. + * + * This code is distributed in the hope that it will be useful but + * WITHOUT ANY WARRANTY. ALL WARRANTIES, EXPRESS OR IMPLIED ARE HEREBY + * DISCLAIMED. This includes but is not limited to warranties of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * + */ + +#ifndef _DEVIOCTL_ +#define _DEVIOCTL_ + +/* DEVICE_OBJECT.DeviceType */ + +#define DEVICE_TYPE ULONG + +#define FILE_DEVICE_BEEP 0x00000001 +#define FILE_DEVICE_CD_ROM 0x00000002 +#define FILE_DEVICE_CD_ROM_FILE_SYSTEM 0x00000003 +#define FILE_DEVICE_CONTROLLER 0x00000004 +#define FILE_DEVICE_DATALINK 0x00000005 +#define FILE_DEVICE_DFS 0x00000006 +#define FILE_DEVICE_DISK 0x00000007 +#define FILE_DEVICE_DISK_FILE_SYSTEM 0x00000008 +#define FILE_DEVICE_FILE_SYSTEM 0x00000009 +#define FILE_DEVICE_INPORT_PORT 0x0000000a +#define FILE_DEVICE_KEYBOARD 0x0000000b +#define FILE_DEVICE_MAILSLOT 0x0000000c +#define FILE_DEVICE_MIDI_IN 0x0000000d +#define FILE_DEVICE_MIDI_OUT 0x0000000e +#define FILE_DEVICE_MOUSE 0x0000000f +#define FILE_DEVICE_MULTI_UNC_PROVIDER 0x00000010 +#define FILE_DEVICE_NAMED_PIPE 0x00000011 +#define FILE_DEVICE_NETWORK 0x00000012 +#define FILE_DEVICE_NETWORK_BROWSER 0x00000013 +#define FILE_DEVICE_NETWORK_FILE_SYSTEM 0x00000014 +#define FILE_DEVICE_NULL 0x00000015 +#define FILE_DEVICE_PARALLEL_PORT 0x00000016 +#define FILE_DEVICE_PHYSICAL_NETCARD 0x00000017 +#define FILE_DEVICE_PRINTER 0x00000018 +#define FILE_DEVICE_SCANNER 0x00000019 +#define FILE_DEVICE_SERIAL_MOUSE_PORT 0x0000001a +#define FILE_DEVICE_SERIAL_PORT 0x0000001b +#define FILE_DEVICE_SCREEN 0x0000001c +#define FILE_DEVICE_SOUND 0x0000001d +#define FILE_DEVICE_STREAMS 0x0000001e +#define FILE_DEVICE_TAPE 0x0000001f +#define FILE_DEVICE_TAPE_FILE_SYSTEM 0x00000020 +#define FILE_DEVICE_TRANSPORT 0x00000021 +#define FILE_DEVICE_UNKNOWN 0x00000022 +#define FILE_DEVICE_VIDEO 0x00000023 +#define FILE_DEVICE_VIRTUAL_DISK 0x00000024 +#define FILE_DEVICE_WAVE_IN 0x00000025 +#define FILE_DEVICE_WAVE_OUT 0x00000026 +#define FILE_DEVICE_8042_PORT 0x00000027 +#define FILE_DEVICE_NETWORK_REDIRECTOR 0x00000028 +#define FILE_DEVICE_BATTERY 0x00000029 +#define FILE_DEVICE_BUS_EXTENDER 0x0000002a +#define FILE_DEVICE_MODEM 0x0000002b +#define FILE_DEVICE_VDM 0x0000002c +#define FILE_DEVICE_MASS_STORAGE 0x0000002d +#define FILE_DEVICE_SMB 0x0000002e +#define FILE_DEVICE_KS 0x0000002f +#define FILE_DEVICE_CHANGER 0x00000030 +#define FILE_DEVICE_SMARTCARD 0x00000031 +#define FILE_DEVICE_ACPI 0x00000032 +#define FILE_DEVICE_DVD 0x00000033 +#define FILE_DEVICE_FULLSCREEN_VIDEO 0x00000034 +#define FILE_DEVICE_DFS_FILE_SYSTEM 0x00000035 +#define FILE_DEVICE_DFS_VOLUME 0x00000036 +#define FILE_DEVICE_SERENUM 0x00000037 +#define FILE_DEVICE_TERMSRV 0x00000038 +#define FILE_DEVICE_KSEC 0x00000039 +#define FILE_DEVICE_FIPS 0x0000003a + +#define CTL_CODE(DeviceType, Function, Method, Access)( \ + ((DeviceType) << 16) | ((Access) << 14) | ((Function) << 2) | (Method)) + +#define DEVICE_TYPE_FROM_CTL_CODE(ctl) (((ULONG) (ctl & 0xffff0000)) >> 16) + +#define METHOD_FROM_CTL_CODE(ctrlCode) ((ULONG)((ctrlCode) & 3)) + +#define METHOD_BUFFERED 0 +#define METHOD_IN_DIRECT 1 +#define METHOD_OUT_DIRECT 2 +#define METHOD_NEITHER 3 + +#define METHOD_DIRECT_TO_HARDWARE METHOD_IN_DIRECT +#define METHOD_DIRECT_FROM_HARDWARE METHOD_OUT_DIRECT + +#define FILE_ANY_ACCESS 0x00000000 +#define FILE_SPECIAL_ACCESS FILE_ANY_ACCESS +#define FILE_READ_ACCESS 0x00000001 +#define FILE_WRITE_ACCESS 0x00000002 + +#endif /* !_DEVIOCTL_ */ Propchange: trunk/reactos/include/ddk/devioctl.h ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/include/ddk/miniport.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/miniport.h?rev… ============================================================================== --- trunk/reactos/include/ddk/miniport.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/miniport.h [iso-8859-1] Mon Apr 6 05:21:04 2009 @@ -20,12 +20,48 @@ * */ -#ifndef __MINIPORT_H -#define __MINIPORT_H +#ifndef _MINIPORT_ +#define _MINIPORT_ + +#include <ntdef.h> +#include <stddef.h> +#include <basetsd.h> +#include <sdkddkver.h> +#include <guiddef.h> + #ifdef __cplusplus extern "C" { #endif + +typedef enum _INTERFACE_TYPE +{ + InterfaceTypeUndefined = -1, + Internal, + Isa, + Eisa, + MicroChannel, + TurboChannel, + PCIBus, + VMEBus, + NuBus, + PCMCIABus, + CBus, + MPIBus, + MPSABus, + ProcessorInternal, + InternalPowerBus, + PNPISABus, + PNPBus, + Vmcs, + MaximumInterfaceType +} INTERFACE_TYPE, *PINTERFACE_TYPE; + +typedef enum _KINTERRUPT_MODE +{ + LevelSensitive, + Latched +} KINTERRUPT_MODE, *PKINTERRUPT_MODE; #define EMULATOR_READ_ACCESS 0x01 #define EMULATOR_WRITE_ACCESS 0x02 @@ -35,7 +71,6 @@ Ushort, Ulong } EMULATOR_PORT_ACCESS_TYPE, *PEMULATOR_PORT_ACCESS_TYPE; - typedef struct _EMULATOR_ACCESS_ENTRY { ULONG BasePort; @@ -58,6 +93,170 @@ } VIDEO_ACCESS_RANGE, *PVIDEO_ACCESS_RANGE; #endif +typedef VOID (*PINTERFACE_REFERENCE)(PVOID Context); +typedef VOID (*PINTERFACE_DEREFERENCE)(PVOID Context); + +typedef struct _INTERFACE +{ + USHORT Size; + USHORT Version; + PVOID Context; + PINTERFACE_REFERENCE InterfaceReference; + PINTERFACE_DEREFERENCE InterfaceDereference; +} INTERFACE, *PINTERFACE; + +typedef enum _IRQ_DEVICE_POLICY +{ + IrqPolicyMachineDefault = 0, + IrqPolicyAllCloseProcessors, + IrqPolicyOneCloseProcessor, + IrqPolicyAllProcessorsInMachine, + IrqPolicySpecifiedProcessors, + IrqPolicySpreadMessagesAcrossAllProcessors +} IRQ_DEVICE_POLICY, *PIRQ_DEVICE_POLICY; + +typedef enum _IRQ_PRIORITY +{ + IrqPriorityUndefined = 0, + IrqPriorityLow, + IrqPriorityNormal, + IrqPriorityHigh +} IRQ_PRIORITY, *PIRQ_PRIORITY; + +typedef enum _DMA_WIDTH +{ + Width8Bits, + Width16Bits, + Width32Bits, + MaximumDmaWidth +} DMA_WIDTH, *PDMA_WIDTH; + +typedef enum _DMA_SPEED +{ + Compatible, + TypeA, + TypeB, + TypeC, + TypeF, + MaximumDmaSpeed +} DMA_SPEED, *PDMA_SPEED; + +#pragma pack(push,4) +typedef enum _BUS_DATA_TYPE +{ + ConfigurationSpaceUndefined = -1, + Cmos, + EisaConfiguration, + Pos, + CbusConfiguration, + PCIConfiguration, + VMEConfiguration, + NuBusConfiguration, + PCMCIAConfiguration, + MPIConfiguration, + MPSAConfiguration, + PNPISAConfiguration, + SgiInternalConfiguration, + MaximumBusDataType +} BUS_DATA_TYPE, *PBUS_DATA_TYPE; +#pragma pack(pop) + +typedef struct _IO_RESOURCE_DESCRIPTOR +{ + UCHAR Option; + UCHAR Type; + UCHAR ShareDisposition; + UCHAR Spare1; + USHORT Flags; + USHORT Spare2; + + union + { + struct + { + ULONG Length; + ULONG Alignment; + PHYSICAL_ADDRESS MinimumAddress; + PHYSICAL_ADDRESS MaximumAddress; + } Port; + + struct + { + ULONG Length; + ULONG Alignment; + PHYSICAL_ADDRESS MinimumAddress; + PHYSICAL_ADDRESS MaximumAddress; + } Memory; + + struct + { + ULONG MinimumVector; + ULONG MaximumVector; + IRQ_DEVICE_POLICY AffinityPolicy; + IRQ_PRIORITY PriorityPolicy; + KAFFINITY TargetedProcessors; + } Interrupt; + + struct + { + ULONG MinimumChannel; + ULONG MaximumChannel; + } Dma; + + struct + { + ULONG Length; + ULONG Alignment; + PHYSICAL_ADDRESS MinimumAddress; + PHYSICAL_ADDRESS MaximumAddress; + } Generic; + + struct + { + ULONG Data[3]; + } DevicePrivate; + + struct + { + ULONG Length; + ULONG MinBusNumber; + ULONG MaxBusNumber; + ULONG Reserved; + } BusNumber; + + struct + { + ULONG Priority; + ULONG Reserved1; + ULONG Reserved2; + } ConfigData; + + struct + { + ULONG Length40; + ULONG Alignment40; + PHYSICAL_ADDRESS MinimumAddress; + PHYSICAL_ADDRESS MaximumAddress; + } Memory40; + + struct + { + ULONG Length48; + ULONG Alignment48; + PHYSICAL_ADDRESS MinimumAddress; + PHYSICAL_ADDRESS MaximumAddress; + } Memory48; + + struct + { + ULONG Length64; + ULONG Alignment64; + PHYSICAL_ADDRESS MinimumAddress; + PHYSICAL_ADDRESS MaximumAddress; + } Memory64; + } u; +} IO_RESOURCE_DESCRIPTOR, *PIO_RESOURCE_DESCRIPTOR; + typedef VOID DDKAPI (*PBANKED_SECTION_ROUTINE)( IN ULONG ReadBank, Modified: trunk/reactos/include/ddk/video.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/video.h?rev=40… ============================================================================== --- trunk/reactos/include/ddk/video.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/video.h [iso-8859-1] Mon Apr 6 05:21:04 2009 @@ -20,10 +20,10 @@ * */ -#ifndef __VIDEO_H -#define __VIDEO_H - -#ifdef __WINDDI_H +#ifndef __VIDEO_H__ +#define __VIDEO_H__ + +#ifdef _WINDDI_ #error winddi.h cannot be included with video.h #else @@ -632,14 +632,6 @@ VPAPI VOID DDKAPI -VideoDebugPrint( - IN ULONG DebugPrintLevel, - IN PCHAR DebugMessage, - IN ...); - -VPAPI -VOID -DDKAPI VideoPortAcquireDeviceLock( IN PVOID HwDeviceExtension); @@ -1558,6 +1550,6 @@ } #endif -#endif /* defined __WINDDI_H */ - -#endif /* __VIDEO_H */ +#endif /* defined _WINDDI_ */ + +#endif /* __VIDEO_H__ */ Modified: trunk/reactos/include/ddk/videoagp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/videoagp.h?rev… ============================================================================== --- trunk/reactos/include/ddk/videoagp.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/videoagp.h [iso-8859-1] Mon Apr 6 05:21:04 2009 @@ -20,8 +20,8 @@ * */ -#ifndef __VIDEOAGP_H -#define __VIDEOAGP_H +#ifndef __VIDEOAGP_H__ +#define __VIDEOAGP_H__ #include "video.h" @@ -120,4 +120,4 @@ } #endif -#endif /* __VIDEOAGP_H */ +#endif /* __VIDEOAGP_H__ */ Modified: trunk/reactos/include/ddk/winddi.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/winddi.h?rev=4… ============================================================================== --- trunk/reactos/include/ddk/winddi.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/winddi.h [iso-8859-1] Mon Apr 6 05:21:04 2009 @@ -20,10 +20,10 @@ * */ -#ifndef __WINDDI_H -#define __WINDDI_H - -#ifdef __VIDEO_H +#ifndef _WINDDI_ +#define _WINDDI_ + +#ifdef __VIDEO_H__ #error video.h cannot be included with winddi.h #else @@ -113,6 +113,12 @@ #define GX_OFFSET 1 #define GX_SCALE 2 #define GX_GENERAL 3 + +#define LTOFX(x) ((x) << 4) +#define FXTOL(x) ((x) >> 4) +#define FXTOLFLOOR(x) ((x) >> 4) +#define FXTOLCEILING(x) ((x + 0x0F) >> 4) +#define FXTOLROUND(x) ((((x) >> 3) + 1) >> 1) typedef struct _POINTE { FLOATL x; @@ -802,7 +808,7 @@ typedef struct _PATHDATA { FLONG flags; ULONG count; - POINTFIX *glypptfx; + POINTFIX *pptfx; } PATHDATA, *PPATHDATA; /* PATHOBJ.fl constants */ @@ -3636,21 +3642,20 @@ IN ULONG iEngineVersion, IN ULONG cj, OUT DRVENABLEDATA *pded); -#if 0 -typedef DHPDEV + +typedef DHPDEV (APIENTRY *PFN_DrvEnablePDEV)( IN DEVMODEW *pdm, IN LPWSTR pwszLogAddress, IN ULONG cPat, OUT HSURF *phsurfPatterns, IN ULONG cjCaps, - OUT ULONG *pdevcaps, + GDIINFO *pdevcaps, IN ULONG cjDevInfo, OUT DEVINFO *pdi, IN HDEV hdev, IN LPWSTR pwszDeviceName, IN HANDLE hDriver); -#endif typedef HSURF (APIENTRY *PFN_DrvEnableSurface)( @@ -4095,10 +4100,21 @@ DrvDisableDirectDraw( IN DHPDEV dhpdev); +typedef VOID +(APIENTRY *PFN_DrvDisableDirectDraw)( + IN DHPDEV dhpdev); + WIN32KAPI BOOL APIENTRY DrvEnableDirectDraw( + IN DHPDEV dhpdev, + OUT DD_CALLBACKS *pCallBacks, + OUT DD_SURFACECALLBACKS *pSurfaceCallBacks, + OUT DD_PALETTECALLBACKS *pPaletteCallBacks); + +typedef BOOL +(APIENTRY *PFN_DrvEnableDirectDraw)( IN DHPDEV dhpdev, OUT DD_CALLBACKS *pCallBacks, OUT DD_SURFACECALLBACKS *pSurfaceCallBacks, @@ -4115,10 +4131,32 @@ OUT DWORD *pdwNumFourCCCodes, OUT DWORD *pdwFourCC); +typedef BOOL +(APIENTRY *PFN_DrvGetDirectDrawInfo)( + IN DHPDEV dhpdev, + OUT DD_HALINFO *pHalInfo, + OUT DWORD *pdwNumHeaps, + OUT VIDEOMEMORY *pvmList, + OUT DWORD *pdwNumFourCCCodes, + OUT DWORD *pdwFourCC); + +//DECLSPEC_DEPRECATED_DDK +BOOL +APIENTRY +DrvQuerySpoolType( + IN DHPDEV dhpdev, + IN LPWSTR pwchType); + +typedef BOOL +(APIENTRY *PFN_DrvQuerySpoolType)( + IN DHPDEV dhpdev, + IN LPWSTR pwchType); + + #ifdef __cplusplus } #endif -#endif /* defined __VIDEO_H */ - -#endif /* __WINDDI_H */ +#endif /* defined __VIDEO_H__ */ + +#endif /* _WINDDI_ */ Modified: trunk/reactos/include/psdk/guiddef.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/guiddef.h?rev… ============================================================================== --- trunk/reactos/include/psdk/guiddef.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/guiddef.h [iso-8859-1] Mon Apr 6 05:21:04 2009 @@ -33,6 +33,14 @@ #ifndef DECLSPEC_SELECTANY #define DECLSPEC_SELECTANY __declspec(selectany) +#endif + +#ifndef EXTERN_C +#ifdef __cplusplus +#define EXTERN_C extern "C" +#else +#define EXTERN_C extern +#endif #endif #undef DEFINE_GUID

1 0

← Newer
1
...
37
38
39
40
41
42
43
...
48
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs April 2009