Ros-diffs

ros-diffs@reactos.org

81390 discussions

[jimtabor] 30931: Unbreak gdi batch... Sometimes dc is null.
by jimtabor＠svn.reactos.org 01 Dec '07

01 Dec '07

Author: jimtabor Date: Sat Dec 1 16:26:45 2007 New Revision: 30931 URL: http://svn.reactos.org/svn/reactos?rev=30931&view=rev Log: Unbreak gdi batch... Sometimes dc is null. Modified: trunk/reactos/subsystems/win32/win32k/objects/gdibatch.c Modified: trunk/reactos/subsystems/win32/win32k/objects/gdibatch.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/gdibatch.c (original) +++ trunk/reactos/subsystems/win32/win32k/objects/gdibatch.c Sat Dec 1 16:26:45 2007 @@ -23,10 +23,11 @@ if (hDC) { dc = DC_LockDc(hDC); - if (!dc) - return pHdr->Size; // Return the full size of the structure. - Dc_Attr = dc->pDc_Attr; - if (!Dc_Attr) Dc_Attr = &dc->Dc_Attr; + if (dc) + { + Dc_Attr = dc->pDc_Attr; + if (!Dc_Attr) Dc_Attr = &dc->Dc_Attr; + } } // The thread is approaching the end of sunset. switch(pHdr->Cmd)

1 0

[tkreuzer] 30930: patch by jimtabor: add some usermode handling to SelectObject, currently if'ed out, as it doesn't properly work yet, add GDI_OBJECT_TYPE_COLORSPACE using SetColorSpace
by tkreuzer＠svn.reactos.org 01 Dec '07

01 Dec '07

Author: tkreuzer Date: Sat Dec 1 05:14:35 2007 New Revision: 30930 URL: http://svn.reactos.org/svn/reactos?rev=30930&view=rev Log: patch by jimtabor: add some usermode handling to SelectObject, currently if'ed out, as it doesn't properly work yet, add GDI_OBJECT_TYPE_COLORSPACE using SetColorSpace Modified: trunk/reactos/dll/win32/gdi32/objects/dc.c Modified: trunk/reactos/dll/win32/gdi32/objects/dc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/objects/dc… ============================================================================== --- trunk/reactos/dll/win32/gdi32/objects/dc.c (original) +++ trunk/reactos/dll/win32/gdi32/objects/dc.c Sat Dec 1 05:14:35 2007 @@ -1344,6 +1344,7 @@ { PDC_ATTR pDc_Attr; // HGDIOBJ hOldObj = NULL; +// PTEB pTeb; if(!GdiGetHandleUserData(hDC, GDI_OBJECT_TYPE_DC, (PVOID)&pDc_Attr)) { @@ -1352,35 +1353,79 @@ } hGdiObj = GdiFixUpHandle(hGdiObj); - if (!GdiIsHandleValid(hGdiObj)) - { - return NULL; - } + if (!GdiIsHandleValid(hGdiObj)) + { + return NULL; + } UINT uType = GDI_HANDLE_GET_TYPE(hGdiObj); switch (uType) { + case GDI_OBJECT_TYPE_REGION: + return (HGDIOBJ)ExtSelectClipRgn(hDC, hGdiObj, RGN_COPY); + + case GDI_OBJECT_TYPE_BITMAP: + return NtGdiSelectBitmap(hDC, hGdiObj); + + case GDI_OBJECT_TYPE_BRUSH: +#if 0 // enable this when support is ready in win32k + hOldObj = pDc_Attr->hbrush; + pDc_Attr->ulDirty_ |= DC_BRUSH_DIRTY; + pDc_Attr->hbrush = hGdiObj; + return hOldObj; +#endif + return NtGdiSelectBrush(hDC, hGdiObj); + + case GDI_OBJECT_TYPE_PEN: +// case GDI_OBJECT_TYPE_EXTPEN: +#if 0 // enable this when support is ready in win32k + hOldObj = pDc_Attr->hpen; + pDc_Attr->ulDirty_ |= DC_PEN_DIRTY; + pDc_Attr->hpen = hGdiObj; + return hOldObj; +#endif + return NtGdiSelectPen(hDC, hGdiObj); + + case GDI_OBJECT_TYPE_FONT: +#if 0 + pTeb = NtCurrentTeb(); + if (((pTeb->GdiTebBatch.HDC == 0) || + (pTeb->GdiTebBatch.HDC == (ULONG)hDC)) && + ((pTeb->GdiTebBatch.Offset + sizeof(GDIBSOBJECT)) <= GDIBATCHBUFSIZE) && + (!(pDc_Attr->ulDirty_ & DC_DIBSECTION))) + { + PGDIBSOBJECT pgO = (PGDIBSOBJECT)(&pTeb->GdiTebBatch.Buffer[0] + + pTeb->GdiTebBatch.Offset); + pgO->gbHdr.Cmd = GdiBCSelObj; + pgO->gbHdr.Size = sizeof(GDIBSOBJECT); + pgO->hgdiobj = hGdiObj; + + pTeb->GdiTebBatch.Offset += sizeof(GDIBSOBJECT); + pTeb->GdiTebBatch.HDC = (ULONG)hDC; + pTeb->GdiBatchCount++; + if (pTeb->GdiBatchCount >= GDI_BatchLimit) NtGdiFlush(); + return pDc_Attr->hlfntNew; + } +#endif + // default for select object font + return NtGdiSelectFont(hDC, hGdiObj); +#if 0 + case GDI_OBJECT_TYPE_METADC: + return MFDRV_SelectObject( hDC, hGdiObj); + case GDI_OBJECT_TYPE_EMF: + PLDC pLDC = GdiGetLDC(hDC); + if ( !pLDC ) return NULL; + return EMFDRV_SelectObject( hDC, hGdiObj); +#endif + case GDI_OBJECT_TYPE_COLORSPACE: + SetColorSpace(hDC, (HCOLORSPACE) hGdiObj); + return NULL; + case GDI_OBJECT_TYPE_PALETTE: + default: SetLastError(ERROR_INVALID_FUNCTION); return NULL; - - case GDI_OBJECT_TYPE_REGION: - return (HGDIOBJ)ExtSelectClipRgn(hDC, hGdiObj, RGN_COPY); - - case GDI_OBJECT_TYPE_BITMAP: - return NtGdiSelectBitmap(hDC, hGdiObj); - - case GDI_OBJECT_TYPE_BRUSH: - return NtGdiSelectBrush(hDC, hGdiObj); - - case GDI_OBJECT_TYPE_PEN: -// case GDI_OBJECT_TYPE_EXTPEN: - return NtGdiSelectPen(hDC, hGdiObj); - - case GDI_OBJECT_TYPE_FONT: - return NtGdiSelectFont(hDC, hGdiObj); - } return NULL;

