Ros-diffs

ros-diffs@reactos.org

81390 discussions

[janderwald] 40104: - Experimental implementation of _RpcEnumInterfaces - If'd out as GetIfEntry2 is not yet implemented

by janderwald＠svn.reactos.org

Author: janderwald Date: Thu Mar 19 19:57:46 2009 New Revision: 40104 URL: http://svn.reactos.org/svn/reactos?rev=40104&view=rev Log: - Experimental implementation of _RpcEnumInterfaces - If'd out as GetIfEntry2 is not yet implemented Modified: trunk/reactos/base/services/wlansvc/rpcserver.c Modified: trunk/reactos/base/services/wlansvc/rpcserver.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/wlansvc/rpcs… ============================================================================== --- trunk/reactos/base/services/wlansvc/rpcserver.c [iso-8859-1] (original) +++ trunk/reactos/base/services/wlansvc/rpcserver.c [iso-8859-1] Thu Mar 19 19:57:46 2009 @@ -8,6 +8,8 @@ /* INCLUDES ****************************************************************/ #include <windows.h> +#include <iphlpapi.h> + #include "wlansvc_s.h" #define NDEBUG @@ -35,8 +37,68 @@ WLANSVC_RPC_HANDLE hClientHandle, PWLAN_INTERFACE_INFO_LIST *ppInterfaceList) { - UNIMPLEMENTED; - return ERROR_CALL_NOT_IMPLEMENTED; +#if GET_IF_ENTRY2_IMPLEMENTED + DWORD dwNumInterfaces; + DWORD dwResult, dwSize; + DWORD dwIndex; + MIB_IF_ROW2 IfRow; + PWLAN_INTERFACE_INFO_LIST InterfaceList; + + if (!hClientHandle || !ppInterfaceList) + return ERROR_INVALID_PARAMETER; + + dwResult = GetNumberOfInterfaces(&dwNumInterfaces); + dwSize = sizeof(WLAN_INTERFACE_INFO_LIST); + if (dwResult != NO_ERROR) + { + /* set num interfaces to zero when an error occurs */ + dwNumInterfaces = 0; + } + else + { + if (dwNumInterfaces > 1) + { + /* add extra size for interface */ + dwSize += (dwNumInterfaces-1) * sizeof(WLAN_INTERFACE_INFO); + } + } + + /* allocate interface list */ + InterfaceList = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, dwSize); + if (!InterfaceList) + { + return ERROR_NOT_ENOUGH_MEMORY; + } + + *ppInterfaceList = InterfaceList; + if (!dwNumInterfaces) + { + return ERROR_SUCCESS; + } + + for(dwIndex = 0; dwIndex < dwNumInterfaces; dwIndex++) + { + ZeroMemory(&IfRow, sizeof(MIB_IF_ROW2)); + IfRow.InterfaceIndex = dwIndex; + + dwResult = GetIfEntry2(&IfRow); + if (dwResult == NO_ERROR) + { + if (IfRow.Type == IF_TYPE_IEEE80211 && IfRow.InterfaceAndOperStatusFlags.HardwareInterface) + { + RtlMoveMemory(&InterfaceList->InterfaceInfo[InterfaceList->dwNumberOfItems].InterfaceGuid, &IfRow.InterfaceGuid, sizeof(GUID)); + wcscpy(InterfaceList->InterfaceInfo[InterfaceList->dwNumberOfItems].strInterfaceDescription, IfRow.Description); + //FIXME set state + InterfaceList->dwNumberOfItems++; + } + } + } + + return ERROR_SUCCESS; +#else + UNIMPLEMENTED; + return ERROR_CALL_NOT_IMPLEMENTED; +#endif } DWORD _RpcSetAutoConfigParameter(

16 years, 4 months

[fireball] 40103: Evgeniy Boltik <bstsoft@narod.ru> - Rework 8bit DIB alphablend to do alpha operations in source's palette (32bpp) to obtain much better output quality with lowest possible quality loss. See issue #4291 for more details.

by fireball＠svn.reactos.org

Author: fireball Date: Thu Mar 19 19:56:07 2009 New Revision: 40103 URL: http://svn.reactos.org/svn/reactos?rev=40103&view=rev Log: Evgeniy Boltik <bstsoft(a)narod.ru> - Rework 8bit DIB alphablend to do alpha operations in source's palette (32bpp) to obtain much better output quality with lowest possible quality loss. See issue #4291 for more details. Modified: trunk/reactos/subsystems/win32/win32k/dib/dib8bpp.c Modified: trunk/reactos/subsystems/win32/win32k/dib/dib8bpp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/di… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/dib/dib8bpp.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/dib/dib8bpp.c [iso-8859-1] Thu Mar 19 19:56:07 2009 @@ -372,12 +372,12 @@ register PUCHAR Dst; ULONG DstDelta; BLENDFUNCTION BlendFunc; - register NICEPIXEL32 DstPixel; - register NICEPIXEL32 SrcPixel; + register NICEPIXEL32 DstPixel32; + register NICEPIXEL32 SrcPixel32; register NICEPIXEL16 SrcPixel16; UCHAR Alpha, SrcBpp; - HPALETTE SrcPalette, DstPalette; - XLATEOBJ *SrcTo32Xlate, *DstTo32Xlate, *DstFrom32Xlate; + XLATEGDI* XlateGDI; + XLATEOBJ* SrcXlateObj; DPRINT("DIB_8BPP_AlphaBlend: srcRect: (%d,%d)-(%d,%d), dstRect: (%d,%d)-(%d,%d)\n", SourceRect->left, SourceRect->top, SourceRect->right, SourceRect->bottom, @@ -408,35 +408,17 @@ DPRINT1("Source bitmap must be 32bpp when AC_SRC_ALPHA is set\n"); return FALSE; } - - SrcBpp = BitsPerFormat(Source->iBitmapFormat); - SrcPalette = IntEngGetXlatePalette(ColorTranslation, XO_SRCPALETTE); - if (SrcPalette != 0) - { - SrcTo32Xlate = IntEngCreateXlate(PAL_RGB, 0, NULL, SrcPalette); - if (SrcTo32Xlate == NULL) - { - DPRINT1("IntEngCreateXlate failed\n"); - return FALSE; - } - } - else - { - SrcTo32Xlate = NULL; - ASSERT(SrcBpp >= 16); - } - - DstPalette = IntEngGetXlatePalette(ColorTranslation, XO_DESTPALETTE); - DstTo32Xlate = IntEngCreateXlate(PAL_RGB, 0, NULL, DstPalette); - DstFrom32Xlate = IntEngCreateXlate(0, PAL_RGB, DstPalette, NULL); - if (DstTo32Xlate == NULL || DstFrom32Xlate == NULL) - { - if (SrcTo32Xlate != NULL) - EngDeleteXlate(SrcTo32Xlate); - if (DstTo32Xlate != NULL) - EngDeleteXlate(DstTo32Xlate); - if (DstFrom32Xlate != NULL) - EngDeleteXlate(DstFrom32Xlate); + if (!ColorTranslation) + { + DPRINT1("ColorTranslation must not be NULL!\n"); + return FALSE; + } + + XlateGDI = ObjToGDI(ColorTranslation, XLATE); + SrcXlateObj = IntEngCreateXlate(0, 0, XlateGDI->SourcePal, XlateGDI->DestPal); + + if (!SrcXlateObj) + { DPRINT1("IntEngCreateXlate failed\n"); return FALSE; } @@ -444,6 +426,7 @@ Dst = (PUCHAR)((ULONG_PTR)Dest->pvScan0 + (DestRect->top * Dest->lDelta) + DestRect->left); DstDelta = Dest->lDelta - (DestRect->right - DestRect->left); + SrcBpp = BitsPerFormat(Source->iBitmapFormat); Rows = DestRect->bottom - DestRect->top; SrcY = SourceRect->top; @@ -453,45 +436,37 @@ SrcX = SourceRect->left; while (--Cols >= 0) { - if (SrcTo32Xlate != NULL) + if (SrcBpp <= 16) { - SrcPixel.ul = DIB_GetSource(Source, SrcX++, SrcY, SrcTo32Xlate); - } - else if (SrcBpp <= 16) - { - SrcPixel16.us = DIB_GetSource(Source, SrcX++, SrcY, ColorTranslation); - SrcPixel.col.red = (SrcPixel16.col.red << 3) | (SrcPixel16.col.red >> 2); - SrcPixel.col.green = (SrcPixel16.col.green << 2) | (SrcPixel16.col.green >> 4); - SrcPixel.col.blue = (SrcPixel16.col.blue << 3) | (SrcPixel16.col.blue >> 2); + SrcPixel16.us = DIB_GetSource(Source, SrcX++, SrcY, ColorTranslation); + SrcPixel32.col.red = (SrcPixel16.col.red << 3) | (SrcPixel16.col.red >> 2); + SrcPixel32.col.green = (SrcPixel16.col.green << 2) | (SrcPixel16.col.green >> 4); + SrcPixel32.col.blue = (SrcPixel16.col.blue << 3) | (SrcPixel16.col.blue >> 2); } else { - SrcPixel.ul = DIB_GetSourceIndex(Source, SrcX++, SrcY); + SrcPixel32.ul = DIB_GetSourceIndex(Source, SrcX++, SrcY); } - SrcPixel.col.red = SrcPixel.col.red * BlendFunc.SourceConstantAlpha / 255; - SrcPixel.col.green = SrcPixel.col.green * BlendFunc.SourceConstantAlpha / 255; - SrcPixel.col.blue = SrcPixel.col.blue * BlendFunc.SourceConstantAlpha / 255; - SrcPixel.col.alpha = (SrcBpp == 32) ? (SrcPixel.col.alpha * BlendFunc.SourceConstantAlpha / 255) : BlendFunc.SourceConstantAlpha; + SrcPixel32.col.red = SrcPixel32.col.red * BlendFunc.SourceConstantAlpha / 255; + SrcPixel32.col.green = SrcPixel32.col.green * BlendFunc.SourceConstantAlpha / 255; + SrcPixel32.col.blue = SrcPixel32.col.blue * BlendFunc.SourceConstantAlpha / 255; + SrcPixel32.col.alpha = (SrcBpp == 32) ? (SrcPixel32.col.alpha * BlendFunc.SourceConstantAlpha / 255) : BlendFunc.SourceConstantAlpha; Alpha = ((BlendFunc.AlphaFormat & AC_SRC_ALPHA) != 0) ? - SrcPixel.col.alpha : BlendFunc.SourceConstantAlpha; - - DstPixel.ul = XLATEOBJ_iXlate(DstTo32Xlate, *Dst); - DstPixel.col.red = Clamp8(DstPixel.col.red * (255 - Alpha) / 255 + SrcPixel.col.red); - DstPixel.col.green = Clamp8(DstPixel.col.green * (255 - Alpha) / 255 + SrcPixel.col.green); - DstPixel.col.blue = Clamp8(DstPixel.col.blue * (255 - Alpha) / 255 + SrcPixel.col.blue); - *Dst++ = XLATEOBJ_iXlate(DstFrom32Xlate, DstPixel.ul); + SrcPixel32.col.alpha : BlendFunc.SourceConstantAlpha; + + DstPixel32.ul = XLATEOBJ_iXlate(SrcXlateObj, *Dst); + SrcPixel32.col.red = Clamp8(DstPixel32.col.red * (255 - Alpha) / 255 + SrcPixel32.col.red); + SrcPixel32.col.green = Clamp8(DstPixel32.col.green * (255 - Alpha) / 255 + SrcPixel32.col.green); + SrcPixel32.col.blue = Clamp8(DstPixel32.col.blue * (255 - Alpha) / 255 + SrcPixel32.col.blue); + *Dst++ = XLATEOBJ_iXlate(ColorTranslation, SrcPixel32.ul); } Dst = (PUCHAR)((ULONG_PTR)Dst + DstDelta); SrcY++; } - if (SrcTo32Xlate != NULL) - EngDeleteXlate(SrcTo32Xlate); - if (DstTo32Xlate != NULL) - EngDeleteXlate(DstTo32Xlate); - if (DstFrom32Xlate != NULL) - EngDeleteXlate(DstFrom32Xlate); + if (SrcXlateObj) + EngDeleteXlate(SrcXlateObj); return TRUE; }

16 years, 4 months

[hyperion] 40102: Conversion to/from ODF is very new, therefore it sucks. Better use the classic Powerpoint format instead

by hyperion＠svn.reactos.org

Author: hyperion Date: Thu Mar 19 19:42:19 2009 New Revision: 40102 URL: http://svn.reactos.org/svn/reactos?rev=40102&view=rev Log: Conversion to/from ODF is very new, therefore it sucks. Better use the classic Powerpoint format instead Added: trunk/press-media/presentations/Imaginatica 2009/ReactOS (no) es Windows.ppt (with props) trunk/press-media/presentations/Imaginatica 2009/reactos_imaginatica.ppt (with props) Removed: trunk/press-media/presentations/Imaginatica 2009/ReactOS (no) es Windows.odp Removed: trunk/press-media/presentations/Imaginatica 2009/ReactOS (no) es Windows.odp URL: http://svn.reactos.org/svn/reactos/trunk/press-media/presentations/Imaginat… ============================================================================== Binary file - no diff available. Added: trunk/press-media/presentations/Imaginatica 2009/ReactOS (no) es Windows.ppt URL: http://svn.reactos.org/svn/reactos/trunk/press-media/presentations/Imaginat… ============================================================================== Binary file - no diff available. Propchange: trunk/press-media/presentations/Imaginatica 2009/ReactOS (no) es Windows.ppt ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/press-media/presentations/Imaginatica 2009/reactos_imaginatica.ppt URL: http://svn.reactos.org/svn/reactos/trunk/press-media/presentations/Imaginat… ============================================================================== Binary file - no diff available. Propchange: trunk/press-media/presentations/Imaginatica 2009/reactos_imaginatica.ppt ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream

16 years, 4 months

