Ros-diffs November 2007

ros-diffs@reactos.org

20 participants
888 discussions

[peterw] 30913: - Add back the 'oldmode' I removed when adding the MinGW prompt (for building older source).
by peterw＠svn.reactos.org 30 Nov '07

30 Nov '07

Author: peterw Date: Fri Nov 30 06:40:15 2007 New Revision: 30913 URL: http://svn.reactos.org/svn/reactos?rev=30913&view=rev Log: - Add back the 'oldmode' I removed when adding the MinGW prompt (for building older source). Modified: trunk/tools/RosBE/RosBE-Windows/Root/RosBE.cmd Modified: trunk/tools/RosBE/RosBE-Windows/Root/RosBE.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/Ros… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/RosBE.cmd (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/RosBE.cmd Fri Nov 30 06:40:15 2007 @@ -9,12 +9,6 @@ :: :: @echo off - -if not "%1" == "" ( - cls - echo Unknown parameter specified. Exiting. - goto :EOC -) :: :: Set defaults to work with and override them if edited by @@ -54,6 +48,22 @@ ) title ReactOS Build Environment %_ROSBE_VERSION% + +:: +:: Check if we are using oldmode or if any unknown parameters +:: were specified. +:: +if /i "%1" == "oldmode" ( + cls + set _ROSBE_MODE=MinGW + call :RosBE4 + goto :EndCommandParse +) +if not "%1" == "" ( + cls + echo Unknown parameter specified. Exiting. + goto :EOC +) cls call :RosBE4

1 0

[tkreuzer] 30912: replace NtGdiSelectObject with NtGdiSelectBitmap and NtGdiSelectBrush in cursoricon.c
by tkreuzer＠svn.reactos.org 30 Nov '07

30 Nov '07

Author: tkreuzer Date: Fri Nov 30 05:44:29 2007 New Revision: 30912 URL: http://svn.reactos.org/svn/reactos?rev=30912&view=rev Log: replace NtGdiSelectObject with NtGdiSelectBitmap and NtGdiSelectBrush in cursoricon.c Modified: trunk/reactos/subsystems/win32/win32k/ntuser/cursoricon.c Modified: trunk/reactos/subsystems/win32/win32k/ntuser/cursoricon.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/cursoricon.c (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/cursoricon.c Fri Nov 30 05:44:29 2007 @@ -1316,7 +1316,7 @@ DPRINT1("Failed to create temporary bitmap\n"); return; } - OldBitmap = NtGdiSelectObject(DcStretched, BitmapStretched); + OldBitmap = NtGdiSelectBitmap(DcStretched, BitmapStretched); if (NULL == OldBitmap) { NtGdiDeleteObject(BitmapStretched); @@ -1332,7 +1332,7 @@ { DPRINT1("Failed to blt\n"); } - NtGdiSelectObject(DcStretched, OldBitmap); + NtGdiSelectBitmap(DcStretched, OldBitmap); NtGdiDeleteObject(BitmapStretched); NtGdiDeleteObjectApp(DcStretched); } @@ -1459,19 +1459,19 @@ BITMAPOBJ_UnlockBitmap(BitmapObj); - hOldOffBmp = NtGdiSelectObject(hdcOff, hbmOff); + hOldOffBmp = NtGdiSelectBitmap(hdcOff, hbmOff); if (!hOldOffBmp) { - DPRINT1("NtGdiSelectObject() failed!\n"); + DPRINT1("NtGdiSelectBitmap() failed!\n"); goto cleanup; } if (DoFlickerFree) { - hOldOffBrush = NtGdiSelectObject(hdcOff, hbrFlickerFreeDraw); + hOldOffBrush = NtGdiSelectBrush(hdcOff, hbrFlickerFreeDraw); if (!hOldOffBrush) { - DPRINT1("NtGdiSelectObject() failed!\n"); + DPRINT1("NtGdiSelectBitmap() failed!\n"); goto cleanup; } @@ -1495,10 +1495,10 @@ if (diFlags & DI_MASK) { - hOldMem = NtGdiSelectObject(hdcMem, hbmMask); + hOldMem = NtGdiSelectBitmap(hdcMem, hbmMask); if (!hOldMem) { - DPRINT("NtGdiSelectObject() failed!\n"); + DPRINT("NtGdiSelectBitmap() failed!\n"); goto cleanup; } @@ -1518,12 +1518,12 @@ diFlags &= ~DI_IMAGE; } - NtGdiSelectObject(hdcMem, hOldMem); + NtGdiSelectBitmap(hdcMem, hOldMem); } if(diFlags & DI_IMAGE) { - hOldMem = NtGdiSelectObject(hdcMem, (hbmColor ? hbmColor : hbmMask)); + hOldMem = NtGdiSelectBitmap(hdcMem, (hbmColor ? hbmColor : hbmMask)); DoStretchBlt(hdcOff, (DoFlickerFree ? 0 : xLeft), (DoFlickerFree ? 0 : yTop), cxWidth, cyHeight, hdcMem, @@ -1531,7 +1531,7 @@ ((diFlags & DI_MASK) ? SRCINVERT : SRCCOPY), NULL != hbmColor); - NtGdiSelectObject(hdcMem, hOldMem); + NtGdiSelectBitmap(hdcMem, hOldMem); } if (bAlpha) @@ -1612,8 +1612,8 @@ cleanup: if(DoFlickerFree) { - if(hOldOffBmp) NtGdiSelectObject(hdcOff, hOldOffBmp); - if(hOldOffBrush) NtGdiSelectObject(hdcOff, hOldOffBrush); + if(hOldOffBmp) NtGdiSelectBitmap(hdcOff, hOldOffBmp); + if(hOldOffBrush) NtGdiSelectBrush(hdcOff, hOldOffBrush); if(hbmOff) NtGdiDeleteObject(hbmOff); if(hdcOff) NtGdiDeleteObjectApp(hdcOff); }