1 0

[tkreuzer] 30929: patch by jimtabor: add GdiBCSelObj to GdiFlushUserBatch
by tkreuzer＠svn.reactos.org 01 Dec '07

01 Dec '07

Author: tkreuzer Date: Sat Dec 1 05:09:39 2007 New Revision: 30929 URL: http://svn.reactos.org/svn/reactos?rev=30929&view=rev Log: patch by jimtabor: add GdiBCSelObj to GdiFlushUserBatch Modified: trunk/reactos/subsystems/win32/win32k/objects/gdibatch.c Modified: trunk/reactos/subsystems/win32/win32k/objects/gdibatch.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/gdibatch.c (original) +++ trunk/reactos/subsystems/win32/win32k/objects/gdibatch.c Sat Dec 1 05:09:39 2007 @@ -49,7 +49,13 @@ case GdiBCExtSelClipRgn: break; case GdiBCSelObj: - break; + { + PGDIBSOBJECT pgO; + if(!dc) break; + pgO = (PGDIBSOBJECT) pHdr; + if(NT_SUCCESS(TextIntRealizeFont((HFONT) pgO->hgdiobj))) + Dc_Attr->hlfntNew = (HFONT) pgO->hgdiobj; + } case GdiBCDelObj: case GdiBCDelRgn: { @@ -115,3 +121,4 @@ return STATUS_SUCCESS; } +

1 0

[tkreuzer] 30928: update ntgdibad.h
by tkreuzer＠svn.reactos.org 01 Dec '07

01 Dec '07

Author: tkreuzer Date: Sat Dec 1 04:38:10 2007 New Revision: 30928 URL: http://svn.reactos.org/svn/reactos?rev=30928&view=rev Log: update ntgdibad.h Modified: trunk/reactos/include/reactos/win32k/ntgdibad.h Modified: trunk/reactos/include/reactos/win32k/ntgdibad.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/win32k/ntg… ============================================================================== --- trunk/reactos/include/reactos/win32k/ntgdibad.h (original) +++ trunk/reactos/include/reactos/win32k/ntgdibad.h Sat Dec 1 04:38:10 2007 @@ -350,9 +350,6 @@ STDCALL NtGdiRemoveFontResource(LPCWSTR FileName); -/* Should be done in user-mode. */ -HGDIOBJ STDCALL NtGdiSelectObject(HDC hDC, HGDIOBJ hGDIObj); - /* Use SetDIBitsToDevice in gdi32. */ INT STDCALL

1 0

[tkreuzer] 30927: - replace NtGdiSelectObject with NtGdiSelectBitmap/Pen/Brush/Font in dc.c - remove NtGdiSelectObject from win32k
by tkreuzer＠svn.reactos.org 01 Dec '07

01 Dec '07

