Ros-diffs December 2007

ros-diffs@reactos.org

22 participants
605 discussions

[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

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 December 2007