Ros-diffs

ros-diffs@reactos.org

81390 discussions

[dreimer] 28271: Add some more locations of files to kill. Thx to Pierre Schweitzer for showing me.
by dreimer＠svn.reactos.org 10 Aug '07

10 Aug '07

Author: dreimer Date: Fri Aug 10 13:18:27 2007 New Revision: 28271 URL: http://svn.reactos.org/svn/reactos?rev=28271&view=rev Log: Add some more locations of files to kill. Thx to Pierre Schweitzer for showing me. Modified: trunk/tools/RosBE-Windows/Root/Clean.cmd Modified: trunk/tools/RosBE-Windows/Root/Clean.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Root/Clean.cmd… ============================================================================== --- trunk/tools/RosBE-Windows/Root/Clean.cmd (original) +++ trunk/tools/RosBE-Windows/Root/Clean.cmd Fri Aug 10 13:18:27 2007 @@ -80,14 +80,18 @@ del /f "dll\win32\comdlg32\hdisk.ico" 1> NUL 2> NUL del /f "dll\ntdll\napi.S" 1> NUL 2> NUL + del /f "dll\ntdll\i386\napi.S" 1> NUL 2> NUL del /f "dll\win32\gdi32\misc\win32k.S" 1> NUL 2> NUL + del /f "dll\win32\gdi32\misc\i386\win32k.S" 1> NUL 2> NUL del /f "dll\win32\kernel32\errcodes.rc" 1> NUL 2> NUL del /f "dll\win32\user32\misc\win32k.S" 1> NUL 2> NUL + del /f "dll\win32\user32\misc\i386\win32k.S" 1> NUL 2> NUL del /f "include\reactos\bugcodes.h" 1> NUL 2> NUL del /f "include\reactos\buildno.h" 1> NUL 2> NUL del /f "include\reactos\errcodes.h" 1> NUL 2> NUL del /f "ntoskrnl\bugcodes.rc" 1> NUL 2> NUL del /f "ntoskrnl\ex\zw.S" 1> NUL 2> NUL + del /f "ntoskrnl\ex\i386\zw.S" 1> NUL 2> NUL del /f "ntoskrnl\include\internal\napi.h" 1> NUL 2> NUL del /f "subsystems\win32\win32k\dib\dib16gen.c" 1> NUL 2> NUL del /f "subsystems\win32\win32k\dib\dib32gen.c" 1> NUL 2> NUL

1 0

[jimtabor] 28270: - Removed NtGdiLPTODP/DPTOLP from w32ksvc.db and updated ntgdibad.h. - Connected the gdi32 parts.
by jimtabor＠svn.reactos.org 10 Aug '07

10 Aug '07

Author: jimtabor Date: Fri Aug 10 11:39:46 2007 New Revision: 28270 URL: http://svn.reactos.org/svn/reactos?rev=28270&view=rev Log: - Removed NtGdiLPTODP/DPTOLP from w32ksvc.db and updated ntgdibad.h. - Connected the gdi32 parts. Modified: trunk/reactos/dll/win32/gdi32/gdi32.def trunk/reactos/dll/win32/gdi32/objects/coord.c trunk/reactos/include/reactos/win32k/ntgdibad.h trunk/reactos/subsystems/win32/win32k/objects/coord.c trunk/reactos/subsystems/win32/win32k/w32ksvc.db Modified: trunk/reactos/dll/win32/gdi32/gdi32.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/gdi32.def?… ============================================================================== --- trunk/reactos/dll/win32/gdi32/gdi32.def (original) +++ trunk/reactos/dll/win32/gdi32/gdi32.def Fri Aug 10 11:39:46 2007 @@ -89,7 +89,7 @@ CreateScalableFontResourceA@16 CreateScalableFontResourceW@16 CreateSolidBrush@4 -DPtoLP@12=NtGdiDPtoLP@12 +DPtoLP@12 DeleteColorSpace@4 DeleteDC@4=NtGdiDeleteObjectApp@4 DeleteEnhMetaFile@4 @@ -464,7 +464,7 @@ HT_Get8BPPMaskPalette@24 IntersectClipRect@20=NtGdiIntersectClipRect@20 InvertRgn@8=NtGdiInvertRgn@8 -LPtoDP@12=NtGdiLPtoDP@12 +LPtoDP@12 LineDDA@24 LineTo@12=NtGdiLineTo@12 MaskBlt@48 Modified: trunk/reactos/dll/win32/gdi32/objects/coord.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/objects/co… ============================================================================== --- trunk/reactos/dll/win32/gdi32/objects/coord.c (original) +++ trunk/reactos/dll/win32/gdi32/objects/coord.c Fri Aug 10 11:39:46 2007 @@ -103,7 +103,7 @@ PAGE_EXTENTS_CHANGED | // do processing in kernel space. WORLD_XFORM_CHANGED ) #endif - return NtGdiTransformPoints( hDC, Points, Points, Count, 0); // Last is 0 or 2 + return NtGdiTransformPoints( hDC, Points, Points, Count, GdiDpToLp); // DPtoLP mode. #if 0 else { @@ -129,7 +129,7 @@ PAGE_EXTENTS_CHANGED | WORLD_XFORM_CHANGED ) #endif - return NtGdiTransformPoints( hDC, Points, Points, Count, 0); + return NtGdiTransformPoints( hDC, Points, Points, Count, GdiLpToDp); // LPtoDP mode #if 0 else { 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 Fri Aug 10 11:39:46 2007 @@ -184,15 +184,6 @@ INT Count, INT PolyFillMode); -/* Use NtGdiTransformPoints with GdiDpToLp. */ -BOOL -STDCALL -NtGdiDPtoLP ( - HDC hDC, - LPPOINT Points, - int Count - ); - /* Meta are user-mode. */ BOOL STDCALL @@ -493,15 +484,6 @@ NtGdiGetWorldTransform ( HDC hDC, LPXFORM Xform - ); - -/* Use NtGdiTransformPoints with GdiDpToLp */ -BOOL -STDCALL -NtGdiLPtoDP ( - HDC hDC, - LPPOINT Points, - int Count ); /* Needs to be done in user-mode. */ Modified: trunk/reactos/subsystems/win32/win32k/objects/coord.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/coord.c (original) +++ trunk/reactos/subsystems/win32/win32k/objects/coord.c Fri Aug 10 11:39:46 2007 @@ -157,99 +157,6 @@ CoordDPtoLP ( dc, &Points[i] ); } -/*! - * Converts points from device coordinates into logical coordinates. Conversion depends on the mapping mode, - * world transfrom, viewport origin settings for the given device context. - * \param hDC device context. - * \param Points an array of POINT structures (in/out). - * \param Count number of elements in the array of POINT structures. - * \return TRUE if success. -*/ -BOOL STDCALL -NtGdiDPtoLP(HDC hDC, - LPPOINT UnsafePoints, - int Count) -{ - PDC dc; - NTSTATUS Status = STATUS_SUCCESS; - LPPOINT Points; - ULONG Size; - - dc = DC_LockDc(hDC); - if (!dc) - { - SetLastWin32Error(ERROR_INVALID_HANDLE); - return FALSE; - } - - if (!UnsafePoints || Count <= 0) - { - DC_UnlockDc(dc); - SetLastWin32Error(ERROR_INVALID_PARAMETER); - return FALSE; - } - - Size = Count * sizeof(POINT); - - Points = (LPPOINT)ExAllocatePoolWithTag(PagedPool, Size, TAG_COORD); - if(!Points) - { - DC_UnlockDc(dc); - SetLastWin32Error(ERROR_NOT_ENOUGH_MEMORY); - return FALSE; - } - - _SEH_TRY - { - ProbeForWrite(UnsafePoints, - Size, - 1); - RtlCopyMemory(Points, - UnsafePoints, - Size); - } - _SEH_HANDLE - { - Status = _SEH_GetExceptionCode(); - } - _SEH_END; - - if(!NT_SUCCESS(Status)) - { - DC_UnlockDc(dc); - ExFreePool(Points); - SetLastNtError(Status); - return FALSE; - } - - IntDPtoLP(dc, Points, Count); - - _SEH_TRY - { - /* pointer was already probed! */ - RtlCopyMemory(UnsafePoints, - Points, - Size); - } - _SEH_HANDLE - { - Status = _SEH_GetExceptionCode(); - } - _SEH_END; - - if(!NT_SUCCESS(Status)) - { - DC_UnlockDc(dc); - ExFreePool(Points); - SetLastNtError(Status); - return FALSE; - } - - DC_UnlockDc(dc); - ExFreePool(Points); - return TRUE; -} - int FASTCALL IntGetGraphicsMode ( PDC dc ) @@ -390,8 +297,13 @@ * \param Count number of elements in the array of POINT structures. * \return TRUE if success. */ -BOOL STDCALL -NtGdiLPtoDP ( HDC hDC, LPPOINT UnsafePoints, INT Count ) +BOOL +APIENTRY +NtGdiTransformPoints( HDC hDC, + PPOINT UnsafePtsIn, + PPOINT UnsafePtOut, + INT Count, + INT iMode ) { PDC dc; NTSTATUS Status = STATUS_SUCCESS; @@ -405,7 +317,7 @@ return FALSE; } - if (!UnsafePoints || Count <= 0) + if (!UnsafePtsIn || !UnsafePtOut || Count <= 0) { DC_UnlockDc(dc); SetLastWin32Error(ERROR_INVALID_PARAMETER); @@ -424,11 +336,14 @@ _SEH_TRY { - ProbeForWrite(UnsafePoints, + ProbeForWrite(UnsafePtOut, + Size, + 1); + ProbeForRead(UnsafePtsIn, Size, 1); RtlCopyMemory(Points, - UnsafePoints, + UnsafePtsIn, Size); } _SEH_HANDLE @@ -445,12 +360,28 @@ return FALSE; } - IntLPtoDP(dc, Points, Count); + switch (iMode) + { + case GdiDpToLp: + IntDPtoLP(dc, Points, Count); + break; + case GdiLpToDp: + IntLPtoDP(dc, Points, Count); + break; + case 2: // Not supported yet. Need testing. + default: + { + DC_UnlockDc(dc); + ExFreePool(Points); + SetLastWin32Error(ERROR_INVALID_PARAMETER); + return FALSE; + } + } _SEH_TRY { /* pointer was already probed! */ - RtlCopyMemory(UnsafePoints, + RtlCopyMemory(UnsafePtOut, Points, Size); } @@ -471,19 +402,6 @@ DC_UnlockDc(dc); ExFreePool(Points); return TRUE; -} - - -BOOL -APIENTRY -NtGdiTransformPoints( HDC hdc, - PPOINT UnsafePtsIn, - PPOINT UnsafePtOut, - INT Count, - INT iMode ) -{ - UNIMPLEMENTED; - return FALSE; } BOOL 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 Fri Aug 10 11:39:46 2007 @@ -770,7 +770,6 @@ NtGdiCreatePolygonRgn 3 NtGdiCreatePolyPolygonRgn 4 NtGdiCreateScalableFontResource 4 -NtGdiDPtoLP 3 NtGdiDeleteEnhMetaFile 1 NtGdiDeleteObject 1 NtGdiEnumEnhMetaFile 5 @@ -816,7 +815,6 @@ NtGdiGetTextColor 1 NtGdiGetTextExtentPoint32 4 NtGdiGetWorldTransform 2 -NtGdiLPtoDP 3 NtGdiMoveToEx 4 NtGdiOffsetViewportOrgEx 4 NtGdiOffsetWindowOrgEx 4