Author: tkreuzer Date: Sat Dec 1 04:37:08 2007 New Revision: 30927 URL: http://svn.reactos.org/svn/reactos?rev=30927&view=rev Log: - replace NtGdiSelectObject with NtGdiSelectBitmap/Pen/Brush/Font in dc.c - remove NtGdiSelectObject from win32k Modified: trunk/reactos/subsystems/win32/win32k/objects/dc.c trunk/reactos/subsystems/win32/win32k/w32ksvc.db Modified: trunk/reactos/subsystems/win32/win32k/objects/dc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/dc.c (original) +++ trunk/reactos/subsystems/win32/win32k/objects/dc.c Sat Dec 1 04:37:08 2007 @@ -978,10 +978,10 @@ if (!(DCToDelete->w.flags & DC_SAVED)) { /* - NtGdiSelectObject (DCHandle, STOCK_BLACK_PEN); - NtGdiSelectObject (DCHandle, STOCK_WHITE_BRUSH); - NtGdiSelectObject (DCHandle, STOCK_SYSTEM_FONT); - DC_LockDC (DCHandle); NtGdiSelectObject does not recognize stock objects yet */ + NtGdiSelectPen (DCHandle, STOCK_BLACK_PEN); + NtGdiSelectBrush (DCHandle, STOCK_WHITE_BRUSH); + NtGdiSelectFont (DCHandle, STOCK_SYSTEM_FONT); + DC_LockDC (DCHandle); NtGdiSelectXxx does not recognize stock objects yet */ if (DCToDelete->w.flags & DC_MEMORY) { NtGdiDeleteObject (DCToDelete->w.hFirstBitmap); @@ -1351,10 +1351,10 @@ #endif if(!hDC) return; // Not a MemoryDC or SaveLevel DC, return. - NtGdiSelectObject( hDC, dcs->w.hBitmap ); - NtGdiSelectObject( hDC, sDc_Attr->hbrush ); - NtGdiSelectObject( hDC, sDc_Attr->hlfntNew ); - NtGdiSelectObject( hDC, sDc_Attr->hpen ); + NtGdiSelectBitmap( hDC, dcs->w.hBitmap ); + NtGdiSelectBrush( hDC, sDc_Attr->hbrush ); + NtGdiSelectFont( hDC, sDc_Attr->hlfntNew ); + NtGdiSelectPen( hDC, sDc_Attr->hpen ); NtGdiSetBkColor( hDC, sDc_Attr->crBackgroundClr); NtGdiSetTextColor( hDC, sDc_Attr->crForegroundClr); @@ -1886,160 +1886,6 @@ return ret; } -HGDIOBJ -STDCALL -NtGdiSelectObject(HDC hDC, HGDIOBJ hGDIObj) -{ - HGDIOBJ objOrg = NULL; // default to failure - BITMAPOBJ *pb; - PDC dc; - PDC_ATTR Dc_Attr; - PGDIBRUSHOBJ pen; - PGDIBRUSHOBJ brush; - XLATEOBJ *XlateObj; - DWORD objectType; - HRGN hVisRgn; - BOOLEAN Failed; - - if (!hDC || !hGDIObj) - { - /* From Wine: - * SelectObject() with a NULL DC returns 0 and sets ERROR_INVALID_HANDLE. - * Note: Under XP at least invalid ptrs can also be passed, not just NULL; - * Don't test that here in case it crashes earlier win versions. - */ - if (!hDC) SetLastWin32Error(ERROR_INVALID_HANDLE); - return NULL; - } - - dc = DC_LockDc(hDC); - if (NULL == dc) - { - SetLastWin32Error(ERROR_INVALID_HANDLE); - return NULL; - } - Dc_Attr = dc->pDc_Attr; - if(!Dc_Attr) Dc_Attr = &dc->Dc_Attr; - - objectType = GDIOBJ_GetObjectType(hGDIObj); - - switch (objectType) - { - case GDI_OBJECT_TYPE_PEN: - pen = PENOBJ_LockPen((HPEN) hGDIObj); - if (pen == NULL) - { - SetLastWin32Error(ERROR_INVALID_HANDLE); - break; - } - - XlateObj = IntGdiCreateBrushXlate(dc, pen, &Failed); - PENOBJ_UnlockPen(pen); - if (Failed) - { - SetLastWin32Error(ERROR_NO_SYSTEM_RESOURCES); - break; - } - - objOrg = (HGDIOBJ)Dc_Attr->hpen; - Dc_Attr->hpen = hGDIObj; - if (dc->XlatePen != NULL) - EngDeleteXlate(dc->XlatePen); - dc->XlatePen = XlateObj; - break; - - case GDI_OBJECT_TYPE_BRUSH: - brush = BRUSHOBJ_LockBrush((HPEN) hGDIObj); - if (brush == NULL) - { - SetLastWin32Error(ERROR_INVALID_HANDLE); - break; - } - - XlateObj = IntGdiCreateBrushXlate(dc, brush, &Failed); - BRUSHOBJ_UnlockBrush(brush); - if (Failed) - { - SetLastWin32Error(ERROR_NO_SYSTEM_RESOURCES); - break; - } - - objOrg = (HGDIOBJ)Dc_Attr->hbrush; - Dc_Attr->hbrush = hGDIObj; - if (dc->XlateBrush != NULL) - EngDeleteXlate(dc->XlateBrush); - dc->XlateBrush = XlateObj; - break; - - case GDI_OBJECT_TYPE_FONT: - if(NT_SUCCESS(TextIntRealizeFont((HFONT)hGDIObj))) - { - objOrg = (HGDIOBJ)Dc_Attr->hlfntNew; - Dc_Attr->hlfntNew = (HFONT) hGDIObj; - } - break; - - case GDI_OBJECT_TYPE_BITMAP: - // must be memory dc to select bitmap - if (!(dc->w.flags & DC_MEMORY)) - { - DC_UnlockDc(dc); - return NULL; - } - pb = BITMAPOBJ_LockBitmap(hGDIObj); - if (NULL == pb) - { - SetLastWin32Error(ERROR_INVALID_HANDLE); - DC_UnlockDc(dc); - return NULL; - } - objOrg = (HGDIOBJ)dc->w.hBitmap; - - /* Release the old bitmap, lock the new one and convert it to a SURF */ - dc->w.hBitmap = hGDIObj; - - // if we're working with a DIB, get the palette [fixme: only create if the selected palette is null] - if(pb->dib) - { - dc->w.bitsPerPixel = pb->dib->dsBmih.biBitCount; - dc->w.hPalette = pb->hDIBPalette; - } - else - { - dc->w.bitsPerPixel = BitsPerFormat(pb->SurfObj.iBitmapFormat); - dc->w.hPalette = ((GDIDEVICE *)dc->pPDev)->DevInfo.hpalDefault; - } - - /* Reselect brush and pen to regenerate the XLATEOBJs. */ - NtGdiSelectObject ( hDC, Dc_Attr->hbrush ); - NtGdiSelectObject ( hDC, Dc_Attr->hpen ); - - DC_UnlockDc ( dc ); - hVisRgn = NtGdiCreateRectRgn ( 0, 0, pb->SurfObj.sizlBitmap.cx, pb->SurfObj.sizlBitmap.cy ); - BITMAPOBJ_UnlockBitmap( pb ); - IntGdiSelectVisRgn ( hDC, hVisRgn ); - NtGdiDeleteObject ( hVisRgn ); - - return objOrg; - - case GDI_OBJECT_TYPE_REGION: - /* - * The return value is one of the following values: - * SIMPLEREGION - * COMPLEXREGION - * NULLREGION - */ - objectType = IntGdiExtSelectClipRgn(dc, (HRGN)hGDIObj, RGN_COPY); - DC_UnlockDc (dc); - return (HGDIOBJ)objectType; - - default: - break; - } - DC_UnlockDc( dc ); - return objOrg; -} - /* * @implemented */ @@ -2598,9 +2444,9 @@ { // NtGdiRealizeDefaultPalette(DCHandle); - NtGdiSelectObject(DCHandle, NtGdiGetStockObject( WHITE_BRUSH )); - NtGdiSelectObject(DCHandle, NtGdiGetStockObject( BLACK_PEN )); - //NtGdiSelectObject(DCHandle, hFont); + NtGdiSelectBrush(DCHandle, NtGdiGetStockObject( WHITE_BRUSH )); + NtGdiSelectPen(DCHandle, NtGdiGetStockObject( BLACK_PEN )); + //NtGdiSelectFont(DCHandle, hFont); /* { Modified: trunk/reactos/subsystems/win32/win32k/w32ksvc.db URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/w3… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/w32ksvc.db (original) +++ trunk/reactos/subsystems/win32/win32k/w32ksvc.db Sat Dec 1 04:37:08 2007 @@ -678,7 +678,6 @@ # # #ReactOS specify syscall -NtGdiSelectObject 2 NtGdiSetDIBits 7 NtGdiSetEnhMetaFileBits 2 NtGdiSetICMProfile 2

1 0

[tkreuzer] 30926: use PatBlt and SelectObject instead of Nt functions
by tkreuzer＠svn.reactos.org 01 Dec '07

01 Dec '07

Author: tkreuzer Date: Sat Dec 1 04:31:10 2007 New Revision: 30926 URL: http://svn.reactos.org/svn/reactos?rev=30926&view=rev Log: use PatBlt and SelectObject instead of Nt functions Modified: trunk/reactos/dll/win32/user32/windows/draw.c Modified: trunk/reactos/dll/win32/user32/windows/draw.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/d… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/draw.c (original) +++ trunk/reactos/dll/win32/user32/windows/draw.c Sat Dec 1 04:31:10 2007 @@ -1828,13 +1828,13 @@ { hbr = GetSysColorBrush((int)hbr - 1); } - if ((prevhbr = NtGdiSelectObject(hDC, hbr)) == NULL) + if ((prevhbr = SelectObject(hDC, hbr)) == NULL) { return FALSE; } - NtGdiPatBlt(hDC, lprc->left, lprc->top, lprc->right - lprc->left, + PatBlt(hDC, lprc->left, lprc->top, lprc->right - lprc->left, lprc->bottom - lprc->top, PATCOPY); - NtGdiSelectObject(hDC, prevhbr); + SelectObject(hDC, prevhbr); return TRUE; }

1 0

[tkreuzer] 30925: replace NtGdiSelectObject with NtGdiSelectBitmap, NtGdiSelectBrush and NtGdiSelectFont in painting.c
by tkreuzer＠svn.reactos.org 01 Dec '07