1 0

[tkreuzer] 30911: replace NtGdiSelectObject with NtGdiSelectBitmap in bitblt.c
by tkreuzer＠svn.reactos.org 30 Nov '07

30 Nov '07

Author: tkreuzer Date: Fri Nov 30 05:41:12 2007 New Revision: 30911 URL: http://svn.reactos.org/svn/reactos?rev=30911&view=rev Log: replace NtGdiSelectObject with NtGdiSelectBitmap in bitblt.c Modified: trunk/reactos/subsystems/win32/win32k/objects/bitblt.c Modified: trunk/reactos/subsystems/win32/win32k/objects/bitblt.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/bitblt.c (original) +++ trunk/reactos/subsystems/win32/win32k/objects/bitblt.c Fri Nov 30 05:41:12 2007 @@ -709,14 +709,14 @@ /* 1. make mask bitmap's dc */ hDCMask = NtGdiCreateCompatibleDC(hdcDest); - hOldMaskBitmap = (HBITMAP)NtGdiSelectObject(hDCMask, hbmMask); + hOldMaskBitmap = (HBITMAP)NtGdiSelectBitmap(hDCMask, hbmMask); /* 2. make masked Background bitmap */ /* 2.1 make bitmap */ hDC1 = NtGdiCreateCompatibleDC(hdcDest); hBitmap2 = NtGdiCreateCompatibleBitmap(hdcDest, nWidth, nHeight); - hOldBitmap2 = (HBITMAP)NtGdiSelectObject(hDC1, hBitmap2); + hOldBitmap2 = (HBITMAP)NtGdiSelectBitmap(hDC1, hBitmap2); /* 2.2 draw dest bitmap and mask */ NtGdiBitBlt(hDC1, 0, 0, nWidth, nHeight, hdcSrc, nXSrc, nYSrc, SRCCOPY, 0, 0); @@ -728,7 +728,7 @@ /* 3.1 make bitmap */ hDC2 = NtGdiCreateCompatibleDC(hdcDest); hBitmap3 = NtGdiCreateCompatibleBitmap(hdcDest, nWidth, nHeight); - hOldBitmap3 = (HBITMAP)NtGdiSelectObject(hDC2, hBitmap3); + hOldBitmap3 = (HBITMAP)NtGdiSelectBitmap(hDC2, hBitmap3); /* 3.2 draw src bitmap and mask */ NtGdiBitBlt(hDC2, 0, 0, nWidth, nHeight, hdcDest, nXDest, nYDest, SRCCOPY, 0, 0); @@ -740,9 +740,9 @@ NtGdiBitBlt(hdcDest, nXDest, nYDest, nWidth, nHeight, hDC1, 0, 0, SRCCOPY, 0, 0); /* 5. restore all object */ - NtGdiSelectObject(hDCMask, hOldMaskBitmap); - NtGdiSelectObject(hDC1, hOldBitmap2); - NtGdiSelectObject(hDC2, hOldBitmap3); + NtGdiSelectBitmap(hDCMask, hOldMaskBitmap); + NtGdiSelectBitmap(hDC1, hOldBitmap2); + NtGdiSelectBitmap(hDC2, hOldBitmap3); /* 6. delete all temp object */ NtGdiDeleteObject(hBitmap2);

1 0

[tkreuzer] 30910: replace NtGdiSelectObject with NtGdiSelectBitmap and NtGdiSelectBrush in bitmaps.c
by tkreuzer＠svn.reactos.org 30 Nov '07

30 Nov '07