[tkreuzer] 40100: win32k RECT/RECTL issues: - Although RECT and RECTL are defined equal, the compiler treats them as incompatible. MS has created a lot of definitions with RECT and a lot with RECTL. So far we had to typecast them. Now with adding some defines into a win32k header file, we can finally treat them as equal inside win32k and get rid of a lot of type casts. Also use RECTL in favour of RECT internally, as this is the type that MS uses for the DDI and seems to be the more appropriate t

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Thu Mar 19 04:42:34 2009 New Revision: 40100 URL: http://svn.reactos.org/svn/reactos?rev=40100&view=rev Log: win32k RECT/RECTL issues: - Although RECT and RECTL are defined equal, the compiler treats them as incompatible. MS has created a lot of definitions with RECT and a lot with RECTL. So far we had to typecast them. Now with adding some defines into a win32k header file, we can finally treat them as equal inside win32k and get rid of a lot of type casts. Also use RECTL in favour of RECT internally, as this is the type that MS uses for the DDI and seems to be the more appropriate type. - We had a lot of "const PRECT" stuff inside win32k. Note: there's difference between "const RECT *" (what you currently want) and "CONST PRECT" (which you proabably don't want). Despite the fact that CONST is not an official modifier (please stick to const) the main difference is that the former describes a pointer to a constant structure, while the latter describes a constant pointer to a modifyable structure. - In an attempt to clean up the overpolluted IntGdi namespace, "objectify" the rect functions, moving them into their own namespace RECTL_Xxx. Modified: trunk/reactos/subsystems/win32/win32k/eng/clip.c trunk/reactos/subsystems/win32/win32k/eng/engwindow.c trunk/reactos/subsystems/win32/win32k/eng/gradient.c trunk/reactos/subsystems/win32/win32k/include/cliprgn.h trunk/reactos/subsystems/win32/win32k/include/desktop.h trunk/reactos/subsystems/win32/win32k/include/engobjects.h (props changed) trunk/reactos/subsystems/win32/win32k/include/intgdi.h trunk/reactos/subsystems/win32/win32k/include/menu.h trunk/reactos/subsystems/win32/win32k/include/painting.h trunk/reactos/subsystems/win32/win32k/include/path.h trunk/reactos/subsystems/win32/win32k/include/rect.h trunk/reactos/subsystems/win32/win32k/include/region.h trunk/reactos/subsystems/win32/win32k/include/text.h trunk/reactos/subsystems/win32/win32k/include/window.h trunk/reactos/subsystems/win32/win32k/include/winpos.h trunk/reactos/subsystems/win32/win32k/ntuser/cursoricon.c trunk/reactos/subsystems/win32/win32k/ntuser/desktop.c trunk/reactos/subsystems/win32/win32k/ntuser/hook.c trunk/reactos/subsystems/win32/win32k/ntuser/menu.c trunk/reactos/subsystems/win32/win32k/ntuser/monitor.c trunk/reactos/subsystems/win32/win32k/ntuser/ntstubs.c trunk/reactos/subsystems/win32/win32k/ntuser/painting.c trunk/reactos/subsystems/win32/win32k/ntuser/scrollbar.c trunk/reactos/subsystems/win32/win32k/ntuser/simplecall.c trunk/reactos/subsystems/win32/win32k/ntuser/sysparams.c trunk/reactos/subsystems/win32/win32k/ntuser/window.c trunk/reactos/subsystems/win32/win32k/ntuser/winpos.c trunk/reactos/subsystems/win32/win32k/objects/bitmaps.c trunk/reactos/subsystems/win32/win32k/objects/cliprgn.c trunk/reactos/subsystems/win32/win32k/objects/freetype.c trunk/reactos/subsystems/win32/win32k/objects/path.c trunk/reactos/subsystems/win32/win32k/objects/rect.c trunk/reactos/subsystems/win32/win32k/objects/region.c trunk/reactos/subsystems/win32/win32k/pch.h Modified: trunk/reactos/subsystems/win32/win32k/eng/clip.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/en… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/eng/clip.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/eng/clip.c [iso-8859-1] Thu Mar 19 04:42:34 2009 @@ -34,8 +34,8 @@ static __inline int CompareRightDown( - const PRECT r1, - const PRECT r2) + const RECTL *r1, + const RECTL *r2) { int Cmp; @@ -70,8 +70,8 @@ static __inline int CompareRightUp( - const PRECT r1, - const PRECT r2) + const RECTL *r1, + const RECTL *r2) { int Cmp; @@ -106,8 +106,8 @@ static __inline int CompareLeftDown( - const PRECT r1, - const PRECT r2) + const RECTL *r1, + const RECTL *r2) { int Cmp; @@ -142,8 +142,8 @@ static __inline int CompareLeftUp( - const PRECT r1, - const PRECT r2) + const RECTL *r1, + const RECTL *r2) { int Cmp; @@ -177,8 +177,8 @@ static __inline int CompareSpans( - const PSPAN Span1, - const PSPAN Span2) + const SPAN *Span1, + const SPAN *Span2) { int Cmp; Modified: trunk/reactos/subsystems/win32/win32k/eng/engwindow.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/en… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/eng/engwindow.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/eng/engwindow.c [iso-8859-1] Thu Mar 19 04:42:34 2009 @@ -91,8 +91,8 @@ { if (visRgn->rdh.nCount > 0) { - ClipObj = IntEngCreateClipRegion(visRgn->rdh.nCount, (PRECTL)visRgn->Buffer, - (PRECTL)&visRgn->rdh.rcBound); + ClipObj = IntEngCreateClipRegion(visRgn->rdh.nCount, visRgn->Buffer, + &visRgn->rdh.rcBound); DPRINT("Created visible region with %d rects\n", visRgn->rdh.nCount); DPRINT(" BoundingRect: %d, %d %d, %d\n", visRgn->rdh.rcBound.left, visRgn->rdh.rcBound.top, @@ -122,8 +122,8 @@ if (ClipObj == NULL) { /* Fall back to client rect */ - ClipObj = IntEngCreateClipRegion(1, (PRECTL)&Window->Wnd->ClientRect, - (PRECTL)&Window->Wnd->ClientRect); + ClipObj = IntEngCreateClipRegion(1, &Window->Wnd->ClientRect, + &Window->Wnd->ClientRect); } if (ClipObj == NULL) Modified: trunk/reactos/subsystems/win32/win32k/eng/gradient.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/en… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/eng/gradient.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/eng/gradient.c [iso-8859-1] Thu Mar 19 04:42:34 2009 @@ -43,11 +43,6 @@ #define VCMPCLRS(a,b,c) \ !(!VCMPCLR(a,b,c,Red) || !VCMPCLR(a,b,c,Green) || !VCMPCLR(a,b,c,Blue)) -#define MOVERECT(r,x,y) \ - r.left += x; r.right += x; \ - r.top += y; r.bottom += y - - /* Horizontal/Vertical gradients */ #define HVINITCOL(Col, id) \ c[id] = v1->Col >> 8; \ @@ -94,7 +89,7 @@ rcGradient.top = min(v1->y, v2->y); rcGradient.bottom = max(v1->y, v2->y); rcSG = rcGradient; - MOVERECT(rcSG, pptlDitherOrg->x, pptlDitherOrg->y); + RECTL_vOffsetRect(&rcSG, pptlDitherOrg->x, pptlDitherOrg->y); if(Horizontal) { @@ -115,7 +110,7 @@ CLIPOBJ_cEnumStart(pco, FALSE, CT_RECTANGLES, CD_RIGHTDOWN, 0); do { - RECT FillRect; + RECTL FillRect; ULONG Color; if(Horizontal) @@ -123,7 +118,7 @@ EnumMore = CLIPOBJ_bEnum(pco, (ULONG) sizeof(RectEnum), (PVOID) &RectEnum); for (i = 0; i < RectEnum.c && RectEnum.arcl[i].top <= rcSG.bottom; i++) { - if(IntGdiIntersectRect(&FillRect, (PRECT)&RectEnum.arcl[i], (PRECT)&rcSG)) + if(RECTL_bIntersectRect(&FillRect, &RectEnum.arcl[i], &rcSG)) { HVINITCOL(Red, 0); HVINITCOL(Green, 1); @@ -151,7 +146,7 @@ EnumMore = CLIPOBJ_bEnum(pco, (ULONG) sizeof(RectEnum), (PVOID) &RectEnum); for (i = 0; i < RectEnum.c && RectEnum.arcl[i].top <= rcSG.bottom; i++) { - if(IntGdiIntersectRect(&FillRect, (PRECT)&RectEnum.arcl[i], (PRECT)&rcSG)) + if(RECTL_bIntersectRect(&FillRect, &RectEnum.arcl[i], &rcSG)) { HVINITCOL(Red, 0); HVINITCOL(Green, 1); @@ -181,13 +176,13 @@ CLIPOBJ_cEnumStart(pco, FALSE, CT_RECTANGLES, CD_RIGHTDOWN, 0); do { - RECT FillRect; + RECTL FillRect; ULONG Color = XLATEOBJ_iXlate(pxlo, RGB(v1->Red, v1->Green, v1->Blue)); EnumMore = CLIPOBJ_bEnum(pco, (ULONG) sizeof(RectEnum), (PVOID) &RectEnum); for (i = 0; i < RectEnum.c && RectEnum.arcl[i].top <= rcSG.bottom; i++) { - if(IntGdiIntersectRect(&FillRect, (PRECT)&RectEnum.arcl[i], (PRECT)&rcSG)) + if(RECTL_bIntersectRect(&FillRect, &RectEnum.arcl[i], &rcSG)) { for(; FillRect.top < FillRect.bottom; FillRect.top++) { @@ -369,7 +364,7 @@ // EnumMore = CLIPOBJ_bEnum(pco, (ULONG) sizeof(RectEnum), (PVOID) &RectEnum); // for (i = 0; i < RectEnum.c && RectEnum.arcl[i].top <= prclExtents->bottom; i++) // { - // if(IntGdiIntersectRect((PRECT)&FillRect, (PRECT)&RectEnum.arcl[i], (PRECT)prclExtents)) + // if(RECTL_bIntersectRect(&FillRect, &RectEnum.arcl[i], prclExtents)) // { // BOOL InY; @@ -417,7 +412,7 @@ // EnumMore = CLIPOBJ_bEnum(pco, (ULONG) sizeof(RectEnum), (PVOID) &RectEnum); // for (i = 0; i < RectEnum.c && RectEnum.arcl[i].top <= prclExtents->bottom; i++) // { - // if(IntGdiIntersectRect((PRECT)&FillRect, (PRECT)&RectEnum.arcl[i], (PRECT)prclExtents)) + // if(RECTL_bIntersectRect(&FillRect, &RectEnum.arcl[i], prclExtents)) // { // S_INITLINE(v1, v3, 0); // S_INITLINE(v1, v2, 1); Modified: trunk/reactos/subsystems/win32/win32k/include/cliprgn.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/cliprgn.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/include/cliprgn.h [iso-8859-1] Thu Mar 19 04:42:34 2009 @@ -4,10 +4,10 @@ #include <include/dc.h> #include <include/region.h> -INT FASTCALL IntGdiGetClipBox(PDC, LPRECT rc); +INT FASTCALL IntGdiGetClipBox(PDC, RECTL* rc); INT FASTCALL IntGdiExtSelectClipRgn (PDC, PROSRGNDATA, int); -INT FASTCALL GdiGetClipBox(HDC hDC, LPRECT rc); +INT FASTCALL GdiGetClipBox(HDC hDC, RECTL *rc); INT FASTCALL GdiSelectVisRgn(HDC hdc, HRGN hrgn); INT FASTCALL GdiExtSelectClipRgn (PDC dc, HRGN hrgn, int fnMode); Modified: trunk/reactos/subsystems/win32/win32k/include/desktop.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/desktop.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/include/desktop.h [iso-8859-1] Thu Mar 19 04:42:34 2009 @@ -17,7 +17,7 @@ /* Pointer to the active queue. */ PVOID ActiveMessageQueue; /* Rectangle of the work area */ - RECT WorkArea; + RECTL WorkArea; /* Handle of the desktop window. */ HANDLE DesktopWindow; /* Thread blocking input */ @@ -65,7 +65,7 @@ IntDesktopObjectDelete(PWIN32_DELETEMETHOD_PARAMETERS Parameters); VOID FASTCALL -IntGetDesktopWorkArea(PDESKTOP Desktop, PRECT Rect); +IntGetDesktopWorkArea(PDESKTOP Desktop, RECTL *Rect); LRESULT CALLBACK IntDesktopWindowProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam); Propchange: trunk/reactos/subsystems/win32/win32k/include/engobjects.h ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Thu Mar 19 04:42:34 2009 @@ -1,0 +1,1 @@ +/branches/ros-amd64-bringup/reactos/subsystems/win32/win32k/include/engobjects.h:40095 Modified: trunk/reactos/subsystems/win32/win32k/include/intgdi.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/intgdi.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/include/intgdi.h [iso-8859-1] Thu Mar 19 04:42:34 2009 @@ -155,26 +155,6 @@ LPXFORM xform1, LPXFORM xform2); -/* RECT functions */ - -VOID FASTCALL -IntGdiSetRect(PRECT Rect, INT left, INT top, INT right, INT bottom); - -VOID FASTCALL -IntGdiSetEmptyRect(PRECT Rect); - -BOOL FASTCALL -IntGdiIsEmptyRect(const RECT* Rect); - -VOID FASTCALL -IntGdiOffsetRect(LPRECT Rect, INT x, INT y); - -BOOL FASTCALL -IntGdiUnionRect(PRECT Dest, const RECT* Src1, const RECT* Src2); - -BOOL FASTCALL -IntGdiIntersectRect(PRECT Dest, const RECT* Src1, const RECT* Src2); - /* Stock objects */ BOOL FASTCALL Modified: trunk/reactos/subsystems/win32/win32k/include/menu.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/menu.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/include/menu.h [iso-8859-1] Thu Mar 19 04:42:34 2009 @@ -23,7 +23,7 @@ ULONG_PTR dwItemData; UNICODE_STRING Text; HBITMAP hbmpItem; - RECT Rect; + RECTL Rect; UINT XTab; } MENU_ITEM, *PMENU_ITEM; @@ -40,7 +40,7 @@ { UINT uItem; BOOL fByPosition; - RECT rcRect; + RECTL rcRect; } SETMENUITEMRECT, *PSETMENUITEMRECT; PMENU_OBJECT FASTCALL @@ -95,7 +95,7 @@ IntCheckMenuItem(PMENU_OBJECT MenuObject, UINT uIDCheckItem, UINT uCheck); BOOL FASTCALL -IntSetMenuItemRect(PMENU_OBJECT MenuObject, UINT Item, BOOL fByPos, RECT *rcRect); +IntSetMenuItemRect(PMENU_OBJECT MenuObject, UINT Item, BOOL fByPos, RECTL *rcRect); DWORD APIENTRY UserInsertMenuItem(HMENU hMenu, UINT uItem, BOOL fByPosition, LPCMENUITEMINFOW lpmii); Modified: trunk/reactos/subsystems/win32/win32k/include/painting.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/painting.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/include/painting.h [iso-8859-1] Thu Mar 19 04:42:34 2009 @@ -6,7 +6,7 @@ #include <include/window.h> BOOL FASTCALL -co_UserRedrawWindow(PWINDOW_OBJECT Wnd, const RECT* UpdateRect, HRGN UpdateRgn, ULONG Flags); +co_UserRedrawWindow(PWINDOW_OBJECT Wnd, const RECTL* UpdateRect, HRGN UpdateRgn, ULONG Flags); VOID FASTCALL IntInvalidateWindows(PWINDOW_OBJECT Window, HRGN hRgn, ULONG Flags); BOOL FASTCALL Modified: trunk/reactos/subsystems/win32/win32k/include/path.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/path.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/include/path.h [iso-8859-1] Thu Mar 19 04:42:34 2009 @@ -67,7 +67,7 @@ BOOL FASTCALL PATH_Rectangle (PDC dc, INT x1, INT y1, INT x2, INT y2); BOOL FASTCALL PATH_RoundRect(DC *dc, INT x1, INT y1, INT x2, INT y2, INT ell_width, INT ell_height); BOOL FASTCALL PATH_PathToRegion (PPATH pPath, INT nPolyFillMode, HRGN *pHrgn); -BOOL FASTCALL PATH_ExtTextOut(PDC dc,INT x,INT y,UINT flags,const RECT *lprc,LPCWSTR str,UINT count,const INT *dx); +BOOL FASTCALL PATH_ExtTextOut(PDC dc,INT x,INT y,UINT flags,const RECTL *lprc,LPCWSTR str,UINT count,const INT *dx); VOID FASTCALL IntGdiCloseFigure(PPATH pPath); BOOL FASTCALL PATH_Delete(HPATH hPath); Modified: trunk/reactos/subsystems/win32/win32k/include/rect.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/rect.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/include/rect.h [iso-8859-1] Thu Mar 19 04:42:34 2009 @@ -1,17 +1,60 @@ #ifndef _WIN32K_RECT_H #define _WIN32K_RECT_H -BOOL APIENTRY -NtGdiUnionRect(PRECT Dest, const RECT* Src1, const RECT* Src2); -BOOL APIENTRY -NtGdiSetRect(PRECT Rect, int left, int top, int right, int bottom); -BOOL APIENTRY -NtGdiSetEmptyRect(PRECT Rect); -BOOL APIENTRY -NtGdiIsEmptyRect(const RECT* Rect); -BOOL APIENTRY -NtGdiIntersectRect(PRECT Dest, const RECT* Src1, const RECT* Src2); -BOOL APIENTRY -NtGdiOffsetRect(LPRECT Rect, int x, int y); +VOID +FORCEINLINE +RECTL_vSetRect(RECTL *prcl, LONG left, LONG top, LONG right, LONG bottom) +{ + prcl->left = left; + prcl->top = top; + prcl->right = right; + prcl->bottom = bottom; +} + +VOID +FORCEINLINE +RECTL_vSetEmptyRect(RECTL *prcl) +{ + prcl->left = 0; + prcl->top = 0; + prcl->right = 0; + prcl->bottom = 0; +} + +VOID +FORCEINLINE +RECTL_vOffsetRect(RECTL *prcl, INT cx, INT cy) +{ + prcl->left += cx; + prcl->right += cx; + prcl->top += cy; + prcl->bottom += cy; +} + +BOOL +FORCEINLINE +RECTL_bIsEmptyRect(const RECTL *prcl) +{ + return (prcl->left >= prcl->right || prcl->top >= prcl->bottom); +} + +BOOL +FORCEINLINE +RECTL_bPointInRect(const RECTL *prcl, INT x, INT y) +{ + return (x >= prcl->left && x <= prcl->right && + y >= prcl->top && y <= prcl->bottom); +} + +BOOL +FASTCALL +RECTL_bUnionRect(RECTL *prclDst, const RECTL *prcl1, const RECTL *prcl2); + +BOOL +FASTCALL +RECTL_bIntersectRect(RECTL *prclDst, const RECTL *prcl1, const RECTL *prcl2); + + + #endif /* _WIN32K_RECT_H */ Modified: trunk/reactos/subsystems/win32/win32k/include/region.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/region.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/include/region.h [iso-8859-1] Thu Mar 19 04:42:34 2009 @@ -15,7 +15,7 @@ BASEOBJECT BaseObject; RGNDATAHEADER rdh; - PRECT Buffer; + RECTL *Buffer; } ROSRGNDATA, *PROSRGNDATA, *LPROSRGNDATA; @@ -27,10 +27,10 @@ #define REGION_UnlockRgn(pRgn) GDIOBJ_UnlockObjByPtr((POBJ)pRgn) PROSRGNDATA FASTCALL REGION_AllocRgnWithHandle(INT n); -VOID FASTCALL REGION_UnionRectWithRgn(ROSRGNDATA *rgn, CONST RECT *rect); -INT FASTCALL REGION_GetRgnBox(PROSRGNDATA Rgn, LPRECT pRect); -BOOL FASTCALL REGION_RectInRegion(PROSRGNDATA Rgn, CONST LPRECT rc); -BOOL FASTCALL REGION_CropAndOffsetRegion(PROSRGNDATA rgnDst, PROSRGNDATA rgnSrc, const PRECT rect, const PPOINT off); +VOID FASTCALL REGION_UnionRectWithRgn(ROSRGNDATA *rgn, const RECTL *rect); +INT FASTCALL REGION_GetRgnBox(PROSRGNDATA Rgn, RECTL *pRect); +BOOL FASTCALL REGION_RectInRegion(PROSRGNDATA Rgn, const RECTL *rc); +BOOL FASTCALL REGION_CropAndOffsetRegion(PROSRGNDATA rgnDst, PROSRGNDATA rgnSrc, const RECTL *rect, const POINT *off); VOID FASTCALL REGION_SetRectRgn(PROSRGNDATA pRgn, INT LeftRect, INT TopRect, INT RightRect, INT BottomRect); BOOL INTERNAL_CALL REGION_Cleanup(PVOID ObjectBody); @@ -41,7 +41,7 @@ VOID FASTCALL IntGdiReleaseRaoRgn(PDC); VOID FASTCALL IntGdiReleaseVisRgn(PDC); -INT APIENTRY IntGdiGetRgnBox(HRGN, LPRECT); +INT APIENTRY IntGdiGetRgnBox(HRGN, RECTL*); BOOL FASTCALL IntGdiPaintRgn(PDC, HRGN ); HRGN FASTCALL IntCreatePolyPolygonRgn(PPOINT, PULONG, INT, INT); Modified: trunk/reactos/subsystems/win32/win32k/include/text.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/text.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/include/text.h [iso-8859-1] Thu Mar 19 04:42:34 2009 @@ -106,7 +106,7 @@ BOOL FASTCALL IntGdiGetFontResourceInfo(PUNICODE_STRING,PVOID,DWORD*,DWORD); BOOL FASTCALL ftGdiRealizationInfo(PFONTGDI,PREALIZATION_INFO); DWORD FASTCALL ftGdiGetKerningPairs(PFONTGDI,DWORD,LPKERNINGPAIR); -BOOL NTAPI GreExtTextOutW(IN HDC,IN INT,IN INT,IN UINT,IN OPTIONAL LPRECT, +BOOL NTAPI GreExtTextOutW(IN HDC,IN INT,IN INT,IN UINT,IN OPTIONAL RECTL*, IN LPWSTR, IN INT, IN OPTIONAL LPINT, IN DWORD); DWORD FASTCALL IntGetCharDimensions(HDC, PTEXTMETRICW, PDWORD); Modified: trunk/reactos/subsystems/win32/win32k/include/window.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/window.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/include/window.h [iso-8859-1] Thu Mar 19 04:42:34 2009 @@ -116,7 +116,7 @@ CleanupWindowImpl (VOID); VOID FASTCALL -IntGetClientRect (PWINDOW_OBJECT WindowObject, PRECT Rect); +IntGetClientRect (PWINDOW_OBJECT WindowObject, RECTL *Rect); HWND FASTCALL IntGetActiveWindow (VOID); @@ -147,7 +147,7 @@ IntGetWindowRgn(PWINDOW_OBJECT Window, HRGN hRgn); INT FASTCALL -IntGetWindowRgnBox(PWINDOW_OBJECT Window, RECT *Rect); +IntGetWindowRgnBox(PWINDOW_OBJECT Window, RECTL *Rect); BOOL FASTCALL IntGetWindowInfo(PWINDOW_OBJECT WindowObject, PWINDOWINFO pwi); Modified: trunk/reactos/subsystems/win32/win32k/include/winpos.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/winpos.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/include/winpos.h [iso-8859-1] Thu Mar 19 04:42:34 2009 @@ -21,12 +21,12 @@ BOOL FASTCALL IntGetClientOrigin(PWINDOW_OBJECT Window, LPPOINT Point); LRESULT FASTCALL -co_WinPosGetNonClientSize(PWINDOW_OBJECT Window, RECT* WindowRect, RECT* ClientRect); +co_WinPosGetNonClientSize(PWINDOW_OBJECT Window, RECTL* WindowRect, RECTL* ClientRect); UINT FASTCALL co_WinPosGetMinMaxInfo(PWINDOW_OBJECT Window, POINT* MaxSize, POINT* MaxPos, POINT* MinTrack, POINT* MaxTrack); UINT FASTCALL -co_WinPosMinMaximize(PWINDOW_OBJECT WindowObject, UINT ShowFlag, RECT* NewPos); +co_WinPosMinMaximize(PWINDOW_OBJECT WindowObject, UINT ShowFlag, RECTL* NewPos); BOOLEAN FASTCALL co_WinPosSetWindowPos(PWINDOW_OBJECT Wnd, HWND WndInsertAfter, INT x, INT y, INT cx, INT cy, UINT flags); @@ -38,6 +38,6 @@ VOID FASTCALL co_WinPosActivateOtherWindow(PWINDOW_OBJECT Window); VOID FASTCALL WinPosInitInternalPos(PWINDOW_OBJECT WindowObject, - POINT *pt, PRECT RestoreRect); + POINT *pt, RECTL *RestoreRect); #endif /* _WIN32K_WINPOS_H */ 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 [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/cursoricon.c [iso-8859-1] Thu Mar 19 04:42:34 2009 @@ -840,13 +840,13 @@ BOOL APIENTRY NtUserClipCursor( - RECT *UnsafeRect) + RECTL *UnsafeRect) { /* FIXME - check if process has WINSTA_WRITEATTRIBUTES */ PWINSTATION_OBJECT WinSta; PSYSTEM_CURSORINFO CurInfo; - RECT Rect; + RECTL Rect; PWINDOW_OBJECT DesktopWindow = NULL; POINT MousePos = {0}; DECLARE_RETURN(BOOL); @@ -1001,12 +1001,12 @@ BOOL APIENTRY NtUserGetClipCursor( - RECT *lpRect) + RECTL *lpRect) { /* FIXME - check if process has WINSTA_READATTRIBUTES */ PSYSTEM_CURSORINFO CurInfo; PWINSTATION_OBJECT WinSta; - RECT Rect; + RECTL Rect; NTSTATUS Status; DECLARE_RETURN(BOOL); @@ -1038,7 +1038,7 @@ Rect.bottom = UserGetSystemMetrics(SM_CYSCREEN); } - Status = MmCopyToCaller((PRECT)lpRect, &Rect, sizeof(RECT)); + Status = MmCopyToCaller(lpRect, &Rect, sizeof(RECT)); if(!NT_SUCCESS(Status)) { ObDereferenceObject(WinSta); @@ -1491,7 +1491,7 @@ if (DoFlickerFree || bAlpha) { - RECT r; + RECTL r; BITMAP bm; SURFACE *psurfOff = NULL; 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 [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/desktop.c [iso-8859-1] Thu Mar 19 04:42:34 2009 @@ -439,9 +439,9 @@ } VOID FASTCALL -IntGetDesktopWorkArea(PDESKTOP Desktop, PRECT Rect) -{ - PRECT Ret; +IntGetDesktopWorkArea(PDESKTOP Desktop, RECTL *Rect) +{ + RECTL *Ret; ASSERT(Desktop); @@ -1358,7 +1358,7 @@ BOOL APIENTRY NtUserPaintDesktop(HDC hDC) { - RECT Rect; + RECTL Rect; HBRUSH DesktopBrush, PreviousBrush; HWND hWndDesktop; BOOL doPatBlt = TRUE; @@ -1513,7 +1513,7 @@ if (g_PaintDesktopVersion) { static WCHAR s_wszVersion[256] = {0}; - RECT rect; + RECTL rect; if (*s_wszVersion) { Modified: trunk/reactos/subsystems/win32/win32k/ntuser/hook.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/hook.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/hook.c [iso-8859-1] Thu Mar 19 04:42:34 2009 @@ -734,7 +734,7 @@ case HCBT_MOVESIZE: { - RECT rt; + RECTL rt; DPRINT1("HOOK HCBT_MOVESIZE\n"); if (lParam) { Modified: trunk/reactos/subsystems/win32/win32k/ntuser/menu.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/menu.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/menu.c [iso-8859-1] Thu Mar 19 04:42:34 2009 @@ -1265,14 +1265,14 @@ INT FASTCALL IntTrackMenu(PMENU_OBJECT Menu, PWINDOW_OBJECT Window, INT x, INT y, - RECT lprect) + RECTL lprect) { return 0; } BOOL FASTCALL co_IntTrackPopupMenu(PMENU_OBJECT Menu, PWINDOW_OBJECT Window, - UINT Flags, POINT *Pos, UINT MenuPos, RECT *ExcludeRect) + UINT Flags, POINT *Pos, UINT MenuPos, RECTL *ExcludeRect) { co_IntInitTracking(Window, Menu, TRUE, Flags); @@ -1281,7 +1281,7 @@ } BOOL FASTCALL -IntSetMenuItemRect(PMENU_OBJECT Menu, UINT Item, BOOL fByPos, RECT *rcRect) +IntSetMenuItemRect(PMENU_OBJECT Menu, UINT Item, BOOL fByPos, RECTL *rcRect) { PMENU_ITEM mi; if(IntGetMenuItemByFlag(Menu, Item, (fByPos ? MF_BYPOSITION : MF_BYCOMMAND), @@ -1327,7 +1327,7 @@ } VOID APIENTRY -co_InflateRect(LPRECT rect, int dx, int dy) +co_InflateRect(RECTL *rect, int dx, int dy) { rect->left -= dx; rect->top -= dy; @@ -1876,7 +1876,7 @@ PWINDOW_OBJECT WindowObject; HMENU hMenu; POINT Offset; - RECT Rect; + RECTL Rect; MENUBARINFO kmbi; DECLARE_RETURN(BOOL); @@ -2098,12 +2098,12 @@ HWND hWnd, HMENU hMenu, UINT uItem, - LPRECT lprcItem) + PRECTL lprcItem) { ROSMENUINFO mi; PWINDOW_OBJECT ReferenceWnd; LONG XMove, YMove; - RECT Rect; + RECTL Rect; NTSTATUS Status; PMENU_OBJECT Menu; PMENU_ITEM MenuItem; Modified: trunk/reactos/subsystems/win32/win32k/ntuser/monitor.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/monitor.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/monitor.c [iso-8859-1] Thu Mar 19 04:42:34 2009 @@ -316,9 +316,9 @@ */ static UINT -IntGetMonitorsFromRect(OPTIONAL IN LPCRECT pRect, +IntGetMonitorsFromRect(OPTIONAL IN LPCRECTL pRect, OPTIONAL OUT HMONITOR *hMonitorList, - OPTIONAL OUT LPRECT monitorRectList, + OPTIONAL OUT PRECTL monitorRectList, OPTIONAL IN DWORD listSize, OPTIONAL IN DWORD flags) { @@ -329,7 +329,7 @@ /* find monitors which intersect the rectangle */ for (Monitor = gMonitorList; Monitor != NULL; Monitor = Monitor->Next) { - RECT MonitorRect, IntersectionRect; + RECTL MonitorRect, IntersectionRect; ExEnterCriticalRegionAndAcquireFastMutexUnsafe(&Monitor->Lock); MonitorRect.left = 0; /* FIXME: get origin */ @@ -456,16 +456,16 @@ APIENTRY NtUserEnumDisplayMonitors( OPTIONAL IN HDC hDC, - OPTIONAL IN LPCRECT pRect, + OPTIONAL IN LPCRECTL pRect, OPTIONAL OUT HMONITOR *hMonitorList, - OPTIONAL OUT LPRECT monitorRectList, + OPTIONAL OUT PRECTL monitorRectList, OPTIONAL IN DWORD listSize) { INT numMonitors, i; HMONITOR *safeHMonitorList = NULL; - LPRECT safeRectList = NULL; - RECT rect, *myRect; - RECT dcRect; + PRECTL safeRectList = NULL; + RECTL rect, *myRect; + RECTL dcRect; NTSTATUS status; /* get rect */ @@ -729,7 +729,7 @@ IN DWORD dwFlags) { INT NumMonitors; - RECT InRect; + RECTL InRect; HMONITOR hMonitor = NULL; /* fill inRect */ @@ -783,14 +783,14 @@ HMONITOR APIENTRY NtUserMonitorFromRect( - IN LPCRECT pRect, + IN LPCRECTL pRect, IN DWORD dwFlags) { INT numMonitors, iLargestArea = -1, i; - LPRECT rectList; + PRECTL rectList; HMONITOR *hMonitorList; HMONITOR hMonitor = NULL; - RECT rect; + RECTL rect; NTSTATUS status; /* get rect */ @@ -883,7 +883,7 @@ { PWINDOW_OBJECT Window; HMONITOR hMonitor = NULL; - RECT Rect; + RECTL Rect; DECLARE_RETURN(HMONITOR); DPRINT("Enter NtUserMonitorFromWindow\n"); Modified: trunk/reactos/subsystems/win32/win32k/ntuser/ntstubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/ntstubs.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/ntstubs.c [iso-8859-1] Thu Mar 19 04:42:34 2009 @@ -1092,7 +1092,7 @@ APIENTRY NtUserValidateRect( HWND hWnd, - CONST RECT *lpRect) + const RECT *lpRect) { UNIMPLEMENTED; return 0; 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 [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/painting.c [iso-8859-1] Thu Mar 19 04:42:34 2009 @@ -55,7 +55,7 @@ */ BOOL FASTCALL -IntIntersectWithParents(PWINDOW_OBJECT Child, PRECT WindowRect) +IntIntersectWithParents(PWINDOW_OBJECT Child, RECTL *WindowRect) { PWINDOW_OBJECT ParentWindow; PWINDOW ParentWnd; @@ -70,7 +70,7 @@ return FALSE; } - if (!IntGdiIntersectRect(WindowRect, WindowRect, &ParentWnd->ClientRect)) + if (!RECTL_bIntersectRect(WindowRect, WindowRect, &ParentWnd->ClientRect)) { return FALSE; } @@ -534,7 +534,7 @@ */ BOOL FASTCALL -co_UserRedrawWindow(PWINDOW_OBJECT Window, const RECT* UpdateRect, HRGN UpdateRgn, +co_UserRedrawWindow(PWINDOW_OBJECT Window, const RECTL* UpdateRect, HRGN UpdateRgn, ULONG Flags) { HRGN hRgn = NULL; @@ -572,21 +572,21 @@ } else if (UpdateRect != NULL) { - if (!IntGdiIsEmptyRect(UpdateRect)) + if (!RECTL_bIsEmptyRect(UpdateRect)) { - hRgn = UnsafeIntCreateRectRgnIndirect((RECT *)UpdateRect); + hRgn = UnsafeIntCreateRectRgnIndirect((RECTL *)UpdateRect); NtGdiOffsetRgn(hRgn, Window->Wnd->ClientRect.left, Window->Wnd->ClientRect.top); } } else if ((Flags & (RDW_INVALIDATE | RDW_FRAME)) == (RDW_INVALIDATE | RDW_FRAME) || (Flags & (RDW_VALIDATE | RDW_NOFRAME)) == (RDW_VALIDATE | RDW_NOFRAME)) { - if (!IntGdiIsEmptyRect(&Window->Wnd->WindowRect)) + if (!RECTL_bIsEmptyRect(&Window->Wnd->WindowRect)) hRgn = UnsafeIntCreateRectRgnIndirect(&Window->Wnd->WindowRect); } else { - if (!IntGdiIsEmptyRect(&Window->Wnd->ClientRect)) + if (!RECTL_bIsEmptyRect(&Window->Wnd->ClientRect)) hRgn = UnsafeIntCreateRectRgnIndirect(&Window->Wnd->ClientRect); } } @@ -712,7 +712,7 @@ static HWND FASTCALL -co_IntFixCaret(PWINDOW_OBJECT Window, LPRECT lprc, UINT flags) +co_IntFixCaret(PWINDOW_OBJECT Window, RECTL *lprc, UINT flags) { PDESKTOP Desktop; PTHRDCARETINFO CaretInfo; @@ -732,7 +732,7 @@ ((flags & SW_SCROLLCHILDREN) && IntIsChildWindow(Window, WndCaret))) { POINT pt, FromOffset, ToOffset, Offset; - RECT rcCaret; + RECTL rcCaret; pt.x = CaretInfo->Pos.x; pt.y = CaretInfo->Pos.y; @@ -744,7 +744,7 @@ rcCaret.top = pt.y; rcCaret.right = pt.x + CaretInfo->Size.cx; rcCaret.bottom = pt.y + CaretInfo->Size.cy; - if (IntGdiIntersectRect(lprc, lprc, &rcCaret)) + if (RECTL_bIntersectRect(lprc, lprc, &rcCaret)) { co_UserHideCaret(0); lprc->left = pt.x; @@ -927,7 +927,7 @@ co_UserGetUpdateRgn(PWINDOW_OBJECT Window, HRGN hRgn, BOOL bErase) { int RegionType; - RECT Rect; + RECTL Rect; ASSERT_REFS_CO(Window); @@ -998,7 +998,7 @@ NtUserGetUpdateRect(HWND hWnd, LPRECT UnsafeRect, BOOL bErase) { PWINDOW_OBJECT Window; - RECT Rect; + RECTL Rect; INT RegionType; PROSRGNDATA RgnData; NTSTATUS Status; @@ -1031,12 +1031,12 @@ REGION_UnlockRgn(RgnData); if (RegionType != ERROR && RegionType != NULLREGION) - IntGdiIntersectRect(&Rect, &Rect, &Window->Wnd->ClientRect); + RECTL_bIntersectRect(&Rect, &Rect, &Window->Wnd->ClientRect); } if (IntIntersectWithParents(Window, &Rect)) { - IntGdiOffsetRect(&Rect, + RECTL_vOffsetRect(&Rect, -Window->Wnd->ClientRect.left, -Window->Wnd->ClientRect.top); } else @@ -1045,7 +1045,7 @@ } } - if (bErase && !IntGdiIsEmptyRect(&Rect)) + if (bErase && !RECTL_bIsEmptyRect(&Rect)) { USER_REFERENCE_ENTRY Ref; UserRefObjectCo(Window, &Ref); @@ -1055,7 +1055,7 @@ if (UnsafeRect != NULL) { - Status = MmCopyToCaller(UnsafeRect, &Rect, sizeof(RECT)); + Status = MmCopyToCaller(UnsafeRect, &Rect, sizeof(RECTL)); if (!NT_SUCCESS(Status)) { SetLastWin32Error(ERROR_INVALID_PARAMETER); @@ -1063,7 +1063,7 @@ } } - RETURN(!IntGdiIsEmptyRect(&Rect)); + RETURN(!RECTL_bIsEmptyRect(&Rect)); CLEANUP: DPRINT("Leave NtUserGetUpdateRect, ret=%i\n",_ret_); @@ -1082,7 +1082,7 @@ NtUserRedrawWindow(HWND hWnd, CONST RECT *lprcUpdate, HRGN hrgnUpdate, UINT flags) { - RECT SafeUpdateRect; + RECTL SafeUpdateRect; NTSTATUS Status; PWINDOW_OBJECT Wnd; DECLARE_RETURN(BOOL); @@ -1098,8 +1098,8 @@ if (lprcUpdate != NULL) { - Status = MmCopyFromCaller(&SafeUpdateRect, (PRECT)lprcUpdate, - sizeof(RECT)); + Status = MmCopyFromCaller(&SafeUpdateRect, lprcUpdate, + sizeof(RECTL)); if (!NT_SUCCESS(Status)) { @@ -1134,24 +1134,24 @@ static INT FASTCALL -UserScrollDC(HDC hDC, INT dx, INT dy, const RECT *prcScroll, - const RECT *prcClip, HRGN hrgnUpdate, LPRECT prcUpdate) +UserScrollDC(HDC hDC, INT dx, INT dy, const RECTL *prcScroll, + const RECTL *prcClip, HRGN hrgnUpdate, RECTL *prcUpdate) { PDC pDC; - RECT rcScroll, rcClip, rcSrc, rcDst; + RECTL rcScroll, rcClip, rcSrc, rcDst; INT Result; GdiGetClipBox(hDC, &rcClip); rcScroll = rcClip; if (prcClip) { - IntGdiIntersectRect(&rcClip, &rcClip, prcClip); + RECTL_bIntersectRect(&rcClip, &rcClip, prcClip); } if (prcScroll) { rcScroll = *prcScroll; - IntGdiIntersectRect(&rcSrc, &rcClip, prcScroll); + RECTL_bIntersectRect(&rcSrc, &rcClip, prcScroll); } else { @@ -1159,8 +1159,8 @@ } rcDst = rcSrc; - IntGdiOffsetRect(&rcDst, dx, dy); - IntGdiIntersectRect(&rcDst, &rcDst, &rcClip); + RECTL_vOffsetRect(&rcDst, dx, dy); + RECTL_bIntersectRect(&rcDst, &rcDst, &rcClip); if (!NtGdiBitBlt(hDC, rcDst.left, rcDst.top, rcDst.right - rcDst.left, rcDst.bottom - rcDst.top, @@ -1185,8 +1185,8 @@ /* Begin with the shifted and then clipped scroll rect */ rcDst = rcScroll; - IntGdiOffsetRect(&rcDst, dx, dy); - IntGdiIntersectRect(&rcDst, &rcDst, &rcClip); + RECTL_vOffsetRect(&rcDst, dx, dy); + RECTL_bIntersectRect(&rcDst, &rcDst, &rcClip); if (hrgnUpdate) { hrgnOwn = hrgnUpdate; @@ -1242,7 +1242,7 @@ const RECT *prcUnsafeClip, HRGN hrgnUpdate, LPRECT prcUnsafeUpdate) { DECLARE_RETURN(DWORD); - RECT rcScroll, rcClip, rcUpdate; + RECTL rcScroll, rcClip, rcUpdate; NTSTATUS Status = STATUS_SUCCESS; DWORD Result; @@ -1325,7 +1325,7 @@ NtUserScrollWindowEx(HWND hWnd, INT dx, INT dy, const RECT *prcUnsafeScroll, const RECT *prcUnsafeClip, HRGN hrgnUpdate, LPRECT prcUnsafeUpdate, UINT flags) { - RECT rcScroll, rcClip, rcCaret, rcUpdate; + RECTL rcScroll, rcClip, rcCaret, rcUpdate; INT Result; PWINDOW_OBJECT Window = NULL, CaretWnd; HDC hDC; @@ -1353,7 +1353,7 @@ if (prcUnsafeScroll) { ProbeForRead(prcUnsafeScroll, sizeof(*prcUnsafeScroll), 1); - IntGdiIntersectRect(&rcScroll, &rcClip, prcUnsafeScroll); + RECTL_bIntersectRect(&rcScroll, &rcClip, prcUnsafeScroll); } else rcScroll = rcClip; @@ -1361,7 +1361,7 @@ if (prcUnsafeClip) { ProbeForRead(prcUnsafeClip, sizeof(*prcUnsafeClip), 1); - IntGdiIntersectRect(&rcClip, &rcClip, prcUnsafeClip); + RECTL_bIntersectRect(&rcClip, &rcClip, prcUnsafeClip); } } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) @@ -1419,10 +1419,10 @@ if (flags & SW_SCROLLCHILDREN) { PWINDOW_OBJECT Child; - RECT rcChild; + RECTL rcChild; POINT ClientOrigin; USER_REFERENCE_ENTRY WndRef; - RECT rcDummy; + RECTL rcDummy; IntGetClientOrigin(Window, &ClientOrigin); for (Child = Window->FirstChild; Child; Child = Child->NextSibling) @@ -1433,7 +1433,7 @@ rcChild.right -= ClientOrigin.x; rcChild.bottom -= ClientOrigin.y; - if (! prcUnsafeScroll || IntGdiIntersectRect(&rcDummy, &rcChild, &rcScroll)) + if (! prcUnsafeScroll || RECTL_bIntersectRect(&rcDummy, &rcChild, &rcScroll)) { UserRefObjectCo(Child, &WndRef); co_WinPosSetWindowPos(Child, 0, rcChild.left + dx, rcChild.top + dy, 0, 0, @@ -1503,7 +1503,7 @@ UserDrawSysMenuButton( PWINDOW_OBJECT pWnd, HDC hDc, - LPRECT lpRc, + RECTL *lpRc, BOOL Down) { HICON hIcon; @@ -1543,7 +1543,7 @@ BOOL UserDrawCaptionText(HDC hDc, const PUNICODE_STRING Text, - const LPRECT lpRc, + const RECTL *lpRc, UINT uFlags) { HFONT hOldFont = NULL, hFont = NULL; @@ -1608,7 +1608,7 @@ BOOL UserDrawCaption( PWINDOW_OBJECT pWnd, HDC hDc, - LPCRECT lpRc, + RECTL *lpRc, HFONT hFont, HICON hIcon, const PUNICODE_STRING str, @@ -1620,7 +1620,7 @@ HDC hMemDc = NULL; ULONG Height; UINT VCenter = 0, Padding = 0; - RECT r = *lpRc; + RECTL r = *lpRc; LONG ButtonWidth, IconWidth; BOOL HasIcon; PWINDOW Wnd = NULL; @@ -1901,7 +1901,7 @@ UINT uFlags) { PWINDOW_OBJECT pWnd = NULL; - RECT SafeRect; + RECTL SafeRect; UNICODE_STRING SafeStr = {0}; BOOL Ret = FALSE; @@ -1918,8 +1918,8 @@ _SEH2_TRY { - ProbeForRead(lpRc, sizeof(RECT), sizeof(ULONG)); - RtlCopyMemory(&SafeRect, lpRc, sizeof(RECT)); + ProbeForRead(lpRc, sizeof(RECTL), sizeof(ULONG)); + RtlCopyMemory(&SafeRect, lpRc, sizeof(RECTL)); if (str != NULL) { SafeStr = ProbeForReadUnicodeString(str); Modified: trunk/reactos/subsystems/win32/win32k/ntuser/scrollbar.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/scrollbar.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/scrollbar.c [iso-8859-1] Thu Mar 19 04:42:34 2009 @@ -57,12 +57,12 @@ * the top. Return TRUE if the scrollbar is vertical, FALSE if horizontal. */ BOOL FASTCALL -IntGetScrollBarRect (PWINDOW_OBJECT Window, INT nBar, PRECT lprect) +IntGetScrollBarRect (PWINDOW_OBJECT Window, INT nBar, RECTL *lprect) { BOOL vertical; PWINDOW Wnd = Window->Wnd; - RECT ClientRect = Window->Wnd->ClientRect; - RECT WindowRect = Window->Wnd->WindowRect; + RECTL ClientRect = Window->Wnd->ClientRect; + RECTL WindowRect = Window->Wnd->WindowRect; switch (nBar) { @@ -107,7 +107,7 @@ { PWINDOW Wnd = Window->Wnd; INT Thumb, ThumbBox, ThumbPos, cxy, mx; - RECT ClientRect; + RECTL ClientRect; switch(idObject) { @@ -120,7 +120,7 @@ cxy = psbi->rcScrollBar.bottom - psbi->rcScrollBar.top; break; case SB_CTL: - IntGetClientRect (Window, &ClientRect); + IntGetClientRect(Window, &ClientRect); if(Wnd->Style & SBS_VERT) { Thumb = UserGetSystemMetrics(SM_CYVSCROLL); @@ -391,7 +391,7 @@ if (bRedraw) { - RECT UpdateRect = psbi->rcScrollBar; + RECTL UpdateRect = psbi->rcScrollBar; UpdateRect.left -= Window->Wnd->ClientRect.left - Window->Wnd->WindowRect.left; UpdateRect.right -= Window->Wnd->ClientRect.left - Window->Wnd->WindowRect.left; UpdateRect.top -= Window->Wnd->ClientRect.top - Window->Wnd->WindowRect.top; Modified: trunk/reactos/subsystems/win32/win32k/ntuser/simplecall.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/simplecall.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/simplecall.c [iso-8859-1] Thu Mar 19 04:42:34 2009 @@ -453,7 +453,7 @@ case TWOPARAM_ROUTINE_GETWINDOWRGNBOX: { DWORD Ret; - RECT rcRect; + RECTL rcRect; Window = UserGetWindowObject((HWND)Param1); if (!Window) RETURN(ERROR); Modified: trunk/reactos/subsystems/win32/win32k/ntuser/sysparams.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/sysparams.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/sysparams.c [iso-8859-1] Thu Mar 19 04:42:34 2009 @@ -506,7 +506,7 @@ } case SPI_SETWORKAREA: { - RECT *rc; + RECTL *rc; PTHREADINFO pti = PsGetCurrentThreadWin32Thread(); PDESKTOP Desktop = pti->Desktop; @@ -517,7 +517,7 @@ } ASSERT(pvParam); - rc = (RECT*)pvParam; + rc = pvParam; Desktop->WorkArea = *rc; bChanged = TRUE; @@ -535,7 +535,7 @@ } ASSERT(pvParam); - IntGetDesktopWorkArea(Desktop, (PRECT)pvParam); + IntGetDesktopWorkArea(Desktop, pvParam); break; } Modified: trunk/reactos/subsystems/win32/win32k/ntuser/window.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/window.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/window.c [iso-8859-1] Thu Mar 19 04:42:34 2009 @@ -739,7 +739,7 @@ * \note Does not check the validity of the parameters */ VOID FASTCALL -IntGetClientRect(PWINDOW_OBJECT Window, PRECT Rect) +IntGetClientRect(PWINDOW_OBJECT Window, RECTL *Rect) { ASSERT( Window ); ASSERT( Rect ); @@ -1484,14 +1484,14 @@ * calculates the default position of a window */ BOOL FASTCALL -IntCalcDefPosSize(PWINDOW_OBJECT Parent, PWINDOW_OBJECT Window, RECT *rc, BOOL IncPos) +IntCalcDefPosSize(PWINDOW_OBJECT Parent, PWINDOW_OBJECT Window, RECTL *rc, BOOL IncPos) { SIZE Sz; POINT Pos = {0, 0}; if(Parent != NULL) { - IntGdiIntersectRect(rc, rc, &Parent->Wnd->ClientRect); + RECTL_bIntersectRect(rc, rc, &Parent->Wnd->ClientRect); if(IncPos) { @@ -1899,7 +1899,7 @@ /* default positioning for overlapped windows */ if(!(Wnd->Style & (WS_POPUP | WS_CHILD))) { - RECT rc, WorkArea; + RECTL rc, WorkArea; PRTL_USER_PROCESS_PARAMETERS ProcessParams; BOOL CalculatedDefPosSize = FALSE; @@ -1997,7 +1997,7 @@ Wnd->WindowRect.bottom = Pos.y + Size.cy; if (0 != (Wnd->Style & WS_CHILD) && ParentWindow) { - IntGdiOffsetRect(&(Wnd->WindowRect), ParentWindow->Wnd->ClientRect.left, + RECTL_vOffsetRect(&(Wnd->WindowRect), ParentWindow->Wnd->ClientRect.left, ParentWindow->Wnd->ClientRect.top); } Wnd->ClientRect = Wnd->WindowRect; @@ -2032,7 +2032,7 @@ Wnd->WindowRect.bottom = Pos.y + Size.cy; if (0 != (Wnd->Style & WS_CHILD) && ParentWindow) { - IntGdiOffsetRect(&(Wnd->WindowRect), ParentWindow->Wnd->ClientRect.left, + RECTL_vOffsetRect(&(Wnd->WindowRect), ParentWindow->Wnd->ClientRect.left, ParentWindow->Wnd->ClientRect.top); } Wnd->ClientRect = Wnd->WindowRect; @@ -2067,7 +2067,7 @@ &Window->Wnd->WindowRect, &Window->Wnd->ClientRect); - IntGdiOffsetRect(&Window->Wnd->WindowRect, + RECTL_vOffsetRect(&Window->Wnd->WindowRect, MaxPos.x - Window->Wnd->WindowRect.left, MaxPos.y - Window->Wnd->WindowRect.top); @@ -2172,7 +2172,7 @@ /* Show or maybe minimize or maximize the window. */ if (Wnd->Style & (WS_MINIMIZE | WS_MAXIMIZE)) { - RECT NewPos; + RECTL NewPos; UINT16 SwFlag; SwFlag = (Wnd->Style & WS_MINIMIZE) ? SW_MINIMIZE : @@ -4484,7 +4484,7 @@ } INT FASTCALL -IntGetWindowRgnBox(PWINDOW_OBJECT Window, RECT *Rect) +IntGetWindowRgnBox(PWINDOW_OBJECT Window, RECTL *Rect) { INT Ret; HRGN VisRgn; Modified: trunk/reactos/subsystems/win32/win32k/ntuser/winpos.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/winpos.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/winpos.c [iso-8859-1] Thu Mar 19 04:42:34 2009 @@ -191,7 +191,7 @@ FASTCALL co_WinPosArrangeIconicWindows(PWINDOW_OBJECT parent) { - RECT rectParent; + RECTL rectParent; INT i, x, y, xspacing, yspacing; HWND *List = IntWinListChildren(parent); @@ -248,7 +248,7 @@ } VOID FASTCALL -WinPosInitInternalPos(PWINDOW_OBJECT Window, POINT *pt, PRECT RestoreRect) +WinPosInitInternalPos(PWINDOW_OBJECT Window, POINT *pt, RECTL *RestoreRect) { PWINDOW_OBJECT Parent; UINT XInc, YInc; @@ -256,7 +256,7 @@ if (!Wnd->InternalPosInitialized) { - RECT WorkArea; + RECTL WorkArea; PTHREADINFO pti = PsGetCurrentThreadWin32Thread(); PDESKTOP Desktop = pti->Desktop; /* Or rather get it from the window? */ @@ -333,7 +333,7 @@ RDW_NOINTERNALPAINT); Wnd->Style |= WS_MINIMIZE; WinPosFindIconPos(Window, &Wnd->InternalPos.IconPos); - IntGdiSetRect(NewPos, Wnd->InternalPos.IconPos.x, Wnd->InternalPos.IconPos.y, + RECTL_vSetRect(NewPos, Wnd->InternalPos.IconPos.x, Wnd->InternalPos.IconPos.y, UserGetSystemMetrics(SM_CXMINIMIZED), UserGetSystemMetrics(SM_CYMINIMIZED)); SwpFlags |= SWP_NOCOPYBITS; @@ -351,7 +351,7 @@ Wnd->Style &= ~WS_MINIMIZE; } Wnd->Style |= WS_MAXIMIZE; - IntGdiSetRect(NewPos, Wnd->InternalPos.MaxPos.x, Wnd->InternalPos.MaxPos.y, + RECTL_vSetRect(NewPos, Wnd->InternalPos.MaxPos.x, Wnd->InternalPos.MaxPos.y, Size.x, Size.y); break; } @@ -366,7 +366,7 @@ co_WinPosGetMinMaxInfo(Window, &Size, &Wnd->InternalPos.MaxPos, NULL, NULL); Wnd->Style |= WS_MAXIMIZE; - IntGdiSetRect(NewPos, Wnd->InternalPos.MaxPos.x, + RECTL_vSetRect(NewPos, Wnd->InternalPos.MaxPos.x, Wnd->InternalPos.MaxPos.y, Size.x, Size.y); break; } @@ -401,7 +401,7 @@ WinPosFillMinMaxInfoStruct(PWINDOW_OBJECT Window, MINMAXINFO *Info) { UINT XInc, YInc; - RECT WorkArea; + RECTL WorkArea; PTHREADINFO pti = PsGetCurrentThreadWin32Thread(); PDESKTOP Desktop = pti->Desktop; /* Or rather get it from the window? */ @@ -459,7 +459,7 @@ static VOID FASTCALL -FixClientRect(PRECT ClientRect, PRECT WindowRect) +FixClientRect(PRECTL ClientRect, PRECTL WindowRect) { if (ClientRect->left < WindowRect->left) { @@ -519,11 +519,11 @@ Parent = Window->Parent; if (0 != (Wnd->Style & WS_CHILD) && Parent) { - IntGdiOffsetRect(&(params.rgrc[0]), - Parent->Wnd->ClientRect.left, + RECTL_vOffsetRect(&(params.rgrc[0]), - Parent->Wnd->ClientRect.left, - Parent->Wnd->ClientRect.top); - IntGdiOffsetRect(&(params.rgrc[1]), - Parent->Wnd->ClientRect.left, + RECTL_vOffsetRect(&(params.rgrc[1]), - Parent->Wnd->ClientRect.left, - Parent->Wnd->ClientRect.top); - IntGdiOffsetRect(&(params.rgrc[2]), - Parent->Wnd->ClientRect.left, + RECTL_vOffsetRect(&(params.rgrc[2]), - Parent->Wnd->ClientRect.left, - Parent->Wnd->ClientRect.top); } params.lppos = &winposCopy; @@ -538,7 +538,7 @@ *ClientRect = params.rgrc[0]; if ((Wnd->Style & WS_CHILD) && Parent) { - IntGdiOffsetRect(ClientRect, Parent->Wnd->ClientRect.left, + RECTL_vOffsetRect(ClientRect, Parent->Wnd->ClientRect.left, Parent->Wnd->ClientRect.top); } FixClientRect(ClientRect, WindowRect); @@ -577,8 +577,8 @@ BOOL FASTCALL co_WinPosDoWinPosChanging(PWINDOW_OBJECT Window, PWINDOWPOS WinPos, - PRECT WindowRect, - PRECT ClientRect) + PRECTL WindowRect, + PRECTL ClientRect) { INT X, Y; PWINDOW Wnd; @@ -616,7 +616,7 @@ WindowRect->top = Y; WindowRect->right += X - Wnd->WindowRect.left; WindowRect->bottom += Y - Wnd->WindowRect.top; - IntGdiOffsetRect(ClientRect, + RECTL_vOffsetRect(ClientRect, X - Wnd->WindowRect.left, Y - Wnd->WindowRect.top); } @@ -871,8 +871,8 @@ ) { WINDOWPOS WinPos; - RECT NewWindowRect; - RECT NewClientRect; + RECTL NewWindowRect; + RECTL NewClientRect; PROSRGNDATA VisRgn; HRGN VisBefore = NULL; HRGN VisAfter = NULL; @@ -880,11 +880,11 @@ HRGN ExposedRgn = NULL; HRGN CopyRgn = NULL; ULONG WvrFlags = 0; - RECT OldWindowRect, OldClientRect; + RECTL OldWindowRect, OldClientRect; int RgnType; HDC Dc; - RECT CopyRect; - RECT TempRect; + RECTL CopyRect; + RECTL TempRect; PWINDOW_OBJECT Ancestor; ASSERT_REFS_CO(Window); @@ -1132,11 +1132,11 @@ RgnType != NULLREGION) { PROSRGNDATA pCopyRgn; - RECT ORect = OldClientRect; - RECT NRect = NewClientRect; - IntGdiOffsetRect(&ORect, - OldWindowRect.left, - OldWindowRect.top); - IntGdiOffsetRect(&NRect, - NewWindowRect.left, - NewWindowRect.top); - IntGdiIntersectRect(&CopyRect, &ORect, &NRect); + RECTL ORect = OldClientRect; + RECTL NRect = NewClientRect; + RECTL_vOffsetRect(&ORect, - OldWindowRect.left, - OldWindowRect.top); + RECTL_vOffsetRect(&NRect, - NewWindowRect.left, - NewWindowRect.top); + RECTL_bIntersectRect(&CopyRect, &ORect, &NRect); pCopyRgn = REGION_LockRgn(CopyRgn); REGION_CropAndOffsetRegion(pCopyRgn, pCopyRgn, &CopyRect, NULL); REGION_UnlockRgn(pCopyRgn); @@ -1316,7 +1316,7 @@ { BOOLEAN WasVisible; UINT Swp = 0; - RECT NewPos; + RECTL NewPos; BOOLEAN ShowFlag; // HRGN VisibleRgn; PWINDOW Wnd; 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 [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/bitmaps.c [iso-8859-1] Thu Mar 19 04:42:34 2009 @@ -23,14 +23,6 @@ #define NDEBUG #include <debug.h> -#define IN_RECT(r,x,y) \ -( \ - (x) >= (r).left && \ - (y) >= (r).top && \ - (x) < (r).right && \ - (y) < (r).bottom \ -) - HBITMAP APIENTRY IntGdiCreateBitmap( INT Width, @@ -366,7 +358,7 @@ XPos += dc->ptlDCOrig.x; YPos += dc->ptlDCOrig.y; - if (IN_RECT(dc->CombinedClip->rclBounds,XPos,YPos)) + if (RECTL_bPointInRect(&dc->CombinedClip->rclBounds, XPos, YPos)) { bInRect = TRUE; psurf = SURFACE_LockSurface(dc->w.hBitmap); Modified: trunk/reactos/subsystems/win32/win32k/objects/cliprgn.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/cliprgn.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/cliprgn.c [iso-8859-1] Thu Mar 19 04:42:34 2009 @@ -43,8 +43,8 @@ Dc->CombinedClip = IntEngCreateClipRegion( CombinedRegion->rdh.nCount, - (PRECTL)CombinedRegion->Buffer, - (PRECTL)&CombinedRegion->rdh.rcBound); + CombinedRegion->Buffer, + &CombinedRegion->rdh.rcBound); REGION_UnlockRgn(CombinedRegion); } @@ -124,7 +124,7 @@ if (!dc->w.hClipRgn) { PROSRGNDATA Rgn; - RECT rect; + RECTL rect; if((Rgn = REGION_LockRgn(dc->w.hVisRgn))) { REGION_GetRgnBox(Rgn, &rect); @@ -169,7 +169,7 @@ } INT FASTCALL -GdiGetClipBox(HDC hDC, LPRECT rc) +GdiGetClipBox(HDC hDC, PRECTL rc) { PROSRGNDATA Rgn; INT retval; @@ -194,11 +194,11 @@ } INT APIENTRY -NtGdiGetAppClipBox(HDC hDC, LPRECT rc) +NtGdiGetAppClipBox(HDC hDC, PRECTL rc) { INT Ret; NTSTATUS Status = STATUS_SUCCESS; - RECT Saferect; + RECTL Saferect; Ret = GdiGetClipBox(hDC, &Saferect); @@ -231,7 +231,7 @@ int BottomRect) { INT Result; - RECT Rect; + RECTL Rect; HRGN NewRgn; PDC dc = DC_LockDc(hDC); @@ -282,7 +282,7 @@ int BottomRect) { INT Result; - RECT Rect; + RECTL Rect; HRGN NewRgn; PDC dc = DC_LockDc(hDC); @@ -374,13 +374,13 @@ } BOOL APIENTRY NtGdiRectVisible(HDC hDC, - CONST PRECT UnsafeRect) + LPRECT UnsafeRect) { NTSTATUS Status = STATUS_SUCCESS; PROSRGNDATA Rgn; PDC dc = DC_LockDc(hDC); BOOL Result = FALSE; - RECT Rect; + RECTL Rect; if (!dc) { @@ -545,8 +545,8 @@ // if (Dc->CombinedClip != NULL) IntEngDeleteClipRegion(Dc->CombinedClip); co = IntEngCreateClipRegion( ((PROSRGNDATA)pDC->prgnRao)->rdh.nCount, - (PRECTL)((PROSRGNDATA)pDC->prgnRao)->Buffer, - (PRECTL)&pDC->erclClip); + ((PROSRGNDATA)pDC->prgnRao)->Buffer, + &pDC->erclClip); return REGION_Complexity(pDC->prgnRao); } Modified: trunk/reactos/subsystems/win32/win32k/objects/freetype.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/freetype.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/freetype.c [iso-8859-1] Thu Mar 19 04:42:34 2009 @@ -3105,7 +3105,7 @@ IN INT XStart, IN INT YStart, IN UINT fuOptions, - IN OPTIONAL LPRECT lprc, + IN OPTIONAL PRECTL lprc, IN LPWSTR String, IN INT Count, IN OPTIONAL LPINT Dx, @@ -3188,7 +3188,7 @@ XStart, YStart, fuOptions, - (const RECT *)lprc, + (const RECTL *)lprc, String, Count, (const INT *)Dx)) goto fail; @@ -3694,7 +3694,7 @@ { BOOL Result = FALSE; NTSTATUS Status = STATUS_SUCCESS; - RECT SafeRect; + RECTL SafeRect; BYTE LocalBuffer[STACK_TEXT_BUFFER_SIZE]; PVOID Buffer = LocalBuffer; LPWSTR SafeString = NULL; Modified: trunk/reactos/subsystems/win32/win32k/objects/path.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/path.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/path.c [iso-8859-1] Thu Mar 19 04:42:34 2009 @@ -2025,7 +2025,7 @@ */ BOOL FASTCALL -PATH_ExtTextOut(PDC dc, INT x, INT y, UINT flags, const RECT *lprc, +PATH_ExtTextOut(PDC dc, INT x, INT y, UINT flags, const RECTL *lprc, LPCWSTR str, UINT count, const INT *dx) { unsigned int idx; Modified: trunk/reactos/subsystems/win32/win32k/objects/rect.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/rect.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/rect.c [iso-8859-1] Thu Mar 19 04:42:34 2009 @@ -25,87 +25,61 @@ /* FUNCTIONS *****************************************************************/ -VOID FASTCALL -IntGdiSetEmptyRect(PRECT Rect) +BOOL +FASTCALL +RECTL_bUnionRect(RECTL *prclDst, const RECTL *prcl1, const RECTL *prcl2) { - Rect->left = Rect->right = Rect->top = Rect->bottom = 0; -} - -BOOL FASTCALL -IntGdiIsEmptyRect(const RECT* Rect) -{ - return(Rect->left >= Rect->right || Rect->top >= Rect->bottom); -} - -VOID FASTCALL -IntGdiOffsetRect(LPRECT Rect, INT x, INT y) -{ - Rect->left += x; - Rect->right += x; - Rect->top += y; - Rect->bottom += y; -} - -BOOL FASTCALL -IntGdiUnionRect(PRECT Dest, const RECT* Src1, const RECT* Src2) -{ - if (IntGdiIsEmptyRect(Src1)) + if (RECTL_bIsEmptyRect(prcl1)) { - if (IntGdiIsEmptyRect(Src2)) - { - IntGdiSetEmptyRect(Dest); - return FALSE; - } - else - { - *Dest = *Src2; - } + if (RECTL_bIsEmptyRect(prcl2)) + { + RECTL_vSetEmptyRect(prclDst); + return FALSE; + } + else + { + *prclDst = *prcl2; + } } - else + else { - if (IntGdiIsEmptyRect(Src2)) - { - *Dest = *Src1; - } - else - { - Dest->left = min(Src1->left, Src2->left); - Dest->top = min(Src1->top, Src2->top); - Dest->right = max(Src1->right, Src2->right); - Dest->bottom = max(Src1->bottom, Src2->bottom); - } + if (RECTL_bIsEmptyRect(prcl2)) + { + *prclDst = *prcl1; + } + else + { + prclDst->left = min(prcl1->left, prcl2->left); + prclDst->top = min(prcl1->top, prcl2->top); + prclDst->right = max(prcl1->right, prcl2->right); + prclDst->bottom = max(prcl1->bottom, prcl2->bottom); + } } - return TRUE; -} - -VOID FASTCALL -IntGdiSetRect(PRECT Rect, INT left, INT top, INT right, INT bottom) -{ - Rect->left = left; - Rect->top = top; - Rect->right = right; - Rect->bottom = bottom; -} - -BOOL FASTCALL -IntGdiIntersectRect(PRECT Dest, const RECT* Src1, const RECT* Src2) -{ - if (IntGdiIsEmptyRect(Src1) || IntGdiIsEmptyRect(Src2) || - Src1->left >= Src2->right || Src2->left >= Src1->right || - Src1->top >= Src2->bottom || Src2->top >= Src1->bottom) - { - IntGdiSetEmptyRect(Dest); - return FALSE; - } - - Dest->left = max(Src1->left, Src2->left); - Dest->right = min(Src1->right, Src2->right); - Dest->top = max(Src1->top, Src2->top); - Dest->bottom = min(Src1->bottom, Src2->bottom); - - return TRUE; + return TRUE; } +BOOL +FASTCALL +RECTL_bIntersectRect(RECTL *prclDst, const RECTL *prcl1, const RECTL *prcl2) +{ + if (RECTL_bIsEmptyRect(prcl1) || RECTL_bIsEmptyRect(prcl2) || + prcl1->left >= prcl2->right || prcl2->left >= prcl1->right || + prcl1->top >= prcl2->bottom || prcl2->top >= prcl1->bottom) + { + RECTL_vSetEmptyRect(prclDst); + return FALSE; + } + + prclDst->left = max(prcl1->left, prcl2->left); + prclDst->right = min(prcl1->right, prcl2->right); + prclDst->top = max(prcl1->top, prcl2->top); + prclDst->bottom = min(prcl1->bottom, prcl2->bottom); + + return TRUE; +} + + + /* EOF */ 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 [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/region.c [iso-8859-1] Thu Mar 19 04:42:34 2009 @@ -126,15 +126,15 @@ #if 1 #define COPY_RECTS(dest, src, nRects) \ do { \ - PRECT xDest = (dest); \ - PRECT xSrc = (src); \ + PRECTL xDest = (dest); \ + PRECTL xSrc = (src); \ UINT xRects = (nRects); \ while(xRects-- > 0) { \ *(xDest++) = *(xSrc++); \ } \ } while(0) #else -#define COPY_RECTS(dest, src, nRects) RtlCopyMemory(dest, src, (nRects) * sizeof(RECT)) +#define COPY_RECTS(dest, src, nRects) RtlCopyMemory(dest, src, (nRects) * sizeof(RECTL)) #endif #define EMPTY_REGION(pReg) { \ @@ -408,11 +408,11 @@ /* * Check to see if there is enough memory in the present region. */ -static __inline int xmemcheck(ROSRGNDATA *reg, PRECT *rect, PRECT *firstrect) +static __inline int xmemcheck(ROSRGNDATA *reg, PRECTL *rect, PRECTL *firstrect) { if ( (reg->rdh.nCount+1) * sizeof(RECT) >= reg->rdh.nRgnSize ) { - PRECT temp; + PRECTL temp; DWORD NewSize = 2 * reg->rdh.nRgnSize; if (NewSize < (reg->rdh.nCount + 1) * sizeof(RECT)) { @@ -439,7 +439,7 @@ return 1; } -#define MEMCHECK(reg, rect, firstrect) xmemcheck(reg,&(rect),(LPRECT *)&(firstrect)) +#define MEMCHECK(reg, rect, firstrect) xmemcheck(reg,&(rect),(PRECTL *)&(firstrect)) typedef void (FASTCALL *overlapProcp)(PROSRGNDATA, PRECT, PRECT, PRECT, PRECT, INT, INT); typedef void (FASTCALL *nonOverlapProcp)(PROSRGNDATA, PRECT, PRECT, INT, INT); @@ -513,7 +513,7 @@ { if (dst->rdh.nRgnSize < src->rdh.nCount * sizeof(RECT)) { - PRECT temp; + PRECTL temp; temp = ExAllocatePoolWithTag(PagedPool, src->rdh.nCount * sizeof(RECT), TAG_REGION ); if (!temp) @@ -538,7 +538,7 @@ static void FASTCALL REGION_SetExtents(ROSRGNDATA *pReg) { - RECT *pRect, *pRectEnd, *pExtents; + RECTL *pRect, *pRectEnd, *pExtents; if (pReg->rdh.nCount == 0) { @@ -551,8 +551,8 @@ } pExtents = &pReg->rdh.rcBound; - pRect = (PRECT)pReg->Buffer; - pRectEnd = (PRECT)pReg->Buffer + pReg->rdh.nCount - 1; + pRect = pReg->Buffer; + pRectEnd = pReg->Buffer + pReg->rdh.nCount - 1; /* * Since pRect is the first rectangle in the region, it must have the @@ -585,22 +585,22 @@ REGION_CropAndOffsetRegion( PROSRGNDATA rgnDst, PROSRGNDATA rgnSrc, - const PRECT rect, - const PPOINT offset + const RECTL *rect, + const POINTL *offset ) { POINT pt = {0,0}; - PPOINT off = offset; + const POINT *off = offset; if (!off) off = &pt; if (!rect) // just copy and offset { - PRECT xrect; + PRECTL xrect; if (rgnDst == rgnSrc) { if (off->x || off->y) - xrect = (PRECT)rgnDst->Buffer; + xrect = rgnDst->Buffer; else return TRUE; } @@ -624,10 +624,10 @@ { for (i = 0; i < rgnDst->rdh.nCount; i++) { - xrect[i].left = ((PRECT)rgnSrc->Buffer + i)->left + off->x; - xrect[i].right = ((PRECT)rgnSrc->Buffer + i)->right + off->x; - xrect[i].top = ((PRECT)rgnSrc->Buffer + i)->top + off->y; - xrect[i].bottom = ((PRECT)rgnSrc->Buffer + i)->bottom + off->y; + xrect[i].left = (rgnSrc->Buffer + i)->left + off->x; + xrect[i].right = (rgnSrc->Buffer + i)->right + off->x; + xrect[i].top = (rgnSrc->Buffer + i)->top + off->y; + xrect[i].bottom = (rgnSrc->Buffer + i)->bottom + off->y; } rgnDst->rdh.rcBound.left += off->x; rgnDst->rdh.rcBound.right += off->x; @@ -652,17 +652,17 @@ } else // region box and clipping rect appear to intersect { - PRECT lpr, rpr; + PRECTL lpr, rpr; ULONG i, j, clipa, clipb; INT left = rgnSrc->rdh.rcBound.right + off->x; INT right = rgnSrc->rdh.rcBound.left + off->x; - for (clipa = 0; ((PRECT)rgnSrc->Buffer + clipa)->bottom <= rect->top; clipa++) + for (clipa = 0; (rgnSrc->Buffer + clipa)->bottom <= rect->top; clipa++) //region and rect intersect so we stop before clipa > rgnSrc->rdh.nCount ; // skip bands above the clipping rectangle for (clipb = clipa; clipb < rgnSrc->rdh.nCount; clipb++) - if (((PRECT)rgnSrc->Buffer + clipb)->top >= rect->bottom) + if ((rgnSrc->Buffer + clipb)->top >= rect->bottom) break; // and below it // clipa - index of the first rect in the first intersecting band @@ -670,7 +670,7 @@ if ((rgnDst != rgnSrc) && (rgnDst->rdh.nCount < (i = (clipb - clipa)))) { - PRECT temp; + PRECTL temp; temp = ExAllocatePoolWithTag(PagedPool, i * sizeof(RECT), TAG_REGION); if (!temp) return FALSE; @@ -686,11 +686,11 @@ { // i - src index, j - dst index, j is always <= i for obvious reasons - lpr = (PRECT)rgnSrc->Buffer + i; + lpr = rgnSrc->Buffer + i; if (lpr->left < rect->right && lpr->right > rect->left) { - rpr = (PRECT)rgnDst->Buffer + j; + rpr = rgnDst->Buffer + j; rpr->top = lpr->top + off->y; rpr->bottom = lpr->bottom + off->y; @@ -720,13 +720,13 @@ break; for (i = j; i > 0; i--) // fixup bottom band - if (((PRECT)rgnDst->Buffer + i)->bottom > right) - ((PRECT)rgnDst->Buffer + i)->bottom = right; + if ((rgnDst->Buffer + i)->bottom > right) + (rgnDst->Buffer + i)->bottom = right; else break; - rgnDst->rdh.rcBound.top = ((PRECT)rgnDst->Buffer)->top; - rgnDst->rdh.rcBound.bottom = ((PRECT)rgnDst->Buffer + j)->bottom; + rgnDst->rdh.rcBound.top = (rgnDst->Buffer)->top; + rgnDst->rdh.rcBound.bottom = (rgnDst->Buffer + j)->bottom; rgnDst->rdh.iType = RDH_RECTANGLES; } @@ -736,7 +736,7 @@ empty: if (!rgnDst->Buffer) { - rgnDst->Buffer = (PRECT)ExAllocatePoolWithTag(PagedPool, RGN_DEFAULT_RECTS * sizeof(RECT), TAG_REGION); + rgnDst->Buffer = ExAllocatePoolWithTag(PagedPool, RGN_DEFAULT_RECTS * sizeof(RECT), TAG_REGION); if (rgnDst->Buffer) { rgnDst->rdh.nCount = RGN_DEFAULT_RECTS; @@ -771,15 +771,15 @@ INT curStart /* Index of start of current band */ ) { - RECT *pPrevRect; /* Current rect in previous band */ - RECT *pCurRect; /* Current rect in current band */ - RECT *pRegEnd; /* End of region */ + RECTL *pPrevRect; /* Current rect in previous band */ + RECTL *pCurRect; /* Current rect in current band */ + RECTL *pRegEnd; /* End of region */ INT curNumRects; /* Number of rectangles in current band */ INT prevNumRects; /* Number of rectangles in previous band */ INT bandtop; /* top coordinate for current band */ - pRegEnd = (PRECT)pReg->Buffer + pReg->rdh.nCount; - pPrevRect = (PRECT)pReg->Buffer + prevStart; + pRegEnd = pReg->Buffer + pReg->rdh.nCount; + pPrevRect = pReg->Buffer + prevStart; prevNumRects = curStart - prevStart; /* @@ -787,7 +787,7 @@ * this because multiple bands could have been added in REGION_RegionOp * at the end when one region has been exhausted. */ - pCurRect = (PRECT)pReg->Buffer + curStart; + pCurRect = pReg->Buffer + curStart; bandtop = pCurRect->top; for (curNumRects = 0; (pCurRect != pRegEnd) && (pCurRect->top == bandtop); @@ -809,8 +809,8 @@ { pRegEnd--; } - curStart = pRegEnd - (PRECT)pReg->Buffer; - pRegEnd = (PRECT)pReg->Buffer + pReg->rdh.nCount; + curStart = pRegEnd - pReg->Buffer; + pRegEnd = pReg->Buffer + pReg->rdh.nCount; } if ((curNumRects == prevNumRects) && (curNumRects != 0)) @@ -921,18 +921,18 @@ nonOverlapProcp nonOverlap2Func /* Function to call for non-overlapping bands in region 2 */ ) { - RECT *r1; /* Pointer into first region */ - RECT *r2; /* Pointer into 2d region */ - RECT *r1End; /* End of 1st region */ - RECT *r2End; /* End of 2d region */ + RECTL *r1; /* Pointer into first region */ + RECTL *r2; /* Pointer into 2d region */ + RECTL *r1End; /* End of 1st region */ + RECTL *r2End; /* End of 2d region */ INT ybot; /* Bottom of intersection */ INT ytop; /* Top of intersection */ - RECT *oldRects; /* Old rects for newReg */ + RECTL *oldRects; /* Old rects for newReg */ ULONG prevBand; /* Index of start of * previous band in newReg */ ULONG curBand; /* Index of start of current band in newReg */ - RECT *r1BandEnd; /* End of current band in r1 */ - RECT *r2BandEnd; /* End of current band in r2 */ + RECTL *r1BandEnd; /* End of current band in r1 */ + RECTL *r2BandEnd; /* End of current band in r2 */ ULONG top; /* Top of non-overlapping band */ ULONG bot; /* Bottom of non-overlapping band */ @@ -943,8 +943,8 @@ * the two source regions, then mark the "new" region empty, allocating * another array of rectangles for it to use. */ - r1 = (PRECT)reg1->Buffer; - r2 = (PRECT)reg2->Buffer; + r1 = reg1->Buffer; + r2 = reg2->Buffer; r1End = r1 + reg1->rdh.nCount; r2End = r2 + reg2->rdh.nCount; @@ -955,7 +955,7 @@ * extents and simply set numRects to zero. */ - oldRects = (PRECT)newReg->Buffer; + oldRects = newReg->Buffer; newReg->rdh.nCount = 0; /* @@ -1159,7 +1159,7 @@ { if (REGION_NOT_EMPTY(newReg)) { - RECT *prev_rects = (PRECT)newReg->Buffer; + RECTL *prev_rects = newReg->Buffer; newReg->Buffer = ExAllocatePoolWithTag(PagedPool, newReg->rdh.nCount*sizeof(RECT), TAG_REGION); if (! newReg->Buffer) @@ -1210,18 +1210,18 @@ static void FASTCALL REGION_IntersectO( PROSRGNDATA pReg, - PRECT r1, - PRECT r1End, - PRECT r2, - PRECT r2End, + PRECTL r1, + PRECTL r1End, + PRECTL r2, + PRECTL r2End, INT top, INT bottom ) { INT left, right; - RECT *pNextRect; - - pNextRect = (PRECT)pReg->Buffer + pReg->rdh.nCount; + RECTL *pNextRect; + + pNextRect = pReg->Buffer + pReg->rdh.nCount; while ((r1 != r1End) && (r2 != r2End)) { @@ -1317,15 +1317,15 @@ static void FASTCALL REGION_UnionNonO ( PROSRGNDATA pReg, - PRECT r, - PRECT rEnd, + PRECTL r, + PRECTL rEnd, INT top, INT bottom ) { - RECT *pNextRect; - - pNextRect = (PRECT)pReg->Buffer + pReg->rdh.nCount; + RECTL *pNextRect; + + pNextRect = pReg->Buffer + pReg->rdh.nCount; while (r != rEnd) { @@ -1356,17 +1356,17 @@ static void FASTCALL REGION_UnionO ( PROSRGNDATA pReg, - PRECT r1, - PRECT r1End, - PRECT r2, - PRECT r2End, + PRECTL r1, + PRECTL r1End, + PRECTL r2, + PRECTL r2End, INT top, INT bottom ) { - RECT *pNextRect; - - pNextRect = (PRECT)pReg->Buffer + pReg->rdh.nCount; + RECTL *pNextRect; + + pNextRect = pReg->Buffer + pReg->rdh.nCount; #define MERGERECT(r) \ if ((pReg->rdh.nCount != 0) && \ @@ -1516,15 +1516,15 @@ static void FASTCALL REGION_SubtractNonO1( PROSRGNDATA pReg, - PRECT r, - PRECT rEnd, + PRECTL r, + PRECTL rEnd, INT top, INT bottom ) { - RECT *pNextRect; - - pNextRect = (PRECT)pReg->Buffer + pReg->rdh.nCount; + RECTL *pNextRect; + + pNextRect = pReg->Buffer + pReg->rdh.nCount; while (r != rEnd) { @@ -1555,19 +1555,19 @@ static void FASTCALL REGION_SubtractO( PROSRGNDATA pReg, - PRECT r1, - PRECT r1End, - PRECT r2, - PRECT r2End, + PRECTL r1, + PRECTL r1End, + PRECTL r2, + PRECTL r2End, INT top, INT bottom ) { - RECT *pNextRect; + RECTL *pNextRect; INT left; left = r1->left; - pNextRect = (PRECT)pReg->Buffer + pReg->rdh.nCount; + pNextRect = pReg->Buffer + pReg->rdh.nCount; while ((r1 != r1End) && (r2 != r2End)) { @@ -1763,7 +1763,7 @@ VOID FASTCALL REGION_UnionRectWithRgn( ROSRGNDATA *rgn, - const RECT *rect + const RECTL *rect ) { ROSRGNDATA region; @@ -1782,8 +1782,8 @@ INT y ) { - RECT rc[4]; - PRECT prc; + RECTL rc[4]; + PRECTL prc; if (x != 0 || y != 0) { @@ -1860,7 +1860,7 @@ ) { PROSRGNDATA srcObj, destObj; - PRECT rc; + PRECTL rc; ULONG i; if (!(srcObj = REGION_LockRgn(hSrc))) @@ -1899,7 +1899,7 @@ else { /* Original region moved to right */ - rc = (PRECT)srcObj->Buffer; + rc = srcObj->Buffer; for (i = 0; i < srcObj->rdh.nCount; i++) { rc->left += x; @@ -1909,7 +1909,7 @@ REGION_IntersectRegion(destObj, destObj, srcObj); /* Original region moved to left */ - rc = (PRECT)srcObj->Buffer; + rc = srcObj->Buffer; for (i = 0; i < srcObj->rdh.nCount; i++) { rc->left -= 2 * x; @@ -1919,7 +1919,7 @@ REGION_IntersectRegion(destObj, destObj, srcObj); /* Original region moved down */ - rc = (PRECT)srcObj->Buffer; + rc = srcObj->Buffer; for (i = 0; i < srcObj->rdh.nCount; i++) { rc->left += x; @@ -1931,7 +1931,7 @@ REGION_IntersectRegion(destObj, destObj, srcObj); /* Original region moved up */ - rc = (PRECT)srcObj->Buffer; + rc = srcObj->Buffer; for (i = 0; i < srcObj->rdh.nCount; i++) { rc->top -= 2 * y; @@ -1941,7 +1941,7 @@ REGION_IntersectRegion(destObj, destObj, srcObj); /* Restore the original region */ - rc = (PRECT)srcObj->Buffer; + rc = srcObj->Buffer; for (i = 0; i < srcObj->rdh.nCount; i++) { rc->top += y; @@ -1963,11 +1963,11 @@ HRGN hDest, HRGN hSrc) { - RECT *pCurRect, *pEndRect; + RECTL *pCurRect, *pEndRect; PROSRGNDATA srcObj = NULL; PROSRGNDATA destObj = NULL; - RECT tmpRect; + RECTL tmpRect; BOOL ret = FALSE; PDC_ATTR Dc_Attr; @@ -1996,8 +1996,8 @@ } EMPTY_REGION(destObj); - pEndRect = (PRECT)srcObj->Buffer + srcObj->rdh.nCount; - for (pCurRect = (PRECT)srcObj->Buffer; pCurRect < pEndRect; pCurRect++) + pEndRect = srcObj->Buffer + srcObj->rdh.nCount; + for (pCurRect = srcObj->Buffer; pCurRect < pEndRect; pCurRect++) { tmpRect = *pCurRect; tmpRect.left = XLPTODP(Dc_Attr, tmpRect.left); @@ -2093,7 +2093,7 @@ PGDI_TABLE_ENTRY Entry = &GdiHandleTable->Entries[Index]; pDC->DC_Flags |= DC_FLAG_DIRTY_RAO; Entry->Flags |= GDI_ENTRY_VALIDATE_VIS; - IntGdiSetEmptyRect((PRECT)&pDC->erclClip); + RECTL_vSetEmptyRect(&pDC->erclClip); } @@ -2104,7 +2104,7 @@ PGDI_TABLE_ENTRY Entry = &GdiHandleTable->Entries[Index]; pDC->DC_Flags |= DC_FLAG_DIRTY_RAO; Entry->Flags |= GDI_ENTRY_VALIDATE_VIS; - IntGdiSetEmptyRect((PRECT)&pDC->erclClip); + RECTL_vSetEmptyRect(&pDC->erclClip); REGION_Delete(pDC->prgnVis); pDC->prgnVis = prgnDefault; } @@ -2137,7 +2137,7 @@ rcl.bottom -= pDC->erclWindow.top; } else - IntGdiSetEmptyRect((PRECT)&rcl); + RECTL_vSetEmptyRect(&rcl); pDc_Attr->VisRectRegion.Rect = rcl; @@ -2303,7 +2303,7 @@ PROSRGNDATA pRgn; HRGN hRgn; - /* Allocate region data structure with space for 1 RECT */ + /* Allocate region data structure with space for 1 RECTL */ if (!(pRgn = REGION_AllocRgnWithHandle(1))) { SetLastWin32Error(ERROR_NOT_ENOUGH_MEMORY); @@ -2332,7 +2332,7 @@ PROSRGNDATA obj; HRGN hrgn; int asq, bsq, d, xd, yd; - RECT rect; + RECTL rect; /* Make the dimensions sensible */ @@ -2444,7 +2444,7 @@ ) { PROSRGNDATA rgn1, rgn2; - PRECT tRect1, tRect2; + PRECTL tRect1, tRect2; ULONG i; BOOL bRet = FALSE; @@ -2465,8 +2465,8 @@ rgn1->rdh.rcBound.bottom != rgn2->rdh.rcBound.bottom) goto exit; - tRect1 = (PRECT)rgn1->Buffer; - tRect2 = (PRECT)rgn2->Buffer; + tRect1 = rgn1->Buffer; + tRect2 = rgn2->Buffer; if (!tRect1 || !tRect2) goto exit; @@ -2598,7 +2598,7 @@ { HBRUSH oldhBrush; PROSRGNDATA rgn; - PRECT r; + PRECTL r; if (NULL == (rgn = REGION_LockRgn(hRgn))) { @@ -2654,7 +2654,7 @@ INT FASTCALL REGION_GetRgnBox( PROSRGNDATA Rgn, - LPRECT pRect + PRECTL pRect ) { DWORD ret; @@ -2754,7 +2754,7 @@ INT APIENTRY IntGdiGetRgnBox( HRGN hRgn, - LPRECT pRect + PRECTL pRect ) { PROSRGNDATA Rgn; @@ -2775,11 +2775,11 @@ INT APIENTRY NtGdiGetRgnBox( HRGN hRgn, - LPRECT pRect + PRECTL pRect ) { PROSRGNDATA Rgn; - RECT SafeRect; + RECTL SafeRect; DWORD ret; NTSTATUS Status = STATUS_SUCCESS; @@ -2822,7 +2822,7 @@ { PROSRGNDATA RgnData; ULONG i; - PRECT rc; + PRECTL rc; if (!(RgnData = REGION_LockRgn(hRgn))) { @@ -2830,7 +2830,7 @@ return FALSE; } - rc = (PRECT)RgnData->Buffer; + rc = RgnData->Buffer; for (i = 0; i < RgnData->rdh.nCount; i++) { @@ -2868,7 +2868,7 @@ if (XOffset || YOffset) { int nbox = rgn->rdh.nCount; - PRECT pbox = (PRECT)rgn->Buffer; + PRECTL pbox = rgn->Buffer; if (nbox && pbox) { @@ -2935,8 +2935,8 @@ } ClipRegion = IntEngCreateClipRegion(visrgn->rdh.nCount, - (PRECTL)visrgn->Buffer, - (PRECTL)&visrgn->rdh.rcBound ); + visrgn->Buffer, + &visrgn->rdh.rcBound ); ASSERT(ClipRegion); pBrush = BRUSHOBJ_LockBrush(Dc_Attr->hbrush); ASSERT(pBrush); @@ -2972,14 +2972,14 @@ { PROSRGNDATA rgn; ULONG i; - PRECT r; + PRECTL r; if (!(rgn = REGION_LockRgn(hRgn) ) ) return FALSE; if (rgn->rdh.nCount > 0 && INRECT(rgn->rdh.rcBound, X, Y)) { - r = (PRECT) rgn->Buffer; + r = rgn->Buffer; for (i = 0; i < rgn->rdh.nCount; i++) { if (INRECT(*r, X, Y)) @@ -2998,15 +2998,15 @@ FASTCALL REGION_RectInRegion( PROSRGNDATA Rgn, - CONST LPRECT rc -) -{ - PRECT pCurRect, pRectEnd; + const RECTL *rc +) +{ + PRECTL pCurRect, pRectEnd; // this is (just) a useful optimization if ((Rgn->rdh.nCount > 0) && EXTENTCHECK(&Rgn->rdh.rcBound, rc)) { - for (pCurRect = (PRECT)Rgn->Buffer, pRectEnd = pCurRect + Rgn->rdh.nCount; pCurRect < pRectEnd; pCurRect++) + for (pCurRect = Rgn->Buffer, pRectEnd = pCurRect + Rgn->rdh.nCount; pCurRect < pRectEnd; pCurRect++) { if (pCurRect->bottom <= rc->top) continue; // not far enough down yet if (pCurRect->top >= rc->bottom) break; // too far down @@ -3023,11 +3023,11 @@ APIENTRY NtGdiRectInRegion( HRGN hRgn, - LPRECT unsaferc + LPRECTL unsaferc ) { PROSRGNDATA Rgn; - RECT rc = {0}; + RECTL rc = {0}; BOOL Ret; NTSTATUS Status = STATUS_SUCCESS; @@ -3070,7 +3070,7 @@ INT BottomRect ) { - PRECT firstRect; + PRECTL firstRect; if (LeftRect > RightRect) { @@ -3087,7 +3087,7 @@ if ((LeftRect != RightRect) && (TopRect != BottomRect)) { - firstRect = (PRECT)rgn->Buffer; + firstRect = rgn->Buffer; ASSERT(firstRect); firstRect->left = rgn->rdh.rcBound.left = LeftRect; firstRect->top = rgn->rdh.rcBound.top = TopRect; @@ -3126,10 +3126,10 @@ HRGN APIENTRY NtGdiUnionRectWithRgn( HRGN hDest, - CONST PRECT UnsafeRect -) -{ - RECT SafeRect = {0}; + const RECTL *UnsafeRect +) +{ + RECTL SafeRect = {0}; PROSRGNDATA Rgn; NTSTATUS Status = STATUS_SUCCESS; @@ -3457,11 +3457,11 @@ POINTBLOCK *FirstPtBlock, ROSRGNDATA *reg) { - RECT *rects; + RECTL *rects; POINT *pts; POINTBLOCK *CurPtBlock; int i; - RECT *extents, *temp; + RECTL *extents, *temp; INT numRects; extents = &reg->rdh.rcBound; Modified: trunk/reactos/subsystems/win32/win32k/pch.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/pc… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/pch.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/pch.h [iso-8859-1] Thu Mar 19 04:42:34 2009 @@ -27,6 +27,13 @@ #define STARTF_USEPOSITION 4 #include <stdarg.h> #include <windef.h> + +/* Avoid type casting, by defining RECT to RECTL */ +#define RECT RECTL +#define PRECT PRECTL +#define LPRECT LPRECTL +#define LPCRECT LPCRECTL + #include <winerror.h> #include <wingdi.h> #include <winddi.h>