1 0

[jimtabor] 28269: Needed the w32ksvc.db too.
by jimtabor＠svn.reactos.org 10 Aug '07

10 Aug '07

Author: jimtabor Date: Fri Aug 10 10:55:18 2007 New Revision: 28269 URL: http://svn.reactos.org/svn/reactos?rev=28269&view=rev Log: Needed the w32ksvc.db too. Modified: trunk/reactos/subsystems/win32/win32k/w32ksvc.db 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 Fri Aug 10 10:55:18 2007 @@ -821,7 +821,6 @@ NtGdiOffsetViewportOrgEx 4 NtGdiOffsetWindowOrgEx 4 NtGdiPaintRgn 2 -NtGdiPie 9 NtGdiPlayEnhMetaFile 3 NtGdiPlayEnhMetaFileRecord 4 NtGdiPolyBezier 3

1 0

[jimtabor] 28268: - Removed NtGdiPie from w32ksvc.db, leaving NtGdiPie in fillshap.c and updated ntgdibad.h. - Separated printing.c to printing.c and coord.c. This was for LP to DP. - Fixed flags.
by jimtabor＠svn.reactos.org 10 Aug '07

10 Aug '07

Author: jimtabor Date: Fri Aug 10 10:47:00 2007 New Revision: 28268 URL: http://svn.reactos.org/svn/reactos?rev=28268&view=rev Log: - Removed NtGdiPie from w32ksvc.db, leaving NtGdiPie in fillshap.c and updated ntgdibad.h. - Separated printing.c to printing.c and coord.c. This was for LP to DP. - Fixed flags. Added: trunk/reactos/dll/win32/gdi32/objects/coord.c - copied, changed from r28266, trunk/reactos/dll/win32/gdi32/objects/painting.c Modified: trunk/reactos/dll/win32/gdi32/gdi32.def trunk/reactos/dll/win32/gdi32/gdi32.rbuild trunk/reactos/dll/win32/gdi32/objects/arc.c trunk/reactos/dll/win32/gdi32/objects/painting.c trunk/reactos/include/reactos/win32k/ntgdibad.h trunk/reactos/include/reactos/win32k/ntgdihdl.h Modified: trunk/reactos/dll/win32/gdi32/gdi32.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/gdi32.def?… ============================================================================== --- trunk/reactos/dll/win32/gdi32/gdi32.def (original) +++ trunk/reactos/dll/win32/gdi32/gdi32.def Fri Aug 10 10:47:00 2007 @@ -485,7 +485,7 @@ PATHOBJ_vGetBounds@8 PolyPatBlt@20=NtGdiPolyPatBlt@20 PathToRegion@4 -Pie@36=NtGdiPie@36 +Pie@36 PlayEnhMetaFile@12 PlayEnhMetaFileRecord@16 PlayMetaFile@8 Modified: trunk/reactos/dll/win32/gdi32/gdi32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/gdi32.rbui… ============================================================================== --- trunk/reactos/dll/win32/gdi32/gdi32.rbuild (original) +++ trunk/reactos/dll/win32/gdi32/gdi32.rbuild Fri Aug 10 10:47:00 2007 @@ -30,6 +30,7 @@ <file>arc.c</file> <file>bitmap.c</file> <file>brush.c</file> + <file>coord.c</file> <file>dc.c</file> <file>enhmfile.c</file> <file>font.c</file> Modified: trunk/reactos/dll/win32/gdi32/objects/arc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/objects/ar… ============================================================================== --- trunk/reactos/dll/win32/gdi32/objects/arc.c (original) +++ trunk/reactos/dll/win32/gdi32/objects/arc.c Fri Aug 10 10:47:00 2007 @@ -148,7 +148,6 @@ } -#if 0 /* * @unimplemented */ @@ -166,6 +165,7 @@ int a8 ) { +#if 0 // Handle something other than a normal dc object. if (GDI_HANDLE_GET_TYPE(hDC) != GDI_OBJECT_TYPE_DC) { @@ -187,7 +187,8 @@ return FALSE; } } +#endif return NtGdiArcInternal(GdiTypePie, hDC, a1, a2, a3, a4, a5, a6, a7, a8); } -#endif + Copied: trunk/reactos/dll/win32/gdi32/objects/coord.c (from r28266, trunk/reactos/dll/win32/gdi32/objects/painting.c) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/objects/co… ============================================================================== --- trunk/reactos/dll/win32/gdi32/objects/painting.c (original) +++ trunk/reactos/dll/win32/gdi32/objects/coord.c Fri Aug 10 10:47:00 2007 @@ -140,677 +140,3 @@ #endif } -#if 0 /* FIXME: enable this as soon as we have working usermode gdi */ - -// Will move to dc.c -HGDIOBJ -STDCALL -GetDCObject( HDC hDC, INT iType) -{ - - if((iType == GDI_OBJECT_TYPE_BRUSH) || - (iType == GDI_OBJECT_TYPE_EXTPEN)|| - (iType == GDI_OBJECT_TYPE_PEN) || - (iType == GDI_OBJECT_TYPE_COLORSPACE)) - { - HGDIOBJ hGO; - PDC_ATTR Dc_Attr; - - if (!GdiGetHandleUserData((HGDIOBJ) hDC, (PVOID) &Dc_Attr)) return NULL; - - switch (iType) - { - case GDI_OBJECT_TYPE_BRUSH: - hGO = Dc_Attr->hbrush; - break; - - case GDI_OBJECT_TYPE_EXTPEN: - case GDI_OBJECT_TYPE_PEN: - hGO = Dc_Attr->hpen; - break; - - case GDI_OBJECT_TYPE_COLORSPACE: - hGO = Dc_Attr->hColorSpace; - break; - } - return hGO; - } - return NtGdiGetDCObject( hDC, iType ); -} - - -BOOL -STDCALL -LineTo( HDC hDC, INT x, INT y ) -{ -// Handle something other than a normal dc object. - if (GDI_HANDLE_GET_TYPE(hDC) != GDI_OBJECT_TYPE_DC) - { - if (GDI_HANDLE_GET_TYPE(hDC) == GDI_OBJECT_TYPE_METADC) - return MFDRV_MetaParam2( hDC, META_LINETO, x, y); - else - { - PLDC pLDC = GdiGetLDC(hDC); - if ( !pLDC ) - { - SetLastError(ERROR_INVALID_HANDLE); - return FALSE; - } - if (pLDC->iType == LDC_EMFLDC) - { - return MFDRV_LineTo( hDC, x, y ) - } - return FALSE; - } - } - return NtGdiLineTo( hDC, x, y); -} - - -BOOL -STDCALL -MoveToEx( HDC hDC, INT x, INT y, LPPOINT Point ) -{ - PDC_ATTR Dc_Attr; - - if (!GdiGetHandleUserData((HGDIOBJ) hDC, (PVOID) &Dc_Attr)) return FALSE; - - if (GDI_HANDLE_GET_TYPE(hDC) != GDI_OBJECT_TYPE_DC) - { - if (GDI_HANDLE_GET_TYPE(hDC) == GDI_OBJECT_TYPE_METADC) - return MFDRV_MetaParam2( hDC, META_MOVETO, x, y); - else - { - PLDC pLDC = Dc_Attr->pvLDC; - if ( !pLDC ) - { - SetLastError(ERROR_INVALID_HANDLE); - return FALSE; - } - if (pLDC->iType == LDC_EMFLDC) - { - if (!EMFDRV_MoveTo( hDC, x, y)) return FALSE; - } - } - } - - if ( Point ) - { - if ( Dc_Attr->ulDirty_ & DIRTY_PTLCURRENT ) // Double hit! - { - Point->x = Dc_Attr->ptfxCurrent.x; // ret prev before change. - Point->y = Dc_Attr->ptfxCurrent.y; - DPtoLP ( hDC, Point, 1); // reconvert back. - } - else - { - Point->x = Dc_Attr->ptlCurrent.x; - Point->y = Dc_Attr->ptlCurrent.y; - } - } - - Dc_Attr->ptlCurrent.x = x; - Dc_Attr->ptlCurrent.y = y; - - Dc_Attr->ulDirty_ |= ( DIRTY_PTLCURRENT|DIRTY_STYLESTATE); // Set dirty - return TRUE; -} - - -BOOL -STDCALL -Ellipse(HDC hDC, INT Left, INT Top, INT Right, INT Bottom) -{ -// Handle something other than a normal dc object. - if (GDI_HANDLE_GET_TYPE(hDC) != GDI_OBJECT_TYPE_DC) - { - if (GDI_HANDLE_GET_TYPE(hDC) == GDI_OBJECT_TYPE_METADC) - return MFDRV_MetaParam4(hDC, META_ELLIPSE, Left, Top, Right, Bottom ); - else - { - PLDC pLDC = GdiGetLDC(hDC); - if ( !pLDC ) - { - SetLastError(ERROR_INVALID_HANDLE); - return FALSE; - } - if (pLDC->iType == LDC_EMFLDC) - { - return EMFDRV_Ellipse( hDC, Left, Top, Right, Bottom ); - } - return FALSE; - } - } - return NtGdiEllipse( hDC, Left, Top, Right, Bottom); -} - - -BOOL -STDCALL -Rectangle(HDC, INT Left, INT Top, INT Right, INT Bottom) -{ -// Handle something other than a normal dc object. - if (GDI_HANDLE_GET_TYPE(hDC) != GDI_OBJECT_TYPE_DC) - { - if (GDI_HANDLE_GET_TYPE(hDC) == GDI_OBJECT_TYPE_METADC) - return MFDRV_MetaParam4(hDC, META_RECTANGLE, Left, Top, Right, Bottom ); - else - { - PLDC pLDC = GdiGetLDC(hDC); - if ( !pLDC ) - { - SetLastError(ERROR_INVALID_HANDLE); - return FALSE; - } - if (pLDC->iType == LDC_EMFLDC) - { - return EMFDRV_Rectangle( hDC, Left, Top, Right, Bottom ); - } - return FALSE; - } - } - return NtGdiRectangle( hDC, Left, Top, Right, Bottom); -} - - -BOOL -STDCALL -RoundRect(HDC, INT Left, INT Top, INT Right, INT Bottom, - INT ell_Width, INT ell_Height) -{ -// Handle something other than a normal dc object. - if (GDI_HANDLE_GET_TYPE(hDC) != GDI_OBJECT_TYPE_DC) - { - if (GDI_HANDLE_GET_TYPE(hDC) == GDI_OBJECT_TYPE_METADC) - return MFDRV_MetaParam6( hDC, META_ROUNDRECT, Left, Top, Right, Bottom, - ell_Width, ell_Height ); - else - { - PLDC pLDC = GdiGetLDC(hDC); - if ( !pLDC ) - { - SetLastError(ERROR_INVALID_HANDLE); - return FALSE; - } - if (pLDC->iType == LDC_EMFLDC) - { - return EMFDRV_RoundRect( hDC, Left, Top, Right, Bottom, - ell_Width, ell_Height ); - } - return FALSE; - } - } - return NtGdiRoundRect( hDc, Left, Top, Right, Bottom, ell_Width, ell_Height); -} - - -COLORREF -STDCALL -GetPixel( HDC hDC, INT x, INT y ) -{ - if (GDI_HANDLE_GET_TYPE(hDC) != GDI_OBJECT_TYPE_DC) return CLR_INVALID; - if (!GdiIsHandleValid((HGDIOBJ) hDC)) return CLR_INVALID; - return NtGdiGetPixel( hDC, x, y); -} - - -COLORREF -STDCALL -SetPixel( HDC hDC, INT x, INT y, COLORREF Color ) -{ -// Handle something other than a normal dc object. - if (GDI_HANDLE_GET_TYPE(hDC) != GDI_OBJECT_TYPE_DC) - { - if (GDI_HANDLE_GET_TYPE(hDC) == GDI_OBJECT_TYPE_METADC) - return MFDRV_MetaParam4(hDC, META_SETPIXEL, x, y, HIWORD(Color), - LOWORD(Color)); - else - { - PLDC pLDC = GdiGetLDC(hDC); - if ( !pLDC ) - { - SetLastError(ERROR_INVALID_HANDLE); - return 0; - } - if (pLDC->iType == LDC_EMFLDC) - { - return EMFDRV_SetPixel( hDC, x, y, Color ); - } - return 0; - } - } - return NtGdiSetPixel( hDC, x, y, Color); -} - - -BOOL -STDCALL -SetPixelV( HDC hDC, INT x, INT y, COLORREF Color ) -{ - COLORREF Cr = SetPixel( hDC, x, y, Color ); - if (Cr) return TRUE; - return FALSE; -} - - -BOOL -STDCALL -FillRgn( HDC hDC, HRGN hRgn, HBRUSH hBrush ) -{ - - if ( (!hRgn) || (!hBrush) ) return FALSE; - -// Handle something other than a normal dc object. - if (GDI_HANDLE_GET_TYPE(hDC) != GDI_OBJECT_TYPE_DC) - { - if (GDI_HANDLE_GET_TYPE(hDC) == GDI_OBJECT_TYPE_METADC) - return MFDRV_FillRgn( hDC, hRgn, hBrush); - else - { - PLDC pLDC = GdiGetLDC(hDC); - if ( !pLDC ) - { - SetLastError(ERROR_INVALID_HANDLE); - return FALSE; - } - if (pLDC->iType == LDC_EMFLDC) - { - return EMFDRV_FillRgn(( hDC, hRgn, hBrush); - } - return FALSE; - } - } - return NtGdiFillRgn( hDC, hRgn, hBrush); -} - - -BOOL -STDCALL -FrameRgn( HDC hDC, HRGN hRgn, HBRUSH hBrush, INT nWidth, INT nHeight ) -{ - - if ( (!hRgn) || (!hBrush) ) return FALSE; - -// Handle something other than a normal dc object. - if (GDI_HANDLE_GET_TYPE(hDC) != GDI_OBJECT_TYPE_DC) - { - if (GDI_HANDLE_GET_TYPE(hDC) == GDI_OBJECT_TYPE_METADC) - return MFDRV_FrameRgn( hDC, hRgn, hBrush, nWidth, nHeight ); - else - { - PLDC pLDC = GdiGetLDC(hDC); - if ( !pLDC ) - { - SetLastError(ERROR_INVALID_HANDLE); - return FALSE; - } - if (pLDC->iType == LDC_EMFLDC) - { - return EMFDRV_FrameRgn( hDC, hRgn, hBrush, nWidth, nHeight ); - } - return FALSE; - } - } - return NtGdiFrameRgn( hDC, hRgn, hBrush, nWidth, nHeight); -} - - -BOOL -STDCALL -InvertRgn( HDC hDC, HRGN hRgn ) -{ - - if ( !hRgn ) return FALSE; - -// Handle something other than a normal dc object. - if (GDI_HANDLE_GET_TYPE(hDC) != GDI_OBJECT_TYPE_DC) - { - if (GDI_HANDLE_GET_TYPE(hDC) == GDI_OBJECT_TYPE_METADC) - return MFDRV_InvertRgn( hDC, HRGN hRgn ); // Use this instead of MFDRV_MetaParam. - else - { - PLDC pLDC = GdiGetLDC(hDC); - if ( !pLDC ) - { - SetLastError(ERROR_INVALID_HANDLE); - return FALSE; - } - if (pLDC->iType == LDC_EMFLDC) - { - return EMFDRV_PaintInvertRgn( hDC, hRgn, EMR_INVERTRGN ); - } - return FALSE; - } - } - return NtGdiInvertRgn( hDC, hRgn); -} - -BOOL -STDCALL -PaintRgn( HDC hDC, HRGN hRgn ) -{ -// Handle something other than a normal dc object. - if (GDI_HANDLE_GET_TYPE(hDC) != GDI_OBJECT_TYPE_DC) - { - if (GDI_HANDLE_GET_TYPE(hDC) == GDI_OBJECT_TYPE_METADC) - return MFDRV_PaintRgn( hDC, HRGN hRgn ); // Use this instead of MFDRV_MetaParam. - else - { - PLDC pLDC = GdiGetLDC(hDC); - if ( !pLDC ) - { - SetLastError(ERROR_INVALID_HANDLE); - return FALSE; - } - if (pLDC->iType == LDC_EMFLDC) - { - return EMFDRV_PaintInvertRgn( hDC, hRgn, EMR_PAINTRGN ); - } - return FALSE; - } - } - // Could just use Dc_Attr->hbrush - HBRUSH hbrush = (HBRUSH) GetDCObject( hDC, GDI_OBJECT_TYPE_BRUSH); - - return NtGdiFillRgn( hDC, hRgn, hBrush); -} - - -BOOL -STDCALL -PolyBezier(HDC hDC ,const POINT* Point, DWORD cPoints) -{ -// Handle something other than a normal dc object. - if (GDI_HANDLE_GET_TYPE(hDC) != GDI_OBJECT_TYPE_DC) - { - if (GDI_HANDLE_GET_TYPE(hDC) == GDI_OBJECT_TYPE_METADC) - /* - * Since MetaFiles don't record Beziers and they don't even record - * approximations to them using lines. - */ - return FALSE; - else - { - PLDC pLDC = GdiGetLDC(hDC); - if ( !pLDC ) - { - SetLastError(ERROR_INVALID_HANDLE); - return FALSE; - } - if (pLDC->iType == LDC_EMFLDC) - { - return FALSE; // Not supported yet. - } - return FALSE; - } - } - return NtGdiPolyPolyDraw( hDC , Point, &cPoints, 1, GdiPolyBezier ); -} - - -BOOL -STDCALL -PolyBezierTo(HDC hDC, const POINT* Point ,DWORD cPoints) -{ -// Handle something other than a normal dc object. - if (GDI_HANDLE_GET_TYPE(hDC) != GDI_OBJECT_TYPE_DC) - { - if (GDI_HANDLE_GET_TYPE(hDC) == GDI_OBJECT_TYPE_METADC) - return FALSE; - else - { - PLDC pLDC = GdiGetLDC(hDC); - if ( !pLDC ) - { - SetLastError(ERROR_INVALID_HANDLE); - return FALSE; - } - if (pLDC->iType == LDC_EMFLDC) - { - return FALSE; // Not supported yet. - } - return FALSE; - } - } - return NtGdiPolyPolyDraw( hDC , Point, &cPoints, 1, GdiPolyBezierTo ); -} - - -BOOL -STDCALL -PolyDraw(HDC hDC, const POINT* Point, const BYTE *lpbTypes, int cCount ) -{ -// Handle something other than a normal dc object. - if (GDI_HANDLE_GET_TYPE(hDC) != GDI_OBJECT_TYPE_DC) - { - if (GDI_HANDLE_GET_TYPE(hDC) == GDI_OBJECT_TYPE_METADC) - return FALSE; - else - { - PLDC pLDC = GdiGetLDC(hDC); - if ( !pLDC ) - { - SetLastError(ERROR_INVALID_HANDLE); - return FALSE; - } - if (pLDC->iType == LDC_EMFLDC) - { - return FALSE; // Not supported yet. - } - return FALSE; - } - } - return NtGdiPolyDraw( hDC , Point, lpbTypes, cCount ); -} - - -BOOL -STDCALL -Polygon(HDC hDC, const POINT *Point, int Count) -{ -// Handle something other than a normal dc object. - if (GDI_HANDLE_GET_TYPE(hDC) != GDI_OBJECT_TYPE_DC) - { - if (GDI_HANDLE_GET_TYPE(hDC) == GDI_OBJECT_TYPE_METADC) - return MFDRV_Polygon( hDC, Point, Count ); - else - { - PLDC pLDC = GdiGetLDC(hDC); - if ( !pLDC ) - { - SetLastError(ERROR_INVALID_HANDLE); - return FALSE; - } - if (pLDC->iType == LDC_EMFLDC) - { - return EMFDRV_Polygon( hDC, Point, Count ); - } - return FALSE; - } - } - return NtGdiPolyPolyDraw( hDC , Point, &Count, 1, GdiPolygon ); -} - - -BOOL -STDCALL -Polyline(HDC hDC, const POINT *Point, int Count) -{ -// Handle something other than a normal dc object. - if (GDI_HANDLE_GET_TYPE(hDC) != GDI_OBJECT_TYPE_DC) - { - if (GDI_HANDLE_GET_TYPE(hDC) == GDI_OBJECT_TYPE_METADC) - return MFDRV_Polyline( hDC, Point, Count ); - else - { - PLDC pLDC = GdiGetLDC(hDC); - if ( !pLDC ) - { - SetLastError(ERROR_INVALID_HANDLE); - return FALSE; - } - if (pLDC->iType == LDC_EMFLDC) - { - return EMFDRV_Polyline( hDC, Point, Count ); - } - return FALSE; - } - } - return NtGdiPolyPolyDraw( hDC , Point, &Count, 1, GdiPolyPolyLine ); -} - - -BOOL -STDCALL -PolylineTo(HDC hDC, const POINT* Point, DWORD Count) -{ -// Handle something other than a normal dc object. - if (GDI_HANDLE_GET_TYPE(hDC) != GDI_OBJECT_TYPE_DC) - { - if (GDI_HANDLE_GET_TYPE(hDC) == GDI_OBJECT_TYPE_METADC) - return FALSE; - else - { - PLDC pLDC = GdiGetLDC(hDC); - if ( !pLDC ) - { - SetLastError(ERROR_INVALID_HANDLE); - return FALSE; - } - if (pLDC->iType == LDC_EMFLDC) - { - return FALSE; // Not supported yet. - } - return FALSE; - } - } - return NtGdiPolyPolyDraw( hDC , Point, &Count, 1, GdiPolyLineTo ); - -} - - -BOOL -STDCALL -PolyPolygon(HDC hDC, const POINT* Point, const INT* Count, int Polys) -{ -// Handle something other than a normal dc object. - if (GDI_HANDLE_GET_TYPE(hDC) != GDI_OBJECT_TYPE_DC) - { - if (GDI_HANDLE_GET_TYPE(hDC) == GDI_OBJECT_TYPE_METADC) - return MFDRV_PolyPolygon( hDC, Point, Count, Polys); - else - { - PLDC pLDC = GdiGetLDC(hDC); - if ( !pLDC ) - { - SetLastError(ERROR_INVALID_HANDLE); - return FALSE; - } - if (pLDC->iType == LDC_EMFLDC) - { - return EMFDRV_PolyPolygon( hDC, Point, Count, Polys ); - } - return FALSE; - } - } - return NtGdiPolyPolyDraw( hDC , Point, Count, Polys, GdiPolygon ); - -} - - -BOOL -STDCALL -PolyPolyline(HDC hDC, const POINT* Point, const DWORD* Counts, DWORD Polys) -{ -// Handle something other than a normal dc object. - if (GDI_HANDLE_GET_TYPE(hDC) != GDI_OBJECT_TYPE_DC) - { - if (GDI_HANDLE_GET_TYPE(hDC) == GDI_OBJECT_TYPE_METADC) - return FALSE; - else - { - PLDC pLDC = GdiGetLDC(hDC); - if ( !pLDC ) - { - SetLastError(ERROR_INVALID_HANDLE); - return FALSE; - } - if (pLDC->iType == LDC_EMFLDC) - { - return EMFDRV_PolyPolyline(hDC, Point, Counts, Polys); - } - return FALSE; - } - } - return NtGdiPolyPolyDraw( hDC , Point, Count, Polys, GdiPolyPolyLine ); -} -#endif - -BOOL -WINAPI -FloodFill( - HDC hDC, - int nXStart, - int nYStart, - COLORREF crFill) -{ - return NtGdiExtFloodFill(hDC, nXStart, nYStart, crFill, FLOODFILLBORDER); -} - -BOOL WINAPI -MaskBlt( - HDC hdcDest, - INT nXDest, - INT nYDest, - INT nWidth, - INT nHeight, - HDC hdcSrc, - INT nXSrc, - INT nYSrc, - HBITMAP hbmMask, - INT xMask, - INT yMask, - DWORD dwRop) -{ - return NtGdiMaskBlt(hdcDest, - nXDest, - nYDest, - nWidth, - nHeight, - hdcSrc, - nXSrc, - nYSrc, - hbmMask, - xMask, - yMask, - dwRop, - 0); -} - - -BOOL -WINAPI -PlgBlt( - HDC hdcDest, - const POINT *lpPoint, - HDC hdcSrc, - INT nXSrc, - INT nYSrc, - INT nWidth, - INT nHeight, - HBITMAP hbmMask, - INT xMask, - INT yMask) -{ - return NtGdiPlgBlt(hdcDest, - (LPPOINT)lpPoint, - hdcSrc, - nXSrc, - nYSrc, - nWidth, - nHeight, - hbmMask, - xMask, - yMask, - 0); -} Modified: trunk/reactos/dll/win32/gdi32/objects/painting.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/objects/pa… ============================================================================== --- trunk/reactos/dll/win32/gdi32/objects/painting.c (original) +++ trunk/reactos/dll/win32/gdi32/objects/painting.c Fri Aug 10 10:47:00 2007 @@ -1,144 +1,5 @@ #include "precomp.h" -/* the following deal with IEEE single-precision numbers */ -#define EXCESS 126L -#define SIGNBIT 0x80000000L -#define SIGN(fp) ((fp) & SIGNBIT) -#define EXP(fp) (((fp) >> 23L) & 0xFF) -#define MANT(fp) ((fp) & 0x7FFFFFL) -#define PACK(s,e,m) ((s) | ((e) << 23L) | (m)) - -// Sames as lrintf. -#ifdef __GNUC__ -#define FLOAT_TO_INT(in,out) \ - __asm__ __volatile__ ("fistpl %0" : "=m" (out) : "t" (in) : "st"); -#else -#define FLOAT_TO_INT(in,out) \ - __asm fld in \ - __asm fistp out -#endif - -LONG -FASTCALL -EFtoF( EFLOAT_S * efp) -{ - long Mant, Exp, Sign = 0; - - if (!efp->lMant) return 0; - - Mant = efp->lMant; - Exp = efp->lExp; - Sign = SIGN(Mant); - -//// M$ storage emulation - if( Sign ) Mant = -Mant; - Mant = ((Mant & 0x3fffffff) >> 7); - Exp += (EXCESS-1); -//// - Mant = MANT(Mant); - return PACK(Sign, Exp, Mant); -} - -VOID -FASTCALL -FtoEF( EFLOAT_S * efp, FLOATL f) -{ - long Mant, Exp, Sign = 0; - gxf_long worker; - -#ifdef _X86_ - worker.l = f; // It's a float stored in a long. -#else - worker.f = f; -#endif - - Exp = EXP(worker.l); - Mant = MANT(worker.l); - if (SIGN(worker.l)) Sign = -1; -//// M$ storage emulation - Mant = ((Mant << 7) | 0x40000000); - Mant ^= Sign; - Mant -= Sign; - Exp -= (EXCESS-1); -//// - efp->lMant = Mant; - efp->lExp = Exp; -} - - -VOID FASTCALL -CoordCnvP(MATRIX_S * mx, LPPOINT Point) -{ - FLOAT x, y; - gxf_long a, b; - - x = (FLOAT)Point->x; - y = (FLOAT)Point->y; - - a.l = EFtoF( &mx->efM11 ); - b.l = EFtoF( &mx->efM21 ); - x = x * a.f + y * b.f + mx->fxDx; - - a.l = EFtoF( &mx->efM12 ); - b.l = EFtoF( &mx->efM22 ); - y = x * a.f + y * b.f + mx->fxDy; - - FLOAT_TO_INT(x, Point->x ); - FLOAT_TO_INT(y, Point->y ); -} - - -BOOL -STDCALL -DPtoLP ( HDC hDC, LPPOINT Points, INT Count ) -{ -#if 0 - INT i; - PDC_ATTR Dc_Attr; - - if (!GdiGetHandleUserData((HGDIOBJ) hDC, (PVOID) &Dc_Attr)) return FALSE; - - if (Dc_Attr->flXform & ( DEVICE_TO_WORLD_INVALID | // Force a full recalibration! - PAGE_XLATE_CHANGED | // Changes or Updates have been made, - PAGE_EXTENTS_CHANGED | // do processing in kernel space. - WORLD_XFORM_CHANGED ) -#endif - return NtGdiTransformPoints( hDC, Points, Points, Count, 0); // Last is 0 or 2 -#if 0 - else - { - for ( i = 0; i < Count; i++ ) - CoordCnvP ( &Dc_Attr->mxDevicetoWorld, &Points[i] ); - } - return TRUE; -#endif -} - - -BOOL -STDCALL -LPtoDP ( HDC hDC, LPPOINT Points, INT Count ) -{ -#if 0 - INT i; - PDC_ATTR Dc_Attr; - - if (!GdiGetHandleUserData((HGDIOBJ) hDC, (PVOID) &Dc_Attr)) return FALSE; - - if (Dc_Attr->flXform & ( PAGE_XLATE_CHANGED | // Check for Changes and Updates - PAGE_EXTENTS_CHANGED | - WORLD_XFORM_CHANGED ) -#endif - return NtGdiTransformPoints( hDC, Points, Points, Count, 0); -#if 0 - else - { - for ( i = 0; i < Count; i++ ) - CoordCnvP ( &Dc_Attr->mxWorldToDevice, &Points[i] ); - } - return TRUE; -#endif -} #if 0 /* FIXME: enable this as soon as we have working usermode gdi */ 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 Fri Aug 10 10:47:00 2007 @@ -538,19 +538,6 @@ NtGdiPaintRgn(HDC hDC, HRGN hRgn); -/* Use NtGdiArcInternal with GdiTypePie. */ -BOOL -STDCALL -NtGdiPie(HDC hDC, - int LeftRect, - int TopRect, - int RightRect, - int BottomRect, - int XRadial1, - int YRadial1, - int XRadial2, - int YRadial2); - /* Metafiles are user-mode. */ BOOL STDCALL Modified: trunk/reactos/include/reactos/win32k/ntgdihdl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/win32k/ntg… ============================================================================== --- trunk/reactos/include/reactos/win32k/ntgdihdl.h (original) +++ trunk/reactos/include/reactos/win32k/ntgdihdl.h Fri Aug 10 10:47:00 2007 @@ -129,8 +129,8 @@ #define DC_DIBSECTION 0x00004000 #define DC_LAST_CLIPRGN_VALID 0x00008000 #define DC_PRIMARY_DISPLAY 0x00010000 -#define DC_MODE_DIRTY 0x00020000 -#define DC_FONTTEXT_DIRTY 0x00040000 +#define DC_MODE_DIRTY 0x00200000 +#define DC_FONTTEXT_DIRTY 0x00400000 /* DC_ATTR LCD Flags */ #define LDC_LDC 0x00000001 // (init) local DC other than a normal DC