01 Dec '07

Author: tkreuzer Date: Sat Dec 1 04:14:52 2007 New Revision: 30925 URL: http://svn.reactos.org/svn/reactos?rev=30925&view=rev Log: replace NtGdiSelectObject with NtGdiSelectBitmap, NtGdiSelectBrush and NtGdiSelectFont in painting.c Modified: trunk/reactos/subsystems/win32/win32k/ntuser/painting.c Modified: trunk/reactos/subsystems/win32/win32k/ntuser/painting.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/painting.c (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/painting.c Sat Dec 1 04:14:52 2007 @@ -1594,10 +1594,10 @@ return FALSE; } - hOldFont = NtGdiSelectObject(hDc, hFont); + hOldFont = NtGdiSelectFont(hDc, hFont); if(!hOldFont) { - DPRINT1("%s: SelectObject() failed!\n", __FUNCTION__); + DPRINT1("%s: SelectFont() failed!\n", __FUNCTION__); NtGdiDeleteObject(hFont); return FALSE; } @@ -1614,7 +1614,7 @@ Text->Length/sizeof(WCHAR), NULL); NtGdiSetTextColor(hDc, OldTextColor); - NtGdiSelectObject(hDc, hOldFont); + NtGdiSelectFont(hDc, hOldFont); NtGdiDeleteObject(hFont); return TRUE; @@ -1662,10 +1662,10 @@ goto cleanup; } - hOldBmp = NtGdiSelectObject(hMemDc, hMemBmp); + hOldBmp = NtGdiSelectBitmap(hMemDc, hMemBmp); if(!hOldBmp) { - DPRINT1("%s: NtGdiSelectObject() failed!\n", __FUNCTION__); + DPRINT1("%s: NtGdiSelectBitmap() failed!\n", __FUNCTION__); goto cleanup; } @@ -1692,13 +1692,13 @@ // Draw the caption background if(uFlags & DC_INBUTTON) { - hOldBrush = NtGdiSelectObject(hMemDc, + hOldBrush = NtGdiSelectBrush(hMemDc, IntGetSysColorBrush(uFlags & DC_ACTIVE ? COLOR_BTNFACE : COLOR_BTNSHADOW)); if(!hOldBrush) { - DPRINT1("%s: NtGdiSelectObject() failed!\n", __FUNCTION__); + DPRINT1("%s: NtGdiSelectBrush() failed!\n", __FUNCTION__); goto cleanup; } @@ -1720,13 +1720,13 @@ ButtonWidth = UserGetSystemMetrics(SM_CXSMSIZE) - 2; else ButtonWidth = UserGetSystemMetrics(SM_CXSIZE) - 2; - hOldBrush = NtGdiSelectObject(hMemDc, + hOldBrush = NtGdiSelectBrush(hMemDc, IntGetSysColorBrush(uFlags & DC_ACTIVE ? COLOR_ACTIVECAPTION : COLOR_INACTIVECAPTION)); if(!hOldBrush) { - DPRINT1("%s: NtGdiSelectObject() failed!\n", __FUNCTION__); + DPRINT1("%s: NtGdiSelectBrush() failed!\n", __FUNCTION__); goto cleanup; } @@ -1767,11 +1767,11 @@ } //Draw buttons background - if(!NtGdiSelectObject(hMemDc, + if(!NtGdiSelectBrush(hMemDc, IntGetSysColorBrush(uFlags & DC_ACTIVE ? COLOR_GRADIENTACTIVECAPTION:COLOR_GRADIENTINACTIVECAPTION))) { - DPRINT1("%s: NtGdiSelectObject() failed!\n", __FUNCTION__); + DPRINT1("%s: NtGdiSelectBrush() failed!\n", __FUNCTION__); goto cleanup; } @@ -1878,8 +1878,8 @@ Ret = TRUE; cleanup: - if (hOldBrush) NtGdiSelectObject(hMemDc, hOldBrush); - if (hOldBmp) NtGdiSelectObject(hMemDc, hOldBmp); + if (hOldBrush) NtGdiSelectBrush(hMemDc, hOldBrush); + if (hOldBmp) NtGdiSelectBitmap(hMemDc, hOldBmp); if (hMemBmp) NtGdiDeleteObject(hMemBmp); if (hMemDc) NtGdiDeleteObjectApp(hMemDc);

1 0

[tkreuzer] 30924: replace NtGdiSelectObject with NtGdiSelectBitmap and NtGdiSelectBrush in desktop.c
by tkreuzer＠svn.reactos.org 01 Dec '07

01 Dec '07

Author: tkreuzer Date: Sat Dec 1 04:11:25 2007 New Revision: 30924 URL: http://svn.reactos.org/svn/reactos?rev=30924&view=rev Log: replace NtGdiSelectObject with NtGdiSelectBitmap and NtGdiSelectBrush in desktop.c Modified: trunk/reactos/subsystems/win32/win32k/ntuser/desktop.c Modified: trunk/reactos/subsystems/win32/win32k/ntuser/desktop.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/desktop.c (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/desktop.c Sat Dec 1 04:11:25 2007 @@ -1403,15 +1403,15 @@ /* FIXME - clip out the bitmap can be replaced with "NtGdiPatBlt(hDC, x, y, WinSta->cxWallpaper, WinSta->cyWallpaper, PATCOPY | DSTINVERT);" once we support DSTINVERT */ - PreviousBrush = NtGdiSelectObject(hDC, DesktopBrush); + PreviousBrush = NtGdiSelectBrush(hDC, DesktopBrush); NtGdiPatBlt(hDC, Rect.left, Rect.top, Rect.right, Rect.bottom, PATCOPY); - NtGdiSelectObject(hDC, PreviousBrush); + NtGdiSelectBrush(hDC, PreviousBrush); } /*Do not fill the background after it is painted no matter the size of the picture */ doPatBlt = FALSE; - hOldBitmap = NtGdiSelectObject(hWallpaperDC, WinSta->hbmWallpaper); + hOldBitmap = NtGdiSelectBitmap(hWallpaperDC, WinSta->hbmWallpaper); if (WinSta->WallpaperMode == wmStretch) { @@ -1465,7 +1465,7 @@ 0, 0); } - NtGdiSelectObject(hWallpaperDC, hOldBitmap); + NtGdiSelectBitmap(hWallpaperDC, hOldBitmap); NtGdiDeleteObjectApp(hWallpaperDC); } } @@ -1474,9 +1474,9 @@ /* Back ground is set to none, clear the screen */ if (doPatBlt) { - PreviousBrush = NtGdiSelectObject(hDC, DesktopBrush); + PreviousBrush = NtGdiSelectBrush(hDC, DesktopBrush); NtGdiPatBlt(hDC, Rect.left, Rect.top, Rect.right, Rect.bottom, PATCOPY); - NtGdiSelectObject(hDC, PreviousBrush); + NtGdiSelectBrush(hDC, PreviousBrush); } /*