16 years, 4 months

[tkreuzer] 40099: Merge 39375 from amd64 branch: csrsrv: convert to spec (Timo Kreuzer)

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Thu Mar 19 03:38:59 2009 New Revision: 40099 URL: http://svn.reactos.org/svn/reactos?rev=40099&view=rev Log: Merge 39375 from amd64 branch: csrsrv: convert to spec (Timo Kreuzer) Added: trunk/reactos/subsystems/csr/csrsrv/csrsrv.spec (with props) Removed: trunk/reactos/subsystems/csr/csrsrv/csrsrv.def Modified: trunk/reactos/subsystems/csr/csrsrv/csrsrv.rbuild Removed: trunk/reactos/subsystems/csr/csrsrv/csrsrv.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/csr/csrsrv/csrs… ============================================================================== --- trunk/reactos/subsystems/csr/csrsrv/csrsrv.def [iso-8859-1] (original) +++ trunk/reactos/subsystems/csr/csrsrv/csrsrv.def (removed) @@ -1,38 +1,0 @@ -LIBRARY CSRSRV - -EXPORTS -CsrAddStaticServerThread@12 -CsrCallServerFromServer@8 -CsrConnectToUser@0 -CsrCreateProcess@24 -CsrCreateRemoteThread@8 -CsrCreateThread@12 -CsrCreateWait@24 -CsrDebugProcess@4 -CsrDebugProcessStop@4 -CsrDereferenceProcess@4 -CsrDereferenceThread@4 -CsrDereferenceWait@4 -CsrDestroyProcess@8 -CsrDestroyThread@4 -CsrExecServerThread@8 -CsrGetProcessLuid@8 -CsrImpersonateClient@4 -CsrLockProcessByClientId@8 -CsrLockThreadByClientId@8 -CsrMoveSatisfiedWait@8 -CsrNotifyWait@16 -CsrPopulateDosDevices@0 -CsrQueryApiPort@0 -CsrReferenceThread@4 -CsrRevertToSelf@0 -CsrServerInitialization@8 -CsrSetBackgroundPriority@4 -CsrSetCallingSpooler@4 -CsrSetForegroundPriority@4 -CsrShutdownProcesses@8 -CsrUnhandledExceptionFilter@8 -CsrUnlockProcess@4 -CsrUnlockThread@4 -CsrValidateMessageBuffer@16 -CsrValidateMessageString@8 Modified: trunk/reactos/subsystems/csr/csrsrv/csrsrv.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/csr/csrsrv/csrs… ============================================================================== --- trunk/reactos/subsystems/csr/csrsrv/csrsrv.rbuild [iso-8859-1] (original) +++ trunk/reactos/subsystems/csr/csrsrv/csrsrv.rbuild [iso-8859-1] Thu Mar 19 03:38:59 2009 @@ -1,7 +1,7 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> <module name="csrsrv" type="nativedll"> - <importlibrary definition="csrsrv.def" /> + <importlibrary definition="csrsrv.spec" /> <include base="csrsrv">.</include> <include base="csr">.</include> <include base="ReactOS">include/reactos/subsys</include> Added: trunk/reactos/subsystems/csr/csrsrv/csrsrv.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/csr/csrsrv/csrs… ============================================================================== --- trunk/reactos/subsystems/csr/csrsrv/csrsrv.spec (added) +++ trunk/reactos/subsystems/csr/csrsrv/csrsrv.spec [iso-8859-1] Thu Mar 19 03:38:59 2009 @@ -1,0 +1,35 @@ +@ stdcall CsrAddStaticServerThread(ptr ptr long) +@ stdcall CsrCallServerFromServer(ptr ptr) +@ stdcall CsrConnectToUser() +@ stdcall CsrCreateProcess(ptr ptr ptr ptr long ptr) +@ stdcall CsrCreateRemoteThread(ptr ptr) +@ stdcall CsrCreateThread(ptr ptr ptr) +@ stdcall CsrCreateWait(ptr ptr ptr ptr ptr ptr) +@ stdcall CsrDebugProcess(ptr) +@ stdcall CsrDebugProcessStop(ptr) +@ stdcall CsrDereferenceProcess(ptr) +@ stdcall CsrDereferenceThread(ptr) +@ stdcall CsrDereferenceWait(ptr) +@ stdcall CsrDestroyProcess(ptr long) +@ stdcall CsrDestroyThread(ptr) +@ stdcall CsrExecServerThread(ptr long) +@ stdcall CsrGetProcessLuid(ptr ptr) +@ stdcall CsrImpersonateClient(ptr) +@ stdcall CsrLockProcessByClientId(ptr ptr) +@ stdcall CsrLockThreadByClientId(ptr ptr) +@ stdcall CsrMoveSatisfiedWait(ptr ptr) +@ stdcall CsrNotifyWait(ptr long ptr ptr) +@ stdcall CsrPopulateDosDevices(ptr ptr) +@ stdcall CsrQueryApiPort() +@ stdcall CsrReferenceThread(ptr) +@ stdcall CsrRevertToSelf() +@ stdcall CsrServerInitialization(long ptr) +@ stdcall CsrSetBackgroundPriority(ptr) +@ stdcall CsrSetCallingSpooler(long) +@ stdcall CsrSetForegroundPriority(ptr) +@ stdcall CsrShutdownProcesses(ptr long) +@ stdcall CsrUnhandledExceptionFilter(ptr ptr) +@ stdcall CsrUnlockProcess(ptr) +@ stdcall CsrUnlockThread(ptr) +@ stdcall CsrValidateMessageBuffer(ptr ptr long long) +@ stdcall CsrValidateMessageString(ptr ptr) Propchange: trunk/reactos/subsystems/csr/csrsrv/csrsrv.spec ------------------------------------------------------------------------------ svn:eol-style = native