1 0

[jimtabor] 28267: Fix a problem in metafile deallocation.
by jimtabor＠svn.reactos.org 10 Aug '07

10 Aug '07

Author: jimtabor Date: Fri Aug 10 09:52:26 2007 New Revision: 28267 URL: http://svn.reactos.org/svn/reactos?rev=28267&view=rev Log: Fix a problem in metafile deallocation. Modified: trunk/reactos/dll/win32/gdi32/objects/metafile.c Modified: trunk/reactos/dll/win32/gdi32/objects/metafile.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/objects/me… ============================================================================== --- trunk/reactos/dll/win32/gdi32/objects/metafile.c (original) +++ trunk/reactos/dll/win32/gdi32/objects/metafile.c Fri Aug 10 09:52:26 2007 @@ -66,6 +66,7 @@ RemoveEntryList(&pMFME->List); LocalFree ( pMFME ); hMFCount--; + if (!hMFCount) hMF_List = NULL; return TRUE; } pMFME = (PMF_ENTRY) pMFME->List.Flink;

1 0

[cfinck] 28266: Changes in the slovak translation of taskmgr by Mario Kacmar (kario AT szm DOT sk) See issue #2552 for more details.
by cfinck＠svn.reactos.org 09 Aug '07

09 Aug '07

Author: cfinck Date: Thu Aug 9 20:53:31 2007 New Revision: 28266 URL: http://svn.reactos.org/svn/reactos?rev=28266&view=rev Log: Changes in the slovak translation of taskmgr by Mario Kacmar (kario AT szm DOT sk) See issue #2552 for more details. Modified: trunk/reactos/base/applications/taskmgr/lang/sk-SK.rc Modified: trunk/reactos/base/applications/taskmgr/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… ============================================================================== --- trunk/reactos/base/applications/taskmgr/lang/sk-SK.rc (original) +++ trunk/reactos/base/applications/taskmgr/lang/sk-SK.rc Thu Aug 9 20:53:31 2007 @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Slovak resource files by Kario (kario(a)szm.sk) (08-08-2007) +// Slovak resource files by Kario (kario(a)szm.sk) (09-08-2007) #if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU) #ifdef _WIN32 @@ -205,7 +205,7 @@ WS_BORDER | WS_TABSTOP,7,7,233,177 PUSHBUTTON "&Ukonèi proces",IDC_ENDPROCESS,171,189,69,14 CONTROL "&Zobrazi procesy vetkých pouívate¾ov",IDC_SHOWALLPROCESSES, - "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,191,111,10 + "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,191,144,10 END //IDD_PERFORMANCE_PAGE DIALOGEX 0, 0, 247, 210 @@ -215,45 +215,45 @@ BEGIN GROUPBOX "Procesor",IDC_CPU_USAGE_FRAME,5,5,60,54,WS_TABSTOP, WS_EX_TRANSPARENT GROUPBOX "Stránkovanie",IDC_MEM_USAGE_FRAME,5,63,60,54,BS_LEFTTEXT, WS_EX_TRANSPARENT - GROUPBOX "Súèty",IDC_TOTALS_FRAME,5,122,111,39,0,WS_EX_TRANSPARENT - GROUPBOX "Vyuitie pamäte (kB)",IDC_COMMIT_CHARGE_FRAME,5,166,111,39,0,WS_EX_TRANSPARENT - GROUPBOX "Fyzická pamä (kB)",IDC_PHYSICAL_MEMORY_FRAME,131,122,111,39,0,WS_EX_TRANSPARENT - GROUPBOX "Pamä jadra (kB)",IDC_KERNEL_MEMORY_FRAME,131,166,111,39,0,WS_EX_TRANSPARENT - LTEXT "Popisovaèe",IDS_TOTALS_HANDLE_COUNT,12,131,27,8 + GROUPBOX "Súèty",IDC_TOTALS_FRAME,5,122,89,39,0,WS_EX_TRANSPARENT + GROUPBOX "Vyuitie pamäte (kB)",IDC_COMMIT_CHARGE_FRAME,5,166,89,39,0,WS_EX_TRANSPARENT + GROUPBOX "Fyzická pamä (kB)",IDC_PHYSICAL_MEMORY_FRAME,99,122,143,39,0,WS_EX_TRANSPARENT + GROUPBOX "Pamä jadra (kB)",IDC_KERNEL_MEMORY_FRAME,99,166,143,39,0,WS_EX_TRANSPARENT + LTEXT "Popisovaèe",IDS_TOTALS_HANDLE_COUNT,12,131,40,8 LTEXT "Vlákna",IDS_TOTALS_THREAD_COUNT,12,140,27,8 LTEXT "Procesy",IDS_TOTALS_PROCESS_COUNT,12,149,34,8 - EDITTEXT IDC_TOTALS_HANDLE_COUNT,65,131,45,8,ES_RIGHT | - ES_READONLY | ES_NUMBER | NOT WS_BORDER - EDITTEXT IDC_TOTALS_THREAD_COUNT,65,140,45,8,ES_RIGHT | - ES_READONLY | ES_NUMBER | NOT WS_BORDER - EDITTEXT IDC_TOTALS_PROCESS_COUNT,65,149,45,8,ES_RIGHT | + EDITTEXT IDC_TOTALS_HANDLE_COUNT,54,131,36,8,ES_RIGHT | + ES_READONLY | ES_NUMBER | NOT WS_BORDER + EDITTEXT IDC_TOTALS_THREAD_COUNT,54,140,36,8,ES_RIGHT | + ES_READONLY | ES_NUMBER | NOT WS_BORDER + EDITTEXT IDC_TOTALS_PROCESS_COUNT,54,149,36,8,ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER LTEXT "Celkovo",IDS_COMMIT_CHARGE_TOTAL,12,175,27,8 LTEXT "Limit",IDS_COMMIT_CHARGE_LIMIT,12,184,15,8 LTEXT "Maximum",IDS_COMMIT_CHARGE_PEAK,12,193,34,8 - EDITTEXT IDC_COMMIT_CHARGE_TOTAL,65,174,45,8,ES_RIGHT | - ES_READONLY | ES_NUMBER | NOT WS_BORDER - EDITTEXT IDC_COMMIT_CHARGE_LIMIT,65,184,45,8,ES_RIGHT | - ES_READONLY | ES_NUMBER | NOT WS_BORDER - EDITTEXT IDC_COMMIT_CHARGE_PEAK,65,193,45,8,ES_RIGHT | - ES_READONLY | ES_NUMBER | NOT WS_BORDER - LTEXT "Celkovo",IDS_PHYSICAL_MEMORY_TOTAL,137,131,27,8 - LTEXT "K dispozícii",IDS_PHYSICAL_MEMORY_AVAILABLE,137,140,30,8 - LTEXT "Vyrovnávacia pamä systému",IDS_PHYSICAL_MEMORY_SYSTEM_CACHE,137,149,46,8 - EDITTEXT IDC_PHYSICAL_MEMORY_TOTAL,185,131,48,8,ES_RIGHT | - ES_READONLY | ES_NUMBER | NOT WS_BORDER - EDITTEXT IDC_PHYSICAL_MEMORY_AVAILABLE,185,140,48,8,ES_RIGHT | - ES_READONLY | ES_NUMBER | NOT WS_BORDER - EDITTEXT IDC_PHYSICAL_MEMORY_SYSTEM_CACHE,185,149,48,8,ES_RIGHT | - ES_READONLY | ES_NUMBER | NOT WS_BORDER - LTEXT "Celkovo",IDS_KERNEL_MEMORY_TOTAL,137,174,27,8 - LTEXT "Stránkovaná",IDS_KERNEL_MEMORY_PAGED,137,184,21,8 - LTEXT "Nestránkovaná",IDS_KERNEL_MEMORY_NONPAGED,137,193,34,8 - EDITTEXT IDC_KERNEL_MEMORY_TOTAL,185,174,48,8,ES_RIGHT | - ES_READONLY | ES_NUMBER | NOT WS_BORDER - EDITTEXT IDC_KERNEL_MEMORY_PAGED,185,184,48,8,ES_RIGHT | - ES_READONLY | ES_NUMBER | NOT WS_BORDER - EDITTEXT IDC_KERNEL_MEMORY_NONPAGED,185,193,48,8,ES_RIGHT | + EDITTEXT IDC_COMMIT_CHARGE_TOTAL,50,174,40,8,ES_RIGHT | + ES_READONLY | ES_NUMBER | NOT WS_BORDER + EDITTEXT IDC_COMMIT_CHARGE_LIMIT,50,184,40,8,ES_RIGHT | + ES_READONLY | ES_NUMBER | NOT WS_BORDER + EDITTEXT IDC_COMMIT_CHARGE_PEAK,50,193,40,8,ES_RIGHT | + ES_READONLY | ES_NUMBER | NOT WS_BORDER + LTEXT "Celkovo",IDS_PHYSICAL_MEMORY_TOTAL,104,131,27,8 + LTEXT "K dispozícii",IDS_PHYSICAL_MEMORY_AVAILABLE,104,140,40,8 + LTEXT "Vyrovnáv. pamä systému",IDS_PHYSICAL_MEMORY_SYSTEM_CACHE,104,149,90,8 + EDITTEXT IDC_PHYSICAL_MEMORY_TOTAL,196,131,40,8,ES_RIGHT | + ES_READONLY | ES_NUMBER | NOT WS_BORDER + EDITTEXT IDC_PHYSICAL_MEMORY_AVAILABLE,196,140,40,8,ES_RIGHT | + ES_READONLY | ES_NUMBER | NOT WS_BORDER + EDITTEXT IDC_PHYSICAL_MEMORY_SYSTEM_CACHE,196,149,40,8,ES_RIGHT | + ES_READONLY | ES_NUMBER | NOT WS_BORDER + LTEXT "Celkovo",IDS_KERNEL_MEMORY_TOTAL,104,174,27,8 + LTEXT "Stránkovaná",IDS_KERNEL_MEMORY_PAGED,104,184,52,8 + LTEXT "Nestránkovaná",IDS_KERNEL_MEMORY_NONPAGED,104,193,52,8 + EDITTEXT IDC_KERNEL_MEMORY_TOTAL,196,174,40,8,ES_RIGHT | + ES_READONLY | ES_NUMBER | NOT WS_BORDER + EDITTEXT IDC_KERNEL_MEMORY_PAGED,196,184,40,8,ES_RIGHT | + ES_READONLY | ES_NUMBER | NOT WS_BORDER + EDITTEXT IDC_KERNEL_MEMORY_NONPAGED,196,193,40,8,ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER GROUPBOX "História vyuitia procesora",IDC_CPU_USAGE_HISTORY_FRAME,74,5,168,54,0,WS_EX_TRANSPARENT GROUPBOX "História vyuitia stránkovacieho súboru",IDC_MEMORY_USAGE_HISTORY_FRAME,74,63,168,54,0,WS_EX_TRANSPARENT @@ -278,140 +278,140 @@ PUSHBUTTON "Zavrie",IDOK,171,189,69,14 END -IDD_AFFINITY_DIALOG DIALOG DISCARDABLE 0, 0, 231, 154 +IDD_AFFINITY_DIALOG DIALOG DISCARDABLE 0, 0, 270, 154 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Afinita procesorov" FONT 8, "MS Shell Dlg" BEGIN - DEFPUSHBUTTON "OK",IDOK,120,133,50,14 - PUSHBUTTON "Zrui",IDCANCEL,174,133,50,14 + DEFPUSHBUTTON "OK",IDOK,159,133,50,14 + PUSHBUTTON "Zrui",IDCANCEL,213,133,50,14 LTEXT "Nastavenie afinity procesorov riadi výber procesorov, na ktorých sa bude môc proces spusti.", - IDC_STATIC,5,5,220,16 + IDC_STATIC,5,5,259,16 CONTROL "Procesor è. 0",IDC_CPU0,"Button",BS_AUTOCHECKBOX | WS_TABSTOP, - 11,28,37,10 + 11,28,58,10 CONTROL "Procesor è. 1",IDC_CPU1,"Button",BS_AUTOCHECKBOX | WS_DISABLED | - WS_TABSTOP,11,41,37,10 + WS_TABSTOP,11,41,58,10 CONTROL "Procesor è. 2",IDC_CPU2,"Button",BS_AUTOCHECKBOX | WS_DISABLED | - WS_TABSTOP,11,54,37,10 + WS_TABSTOP,11,54,58,10 CONTROL "Procesor è. 3",IDC_CPU3,"Button",BS_AUTOCHECKBOX | WS_DISABLED | - WS_TABSTOP,11,67,37,10 + WS_TABSTOP,11,67,58,10 CONTROL "Procesor è. 4",IDC_CPU4,"Button",BS_AUTOCHECKBOX | WS_DISABLED | - WS_TABSTOP,11,80,37,10 + WS_TABSTOP,11,80,58,10 CONTROL "Procesor è. 5",IDC_CPU5,"Button",BS_AUTOCHECKBOX | WS_DISABLED | - WS_TABSTOP,11,93,37,10 + WS_TABSTOP,11,93,58,10 CONTROL "Procesor è. 6",IDC_CPU6,"Button",BS_AUTOCHECKBOX | WS_DISABLED | - WS_TABSTOP,11,106,37,10 + WS_TABSTOP,11,106,58,10 CONTROL "Procesor è. 7",IDC_CPU7,"Button",BS_AUTOCHECKBOX | WS_DISABLED | - WS_TABSTOP,11,119,37,10 + WS_TABSTOP,11,119,58,10 CONTROL "Procesor è. 8",IDC_CPU8,"Button",BS_AUTOCHECKBOX | WS_DISABLED | - WS_TABSTOP,61,28,37,10 + WS_TABSTOP,72,28,58,10 CONTROL "Procesor è. 9",IDC_CPU9,"Button",BS_AUTOCHECKBOX | WS_DISABLED | - WS_TABSTOP,61,41,37,10 + WS_TABSTOP,72,41,58,10 CONTROL "Procesor è. 10",IDC_CPU10,"Button",BS_AUTOCHECKBOX | - WS_DISABLED | WS_TABSTOP,61,54,41,10 + WS_DISABLED | WS_TABSTOP,72,54,62,10 CONTROL "Procesor è. 11",IDC_CPU11,"Button",BS_AUTOCHECKBOX | - WS_DISABLED | WS_TABSTOP,61,67,41,10 + WS_DISABLED | WS_TABSTOP,72,67,62,10 CONTROL "Procesor è. 12",IDC_CPU12,"Button",BS_AUTOCHECKBOX | - WS_DISABLED | WS_TABSTOP,61,80,41,10 + WS_DISABLED | WS_TABSTOP,72,80,62,10 CONTROL "Procesor è. 13",IDC_CPU13,"Button",BS_AUTOCHECKBOX | - WS_DISABLED | WS_TABSTOP,61,93,41,10 + WS_DISABLED | WS_TABSTOP,72,93,62,10 CONTROL "Procesor è. 14",IDC_CPU14,"Button",BS_AUTOCHECKBOX | - WS_DISABLED | WS_TABSTOP,61,106,41,10 + WS_DISABLED | WS_TABSTOP,72,106,62,10 CONTROL "Procesor è. 15",IDC_CPU15,"Button",BS_AUTOCHECKBOX | - WS_DISABLED | WS_TABSTOP,61,119,41,10 + WS_DISABLED | WS_TABSTOP,72,119,62,10 CONTROL "Procesor è. 16",IDC_CPU16,"Button",BS_AUTOCHECKBOX | - WS_DISABLED | WS_TABSTOP,116,28,41,10 + WS_DISABLED | WS_TABSTOP,136,28,62,10 CONTROL "Procesor è. 17",IDC_CPU17,"Button",BS_AUTOCHECKBOX | - WS_DISABLED | WS_TABSTOP,116,41,41,10 + WS_DISABLED | WS_TABSTOP,136,41,62,10 CONTROL "Procesor è. 18",IDC_CPU18,"Button",BS_AUTOCHECKBOX | - WS_DISABLED | WS_TABSTOP,116,54,41,10 + WS_DISABLED | WS_TABSTOP,136,54,62,10 CONTROL "Procesor è. 19",IDC_CPU19,"Button",BS_AUTOCHECKBOX | - WS_DISABLED | WS_TABSTOP,116,67,41,10 + WS_DISABLED | WS_TABSTOP,136,67,62,10 CONTROL "Procesor è. 20",IDC_CPU20,"Button",BS_AUTOCHECKBOX | - WS_DISABLED | WS_TABSTOP,116,80,41,10 + WS_DISABLED | WS_TABSTOP,136,80,62,10 CONTROL "Procesor è. 21",IDC_CPU21,"Button",BS_AUTOCHECKBOX | - WS_DISABLED | WS_TABSTOP,116,93,41,10 + WS_DISABLED | WS_TABSTOP,136,93,62,10 CONTROL "Procesor è. 22",IDC_CPU22,"Button",BS_AUTOCHECKBOX | - WS_DISABLED | WS_TABSTOP,116,106,41,10 + WS_DISABLED | WS_TABSTOP,136,106,62,10 CONTROL "Procesor è. 23",IDC_CPU23,"Button",BS_AUTOCHECKBOX | - WS_DISABLED | WS_TABSTOP,116,119,41,10 + WS_DISABLED | WS_TABSTOP,136,119,62,10 CONTROL "Procesor è. 24",IDC_CPU24,"Button",BS_AUTOCHECKBOX | - WS_DISABLED | WS_TABSTOP,175,28,41,10 + WS_DISABLED | WS_TABSTOP,200,28,62,10 CONTROL "Procesor è. 25",IDC_CPU25,"Button",BS_AUTOCHECKBOX | - WS_DISABLED | WS_TABSTOP,175,41,41,10 + WS_DISABLED | WS_TABSTOP,200,41,62,10 CONTROL "Procesor è. 26",IDC_CPU26,"Button",BS_AUTOCHECKBOX | - WS_DISABLED | WS_TABSTOP,175,54,41,10 + WS_DISABLED | WS_TABSTOP,200,54,62,10 CONTROL "Procesor è. 27",IDC_CPU27,"Button",BS_AUTOCHECKBOX | - WS_DISABLED | WS_TABSTOP,175,67,41,10 + WS_DISABLED | WS_TABSTOP,200,67,62,10 CONTROL "Procesor è. 28",IDC_CPU28,"Button",BS_AUTOCHECKBOX | - WS_DISABLED | WS_TABSTOP,175,80,41,10 + WS_DISABLED | WS_TABSTOP,200,80,62,10 CONTROL "Procesor è. 29",IDC_CPU29,"Button",BS_AUTOCHECKBOX | - WS_DISABLED | WS_TABSTOP,175,93,41,10 + WS_DISABLED | WS_TABSTOP,200,93,62,10 CONTROL "Procesor è. 30",IDC_CPU30,"Button",BS_AUTOCHECKBOX | - WS_DISABLED | WS_TABSTOP,175,106,41,10 + WS_DISABLED | WS_TABSTOP,200,106,62,10 CONTROL "Procesor è. 31",IDC_CPU31,"Button",BS_AUTOCHECKBOX | - WS_DISABLED | WS_TABSTOP,175,119,41,10 -END - -IDD_COLUMNS_DIALOG DIALOG DISCARDABLE 0, 0, 195, 199 + WS_DISABLED | WS_TABSTOP,200,119,62,10 +END + +IDD_COLUMNS_DIALOG DIALOG DISCARDABLE 0, 0, 258, 199 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Výber ståpcov" FONT 8, "MS Shell Dlg" BEGIN - DEFPUSHBUTTON "OK",IDOK,84,178,50,14 - PUSHBUTTON "Zrui",IDCANCEL,138,178,50,14 + DEFPUSHBUTTON "OK",IDOK,147,178,50,14 + PUSHBUTTON "Zrui",IDCANCEL,201,178,50,14 LTEXT "Vyberte ståpce, ktoré sa majú zobrazi na karte procesov v Správcovi úloh.", - IDC_STATIC,7,7,181,17 + IDC_STATIC,7,7,244,17 CONTROL "&Názov obrazu",IDC_IMAGENAME,"Button",BS_AUTOCHECKBOX | WS_DISABLED | WS_TABSTOP,7,28,56,10 CONTROL "I&dentifikátor procesu (PID)",IDC_PID,"Button", - BS_AUTOCHECKBOX | WS_TABSTOP,7,39,88,10 + BS_AUTOCHECKBOX | WS_TABSTOP,7,39,108,10 CONTROL "Vy&uitie procesora",IDC_CPUUSAGE,"Button",BS_AUTOCHECKBOX | - WS_TABSTOP,7,50,53,10 + WS_TABSTOP,7,50,73,10 CONTROL "Èa&s procesora",IDC_CPUTIME,"Button",BS_AUTOCHECKBOX | - WS_TABSTOP,7,61,48,10 + WS_TABSTOP,7,61,58,10 CONTROL "&Vyuitie pamäte",IDC_MEMORYUSAGE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,72,63,10 CONTROL "&Rozdiel vyuitia pamäte",IDC_MEMORYUSAGEDELTA,"Button", - BS_AUTOCHECKBOX | WS_TABSTOP,7,83,82,10 + BS_AUTOCHECKBOX | WS_TABSTOP,7,83,102,10 CONTROL "M&aximálne vyuitie pamäte",IDC_PEAKMEMORYUSAGE,"Button", - BS_AUTOCHECKBOX | WS_TABSTOP,7,94,82,10 + BS_AUTOCHECKBOX | WS_TABSTOP,7,94,102,10 CONTROL "C&hyby stránkovania pamäte",IDC_PAGEFAULTS,"Button",BS_AUTOCHECKBOX | - WS_TABSTOP,7,105,53,10 + WS_TABSTOP,7,105,102,10 CONTROL "O&bjekty USER",IDC_USEROBJECTS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,116,62,10 CONTROL "Vstup a výstup - èítanie",IDC_IOREADS,"Button",BS_AUTOCHECKBOX | - WS_TABSTOP,7,127,49,10 + WS_TABSTOP,7,127,92,10 CONTROL "Vstup a výstup - preèítané bajty",IDC_IOREADBYTES,"Button", - BS_AUTOCHECKBOX | WS_TABSTOP,7,138,65,10 + BS_AUTOCHECKBOX | WS_TABSTOP,7,138,112,10 CONTROL "&Identifikácia relácie",IDC_SESSIONID,"Button",BS_AUTOCHECKBOX | - WS_TABSTOP,7,149,50,10 + WS_TABSTOP,7,149,73,10 CONTROL "&Meno pouívate¾a",IDC_USERNAME,"Button",BS_AUTOCHECKBOX | - WS_TABSTOP,7,160,51,10 + WS_TABSTOP,7,160,71,10 CONTROL "Rozdiel &chýb stránkovania pamäte",IDC_PAGEFAULTSDELTA,"Button", - BS_AUTOCHECKBOX | WS_TABSTOP,107,28,72,10 + BS_AUTOCHECKBOX | WS_TABSTOP,130,28,120,10 CONTROL "V&e¾kos virtuálnej pamäte",IDC_VIRTUALMEMORYSIZE,"Button", - BS_AUTOCHECKBOX | WS_TABSTOP,107,39,77,10 + BS_AUTOCHECKBOX | WS_TABSTOP,130,39,97,10 CONTROL "Stránkovaný &fond",IDC_PAGEDPOOL,"Button",BS_AUTOCHECKBOX | - WS_TABSTOP,107,50,53,10 + WS_TABSTOP,130,50,73,10 CONTROL "Nes&tránkovaný fond",IDC_NONPAGEDPOOL,"Button", - BS_AUTOCHECKBOX | WS_TABSTOP,107,61,67,10 + BS_AUTOCHECKBOX | WS_TABSTOP,130,61,77,10 CONTROL "&Základná priorita",IDC_BASEPRIORITY,"Button", - BS_AUTOCHECKBOX | WS_TABSTOP,107,72,55,10 + BS_AUTOCHECKBOX | WS_TABSTOP,130,72,75,10 CONTROL "P&oèet popisovaèov",IDC_HANDLECOUNT,"Button",BS_AUTOCHECKBOX | - WS_TABSTOP,107,83,59,10 + WS_TABSTOP,130,83,79,10 CONTROL "&Poèet vlákien",IDC_THREADCOUNT,"Button",BS_AUTOCHECKBOX | - WS_TABSTOP,107,94,59,10 + WS_TABSTOP,130,94,59,10 CONTROL "Objekty &GDI",IDC_GDIOBJECTS,"Button",BS_AUTOCHECKBOX | - WS_TABSTOP,107,105,55,10 + WS_TABSTOP,130,105,55,10 CONTROL "Vstup a výstup - zápis",IDC_IOWRITES,"Button",BS_AUTOCHECKBOX | - WS_TABSTOP,107,116,49,10 + WS_TABSTOP,130,116,92,10 CONTROL "Vstup a výstup - zapísané bajty",IDC_IOWRITEBYTES,"Button", - BS_AUTOCHECKBOX | WS_TABSTOP,107,127,65,10 + BS_AUTOCHECKBOX | WS_TABSTOP,130,127,112,10 CONTROL "Vstup a výstup - iné",IDC_IOOTHER,"Button",BS_AUTOCHECKBOX | - WS_TABSTOP,107,138,46,10 + WS_TABSTOP,130,138,77,10 CONTROL "Vstup a výstup - iné bajty",IDC_IOOTHERBYTES,"Button", - BS_AUTOCHECKBOX | WS_TABSTOP,107,149,65,10 + BS_AUTOCHECKBOX | WS_TABSTOP,130,149,97,10 END @@ -601,7 +601,7 @@ ID_PROCESS_PAGE_SETPRIORITY_BELOWNORMAL "Zaradí proces do triedy priorít ZNÍENÁ." ID_PROCESS_PAGE_SETPRIORITY_LOW "Zaradí proces do triedy priorít NÍZKA." - IDS_LICENSE "Tento program je vo¾ný softvér; môete ho íri a/alebo modifikova pod¾a podmienok GNU Menej veobecnej verejnej licencie (GNU Lesser General Public License) ako boli zverejnené nadáciou Free Software Foundation; buï verzie 2.1 tejto licencie, alebo (pod¾a váho uváenia) niektorej neskorej verzie.\r\n\r\nTento program je distribuovaný v nádeji, e bude uitoèný, avak BEZ AKEJKO¼VEK ZÁRUKY; rovnako bez záruky PREDAJNOSTI alebo VHODNOSTI PRE URÈITÝ ÚÈEL. Pre viac detajlov si pozrite GNU Veobecnú verejnú licenciu (GNU General Public License).\r\n\r\nKópiu Veobecnej verejnej licencie GNU ste mali dosta spolu s týmto programom; ak nie, napíte si o òu na Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA." + IDS_LICENSE "Tento program je vo¾ný softvér; môete ho íri a/alebo modifikova pod¾a podmienok GNU Menej veobecnej verejnej licencie (GNU Lesser General Public License) ako bola zverejnená nadáciou Free Software Foundation; buï verzie 2.1 tejto licencie, alebo (pod¾a váho uváenia) niektorej neskorej verzie.\r\n\r\nTento program je distribuovaný v nádeji, e bude uitoèný, avak BEZ AKEJKO¼VEK ZÁRUKY; rovnako bez záruky PREDAJNOSTI alebo VHODNOSTI PRE URÈITÝ ÚÈEL. Pre viac detajlov si pozrite GNU Veobecnú verejnú licenciu (GNU General Public License).\r\n\r\nKópiu Veobecnej verejnej licencie GNU ste mali dosta spolu s týmto programom; ak nie, napíte si o òu na Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA." END