Author: tkreuzer Date: Fri Nov 30 05:38:19 2007 New Revision: 30910 URL: http://svn.reactos.org/svn/reactos?rev=30910&view=rev Log: replace NtGdiSelectObject with NtGdiSelectBitmap and NtGdiSelectBrush in bitmaps.c Modified: trunk/reactos/subsystems/win32/win32k/objects/bitmaps.c Modified: trunk/reactos/subsystems/win32/win32k/objects/bitmaps.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/bitmaps.c (original) +++ trunk/reactos/subsystems/win32/win32k/objects/bitmaps.c Fri Nov 30 05:38:19 2007 @@ -305,13 +305,13 @@ //HBITMAP hBmpTmp = IntGdiCreateBitmap ( 1, 1, 1, 32, NULL); if ( hBmpTmp ) { - HBITMAP hBmpOld = (HBITMAP)NtGdiSelectObject ( hDCTmp, hBmpTmp ); + HBITMAP hBmpOld = (HBITMAP)NtGdiSelectBitmap ( hDCTmp, hBmpTmp ); if ( hBmpOld ) { PBITMAPOBJ bmpobj; NtGdiBitBlt ( hDCTmp, 0, 0, 1, 1, hDC, XPos, YPos, SRCCOPY, 0, 0 ); - NtGdiSelectObject ( hDCTmp, hBmpOld ); + NtGdiSelectBitmap ( hDCTmp, hBmpOld ); // our bitmap is no longer selected, so we can access it's stuff... bmpobj = BITMAPOBJ_LockBitmap ( hBmpTmp ); @@ -529,14 +529,14 @@ if (NewBrush == NULL) return(FALSE); - OldBrush = NtGdiSelectObject(hDC, NewBrush); + OldBrush = NtGdiSelectBrush(hDC, NewBrush); if (OldBrush == NULL) { NtGdiDeleteObject(NewBrush); return(FALSE); } NtGdiPatBlt(hDC, X, Y, 1, 1, PATCOPY); - NtGdiSelectObject(hDC, OldBrush); + NtGdiSelectBrush(hDC, OldBrush); NtGdiDeleteObject(NewBrush); return TRUE; }

1 0

[tkreuzer] 30909: replace NtGdiSelectObject with NtGdiSelectBrush in region.c
by tkreuzer＠svn.reactos.org 30 Nov '07

30 Nov '07

Author: tkreuzer Date: Fri Nov 30 05:32:39 2007 New Revision: 30909 URL: http://svn.reactos.org/svn/reactos?rev=30909&view=rev Log: replace NtGdiSelectObject with NtGdiSelectBrush in region.c Modified: trunk/reactos/subsystems/win32/win32k/objects/region.c Modified: trunk/reactos/subsystems/win32/win32k/objects/region.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/region.c (original) +++ trunk/reactos/subsystems/win32/win32k/objects/region.c Fri Nov 30 05:32:39 2007 @@ -2375,7 +2375,7 @@ return FALSE; } - if (NULL == (oldhBrush = NtGdiSelectObject(hDC, hBrush))) + if (NULL == (oldhBrush = NtGdiSelectBrush(hDC, hBrush))) { RGNDATA_UnlockRgn(rgn); return FALSE; @@ -2387,7 +2387,7 @@ } RGNDATA_UnlockRgn( rgn ); - NtGdiSelectObject(hDC, oldhBrush); + NtGdiSelectBrush(hDC, oldhBrush); return TRUE; }

1 0

[tkreuzer] 30908: replace NtGdiSelectObject with NtGdiSelectbrush in dcutils.c
by tkreuzer＠svn.reactos.org 30 Nov '07

30 Nov '07

Author: tkreuzer Date: Fri Nov 30 05:27:40 2007 New Revision: 30908 URL: http://svn.reactos.org/svn/reactos?rev=30908&view=rev Log: replace NtGdiSelectObject with NtGdiSelectbrush in dcutils.c Modified: trunk/reactos/subsystems/win32/win32k/objects/dcutil.c Modified: trunk/reactos/subsystems/win32/win32k/objects/dcutil.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/dcutil.c (original) +++ trunk/reactos/subsystems/win32/win32k/objects/dcutil.c Fri Nov 30 05:27:40 2007 @@ -184,7 +184,7 @@ Dc_Attr->ulDirty_ &= ~DIRTY_LINE; // Clear Flag if set. hBrush = Dc_Attr->hbrush; DC_UnlockDc(dc); - NtGdiSelectObject(hDC, hBrush); + NtGdiSelectBrush(hDC, hBrush); return oldColor; } @@ -254,6 +254,6 @@ Dc_Attr->crForegroundClr = color; hBrush = Dc_Attr->hbrush; DC_UnlockDc( dc ); - NtGdiSelectObject(hDC, hBrush); + NtGdiSelectBrush(hDC, hBrush); return oldColor; }

1 0

[tkreuzer] 30907: replace NtGdiSelectObject with NtGdiSelectBitmap in dibobj.c
by tkreuzer＠svn.reactos.org 30 Nov '07

30 Nov '07