16 years, 4 months

[tkreuzer] 40098: remove UNW flags from winnt.h, they don't belong there

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Thu Mar 19 01:58:49 2009 New Revision: 40098 URL: http://svn.reactos.org/svn/reactos?rev=40098&view=rev Log: remove UNW flags from winnt.h, they don't belong there Modified: trunk/reactos/include/psdk/winnt.h Modified: trunk/reactos/include/psdk/winnt.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winnt.h?rev=4… ============================================================================== --- trunk/reactos/include/psdk/winnt.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/winnt.h [iso-8859-1] Thu Mar 19 01:58:49 2009 @@ -2319,11 +2319,6 @@ }; } KNONVOLATILE_CONTEXT_POINTERS, *PKNONVOLATILE_CONTEXT_POINTERS; -#define UNW_FLAG_NHANDLER 0x0 /* No handler. */ -#define UNW_FLAG_EHANDLER 0x1 /* Exception handler should be called */ -#define UNW_FLAG_UHANDLER 0x2 /* Termination handler that should be called when unwinding an exception */ -#define UNW_FLAG_CHAININFO 0x4 /* FunctionEntry member is the contents of a previous function table entry */ - #define RUNTIME_FUNCTION_INDIRECT 0x1 typedef struct _RUNTIME_FUNCTION {