1 0

[tkreuzer] 28265: fix icon display
by tkreuzer＠svn.reactos.org 09 Aug '07

09 Aug '07

Author: tkreuzer Date: Thu Aug 9 18:42:33 2007 New Revision: 28265 URL: http://svn.reactos.org/svn/reactos?rev=28265&view=rev Log: fix icon display 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 Thu Aug 9 18:42:33 2007 @@ -1565,6 +1565,7 @@ HBITMAP res; BITMAP bm; BITMAPOBJ *Bitmap, *resBitmap; + SIZEL Size; if (hBitmap == NULL) { @@ -1582,11 +1583,14 @@ if (Bitmap->SurfObj.lDelta >= 0) bm.bmHeight = -bm.bmHeight; - res = NtGdiCreateBitmap(bm.bmWidth, - bm.bmHeight, - bm.bmPlanes, - bm.bmBitsPixel, - bm.bmBits); + Size.cx = abs(bm.bmWidth); + Size.cy = abs(bm.bmHeight); + res = IntCreateBitmap(Size, + bm.bmWidthBytes, + BitmapFormat(bm.bmBitsPixel * bm.bmPlanes, BI_RGB), + (bm.bmHeight < 0 ? BMF_TOPDOWN : 0) | BMF_NOZEROINIT, + NULL); + if(res) { PBYTE buf;