Author: tkreuzer Date: Fri Nov 30 05:22:34 2007 New Revision: 30907 URL: http://svn.reactos.org/svn/reactos?rev=30907&view=rev Log: replace NtGdiSelectObject with NtGdiSelectBitmap in dibobj.c Modified: trunk/reactos/subsystems/win32/win32k/objects/dibobj.c Modified: trunk/reactos/subsystems/win32/win32k/objects/dibobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/dibobj.c (original) +++ trunk/reactos/subsystems/win32/win32k/objects/dibobj.c Fri Nov 30 05:22:34 2007 @@ -747,7 +747,7 @@ hdcMem = NtGdiCreateCompatibleDC(hDC); hBitmap = NtGdiCreateCompatibleBitmap(hDC, BitsInfo->bmiHeader.biWidth, BitsInfo->bmiHeader.biHeight); - hOldBitmap = NtGdiSelectObject(hdcMem, hBitmap); + hOldBitmap = NtGdiSelectBitmap(hdcMem, hBitmap); if(Usage == DIB_PAL_COLORS) { @@ -785,7 +785,7 @@ if(hPal) NtUserSelectPalette(hdcMem, hPal, FALSE); - NtGdiSelectObject(hdcMem, hOldBitmap); + NtGdiSelectBitmap(hdcMem, hOldBitmap); NtGdiDeleteObjectApp(hdcMem); NtGdiDeleteObject(hBitmap);

1 0

[tkreuzer] 30906: Beginning of an implementation of SelectObject, using NtGdiSelectBitmap, NtGdiSelectBrush, NtGdiselectFont, NtGdiSelectPen and ExtSelectClipRgn instead of NtGdiSelectObject. Todo: Do most stuff in user mode
by tkreuzer＠svn.reactos.org 30 Nov '07

30 Nov '07

Author: tkreuzer Date: Fri Nov 30 05:14:58 2007 New Revision: 30906 URL: http://svn.reactos.org/svn/reactos?rev=30906&view=rev Log: Beginning of an implementation of SelectObject, using NtGdiSelectBitmap, NtGdiSelectBrush, NtGdiselectFont, NtGdiSelectPen and ExtSelectClipRgn instead of NtGdiSelectObject. Todo: Do most stuff in user mode Modified: trunk/reactos/dll/win32/gdi32/misc/hacks.c trunk/reactos/dll/win32/gdi32/objects/dc.c Modified: trunk/reactos/dll/win32/gdi32/misc/hacks.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/misc/hacks… ============================================================================== --- trunk/reactos/dll/win32/gdi32/misc/hacks.c (original) +++ trunk/reactos/dll/win32/gdi32/misc/hacks.c Fri Nov 30 05:14:58 2007 @@ -48,17 +48,6 @@ NULL); } -/* - * @implemented - * - */ -HGDIOBJ -STDCALL -SelectObject(HDC hdc, - HGDIOBJ hgdiobj) -{ - return NtGdiSelectObject(hdc,hgdiobj); -} /* * @implemented 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 Fri Nov 30 05:14:58 2007 @@ -1333,3 +1333,58 @@ } +/* + * @implemented + * + */ +HGDIOBJ +STDCALL +SelectObject(HDC hDC, + HGDIOBJ hGdiObj) +{ + PDC_ATTR pDc_Attr; +// HGDIOBJ hOldObj = NULL; + + if(!GdiGetHandleUserData(hDC, GDI_OBJECT_TYPE_DC, (PVOID)&pDc_Attr)) + { + SetLastError(ERROR_INVALID_HANDLE); + return NULL; + } + + hGdiObj = GdiFixUpHandle(hGdiObj); + if (!GdiIsHandleValid(hGdiObj)) + { + return NULL; + } + + UINT uType = GDI_HANDLE_GET_TYPE(hGdiObj); + + switch (uType) + { + case GDI_OBJECT_TYPE_PALETTE: + 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] 30905: implement NtGdiSelectBitmap, NtGdiSelectBrush, NtGdiSelectFont and NtGdiSelectPen based on NtGdiSelectObject and tests, move those functions to dc.c. Not used yet.
by tkreuzer＠svn.reactos.org 30 Nov '07

30 Nov '07