16 years, 4 months

[tkreuzer] 40097: merge r40095 from amd64 branch

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Wed Mar 18 22:28:54 2009 New Revision: 40097 URL: http://svn.reactos.org/svn/reactos?rev=40097&view=rev Log: merge r40095 from amd64 branch Modified: trunk/reactos/base/services/dhcp/privsep.c Modified: trunk/reactos/base/services/dhcp/privsep.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/dhcp/privsep… ============================================================================== --- trunk/reactos/base/services/dhcp/privsep.c [iso-8859-1] (original) +++ trunk/reactos/base/services/dhcp/privsep.c [iso-8859-1] Wed Mar 18 22:28:54 2009 @@ -63,8 +63,8 @@ } while (n == -1 && (errno == EAGAIN || errno == EINTR)); if (buf->rpos < buf->size) - error("short write: wanted %lu got %ld bytes", - (unsigned long)buf->size, (long)buf->rpos); + error("short %s write: wanted %lu got %ld bytes", + strerror(errno), (unsigned long)buf->size, (long)buf->rpos); free(buf->buf); free(buf); @@ -89,7 +89,7 @@ } while (n == -1 && (errno == EINTR || errno == EAGAIN)); if (n == -1) - error("buf_read: %m"); + error("buf_read: %s", strerror(errno)); if (r < nbytes) error("short read: wanted %lu got %ld bytes", @@ -122,7 +122,7 @@ error("corrupted message received"); if (medium_len > 0) { if ((medium = calloc(1, medium_len + 1)) == NULL) - error("%m"); + error("%s", strerror(errno)); buf_read(fd, medium, medium_len); } else medium = NULL; @@ -133,7 +133,7 @@ error("corrupted message received"); if (reason_len > 0) { if ((reason = calloc(1, reason_len + 1)) == NULL) - error("%m"); + error("%s", strerror(errno)); buf_read(fd, reason, reason_len); } else reason = NULL; @@ -156,7 +156,7 @@ error("corrupted message received"); if (filename_len > 0) { if ((filename = calloc(1, filename_len + 1)) == NULL) - error("%m"); + error("%s", strerror(errno)); buf_read(fd, filename, filename_len); } else filename = NULL; @@ -168,7 +168,7 @@ if (servername_len > 0) { if ((servername = calloc(1, servername_len + 1)) == NULL) - error("%m"); + error("%s", strerror(errno)); buf_read(fd, servername, servername_len); } else servername = NULL; @@ -179,7 +179,7 @@ error("corrupted message received"); if (prefix_len > 0) { if ((prefix = calloc(1, prefix_len + 1)) == NULL) - error("%m"); + error("%s", strerror(errno)); buf_read(fd, prefix, prefix_len); } else prefix = NULL; @@ -198,7 +198,7 @@ lease.options[i].data = calloc(1, optlen + 1); if (lease.options[i].data == NULL) - error("%m"); + error("%s", strerror(errno)); buf_read(fd, lease.options[i].data, optlen); } } @@ -223,13 +223,13 @@ hdr.code = IMSG_SCRIPT_GO_RET; hdr.len = sizeof(struct imsg_hdr) + sizeof(int); if ((buf = buf_open(hdr.len)) == NULL) - error("buf_open: %m"); + error("buf_open: %s", strerror(errno)); if (buf_add(buf, &hdr, sizeof(hdr))) - error("buf_add: %m"); + error("buf_add: %s", strerror(errno)); if (buf_add(buf, &ret, sizeof(ret))) - error("buf_add: %m"); + error("buf_add: %s", strerror(errno)); if (buf_close(fd, buf) == -1) - error("buf_close: %m"); + error("buf_close: %s", strerror(errno)); break; default: error("received unknown message, code %d", hdr.code);