1 0

[tkreuzer] 28264: add myself to CREDITS
by tkreuzer＠svn.reactos.org 09 Aug '07

09 Aug '07

Author: tkreuzer Date: Thu Aug 9 16:47:07 2007 New Revision: 28264 URL: http://svn.reactos.org/svn/reactos?rev=28264&view=rev Log: add myself to CREDITS Modified: trunk/reactos/CREDITS Modified: trunk/reactos/CREDITS URL: http://svn.reactos.org/svn/reactos/trunk/reactos/CREDITS?rev=28264&r1=28263… ============================================================================== --- trunk/reactos/CREDITS (original) +++ trunk/reactos/CREDITS Thu Aug 9 16:47:07 2007 @@ -57,6 +57,7 @@ Saveliy Tretiakov <saveliyt(a)mail.ru> Steven Edwards <steven_ed4153(a)yahoo.com> Thomas Weidenmueller <w3seek(a)users.sourceforge.net> +Timo Kreuzer <timo.kreuzer(a)reactos.org> Victor Kirhenshtein <sauros(a)iname.com> Vizzini <vizzini(a)plasmic.com>

1 0

[amunger] 28263: Merge 28257 from trunk.
by amunger＠svn.reactos.org 09 Aug '07

09 Aug '07

Author: amunger Date: Thu Aug 9 16:10:43 2007 New Revision: 28263 URL: http://svn.reactos.org/svn/reactos?rev=28263&view=rev Log: Merge 28257 from trunk. Added: branches/ros-branch-0_3_3/reactos/ntoskrnl/kd/wrappers/kdbg.c - copied unchanged from r28257, trunk/reactos/ntoskrnl/kd/wrappers/kdbg.c Modified: branches/ros-branch-0_3_3/reactos/ntoskrnl/kdbg/kdb_symbols.c branches/ros-branch-0_3_3/reactos/ntoskrnl/ntoskrnl.rbuild Modified: branches/ros-branch-0_3_3/reactos/ntoskrnl/kdbg/kdb_symbols.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/reactos/ntoskr… ============================================================================== --- branches/ros-branch-0_3_3/reactos/ntoskrnl/kdbg/kdb_symbols.c (original) +++ branches/ros-branch-0_3_3/reactos/ntoskrnl/kdbg/kdb_symbols.c Thu Aug 9 16:10:43 2007 @@ -671,21 +671,22 @@ } VOID -STDCALL +NTAPI KdbDebugPrint(PCH Message, ULONG Length) { + /* Nothing here */ } /*! \brief Initializes the KDB symbols implementation. * - * \param NtoskrnlModuleObject LDR_DATA_TABLE_ENTRY of ntoskrnl.exe - * \param LdrHalModuleObject LDR_DATA_TABLE_ENTRY of hal.sys + * \param DispatchTable Pointer to the KD dispatch table + * \param BootPhase Phase of initialization */ VOID -STDCALL -KdpKdbgInit(PKD_DISPATCH_TABLE DispatchTable, - ULONG BootPhase) +NTAPI +KdbInitialize(PKD_DISPATCH_TABLE DispatchTable, + ULONG BootPhase) { PCHAR p1, p2; int Found; Modified: branches/ros-branch-0_3_3/reactos/ntoskrnl/ntoskrnl.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/reactos/ntoskr… ============================================================================== --- branches/ros-branch-0_3_3/reactos/ntoskrnl/ntoskrnl.rbuild (original) +++ branches/ros-branch-0_3_3/reactos/ntoskrnl/ntoskrnl.rbuild Thu Aug 9 16:10:43 2007 @@ -263,6 +263,7 @@ <directory name="wrappers"> <file>bochs.c</file> <file>gdbstub.c</file> + <file>kdbg.c</file> </directory> <file>kdinit.c</file> <file>kdio.c</file>