Author: tkreuzer Date: Fri Nov 30 05:05:03 2007 New Revision: 30905 URL: http://svn.reactos.org/svn/reactos?rev=30905&view=rev Log: implement NtGdiSelectBitmap, NtGdiSelectBrush, NtGdiSelectFont and NtGdiSelectPen based on NtGdiSelectObject and tests, move those functions to dc.c. Not used yet. Modified: trunk/reactos/subsystems/win32/win32k/objects/dc.c trunk/reactos/subsystems/win32/win32k/stubs/stubs.c 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 Fri Nov 30 05:05:03 2007 @@ -2040,6 +2040,214 @@ return objOrg; } + /* + * @implemented + */ +HBITMAP +APIENTRY +NtGdiSelectBitmap( + IN HDC hDC, + IN HBITMAP hBmp) +{ + PDC pDC; + PDC_ATTR pDc_Attr; + HBITMAP hOrgBmp; + PBITMAPOBJ pBmp; + HRGN hVisRgn; + BOOLEAN bFailed; + + pDC = DC_LockDc(hDC); + if (!pDC) + { + return NULL; + } + + pDc_Attr = pDC->pDc_Attr; + if(!pDc_Attr) pDc_Attr = &pDC->Dc_Attr; + + /* must be memory dc to select bitmap */ + if (!(pDC->w.flags & DC_MEMORY)) + { + DC_UnlockDc(pDC); + return NULL; + } + + pBmp = BITMAPOBJ_LockBitmap(hBmp); + if (!pBmp) + { + DC_UnlockDc(pDC); + return NULL; + } + hOrgBmp = pDC->w.hBitmap; + + /* Release the old bitmap, lock the new one and convert it to a SURF */ + pDC->w.hBitmap = hBmp; + + // if we're working with a DIB, get the palette [fixme: only create if the selected palette is null] + if(pBmp->dib) + { + pDC->w.bitsPerPixel = pBmp->dib->dsBmih.biBitCount; + pDC->w.hPalette = pBmp->hDIBPalette; + } + else + { + pDC->w.bitsPerPixel = BitsPerFormat(pBmp->SurfObj.iBitmapFormat); + pDC->w.hPalette = ((GDIDEVICE *)pDC->pPDev)->DevInfo.hpalDefault; + } + + /* Regenerate the XLATEOBJs. */ + EngDeleteXlate(pDC->XlateBrush); + pDC->XlateBrush = IntGdiCreateBrushXlate(pDC, pDc_Attr->hbrush, &bFailed); + + EngDeleteXlate(pDC->XlatePen); + pDC->XlatePen = IntGdiCreateBrushXlate(pDC, pDc_Attr->hpen, &bFailed); + + DC_UnlockDc(pDC); + + hVisRgn = NtGdiCreateRectRgn(0, 0, pBmp->SurfObj.sizlBitmap.cx, pBmp->SurfObj.sizlBitmap.cy); + BITMAPOBJ_UnlockBitmap(pBmp); + IntGdiSelectVisRgn(hDC, hVisRgn); + NtGdiDeleteObject(hVisRgn); + + return hOrgBmp; +} + + /* + * @implemented + */ +HBRUSH +APIENTRY +NtGdiSelectBrush( + IN HDC hDC, + IN HBRUSH hBrush) +{ + PDC pDC; + PDC_ATTR pDc_Attr; + HBRUSH hOrgBrush; + PGDIBRUSHOBJ pBrush; + XLATEOBJ *XlateObj; + BOOLEAN bFailed; + + pDC = DC_LockDc(hDC); + if (!pDC) + { + return NULL; + } + + pDc_Attr = pDC->pDc_Attr; + if(!pDc_Attr) pDc_Attr = &pDC->Dc_Attr; + + pBrush = BRUSHOBJ_LockBrush(hBrush); + if (pBrush == NULL) + { + SetLastWin32Error(ERROR_INVALID_HANDLE); + return NULL; + } + + XlateObj = IntGdiCreateBrushXlate(pDC, pBrush, &bFailed); + BRUSHOBJ_UnlockBrush(pBrush); + if(bFailed) + { + return NULL; + } + + hOrgBrush = pDc_Attr->hbrush; + pDc_Attr->hbrush = hBrush; + if (pDC->XlateBrush != NULL) + { + EngDeleteXlate(pDC->XlateBrush); + } + pDC->XlateBrush = XlateObj; + + DC_UnlockDc(pDC); + return hOrgBrush; +} + + /* + * @implemented + */ +HFONT +APIENTRY +NtGdiSelectFont( + IN HDC hDC, + IN HFONT hFont) +{ + PDC pDC; + PDC_ATTR pDc_Attr; + HFONT hOrgFont = NULL; + + pDC = DC_LockDc(hDC); + if (!pDC) + { + return NULL; + } + + pDc_Attr = pDC->pDc_Attr; + if(!pDc_Attr) pDc_Attr = &pDC->Dc_Attr; + + /* FIXME: what if not successful? */ + if(NT_SUCCESS(TextIntRealizeFont((HFONT)hFont))) + { + hOrgFont = pDc_Attr->hlfntNew; + pDc_Attr->hlfntNew = hFont; + } + + DC_UnlockDc(pDC); + + return hOrgFont; +} + + /* + * @implemented + */ +HPEN +APIENTRY +NtGdiSelectPen( + IN HDC hDC, + IN HPEN hPen) +{ + PDC pDC; + PDC_ATTR pDc_Attr; + HPEN hOrgPen = NULL; + PGDIBRUSHOBJ pPen; + XLATEOBJ *XlateObj; + BOOLEAN bFailed; + + pDC = DC_LockDc(hDC); + if (!pDC) + { + return NULL; + } + + pDc_Attr = pDC->pDc_Attr; + if(!pDc_Attr) pDc_Attr = &pDC->Dc_Attr; + + pPen = PENOBJ_LockPen(hPen); + if (pPen == NULL) + { + return NULL; + } + + XlateObj = IntGdiCreateBrushXlate(pDC, pPen, &bFailed); + PENOBJ_UnlockPen(pPen); + if (bFailed) + { + SetLastWin32Error(ERROR_NO_SYSTEM_RESOURCES); + return NULL; + } + + hOrgPen = pDc_Attr->hpen; + pDc_Attr->hpen = hPen; + if (pDC->XlatePen != NULL) + { + EngDeleteXlate(pDC->XlatePen); + } + pDC->XlatePen = XlateObj; + + DC_UnlockDc(pDC); + + return hOrgPen; +} WORD STDCALL IntGdiSetHookFlags(HDC hDC, WORD Flags) Modified: trunk/reactos/subsystems/win32/win32k/stubs/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/st… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/stubs/stubs.c (original) +++ trunk/reactos/subsystems/win32/win32k/stubs/stubs.c Fri Nov 30 05:05:03 2007 @@ -3031,58 +3031,6 @@ */ HBITMAP APIENTRY -NtGdiSelectBitmap( - IN HDC hdc, - IN HBITMAP hbm) -{ - UNIMPLEMENTED; - return NULL; -} - - /* - * @unimplemented - */ -HBRUSH -APIENTRY -NtGdiSelectBrush( - IN HDC hdc, - IN HBRUSH hbrush) -{ - UNIMPLEMENTED; - return NULL; -} - - /* - * @unimplemented - */ -HFONT -APIENTRY -NtGdiSelectFont( - IN HDC hdc, - IN HFONT hf) -{ - UNIMPLEMENTED; - return NULL; -} - - /* - * @unimplemented - */ -HPEN -APIENTRY -NtGdiSelectPen( - IN HDC hdc, - IN HPEN hpen) -{ - UNIMPLEMENTED; - return NULL; -} - - /* - * @unimplemented - */ -HBITMAP -APIENTRY NtGdiSetBitmapAttributes( IN HBITMAP hbm, IN DWORD dwFlags)

1 0

[tkreuzer] 30904: - another test for NtGdiBitBlt - Add tests for NtGdiSelectBitmap, NtGdiSelectBrush, NtGdiSelectFont and NtGdiSelectPen
by tkreuzer＠svn.reactos.org 30 Nov '07

30 Nov '07

Author: tkreuzer Date: Fri Nov 30 03:09:28 2007 New Revision: 30904 URL: http://svn.reactos.org/svn/reactos?rev=30904&view=rev Log: - another test for NtGdiBitBlt - Add tests for NtGdiSelectBitmap, NtGdiSelectBrush, NtGdiSelectFont and NtGdiSelectPen Added: trunk/rostests/apitests/w32knapi/ntgdi/NtGdiSelectBitmap.c (with props) trunk/rostests/apitests/w32knapi/ntgdi/NtGdiSelectBrush.c (with props) trunk/rostests/apitests/w32knapi/ntgdi/NtGdiSelectFont.c (with props) trunk/rostests/apitests/w32knapi/ntgdi/NtGdiSelectPen.c (with props) Modified: trunk/rostests/apitests/w32knapi/ntgdi/NtGdiBitBlt.c trunk/rostests/apitests/w32knapi/testlist.c Modified: trunk/rostests/apitests/w32knapi/ntgdi/NtGdiBitBlt.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/w32knapi/ntgdi/N… ============================================================================== --- trunk/rostests/apitests/w32knapi/ntgdi/NtGdiBitBlt.c (original) +++ trunk/rostests/apitests/w32knapi/ntgdi/NtGdiBitBlt.c Fri Nov 30 03:09:28 2007 @@ -3,6 +3,12 @@ Test_NtGdiBitBlt(PTESTINFO pti) { BOOL bRet; + + /* Test NULL dc */ + SetLastError(ERROR_SUCCESS); + bRet = NtGdiBitBlt((HDC)0, 0, 0, 10, 10, (HDC)0, 10, 10, SRCCOPY, 0, 0); + TEST(bRet == FALSE); + TEST(GetLastError() == ERROR_SUCCESS); /* Test invalid dc */ SetLastError(ERROR_SUCCESS); Added: trunk/rostests/apitests/w32knapi/ntgdi/NtGdiSelectBitmap.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/w32knapi/ntgdi/N… ============================================================================== --- trunk/rostests/apitests/w32knapi/ntgdi/NtGdiSelectBitmap.c (added) +++ trunk/rostests/apitests/w32knapi/ntgdi/NtGdiSelectBitmap.c Fri Nov 30 03:09:28 2007 @@ -1,0 +1,49 @@ +INT +Test_NtGdiSelectBitmap(PTESTINFO pti) +{ + HDC hDC; + HBITMAP hBmp, hOldBmp; + + hDC = CreateCompatibleDC(GetDC(NULL)); + ASSERT(hDC); + + hBmp = CreateBitmap(2,2,1,1,NULL); + + /* Test NULL DC */ + SetLastError(ERROR_SUCCESS); + hOldBmp = NtGdiSelectBitmap(NULL, hBmp); + TEST(hOldBmp == NULL); + TEST(GetLastError() == ERROR_SUCCESS); + + /* Test invalid DC */ + SetLastError(ERROR_SUCCESS); + hOldBmp = NtGdiSelectBitmap((HDC)((ULONG_PTR)hDC & 0x0000ffff), hBmp); + TEST(hOldBmp == NULL); + TEST(GetLastError() == ERROR_SUCCESS); + + /* Test NULL bitmap */ + SetLastError(ERROR_SUCCESS); + hOldBmp = NtGdiSelectBitmap(hDC, NULL); + TEST(hOldBmp == NULL); + TEST(GetLastError() == ERROR_SUCCESS); + + /* Test NULL bitmap */ + SetLastError(ERROR_SUCCESS); + hOldBmp = NtGdiSelectBitmap(hDC, (HBITMAP)((ULONG_PTR)hBmp & 0x0000ffff)); + TEST(hOldBmp == NULL); + TEST(GetLastError() == ERROR_SUCCESS); + + /* Test invalid bitmap */ + SetLastError(ERROR_SUCCESS); + hOldBmp = NtGdiSelectBitmap(hDC, hBmp); + TEST(hOldBmp != NULL); + hOldBmp = NtGdiSelectBitmap(hDC, hOldBmp); + TEST(hOldBmp == hBmp); + TEST(GetLastError() == ERROR_SUCCESS); + + DeleteObject(hBmp); + DeleteDC(hDC); + + return APISTATUS_NORMAL; +} + Propchange: trunk/rostests/apitests/w32knapi/ntgdi/NtGdiSelectBitmap.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rostests/apitests/w32knapi/ntgdi/NtGdiSelectBrush.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/w32knapi/ntgdi/N… ============================================================================== --- trunk/rostests/apitests/w32knapi/ntgdi/NtGdiSelectBrush.c (added) +++ trunk/rostests/apitests/w32knapi/ntgdi/NtGdiSelectBrush.c Fri Nov 30 03:09:28 2007 @@ -1,0 +1,47 @@ +INT +Test_NtGdiSelectBrush(PTESTINFO pti) +{ + HDC hDC; + HBRUSH hBrush, hOldBrush; + + hDC = CreateDCW(L"DISPLAY", NULL, NULL, NULL); + + hBrush = GetStockObject(GRAY_BRUSH); + + /* Test NULL DC */ + SetLastError(ERROR_SUCCESS); + hOldBrush = NtGdiSelectBrush(NULL, hBrush); + TEST(hOldBrush == NULL); + TEST(GetLastError() == ERROR_SUCCESS); + + /* Test invalid DC */ + SetLastError(ERROR_SUCCESS); + hOldBrush = NtGdiSelectBrush((HDC)((ULONG_PTR)hDC & 0x0000ffff), hBrush); + TEST(hOldBrush == NULL); + TEST(GetLastError() == ERROR_SUCCESS); + + /* Test NULL brush */ + SetLastError(ERROR_SUCCESS); + hOldBrush = NtGdiSelectBrush(hDC, NULL); + TEST(hOldBrush == NULL); + TEST(GetLastError() == ERROR_SUCCESS); + + /* Test invalid brush */ + SetLastError(ERROR_SUCCESS); + hOldBrush = NtGdiSelectBrush(hDC, (HBRUSH)((ULONG_PTR)hBrush & 0x0000ffff)); + TEST(hOldBrush == NULL); + TEST(GetLastError() == ERROR_SUCCESS); + + SetLastError(ERROR_SUCCESS); + hOldBrush = NtGdiSelectBrush(hDC, hBrush); + TEST(hOldBrush != NULL); + hOldBrush = NtGdiSelectBrush(hDC, hOldBrush); + TEST(hOldBrush == hBrush); + TEST(GetLastError() == ERROR_SUCCESS); + + + DeleteDC(hDC); + + return APISTATUS_NORMAL; +} + Propchange: trunk/rostests/apitests/w32knapi/ntgdi/NtGdiSelectBrush.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rostests/apitests/w32knapi/ntgdi/NtGdiSelectFont.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/w32knapi/ntgdi/N… ============================================================================== --- trunk/rostests/apitests/w32knapi/ntgdi/NtGdiSelectFont.c (added) +++ trunk/rostests/apitests/w32knapi/ntgdi/NtGdiSelectFont.c Fri Nov 30 03:09:28 2007 @@ -1,0 +1,47 @@ +INT +Test_NtGdiSelectFont(PTESTINFO pti) +{ + HDC hDC; + HFONT hFont, hOldFont; + + hDC = CreateDCW(L"DISPLAY", NULL, NULL, NULL); + + hFont = GetStockObject(DEFAULT_GUI_FONT); + + /* Test NULL DC */ + SetLastError(ERROR_SUCCESS); + hOldFont = NtGdiSelectFont(NULL, hFont); + TEST(hOldFont == NULL); + TEST(GetLastError() == ERROR_SUCCESS); + + /* Test invalid DC */ + SetLastError(ERROR_SUCCESS); + hOldFont = NtGdiSelectFont((HDC)((ULONG_PTR)hDC & 0x0000ffff), hFont); + TEST(hOldFont == NULL); + TEST(GetLastError() == ERROR_SUCCESS); + + /* Test NULL font */ + SetLastError(ERROR_SUCCESS); + hOldFont = NtGdiSelectFont(hDC, NULL); + TEST(hOldFont == NULL); + TEST(GetLastError() == ERROR_SUCCESS); + + /* Test invalid font */ + SetLastError(ERROR_SUCCESS); + hOldFont = NtGdiSelectFont(hDC, (HFONT)((ULONG_PTR)hFont & 0x0000ffff)); + TEST(hOldFont == NULL); + TEST(GetLastError() == ERROR_SUCCESS); + + SetLastError(ERROR_SUCCESS); + hOldFont = NtGdiSelectFont(hDC, hFont); + TEST(hOldFont != NULL); + hOldFont = NtGdiSelectFont(hDC, hOldFont); + TEST(hOldFont == hFont); + TEST(GetLastError() == ERROR_SUCCESS); + + + DeleteDC(hDC); + + return APISTATUS_NORMAL; +} + Propchange: trunk/rostests/apitests/w32knapi/ntgdi/NtGdiSelectFont.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rostests/apitests/w32knapi/ntgdi/NtGdiSelectPen.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/w32knapi/ntgdi/N… ============================================================================== --- trunk/rostests/apitests/w32knapi/ntgdi/NtGdiSelectPen.c (added) +++ trunk/rostests/apitests/w32knapi/ntgdi/NtGdiSelectPen.c Fri Nov 30 03:09:28 2007 @@ -1,0 +1,46 @@ +INT +Test_NtGdiSelectPen(PTESTINFO pti) +{ + HDC hDC; + HPEN hPen, hOldPen; + + hDC = CreateDCW(L"DISPLAY", NULL, NULL, NULL); + + hPen = GetStockObject(WHITE_PEN); + + /* Test NULL DC */ + SetLastError(ERROR_SUCCESS); + hOldPen = NtGdiSelectPen(NULL, hPen); + TEST(hOldPen == NULL); + TEST(GetLastError() == ERROR_SUCCESS); + + /* Test invalid DC */ + SetLastError(ERROR_SUCCESS); + hOldPen = NtGdiSelectPen((HDC)((ULONG_PTR)hDC & 0x0000ffff), hPen); + TEST(hOldPen == NULL); + TEST(GetLastError() == ERROR_SUCCESS); + + /* Test NULL pen */ + SetLastError(ERROR_SUCCESS); + hOldPen = NtGdiSelectPen(hDC, NULL); + TEST(hOldPen == NULL); + TEST(GetLastError() == ERROR_SUCCESS); + + /* Test NULL pen */ + SetLastError(ERROR_SUCCESS); + hOldPen = NtGdiSelectPen(hDC, (HPEN)((ULONG_PTR)hPen & 0x0000ffff)); + TEST(hOldPen == NULL); + TEST(GetLastError() == ERROR_SUCCESS); + + SetLastError(ERROR_SUCCESS); + hOldPen = NtGdiSelectPen(hDC, hPen); + TEST(hOldPen != NULL); + hOldPen = NtGdiSelectPen(hDC, hOldPen); + TEST(hOldPen == hPen); + TEST(GetLastError() == ERROR_SUCCESS); + + + DeleteDC(hDC); + + return APISTATUS_NORMAL; +} Propchange: trunk/rostests/apitests/w32knapi/ntgdi/NtGdiSelectPen.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/rostests/apitests/w32knapi/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/w32knapi/testlis… ============================================================================== --- trunk/rostests/apitests/w32knapi/testlist.c (original) +++ trunk/rostests/apitests/w32knapi/testlist.c Fri Nov 30 03:09:28 2007 @@ -16,6 +16,10 @@ #include "ntgdi/NtGdiEnumFontOpen.c" #include "ntgdi/NtGdiGetBitmapBits.c" #include "ntgdi/NtGdiGetRandomRgn.c" +#include "ntgdi/NtGdiSelectBitmap.c" +#include "ntgdi/NtGdiSelectBrush.c" +#include "ntgdi/NtGdiSelectFont.c" +#include "ntgdi/NtGdiSelectPen.c" #include "ntgdi/NtGdiSetBitmapBits.c" //#include "ntgdi/NtGdiSTROBJ_vEnumStart.c" #include "ntgdi/NtGdiGetDIBits.c" @@ -46,6 +50,10 @@ { L"NtGdiGetBitmapBits", Test_NtGdiGetBitmapBits }, { L"NtGdiGetRandomRgn", Test_NtGdiGetRandomRgn }, { L"NtGdiSetBitmapBits", Test_NtGdiSetBitmapBits }, + { L"NtGdiSelectBitmap", Test_NtGdiSelectBitmap }, + { L"NtGdiSelectBrush", Test_NtGdiSelectBrush }, + { L"NtGdiSelectFont", Test_NtGdiSelectFont }, + { L"NtGdiSelectPen", Test_NtGdiSelectPen }, // { L"NtGdiSTROBJ_vEnumStart", Test_NtGdiSTROBJ_vEnumStart }, { L"NtGdiGetDIBitsInternal", Test_NtGdiGetDIBitsInternal },

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