1 0

[jimtabor] 30923: Reorder drv function and added missing items. One update to winddi.h.
by jimtabor＠svn.reactos.org 30 Nov '07

30 Nov '07

Author: jimtabor Date: Sat Dec 1 02:52:25 2007 New Revision: 30923 URL: http://svn.reactos.org/svn/reactos?rev=30923&view=rev Log: Reorder drv function and added missing items. One update to winddi.h. Modified: trunk/reactos/include/ddk/winddi.h trunk/reactos/include/reactos/win32k/ntgdityp.h Modified: trunk/reactos/include/ddk/winddi.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/winddi.h?rev=3… ============================================================================== --- trunk/reactos/include/ddk/winddi.h (original) +++ trunk/reactos/include/ddk/winddi.h Sat Dec 1 02:52:25 2007 @@ -3779,6 +3779,12 @@ IN POINTL *pptlBrushOrg, IN MIX mix); +typedef VOID +(APIENTRY *PFN_DrvMovePanning)( + IN LONG x, + IN LONG y, + IN FLONG fl); + typedef BOOL (APIENTRY *PFN_DrvPlgBlt)( IN SURFOBJ *psoTrg, 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 (original) +++ trunk/reactos/include/reactos/win32k/ntgdityp.h Sat Dec 1 02:52:25 2007 @@ -1,437 +1,467 @@ -/* - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS Win32 Graphical Subsystem (WIN32K) - * FILE: include/win32k/ntgdityp.h - * PURPOSE: Win32 Shared GDI Types for NtGdi* - * PROGRAMMER: Alex Ionescu (alex(a)relsoft.net) - */ - -/* INCLUDES ******************************************************************/ - -#ifndef _NTGDITYP_ -#define _NTGDITYP_ - -/* ENUMERATIONS **************************************************************/ - -typedef enum _ARCTYPE -{ - GdiTypeArc, - GdiTypeArcTo, - GdiTypeChord, - GdiTypePie, -} ARCTYPE, *PARCTYPE; - -typedef enum _PALFUNCTYPE -{ - GdiPalAnimate, - GdiPalSetEntries, - GdiPalGetEntries, - GdiPalGetSystemEntries, - GdiPalSetColorTable, - GdiPalGetColorTable, -} PALFUNCTYPE, *PPALFUNCTYPE; - -typedef enum _POLYFUNCTYPE -{ - GdiPolyPolygon = 1, - GdiPolyPolyLine, - GdiPolyBezier, - GdiPolyLineTo, - GdiPolyBezierTo, - GdiPolyPolyRgn, -} POLYFUNCTYPE, *PPOLYFUNCTYPE; - -typedef enum _GETDCDWORD -{ - GdiGetJournal, - GdiGetRelAbs, - GdiGetBreakExtra, - GdiGerCharBreak, - GdiGetArcDirection, - GdiGetEMFRestorDc, - GdiGetFontLanguageInfo, - GdiGetIsMemDc, - GdiGetMapMode, - GdiGetTextCharExtra, -} GETDCDWORD, *PGETDCDWORD; - -typedef enum _GETSETDCDWORD -{ - GdtGetSetCopyCount = 2, - GdiGetSetTextAlign, - GdiGetSetRelAbs, - GdiGetSetTextCharExtra, - GdiGetSetSelectFont, - GdiGetSetMapperFlagsInternal, - GdiGetSetMapMode, - GdiGetSetArcDirection, -} GETSETDCDWORD, *PGETSETDCDWORD; - -typedef enum _GETDCPOINT -{ - GdiGetViewPortExt = 1, - GdiGetWindowExt, - GdiGetViewPortOrg, - GdiGetWindowOrg, - GdiGetAspectRatioFilter, - GdiGetDCOrg = 6, -} GETDCPOINT, *PGETDCPOINT; - - -typedef enum _GDIBATCHCMD -{ - GdiBCPatBlt, - GdiBCPolyPatBlt, - GdiBCTextOut, - GdiBCExtTextOut, - GdiBCSetBrushOrg, - GdiBCExtSelClipRgn, - GdiBCSelObj, - GdiBCDelObj, - GdiBCDelRgn, -} GDIBATCHCMD, *PGDIBATCHCMD; - -typedef enum _TRANSFORMTYPE -{ - GdiDpToLp, - GdiLpToDp, -} TRANSFORMTYPE, *PTRANSFORMTYPE; - -#define GdiWorldSpaceToPageSpace 0x203 - -/* FIXME: Unknown */ -typedef DWORD FULLSCREENCONTROL; -typedef DWORD LFTYPE; - -/* DEFINES *******************************************************************/ - -#define GDIBATCHBUFSIZE 0x136*4 -#define GDI_BATCH_LIMIT 20 - -// NtGdiGetCharWidthW Flags -#define GCW_WIN32 0x0001 -#define GCW_NOFLOAT 0x0002 -#define GCW_INDICES 0x0008 - -// NtGdiGetCharABCWidthW Flags -#define GCABCW_NOFLOAT 0x0001 -#define GCABCW_INDICES 0x0002 - - -/* TYPES *********************************************************************/ - -typedef PVOID KERNEL_PVOID; -typedef DWORD UNIVERSAL_FONT_ID; -typedef UNIVERSAL_FONT_ID *PUNIVERSAL_FONT_ID; -typedef DWORD CHWIDTHINFO; -typedef CHWIDTHINFO *PCHWIDTHINFO; -typedef D3DNTHAL_CONTEXTCREATEDATA D3DNTHAL_CONTEXTCREATEI; -typedef LONG FIX; - -/* FIXME: Unknown; easy to guess, usually based on public types and converted */ -typedef struct _WIDTHDATA WIDTHDATA, *PWIDTHDATA; -typedef struct _DEVCAPS DEVCAPS, *PDEVCAPS; -typedef struct _REALIZATION_INFO REALIZATION_INFO, *PREALIZATION_INFO; - -/* Font Structures */ -typedef struct _TMDIFF -{ - ULONG cjotma; - CHAR chFirst; - CHAR chLast; - CHAR ChDefault; - CHAR ChBreak; -} TMDIFF, *PTMDIFF; - -typedef struct _TMW_INTERNAL -{ - TEXTMETRICW TextMetric; - TMDIFF Diff; -} TMW_INTERNAL, *PTMW_INTERNAL; - -typedef struct _NTMW_INTERNAL -{ - TMDIFF tmd; - NEWTEXTMETRICEXW ntmw; -} NTMW_INTERNAL, *PNTMW_INTERNAL; - -typedef struct _ENUMFONTDATAW -{ - ULONG cbSize; - ULONG ulNtmwiOffset; - DWORD dwFontType; - ENUMLOGFONTEXDVW elfexdv; /* variable size! */ - /* NTMW_INTERNAL ntmwi; use ulNtwmOffset */ -} ENUMFONTDATAW, *PENUMFONTDATAW; - -/* Number Representation */ -typedef struct _EFLOAT_S -{ - LONG lMant; - LONG lExp; -} EFLOAT_S; - -/* XFORM Structures */ -typedef struct _MATRIX_S -{ - EFLOAT_S efM11; - EFLOAT_S efM12; - EFLOAT_S efM21; - EFLOAT_S efM22; - EFLOAT_S efDx; - EFLOAT_S efDy; - FIX fxDx; - FIX fxDy; - FLONG flAccel; -} MATRIX_S; - -/* Gdi XForm storage union */ -typedef union -{ - FLOAT f; - ULONG l; -} gxf_long; - -// -// GDI Batch structures. -// -typedef struct _GDIBATCHHDR -{ - SHORT Size; - SHORT Cmd; -} GDIBATCHHDR, *PGDIBATCHHDR; - -typedef struct _GDIBSPATBLT -{ - GDIBATCHHDR gbHdr; - int nXLeft; - int nYLeft; - int nWidth; - int nHeight; - HANDLE hbrush; - DWORD dwRop; - COLORREF crForegroundClr; - COLORREF crBackgroundClr; - COLORREF crBrushClr; - INT IcmBrushColor; - POINTL ptlViewportOrg; - ULONG ulForegroundClr; - ULONG ulBackgroundClr; - ULONG ulBrushClr; -} GDIBSPATBLT, *PGDIBSPATBLT; - -#ifndef _NTUSRTYP_ -typedef struct _PATRECT -{ - RECT r; - HBRUSH hBrush; -} PATRECT, * PPATRECT; -#endif - -typedef struct _GDIBSPPATBLT -{ - GDIBATCHHDR gbHdr; - DWORD rop4; - DWORD Mode; - DWORD Count; - COLORREF crForegroundClr; - COLORREF crBackgroundClr; - COLORREF crBrushClr; - ULONG ulForegroundClr; - ULONG ulBackgroundClr; - ULONG ulBrushClr; - POINTL ptlViewportOrg; - PATRECT pRect[1]; // POLYPATBLT -} GDIBSPPATBLT, *PGDIBSPPATBLT; - -typedef struct _GDIBSTEXTOUT -{ - GDIBATCHHDR gbHdr; - COLORREF crForegroundClr; - COLORREF crBackgroundClr; - LONG lmBkMode; - ULONG ulForegroundClr; - ULONG ulBackgroundClr; - int x; - int y; - UINT Options; - RECT Rect; - DWORD iCS_CP; - UINT cbCount; - UINT Size; - HANDLE hlfntNew; - FLONG flTextAlign; - POINTL ptlViewportOrg; - WCHAR String[2]; -} GDIBSTEXTOUT, *PGDIBSTEXTOUT; - -typedef struct _GDIBSEXTTEXTOUT -{ - GDIBATCHHDR gbHdr; - UINT Count; - UINT Options; - RECT Rect; - POINTL ptlViewportOrg; - ULONG ulBackgroundClr; -} GDIBSEXTTEXTOUT, *PGDIBSEXTTEXTOUT; - -typedef struct _GDIBSSETBRHORG -{ - GDIBATCHHDR gbHdr; - POINTL ptlBrushOrigin; -} GDIBSSETBRHORG, *PGDIBSSETBRHORG; - -typedef struct _GDIBSEXTSELCLPRGN -{ - GDIBATCHHDR gbHdr; - int fnMode; - LONG right; - LONG bottom; - LONG left; - LONG top; -} GDIBSEXTSELCLPRGN, *PGDIBSEXTSELCLPRGN; -// -// Use with GdiBCSelObj, GdiBCDelObj and GdiBCDelRgn. -typedef struct _GDIBSOBJECT -{ - GDIBATCHHDR gbHdr; - HGDIOBJ hgdiobj; -} 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); - -typedef struct _DRIVER_FUNCTIONS -{ - PGD_ENABLEDRIVER EnableDriver; - 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; - 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_TRANSPARENTBLT TransparentBlt; - PGD_COPYBITS CopyBits; - PGD_STRETCHBLT StretchBlt; - PGD_STRETCHBLTROP StretchBltROP; - 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; - PGD_GETGLYPHMODE GetGlyphMode; - PGD_SYNCHRONIZE Synchronize; - 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; - 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; - PGD_GRADIENTFILL GradientFill; - PGD_SYNCHRONIZESURFACE SynchronizeSurface; - PGD_ALPHABLEND AlphaBlend; -} DRIVER_FUNCTIONS, *PDRIVER_FUNCTIONS; - -#endif +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS Win32 Graphical Subsystem (WIN32K) + * FILE: include/win32k/ntgdityp.h + * PURPOSE: Win32 Shared GDI Types for NtGdi* + * PROGRAMMER: Alex Ionescu (alex(a)relsoft.net) + */ + +/* INCLUDES ******************************************************************/ + +#ifndef _NTGDITYP_ +#define _NTGDITYP_ + +/* ENUMERATIONS **************************************************************/ + +typedef enum _ARCTYPE +{ + GdiTypeArc, + GdiTypeArcTo, + GdiTypeChord, + GdiTypePie, +} ARCTYPE, *PARCTYPE; + +typedef enum _PALFUNCTYPE +{ + GdiPalAnimate, + GdiPalSetEntries, + GdiPalGetEntries, + GdiPalGetSystemEntries, + GdiPalSetColorTable, + GdiPalGetColorTable, +} PALFUNCTYPE, *PPALFUNCTYPE; + +typedef enum _POLYFUNCTYPE +{ + GdiPolyPolygon = 1, + GdiPolyPolyLine, + GdiPolyBezier, + GdiPolyLineTo, + GdiPolyBezierTo, + GdiPolyPolyRgn, +} POLYFUNCTYPE, *PPOLYFUNCTYPE; + +typedef enum _GETDCDWORD +{ + GdiGetJournal, + GdiGetRelAbs, + GdiGetBreakExtra, + GdiGerCharBreak, + GdiGetArcDirection, + GdiGetEMFRestorDc, + GdiGetFontLanguageInfo, + GdiGetIsMemDc, + GdiGetMapMode, + GdiGetTextCharExtra, +} GETDCDWORD, *PGETDCDWORD; + +typedef enum _GETSETDCDWORD +{ + GdtGetSetCopyCount = 2, + GdiGetSetTextAlign, + GdiGetSetRelAbs, + GdiGetSetTextCharExtra, + GdiGetSetSelectFont, + GdiGetSetMapperFlagsInternal, + GdiGetSetMapMode, + GdiGetSetArcDirection, +} GETSETDCDWORD, *PGETSETDCDWORD; + +typedef enum _GETDCPOINT +{ + GdiGetViewPortExt = 1, + GdiGetWindowExt, + GdiGetViewPortOrg, + GdiGetWindowOrg, + GdiGetAspectRatioFilter, + GdiGetDCOrg = 6, +} GETDCPOINT, *PGETDCPOINT; + + +typedef enum _GDIBATCHCMD +{ + GdiBCPatBlt, + GdiBCPolyPatBlt, + GdiBCTextOut, + GdiBCExtTextOut, + GdiBCSetBrushOrg, + GdiBCExtSelClipRgn, + GdiBCSelObj, + GdiBCDelObj, + GdiBCDelRgn, +} GDIBATCHCMD, *PGDIBATCHCMD; + +typedef enum _TRANSFORMTYPE +{ + GdiDpToLp, + GdiLpToDp, +} TRANSFORMTYPE, *PTRANSFORMTYPE; + +#define GdiWorldSpaceToPageSpace 0x203 + +/* FIXME: Unknown */ +typedef DWORD FULLSCREENCONTROL; +typedef DWORD LFTYPE; + +/* DEFINES *******************************************************************/ + +#define GDIBATCHBUFSIZE 0x136*4 +#define GDI_BATCH_LIMIT 20 + +// NtGdiGetCharWidthW Flags +#define GCW_WIN32 0x0001 +#define GCW_NOFLOAT 0x0002 +#define GCW_INDICES 0x0008 + +// NtGdiGetCharABCWidthW Flags +#define GCABCW_NOFLOAT 0x0001 +#define GCABCW_INDICES 0x0002 + + +/* TYPES *********************************************************************/ + +typedef PVOID KERNEL_PVOID; +typedef DWORD UNIVERSAL_FONT_ID; +typedef UNIVERSAL_FONT_ID *PUNIVERSAL_FONT_ID; +typedef DWORD CHWIDTHINFO; +typedef CHWIDTHINFO *PCHWIDTHINFO; +typedef D3DNTHAL_CONTEXTCREATEDATA D3DNTHAL_CONTEXTCREATEI; +typedef LONG FIX; + +/* FIXME: Unknown; easy to guess, usually based on public types and converted */ +typedef struct _WIDTHDATA WIDTHDATA, *PWIDTHDATA; +typedef struct _DEVCAPS DEVCAPS, *PDEVCAPS; +typedef struct _REALIZATION_INFO REALIZATION_INFO, *PREALIZATION_INFO; + +/* Font Structures */ +typedef struct _TMDIFF +{ + ULONG cjotma; + CHAR chFirst; + CHAR chLast; + CHAR ChDefault; + CHAR ChBreak; +} TMDIFF, *PTMDIFF; + +typedef struct _TMW_INTERNAL +{ + TEXTMETRICW TextMetric; + TMDIFF Diff; +} TMW_INTERNAL, *PTMW_INTERNAL; + +typedef struct _NTMW_INTERNAL +{ + TMDIFF tmd; + NEWTEXTMETRICEXW ntmw; +} NTMW_INTERNAL, *PNTMW_INTERNAL; + +typedef struct _ENUMFONTDATAW +{ + ULONG cbSize; + ULONG ulNtmwiOffset; + DWORD dwFontType; + ENUMLOGFONTEXDVW elfexdv; /* variable size! */ + /* NTMW_INTERNAL ntmwi; use ulNtwmOffset */ +} ENUMFONTDATAW, *PENUMFONTDATAW; + +/* Number Representation */ +typedef struct _EFLOAT_S +{ + LONG lMant; + LONG lExp; +} EFLOAT_S; + +/* XFORM Structures */ +typedef struct _MATRIX_S +{ + EFLOAT_S efM11; + EFLOAT_S efM12; + EFLOAT_S efM21; + EFLOAT_S efM22; + EFLOAT_S efDx; + EFLOAT_S efDy; + FIX fxDx; + FIX fxDy; + FLONG flAccel; +} MATRIX_S; + +/* Gdi XForm storage union */ +typedef union +{ + FLOAT f; + ULONG l; +} gxf_long; + +// +// GDI Batch structures. +// +typedef struct _GDIBATCHHDR +{ + SHORT Size; + SHORT Cmd; +} GDIBATCHHDR, *PGDIBATCHHDR; + +typedef struct _GDIBSPATBLT +{ + GDIBATCHHDR gbHdr; + int nXLeft; + int nYLeft; + int nWidth; + int nHeight; + HANDLE hbrush; + DWORD dwRop; + COLORREF crForegroundClr; + COLORREF crBackgroundClr; + COLORREF crBrushClr; + INT IcmBrushColor; + POINTL ptlViewportOrg; + ULONG ulForegroundClr; + ULONG ulBackgroundClr; + ULONG ulBrushClr; +} GDIBSPATBLT, *PGDIBSPATBLT; + +#ifndef _NTUSRTYP_ +typedef struct _PATRECT +{ + RECT r; + HBRUSH hBrush; +} PATRECT, * PPATRECT; +#endif + +typedef struct _GDIBSPPATBLT +{ + GDIBATCHHDR gbHdr; + DWORD rop4; + DWORD Mode; + DWORD Count; + COLORREF crForegroundClr; + COLORREF crBackgroundClr; + COLORREF crBrushClr; + ULONG ulForegroundClr; + ULONG ulBackgroundClr; + ULONG ulBrushClr; + POINTL ptlViewportOrg; + PATRECT pRect[1]; // POLYPATBLT +} GDIBSPPATBLT, *PGDIBSPPATBLT; + +typedef struct _GDIBSTEXTOUT +{ + GDIBATCHHDR gbHdr; + COLORREF crForegroundClr; + COLORREF crBackgroundClr; + LONG lmBkMode; + ULONG ulForegroundClr; + ULONG ulBackgroundClr; + int x; + int y; + UINT Options; + RECT Rect; + DWORD iCS_CP; + UINT cbCount; + UINT Size; + HANDLE hlfntNew; + FLONG flTextAlign; + POINTL ptlViewportOrg; + WCHAR String[2]; +} GDIBSTEXTOUT, *PGDIBSTEXTOUT; + +typedef struct _GDIBSEXTTEXTOUT +{ + GDIBATCHHDR gbHdr; + UINT Count; + UINT Options; + RECT Rect; + POINTL ptlViewportOrg; + ULONG ulBackgroundClr; +} GDIBSEXTTEXTOUT, *PGDIBSEXTTEXTOUT; + +typedef struct _GDIBSSETBRHORG +{ + GDIBATCHHDR gbHdr; + POINTL ptlBrushOrigin; +} GDIBSSETBRHORG, *PGDIBSSETBRHORG; + +typedef struct _GDIBSEXTSELCLPRGN +{ + GDIBATCHHDR gbHdr; + int fnMode; + LONG right; + LONG bottom; + LONG left; + LONG top; +} GDIBSEXTSELCLPRGN, *PGDIBSEXTSELCLPRGN; +// +// Use with GdiBCSelObj, GdiBCDelObj and GdiBCDelRgn. +typedef struct _GDIBSOBJECT +{ + GDIBATCHHDR gbHdr; + HGDIOBJ hgdiobj; +} 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); + +// +// Most of these are definded in ddk/winddi.h +// +typedef struct _DRIVER_FUNCTIONS +{ + PGD_ENABLEDRIVER EnableDriver; //ReactOS Extra + 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; + 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; + 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; + PGD_GETGLYPHMODE GetGlyphMode; + PGD_SYNCHRONIZE Synchronize; + 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_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_DrvIcmCreateColorTransform IcmCreateColorTransform; + PFN_DrvIcmDeleteColorTransform IcmDeleteColorTransform; + PFN_DrvIcmCheckBitmapBits IcmCheckBitmapBits; + PFN_DrvIcmSetDeviceGammaRamp IcmSetDeviceGammaRamp; + PGD_GRADIENTFILL GradientFill; + PGD_STRETCHBLTROP StretchBltROP; + PFN_DrvPlgBlt PlgBlt; + PGD_ALPHABLEND AlphaBlend; +// PFN_DrvSynthesizeFont SynthesizeFont; + PVOID Unknown1; +// PFN_DrvGetSynthesizedFontFiles GetSynthesizedFontFiles; + PVOID Unknown2; + PGD_TRANSPARENTBLT TransparentBlt; + PFN_DrvQueryPerBandInfo QueryPerBandInfo; + PFN_DrvQueryDeviceSupport QueryDeviceSupport; + PVOID Reserved1; + PVOID Reserved2; + PVOID Reserved3; + PVOID Reserved4; + PVOID Reserved5; + PVOID Reserved6; + PVOID Reserved7; + PVOID Reserved8; + PFN_DrvDeriveSurface DeriveSurface; + PFN_DrvQueryGlyphAttrs QueryGlyphAttrs; + PFN_DrvNotify Notify; + PGD_SYNCHRONIZESURFACE SynchronizeSurface; + PFN_DrvResetDevice ResetDevice; + PVOID Reserved9; + PVOID Reserved10; + PVOID Reserved11; +} DRIVER_FUNCTIONS, *PDRIVER_FUNCTIONS; + +#endif