1 0

[greatlrd] 28261: win32k Implement NtGdiEngStretchBlt, NtGdiEngLockSurface gdi32 Implement EngStretchBlt, EngLockSurface Fix small typo in NtGdiEngBitBlt
by greatlrd＠svn.reactos.org 09 Aug '07

09 Aug '07

Author: greatlrd Date: Thu Aug 9 14:11:47 2007 New Revision: 28261 URL: http://svn.reactos.org/svn/reactos?rev=28261&view=rev Log: win32k Implement NtGdiEngStretchBlt, NtGdiEngLockSurface gdi32 Implement EngStretchBlt, EngLockSurface Fix small typo in NtGdiEngBitBlt Modified: trunk/reactos/dll/win32/gdi32/gdi32.def trunk/reactos/dll/win32/gdi32/misc/stubs.c trunk/reactos/subsystems/win32/win32k/eng/bitblt.c trunk/reactos/subsystems/win32/win32k/eng/surface.c trunk/reactos/subsystems/win32/win32k/w32ksvc.db Modified: trunk/reactos/dll/win32/gdi32/gdi32.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/gdi32.def?… ============================================================================== --- trunk/reactos/dll/win32/gdi32/gdi32.def (original) +++ trunk/reactos/dll/win32/gdi32/gdi32.def Thu Aug 9 14:11:47 2007 @@ -189,7 +189,7 @@ EngGradientFill@40 EngLineTo@36 EngLoadModule@4 -EngLockSurface@4 +EngLockSurface@4=NtGdiEngLockSurface@4 EngMarkBandingSurface@4 EngMultiByteToUnicodeN@20 EngMultiByteToWideChar@20 @@ -198,7 +198,7 @@ EngQueryEMFInfo@8 EngQueryLocalTime@4 EngReleaseSemaphore@4 -EngStretchBlt@44 +EngStretchBlt@44=NtGdiEngStretchBlt@44 EngStretchBltROP@52 EngStrokeAndFillPath@40 EngStrokePath@32 Modified: trunk/reactos/dll/win32/gdi32/misc/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/misc/stubs… ============================================================================== --- trunk/reactos/dll/win32/gdi32/misc/stubs.c (original) +++ trunk/reactos/dll/win32/gdi32/misc/stubs.c Thu Aug 9 14:11:47 2007 @@ -2842,16 +2842,6 @@ return 0; } -/* - * @unimplemented - */ -SURFOBJ * STDCALL -EngLockSurface(IN HSURF Surface) -{ - UNIMPLEMENTED; - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return 0; -} /* * @unimplemented @@ -2947,16 +2937,7 @@ SetLastError(ERROR_CALL_NOT_IMPLEMENTED); } -/* - * @unimplemented - */ -BOOL STDCALL -EngStretchBlt(SURFOBJ *psoDest,SURFOBJ *psoSrc,SURFOBJ *psoMask,CLIPOBJ *pco,XLATEOBJ *pxlo,COLORADJUSTMENT *pca,POINTL *pptlHTOrg,RECTL *prclDest,RECTL *prclSrc,POINTL *pptlMask,ULONG iMode) -{ - UNIMPLEMENTED; - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return 0; -} + /* * @unimplemented Modified: trunk/reactos/subsystems/win32/win32k/eng/bitblt.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/en… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/eng/bitblt.c (original) +++ trunk/reactos/subsystems/win32/win32k/eng/bitblt.c Thu Aug 9 14:11:47 2007 @@ -249,6 +249,9 @@ INT __cdecl abs(INT nm); +/* + * @implemented + */ BOOL STDCALL NtGdiEngBitBlt( IN SURFOBJ *psoTrg, @@ -271,15 +274,15 @@ _SEH_TRY { ProbeForRead(prclTrg, sizeof(RECTL), 1); - RtlCopyMemory(&rclTrg,prclTrg, sizeof(POINTL)); - - ProbeForRead(pptlSrc, sizeof(RECTL), 1); + RtlCopyMemory(&rclTrg,prclTrg, sizeof(RECTL)); + + ProbeForRead(pptlSrc, sizeof(POINTL), 1); RtlCopyMemory(&ptlSrc, pptlSrc, sizeof(POINTL)); - ProbeForRead(pptlMask, sizeof(RECTL), 1); + ProbeForRead(pptlMask, sizeof(POINTL), 1); RtlCopyMemory(&ptlMask, pptlMask, sizeof(POINTL)); - ProbeForRead(pptlBrush, sizeof(RECTL), 1); + ProbeForRead(pptlBrush, sizeof(POINTL), 1); RtlCopyMemory(&ptlBrush, pptlBrush, sizeof(POINTL)); } @@ -758,6 +761,55 @@ BOOL STDCALL +NtGdiEngStretchBlt( + IN SURFOBJ *DestObj, + IN SURFOBJ *SourceObj, + IN SURFOBJ *Mask, + IN CLIPOBJ *ClipRegion, + IN XLATEOBJ *ColorTranslation, + IN COLORADJUSTMENT *pca, + IN POINTL *BrushOrigin, + IN RECTL *prclDest, + IN RECTL *prclSrc, + IN POINTL *MaskOrigin, + IN ULONG Mode +) +{ + COLORADJUSTMENT ca; + POINTL lBrushOrigin; + RECTL rclDest; + RECTL rclSrc; + POINTL lMaskOrigin; + + _SEH_TRY + { + ProbeForRead(pca, sizeof(COLORADJUSTMENT), 1); + RtlCopyMemory(&ca,pca, sizeof(COLORADJUSTMENT)); + + ProbeForRead(BrushOrigin, sizeof(POINTL), 1); + RtlCopyMemory(&lBrushOrigin, BrushOrigin, sizeof(POINTL)); + + ProbeForRead(prclDest, sizeof(RECTL), 1); + RtlCopyMemory(&rclDest, prclDest, sizeof(RECTL)); + + ProbeForRead(prclSrc, sizeof(RECTL), 1); + RtlCopyMemory(&rclSrc, prclSrc, sizeof(RECTL)); + + ProbeForRead(MaskOrigin, sizeof(POINTL), 1); + RtlCopyMemory(&lMaskOrigin, MaskOrigin, sizeof(POINTL)); + + } + _SEH_HANDLE + { + _SEH_YIELD(return FALSE); + } + _SEH_END; + + return EngStretchBlt(DestObj, SourceObj, Mask, ClipRegion, ColorTranslation, &ca, &lBrushOrigin, &rclDest, &rclSrc, &lMaskOrigin, Mode); +} + +BOOL +STDCALL EngStretchBlt( IN SURFOBJ *DestObj, IN SURFOBJ *SourceObj, @@ -937,6 +989,9 @@ } +/* + * @implemented + */ BOOL STDCALL NtGdiEngAlphaBlend(IN SURFOBJ *Dest, @@ -954,6 +1009,7 @@ { ProbeForRead(upDestRect, sizeof(RECTL), 1); RtlCopyMemory(&DestRect,upDestRect, sizeof(RECTL)); + ProbeForRead(upSourceRect, sizeof(RECTL), 1); RtlCopyMemory(&SourceRect, upSourceRect, sizeof(RECTL)); @@ -967,6 +1023,9 @@ return EngAlphaBlend(Dest, Source, ClipRegion, ColorTranslation, &DestRect, &SourceRect, BlendObj); } +/* + * @implemented + */ BOOL STDCALL EngAlphaBlend(IN SURFOBJ *Dest, Modified: trunk/reactos/subsystems/win32/win32k/eng/surface.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/en… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/eng/surface.c (original) +++ trunk/reactos/subsystems/win32/win32k/eng/surface.c Thu Aug 9 14:11:47 2007 @@ -533,6 +533,17 @@ #define GDIBdyToHdr(body) \ ((PGDIOBJHDR)(body) - 1) + +/* + * @implemented + */ +SURFOBJ * STDCALL +NtGdiEngLockSurface(IN HSURF Surface) +{ + return EngLockSurface(Surface); +} + + /* * @implemented */ 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 Thu Aug 9 14:11:47 2007 @@ -616,9 +616,9 @@ # NtGdiEngDeleteSurface 1 # NtGdiEngEraseSurface 3 # NtGdiEngUnlockSurface 1 -# NtGdiEngLockSurface 1 +NtGdiEngLockSurface 1 NtGdiEngBitBlt 11 -# NtGdiEngStretchBlt 11 +NtGdiEngStretchBlt 11 # NtGdiEngPlgBlt 11 # NtGdiEngMarkBandingSurface 1 # NtGdiEngStrokePath 8

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