16 years, 4 months

[tkreuzer] 40096: remove allowwarnings="true"

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Wed Mar 18 22:26:12 2009 New Revision: 40096 URL: http://svn.reactos.org/svn/reactos?rev=40096&view=rev Log: remove allowwarnings="true" Modified: branches/ros-amd64-bringup/reactos/base/services/dhcp/dhcp.rbuild Modified: branches/ros-amd64-bringup/reactos/base/services/dhcp/dhcp.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/base/… ============================================================================== --- branches/ros-amd64-bringup/reactos/base/services/dhcp/dhcp.rbuild [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/base/services/dhcp/dhcp.rbuild [iso-8859-1] Wed Mar 18 22:26:12 2009 @@ -1,6 +1,6 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> -<module name="dhcp" type="win32cui" installbase="system32" installname="dhcp.exe" allowwarnings="true"> +<module name="dhcp" type="win32cui" installbase="system32" installname="dhcp.exe"> <include base="dhcp">.</include> <include base="dhcp">include</include> <library>ntdll</library>

16 years, 4 months

[tkreuzer] 40095: %m is a glibc extension, convert it to "%s", strerror(errno).

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Wed Mar 18 22:25:16 2009 New Revision: 40095 URL: http://svn.reactos.org/svn/reactos?rev=40095&view=rev Log: %m is a glibc extension, convert it to "%s", strerror(errno). Modified: branches/ros-amd64-bringup/reactos/base/services/dhcp/privsep.c Modified: branches/ros-amd64-bringup/reactos/base/services/dhcp/privsep.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/base/… ============================================================================== --- branches/ros-amd64-bringup/reactos/base/services/dhcp/privsep.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/base/services/dhcp/privsep.c [iso-8859-1] Wed Mar 18 22:25:16 2009 @@ -63,8 +63,8 @@ } while (n == -1 && (errno == EAGAIN || errno == EINTR)); if (buf->rpos < buf->size) - error("short write: wanted %lu got %ld bytes", - (unsigned long)buf->size, (long)buf->rpos); + error("short %s write: wanted %lu got %ld bytes", + strerror(errno), (unsigned long)buf->size, (long)buf->rpos); free(buf->buf); free(buf); @@ -89,7 +89,7 @@ } while (n == -1 && (errno == EINTR || errno == EAGAIN)); if (n == -1) - error("buf_read: %m"); + error("buf_read: %s", strerror(errno)); if (r < nbytes) error("short read: wanted %lu got %ld bytes", @@ -122,7 +122,7 @@ error("corrupted message received"); if (medium_len > 0) { if ((medium = calloc(1, medium_len + 1)) == NULL) - error("%m"); + error("%s", strerror(errno)); buf_read(fd, medium, medium_len); } else medium = NULL; @@ -133,7 +133,7 @@ error("corrupted message received"); if (reason_len > 0) { if ((reason = calloc(1, reason_len + 1)) == NULL) - error("%m"); + error("%s", strerror(errno)); buf_read(fd, reason, reason_len); } else reason = NULL; @@ -156,7 +156,7 @@ error("corrupted message received"); if (filename_len > 0) { if ((filename = calloc(1, filename_len + 1)) == NULL) - error("%m"); + error("%s", strerror(errno)); buf_read(fd, filename, filename_len); } else filename = NULL; @@ -168,7 +168,7 @@ if (servername_len > 0) { if ((servername = calloc(1, servername_len + 1)) == NULL) - error("%m"); + error("%s", strerror(errno)); buf_read(fd, servername, servername_len); } else servername = NULL; @@ -179,7 +179,7 @@ error("corrupted message received"); if (prefix_len > 0) { if ((prefix = calloc(1, prefix_len + 1)) == NULL) - error("%m"); + error("%s", strerror(errno)); buf_read(fd, prefix, prefix_len); } else prefix = NULL; @@ -198,7 +198,7 @@ lease.options[i].data = calloc(1, optlen + 1); if (lease.options[i].data == NULL) - error("%m"); + error("%s", strerror(errno)); buf_read(fd, lease.options[i].data, optlen); } } @@ -223,13 +223,13 @@ hdr.code = IMSG_SCRIPT_GO_RET; hdr.len = sizeof(struct imsg_hdr) + sizeof(int); if ((buf = buf_open(hdr.len)) == NULL) - error("buf_open: %m"); + error("buf_open: %s", strerror(errno)); if (buf_add(buf, &hdr, sizeof(hdr))) - error("buf_add: %m"); + error("buf_add: %s", strerror(errno)); if (buf_add(buf, &ret, sizeof(ret))) - error("buf_add: %m"); + error("buf_add: %s", strerror(errno)); if (buf_close(fd, buf) == -1) - error("buf_close: %m"); + error("buf_close: %s", strerror(errno)); break; default: error("received unknown message, code %d", hdr.code);

16 years, 4 months

[jmorlan] 40094: - Make MEMORY command use GlobalMemoryStatusEx if available, so it can show values >= 4GB. - Fix overflow bug in FREE command that caused values >= 4GB to wrap around. - A little simplification of ConvertULargeInteger function

by jmorlan＠svn.reactos.org

Author: jmorlan Date: Wed Mar 18 21:11:19 2009 New Revision: 40094 URL: http://svn.reactos.org/svn/reactos?rev=40094&view=rev Log: - Make MEMORY command use GlobalMemoryStatusEx if available, so it can show values >= 4GB. - Fix overflow bug in FREE command that caused values >= 4GB to wrap around. - A little simplification of ConvertULargeInteger function Modified: trunk/reactos/base/shell/cmd/cmd.c trunk/reactos/base/shell/cmd/cmd.h trunk/reactos/base/shell/cmd/dir.c trunk/reactos/base/shell/cmd/free.c trunk/reactos/base/shell/cmd/memory.c Modified: trunk/reactos/base/shell/cmd/cmd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/cmd.c?rev=4… ============================================================================== --- trunk/reactos/base/shell/cmd/cmd.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/cmd.c [iso-8859-1] Wed Mar 18 21:11:19 2009 @@ -179,36 +179,29 @@ * insert commas into a number */ INT -ConvertULargeInteger (ULARGE_INTEGER num, LPTSTR des, INT len, BOOL bPutSeperator) +ConvertULargeInteger(ULONGLONG num, LPTSTR des, INT len, BOOL bPutSeperator) { TCHAR temp[32]; UINT n, iTarget; if (len <= 1) return 0; - - if (num.QuadPart == 0) - { - des[0] = _T('0'); - des[1] = _T('\0'); - return 1; - } n = 0; iTarget = nNumberGroups; if (!nNumberGroups) bPutSeperator = FALSE; - while (num.QuadPart > 0) + do { if (iTarget == n && bPutSeperator) { iTarget += nNumberGroups + 1; temp[31 - n++] = cThousandSeparator; } - temp[31 - n++] = (TCHAR)(num.QuadPart % 10) + _T('0'); - num.QuadPart /= 10; - } + temp[31 - n++] = (TCHAR)(num % 10) + _T('0'); + num /= 10; + } while (num > 0); if (n > len-1) n = len-1; Modified: trunk/reactos/base/shell/cmd/cmd.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/cmd.h?rev=4… ============================================================================== --- trunk/reactos/base/shell/cmd/cmd.h [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/cmd.h [iso-8859-1] Wed Mar 18 21:11:19 2009 @@ -99,7 +99,7 @@ /* Prototypes for CMD.C */ -INT ConvertULargeInteger (ULARGE_INTEGER num, LPTSTR des, INT len, BOOL bPutSeperator); +INT ConvertULargeInteger(ULONGLONG num, LPTSTR des, INT len, BOOL bPutSeperator); VOID ParseCommandLine (LPTSTR); struct _PARSED_COMMAND; BOOL ExecuteCommand(struct _PARSED_COMMAND *Cmd); Modified: trunk/reactos/base/shell/cmd/dir.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/dir.c?rev=4… ============================================================================== --- trunk/reactos/base/shell/cmd/dir.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/dir.c [iso-8859-1] Wed Mar 18 21:11:19 2009 @@ -211,7 +211,7 @@ * probabaly later pass them to functions. Rob Lake */ static ULONG recurse_dir_cnt; static ULONG recurse_file_cnt; -static ULARGE_INTEGER recurse_bytes; +static ULONGLONG recurse_bytes; /* @@ -772,7 +772,7 @@ PrintSummary(LPTSTR szPath, ULONG ulFiles, ULONG ulDirs, - ULARGE_INTEGER u64Bytes, + ULONGLONG u64Bytes, LPDIRSWITCHFLAGS lpFlags, BOOL TotalSummary) { @@ -817,7 +817,7 @@ if (!lpFlags->bRecursive || TotalSummary) { GetUserDiskFreeSpace(szPath, &uliFree); - ConvertULargeInteger(uliFree, szBuffer, sizeof(szBuffer), lpFlags->bTSeperator); + ConvertULargeInteger(uliFree.QuadPart, szBuffer, sizeof(szBuffer), lpFlags->bTSeperator); LoadString(CMD_ModuleHandle, STRING_DIR_HELP6, (LPTSTR) szMsg, RC_STRING_MAX_SIZE); DirPrintf(lpFlags, szMsg, ulDirs, szBuffer); } @@ -910,7 +910,7 @@ iSizeFormat = 14; u64FileSize.HighPart = ptrFiles[i]->nFileSizeHigh; u64FileSize.LowPart = ptrFiles[i]->nFileSizeLow; - ConvertULargeInteger(u64FileSize, szSize, 20, lpFlags->bTSeperator); + ConvertULargeInteger(u64FileSize.QuadPart, szSize, 20, lpFlags->bTSeperator); } /* Calculate short name */ @@ -1065,7 +1065,7 @@ iSizeFormat = 17; u64FileSize.HighPart = ptrFiles[i]->nFileSizeHigh; u64FileSize.LowPart = ptrFiles[i]->nFileSizeLow; - ConvertULargeInteger(u64FileSize, szSize, 20, lpFlags->bTSeperator); + ConvertULargeInteger(u64FileSize.QuadPart, szSize, 20, lpFlags->bTSeperator); } /* Format date and time */ @@ -1345,7 +1345,7 @@ DWORD dwCount; /* A counter of files found in directory */ DWORD dwCountFiles; /* Counter for files */ DWORD dwCountDirs; /* Counter for directories */ - ULARGE_INTEGER u64CountBytes; /* Counter for bytes */ + ULONGLONG u64CountBytes; /* Counter for bytes */ ULARGE_INTEGER u64Temp; /* A temporary counter */ /* Initialize Variables */ @@ -1354,7 +1354,7 @@ dwCount = 0; dwCountFiles = 0; dwCountDirs = 0; - u64CountBytes.QuadPart = 0; + u64CountBytes = 0; fPoint= FALSE; /* Create szFullPath */ @@ -1448,7 +1448,7 @@ dwCountFiles++; u64Temp.HighPart = wfdFileInfo.nFileSizeHigh; u64Temp.LowPart = wfdFileInfo.nFileSizeLow; - u64CountBytes.QuadPart += u64Temp.QuadPart; + u64CountBytes += u64Temp.QuadPart; } } } @@ -1524,7 +1524,7 @@ /* Add statistics to recursive statistics*/ recurse_dir_cnt += dwCountDirs; recurse_file_cnt += dwCountFiles; - recurse_bytes.QuadPart += u64CountBytes.QuadPart; + recurse_bytes += u64CountBytes; /* Do the recursive job if requested the recursive is be done on ALL(indepent of their attribs) @@ -1648,7 +1648,7 @@ recurse_dir_cnt = 0L; recurse_file_cnt = 0L; - recurse_bytes.QuadPart = 0; + recurse_bytes = 0; /* <Debug :> Uncomment this to show the final state of switch flags*/ Modified: trunk/reactos/base/shell/cmd/free.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/free.c?rev=… ============================================================================== --- trunk/reactos/base/shell/cmd/free.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/free.c [iso-8859-1] Wed Mar 18 21:11:19 2009 @@ -27,7 +27,7 @@ TCHAR szUsed[40]; TCHAR szFree[40]; DWORD dwSerial; - ULARGE_INTEGER uliSize; + ULONGLONG uliSize; DWORD dwSecPerCl; DWORD dwBytPerSec; DWORD dwFreeCl; @@ -70,14 +70,14 @@ return; } - uliSize.QuadPart = dwSecPerCl * dwBytPerSec * dwTotCl; - ConvertULargeInteger (uliSize, szTotal, 40, TRUE); + uliSize = dwSecPerCl * dwBytPerSec * (ULONGLONG)dwTotCl; + ConvertULargeInteger(uliSize, szTotal, 40, TRUE); - uliSize.QuadPart = dwSecPerCl * dwBytPerSec * (dwTotCl - dwFreeCl); - ConvertULargeInteger (uliSize, szUsed, 40, TRUE); + uliSize = dwSecPerCl * dwBytPerSec * (ULONGLONG)(dwTotCl - dwFreeCl); + ConvertULargeInteger(uliSize, szUsed, 40, TRUE); - uliSize.QuadPart = dwSecPerCl * dwBytPerSec * dwFreeCl; - ConvertULargeInteger (uliSize, szFree, 40, TRUE); + uliSize = dwSecPerCl * dwBytPerSec * (ULONGLONG)dwFreeCl; + ConvertULargeInteger(uliSize, szFree, 40, TRUE); ConOutResPrintf(STRING_FREE_HELP1, szDrive, szVolume, szSerial, szTotal, szUsed, szFree); Modified: trunk/reactos/base/shell/cmd/memory.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/memory.c?re… ============================================================================== --- trunk/reactos/base/shell/cmd/memory.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/memory.c [iso-8859-1] Wed Mar 18 21:11:19 2009 @@ -15,33 +15,16 @@ #ifdef INCLUDE_CMD_MEMORY - -/* - * convert - * - * insert commas into a number - */ -static INT -ConvertDWord (DWORD num, LPTSTR des, INT len, BOOL bSeparator) -{ - ULARGE_INTEGER ui; - - ui.u.LowPart = num; - ui.u.HighPart = 0; - return ConvertULargeInteger(ui, des, len, bSeparator); -} - - INT CommandMemory (LPTSTR param) { - MEMORYSTATUS ms; + MEMORYSTATUSEX msex; TCHAR szMemoryLoad[20]; - TCHAR szTotalPhys[20]; - TCHAR szAvailPhys[20]; - TCHAR szTotalPageFile[20]; - TCHAR szAvailPageFile[20]; - TCHAR szTotalVirtual[20]; - TCHAR szAvailVirtual[20]; + TCHAR szTotalPhys[40]; + TCHAR szAvailPhys[40]; + TCHAR szTotalPageFile[40]; + TCHAR szAvailPageFile[40]; + TCHAR szTotalVirtual[40]; + TCHAR szAvailVirtual[40]; if (!_tcsncmp (param, _T("/?"), 2)) { @@ -49,17 +32,34 @@ return 0; } - ms.dwLength = sizeof(MEMORYSTATUS); + BOOL (WINAPI *GlobalMemoryStatusEx)(LPMEMORYSTATUSEX) + = GetProcAddress(GetModuleHandle(_T("KERNEL32")), "GlobalMemoryStatusEx"); + if (GlobalMemoryStatusEx) + { + msex.dwLength = sizeof(MEMORYSTATUSEX); + GlobalMemoryStatusEx(&msex); + } + else + { + MEMORYSTATUS ms; + ms.dwLength = sizeof(MEMORYSTATUS); + GlobalMemoryStatus(&ms); + msex.dwMemoryLoad = ms.dwMemoryLoad; + msex.ullTotalPhys = ms.dwTotalPhys; + msex.ullAvailPhys = ms.dwAvailPhys; + msex.ullTotalPageFile = ms.dwTotalPageFile; + msex.ullAvailPageFile = ms.dwAvailPageFile; + msex.ullTotalVirtual = ms.dwTotalVirtual; + msex.ullAvailVirtual = ms.dwAvailVirtual; + } - GlobalMemoryStatus (&ms); - - ConvertDWord (ms.dwMemoryLoad, szMemoryLoad, 20, FALSE); - ConvertDWord (ms.dwTotalPhys, szTotalPhys, 20, TRUE); - ConvertDWord (ms.dwAvailPhys, szAvailPhys, 20, TRUE); - ConvertDWord (ms.dwTotalPageFile, szTotalPageFile, 20, TRUE); - ConvertDWord (ms.dwAvailPageFile, szAvailPageFile, 20, TRUE); - ConvertDWord (ms.dwTotalVirtual, szTotalVirtual, 20, TRUE); - ConvertDWord (ms.dwAvailVirtual, szAvailVirtual, 20, TRUE); + ConvertULargeInteger(msex.dwMemoryLoad, szMemoryLoad, 20, FALSE); + ConvertULargeInteger(msex.ullTotalPhys, szTotalPhys, 40, TRUE); + ConvertULargeInteger(msex.ullAvailPhys, szAvailPhys, 40, TRUE); + ConvertULargeInteger(msex.ullTotalPageFile, szTotalPageFile, 40, TRUE); + ConvertULargeInteger(msex.ullAvailPageFile, szAvailPageFile, 40, TRUE); + ConvertULargeInteger(msex.ullTotalVirtual, szTotalVirtual, 40, TRUE); + ConvertULargeInteger(msex.ullAvailVirtual, szAvailVirtual, 40, TRUE); ConOutResPrintf(STRING_MEMMORY_HELP2, szMemoryLoad, szTotalPhys, szAvailPhys, szTotalPageFile,

16 years, 4 months

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