1 0

[mpiulachs] 30922: - XML compliance : add XInclude namespace
by mpiulachs＠svn.reactos.org 30 Nov '07

30 Nov '07

Author: mpiulachs Date: Sat Dec 1 02:45:10 2007 New Revision: 30922 URL: http://svn.reactos.org/svn/reactos?rev=30922&view=rev Log: - XML compliance : add XInclude namespace Modified: trunk/rosapps/sysutils/utils/driver/driver.rbuild trunk/rosapps/sysutils/utils/utils.rbuild Modified: trunk/rosapps/sysutils/utils/driver/driver.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/sysutils/utils/driver/driv… ============================================================================== --- trunk/rosapps/sysutils/utils/driver/driver.rbuild (original) +++ trunk/rosapps/sysutils/utils/driver/driver.rbuild Sat Dec 1 02:45:10 2007 @@ -1,8 +1,8 @@ -<group> -<directory name="load"> - <xi:include href="load/load.rbuild" /> -</directory> -<directory name="unload"> - <xi:include href="unload/unload.rbuild" /> -</directory> +<group xmlns:xi="http://www.w3.org/2001/XInclude"> + <directory name="load"> + <xi:include href="load/load.rbuild" /> + </directory> + <directory name="unload"> + <xi:include href="unload/unload.rbuild" /> + </directory> </group> Modified: trunk/rosapps/sysutils/utils/utils.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/sysutils/utils/utils.rbuil… ============================================================================== --- trunk/rosapps/sysutils/utils/utils.rbuild (original) +++ trunk/rosapps/sysutils/utils/utils.rbuild Sat Dec 1 02:45:10 2007 @@ -1,35 +1,35 @@ -<group> -<directory name="binpatch"> - <xi:include href="binpatch/binpatch.rbuild" /> -</directory> -<directory name="cat"> - <xi:include href="cat/cat.rbuild" /> -</directory> -<directory name="driver"> - <xi:include href="driver/driver.rbuild" /> -</directory> -<directory name="infinst"> - <xi:include href="infinst/infinst.rbuild" /> -</directory> -<directory name="nts2w32err"> - <xi:include href="nts2w32err/nts2w32err.rbuild" /> -</directory> -<directory name="objdir"> - <xi:include href="objdir/objdir.rbuild" /> -</directory> -<directory name="partinfo"> - <xi:include href="partinfo/partinfo.rbuild" /> -</directory> -<directory name="ps"> - <xi:include href="ps/ps.rbuild" /> -</directory> -<directory name="rosperf"> - <xi:include href="rosperf/rosperf.rbuild" /> -</directory> -<directory name="stats"> - <xi:include href="stats/stats.rbuild" /> -</directory> -<directory name="tickcount"> - <xi:include href="tickcount/tickcount.rbuild" /> -</directory> -</group> +<group xmlns:xi="http://www.w3.org/2001/XInclude"> + <directory name="binpatch"> + <xi:include href="binpatch/binpatch.rbuild" /> + </directory> + <directory name="cat"> + <xi:include href="cat/cat.rbuild" /> + </directory> + <directory name="driver"> + <xi:include href="driver/driver.rbuild" /> + </directory> + <directory name="infinst"> + <xi:include href="infinst/infinst.rbuild" /> + </directory> + <directory name="nts2w32err"> + <xi:include href="nts2w32err/nts2w32err.rbuild" /> + </directory> + <directory name="objdir"> + <xi:include href="objdir/objdir.rbuild" /> + </directory> + <directory name="partinfo"> + <xi:include href="partinfo/partinfo.rbuild" /> + </directory> + <directory name="ps"> + <xi:include href="ps/ps.rbuild" /> + </directory> + <directory name="rosperf"> + <xi:include href="rosperf/rosperf.rbuild" /> + </directory> + <directory name="stats"> + <xi:include href="stats/stats.rbuild" /> + </directory> + <directory name="tickcount"> + <xi:include href="tickcount/tickcount.rbuild" /> + </directory> +</group>

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs