Ros-diffs August 2007

ros-diffs@reactos.org

21 participants
666 discussions

[jimtabor] 28237: Add two more Dc_Attr Dirty flags.

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Wed Aug 8 05:28:36 2007 New Revision: 28237 URL: http://svn.reactos.org/svn/reactos?rev=28237&view=rev Log: Add two more Dc_Attr Dirty flags. Modified: trunk/reactos/include/reactos/win32k/ntgdihdl.h Modified: trunk/reactos/include/reactos/win32k/ntgdihdl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/win32k/ntg… ============================================================================== --- trunk/reactos/include/reactos/win32k/ntgdihdl.h (original) +++ trunk/reactos/include/reactos/win32k/ntgdihdl.h Wed Aug 8 05:28:36 2007 @@ -129,6 +129,8 @@ #define DC_DIBSECTION 0x00004000 #define DC_LAST_CLIPRGN_VALID 0x00008000 #define DC_PRIMARY_DISPLAY 0x00010000 +#define DC_MODE_DIRTY 0x00020000 +#define DC_FONTTEXT_DIRTY 0x00040000 /* DC_ATTR LCD Flags */ #define LDC_LDC 0x00000001 // (init) local DC other than a normal DC

18 years, 1 month

[tkreuzer] 28236: GetClipRgn: use NtGdiGetRandomRgn

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Wed Aug 8 05:03:54 2007 New Revision: 28236 URL: http://svn.reactos.org/svn/reactos?rev=28236&view=rev Log: GetClipRgn: use NtGdiGetRandomRgn Modified: trunk/reactos/dll/win32/gdi32/objects/region.c Modified: trunk/reactos/dll/win32/gdi32/objects/region.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/objects/re… ============================================================================== --- trunk/reactos/dll/win32/gdi32/objects/region.c (original) +++ trunk/reactos/dll/win32/gdi32/objects/region.c Wed Aug 8 05:03:54 2007 @@ -24,14 +24,7 @@ HRGN hrgn ) { - HRGN rgn = NtGdiGetClipRgn(hdc); - if(rgn) - { - if(NtGdiCombineRgn(hrgn, rgn, 0, RGN_COPY) != ERROR) return 1; - else - return -1; - } - else return 0; + return NtGdiGetRandomRgn(hdc, hrgn, 1); }

18 years, 1 month

[jimtabor] 28235: Removed AbortProc from WIN_DC_INFO. AbortProc is handled in gdi32 and stored in the Dc_Attr->pvLDC (LDC) structure. LDC structure is used for printing and EMF functions. WIN_DC_INFO is still useful and might stick around for a while.

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Wed Aug 8 05:02:32 2007 New Revision: 28235 URL: http://svn.reactos.org/svn/reactos?rev=28235&view=rev Log: Removed AbortProc from WIN_DC_INFO. AbortProc is handled in gdi32 and stored in the Dc_Attr->pvLDC (LDC) structure. LDC structure is used for printing and EMF functions. WIN_DC_INFO is still useful and might stick around for a while. Modified: trunk/reactos/subsystems/win32/win32k/include/dc.h Modified: trunk/reactos/subsystems/win32/win32k/include/dc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/dc.h (original) +++ trunk/reactos/subsystems/win32/win32k/include/dc.h Wed Aug 8 05:02:32 2007 @@ -41,11 +41,6 @@ INT DCOrgX; /* DC origin */ INT DCOrgY; - -#if 0 - FARPROC lpfnPrint; /* AbortProc for Printing */ -#endif - INT ArcDirection; XFORM xformWorld2Wnd; /* World-to-window transformation */

18 years, 1 month

[jimtabor] 28234: Moved CurrentPos to Dc_Attr.ptlCurrent. Plugged in NtGdiGet-AndSetDCDword with out any internal support code. Still sorting out internal calls to old NtGdi functions. Ntgdibad.h will be updated on each removed external call of these functions are gone from w32ksvc.db.

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Wed Aug 8 04:46:11 2007 New Revision: 28234 URL: http://svn.reactos.org/svn/reactos?rev=28234&view=rev Log: Moved CurrentPos to Dc_Attr.ptlCurrent. Plugged in NtGdiGet-AndSetDCDword with out any internal support code. Still sorting out internal calls to old NtGdi functions. Ntgdibad.h will be updated on each removed external call of these functions are gone from w32ksvc.db. Modified: trunk/reactos/subsystems/win32/win32k/include/dc.h trunk/reactos/subsystems/win32/win32k/objects/dc.c trunk/reactos/subsystems/win32/win32k/objects/line.c trunk/reactos/subsystems/win32/win32k/w32ksvc.db Modified: trunk/reactos/subsystems/win32/win32k/include/dc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/dc.h (original) +++ trunk/reactos/subsystems/win32/win32k/include/dc.h Wed Aug 8 04:46:11 2007 @@ -46,8 +46,6 @@ FARPROC lpfnPrint; /* AbortProc for Printing */ #endif - INT CursPosX; /* Current position */ - INT CursPosY; INT ArcDirection; XFORM xformWorld2Wnd; /* World-to-window transformation */ Modified: trunk/reactos/subsystems/win32/win32k/objects/dc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/dc.c (original) +++ trunk/reactos/subsystems/win32/win32k/objects/dc.c Wed Aug 8 04:46:11 2007 @@ -1150,7 +1150,7 @@ return SelObject; } -DC_GET_VAL_EX ( GetCurrentPositionEx, w.CursPosX, w.CursPosY, POINT, x, y ) +DC_GET_VAL_EX ( GetCurrentPositionEx, Dc_Attr.ptlCurrent.x, Dc_Attr.ptlCurrent.y, POINT, x, y ) BOOL FASTCALL IntGdiGetDCOrgEx(DC *dc, LPPOINT Point) @@ -1317,8 +1317,8 @@ newdc->w.DCOrgX = dc->w.DCOrgX; newdc->w.DCOrgY = dc->w.DCOrgY; #endif - newdc->w.CursPosX = dc->w.CursPosX; - newdc->w.CursPosY = dc->w.CursPosY; + newdc->Dc_Attr.ptlCurrent.x = dc->Dc_Attr.ptlCurrent.x; + newdc->Dc_Attr.ptlCurrent.y = dc->Dc_Attr.ptlCurrent.y; newdc->w.ArcDirection = dc->w.ArcDirection; newdc->w.xformWorld2Wnd = dc->w.xformWorld2Wnd; newdc->w.xformWorld2Vport = dc->w.xformWorld2Vport; @@ -1398,8 +1398,8 @@ dc->w.DCOrgX = dcs->w.DCOrgX; dc->w.DCOrgY = dcs->w.DCOrgY; #endif - dc->w.CursPosX = dcs->w.CursPosX; - dc->w.CursPosY = dcs->w.CursPosY; + dc->Dc_Attr.ptlCurrent.x = dcs->Dc_Attr.ptlCurrent.x; + dc->Dc_Attr.ptlCurrent.y = dcs->Dc_Attr.ptlCurrent.y; dc->w.ArcDirection = dcs->w.ArcDirection; dc->w.xformWorld2Wnd = dcs->w.xformWorld2Wnd; @@ -2127,6 +2127,167 @@ return wRet; } + + +BOOL +STDCALL +NtGdiGetDCDword( + HDC hDC, + UINT u, + DWORD *Result + ) +{ + BOOL Ret = TRUE; + DC *dc; + DWORD SafeResult = 0; + NTSTATUS Status = STATUS_SUCCESS; + + if(!Result) + { + SetLastWin32Error(ERROR_INVALID_PARAMETER); + return FALSE; + } + + dc = DC_LockDc(hDC); + if(!dc) + { + SetLastWin32Error(ERROR_INVALID_HANDLE); + return FALSE; + } + + switch (u) + { + case GdiGetJournal: + break; + case GdiGetRelAbs: + break; + case GdiGetBreakExtra: + break; + case GdiGerCharBreak: + break; + case GdiGetArcDirection: + break; + case GdiGetEMFRestorDc: + break; + case GdiGetFontLanguageInfo: + break; + case GdiGetIsMemDc: + break; + case GdiGetMapMode: + break; + case GdiGetTextCharExtra: + break; + default: + SetLastWin32Error(ERROR_INVALID_PARAMETER); + Ret = FALSE; + break; + } + + if (Ret) + { + _SEH_TRY + { + ProbeForWrite(Result, + sizeof(DWORD), + 1); + *Result = SafeResult; + } + _SEH_HANDLE + { + Status = _SEH_GetExceptionCode(); + } + _SEH_END; + } + + if(!NT_SUCCESS(Status)) + { + SetLastNtError(Status); + DC_UnlockDc(dc); + return FALSE; + } + + DC_UnlockDc(dc); + return Ret; +} + +BOOL +STDCALL +NtGdiGetAndSetDCDword( + HDC hDC, + UINT u, + DWORD dwIn, + DWORD *Result + ) +{ + BOOL Ret = TRUE; + DC *dc; + DWORD SafeResult = 0; + NTSTATUS Status = STATUS_SUCCESS; + + if(!Result) + { + SetLastWin32Error(ERROR_INVALID_PARAMETER); + return FALSE; + } + + dc = DC_LockDc(hDC); + if(!dc) + { + SetLastWin32Error(ERROR_INVALID_HANDLE); + return FALSE; + } + + switch (u) + { + case GdtGetSetCopyCount: + break; + case GdiGetSetTextAlign: + break; + case GdiGetSetRelAbs: + break; + case GdiGetSetTextCharExtra: + break; + case GdiGetSetSelectFont: + break; + case GdiGetSetMapperFlagsInternal: + break; + case GdiGetSetMapMode: + break; + case GdiGetSetArcDirection: + break; + default: + SetLastWin32Error(ERROR_INVALID_PARAMETER); + Ret = FALSE; + break; + } + + if (Ret) + { + _SEH_TRY + { + ProbeForWrite(Result, + sizeof(DWORD), + 1); + *Result = SafeResult; + } + _SEH_HANDLE + { + Status = _SEH_GetExceptionCode(); + } + _SEH_END; + } + + if(!NT_SUCCESS(Status)) + { + SetLastNtError(Status); + DC_UnlockDc(dc); + return FALSE; + } + + DC_UnlockDc(dc); + return Ret; +} + DC_SET_MODE( NtGdiSetBkMode, Dc_Attr.jBkMode, TRANSPARENT, OPAQUE ) DC_SET_MODE( NtGdiSetPolyFillMode, Dc_Attr.jFillMode, ALTERNATE, WINDING ) Modified: trunk/reactos/subsystems/win32/win32k/objects/line.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/line.c (original) +++ trunk/reactos/subsystems/win32/win32k/objects/line.c Wed Aug 8 04:46:11 2007 @@ -35,11 +35,11 @@ if ( Point ) { - Point->x = dc->w.CursPosX; - Point->y = dc->w.CursPosY; - } - dc->w.CursPosX = X; - dc->w.CursPosY = Y; + Point->x = dc->Dc_Attr.ptlCurrent.x; + Point->y = dc->Dc_Attr.ptlCurrent.y; + } + dc->Dc_Attr.ptlCurrent.x = X; + dc->Dc_Attr.ptlCurrent.y = Y; PathIsOpen = PATH_IsPathOpen(dc->w.path); @@ -67,8 +67,8 @@ if (Ret) { // FIXME - PATH_LineTo should maybe do this... - dc->w.CursPosX = XEnd; - dc->w.CursPosY = YEnd; + dc->Dc_Attr.ptlCurrent.x = XEnd; + dc->Dc_Attr.ptlCurrent.y = YEnd; } return Ret; } @@ -81,8 +81,8 @@ return FALSE; } - Points[0].x = dc->w.CursPosX; - Points[0].y = dc->w.CursPosY; + Points[0].x = dc->Dc_Attr.ptlCurrent.x; + Points[0].y = dc->Dc_Attr.ptlCurrent.y; Points[1].x = XEnd; Points[1].y = YEnd; @@ -122,8 +122,8 @@ if (Ret) { - dc->w.CursPosX = XEnd; - dc->w.CursPosY = YEnd; + dc->Dc_Attr.ptlCurrent.x = XEnd; + dc->Dc_Attr.ptlCurrent.y = YEnd; } return Ret; @@ -172,8 +172,8 @@ npt = ExAllocatePoolWithTag(PagedPool, sizeof(POINT) * (Count + 1), TAG_BEZIER); if ( npt ) { - npt[0].x = dc->w.CursPosX; - npt[0].y = dc->w.CursPosY; + npt[0].x = dc->Dc_Attr.ptlCurrent.x; + npt[0].y = dc->Dc_Attr.ptlCurrent.y; memcpy(npt + 1, pt, sizeof(POINT) * Count); ret = IntGdiPolyBezier(dc, npt, Count+1); ExFreePool(npt); @@ -181,8 +181,8 @@ } if ( ret ) { - dc->w.CursPosX = pt[Count-1].x; - dc->w.CursPosY = pt[Count-1].y; + dc->Dc_Attr.ptlCurrent.x = pt[Count-1].x; + dc->Dc_Attr.ptlCurrent.y = pt[Count-1].y; } return ret; @@ -262,8 +262,8 @@ POINT *pts = ExAllocatePoolWithTag(PagedPool, sizeof(POINT) * (Count + 1), TAG_SHAPE); if ( pts ) { - pts[0].x = dc->w.CursPosX; - pts[0].y = dc->w.CursPosY; + pts[0].x = dc->Dc_Attr.ptlCurrent.x; + pts[0].y = dc->Dc_Attr.ptlCurrent.y; memcpy( pts + 1, pt, sizeof(POINT) * Count); ret = IntGdiPolyline(dc, pts, Count + 1); ExFreePool(pts); @@ -271,8 +271,8 @@ } if ( ret ) { - dc->w.CursPosX = pt[Count-1].x; - dc->w.CursPosY = pt[Count-1].y; + dc->Dc_Attr.ptlCurrent.x = pt[Count-1].x; + dc->Dc_Attr.ptlCurrent.y = pt[Count-1].y; } return ret; @@ -636,8 +636,8 @@ } /* if no moveto occurs, we will close the figure here */ - lastmove.x = dc->w.CursPosX; - lastmove.y = dc->w.CursPosY; + lastmove.x = dc->Dc_Attr.ptlCurrent.x; + lastmove.y = dc->Dc_Attr.ptlCurrent.y; /* now let's draw */ for( i = 0; i < cCount; i++ ) @@ -645,16 +645,16 @@ if( lpbTypes[i] == PT_MOVETO ) { IntGdiMoveToEx( dc, lppt[i].x, lppt[i].y, NULL ); - lastmove.x = dc->w.CursPosX; - lastmove.y = dc->w.CursPosY; + lastmove.x = dc->Dc_Attr.ptlCurrent.x; + lastmove.y = dc->Dc_Attr.ptlCurrent.y; } else if( lpbTypes[i] & PT_LINETO ) IntGdiLineTo( dc, lppt[i].x, lppt[i].y ); else if( lpbTypes[i] & PT_BEZIERTO ) { POINT pts[4]; - pts[0].x = dc->w.CursPosX; - pts[0].y = dc->w.CursPosY; + pts[0].x = dc->Dc_Attr.ptlCurrent.x; + pts[0].y = dc->Dc_Attr.ptlCurrent.y; RtlCopyMemory(pts + 1, &lppt[i], sizeof(POINT) * 3); IntGdiPolyBezier(dc, pts, 4); i += 2; Modified: trunk/reactos/subsystems/win32/win32k/w32ksvc.db URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/w3… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/w32ksvc.db (original) +++ trunk/reactos/subsystems/win32/win32k/w32ksvc.db Wed Aug 8 04:46:11 2007 @@ -161,7 +161,7 @@ # NtGdiForceUFIMapping 2 NtGdiFrameRgn 5 # NtGdiFullscreenControl 5 -# NtGdiGetAndSetDCDword 4 +NtGdiGetAndSetDCDword 4 # NtGdiGetAppClipBox 2 NtGdiGetBitmapBits 3 # NtGdiGetBitmapDimension 2 @@ -173,7 +173,7 @@ # NtGdiGetCharWidthInfo 2 NtGdiGetColorAdjustment 2 # NtGdiGetColorSpaceforBitmap 1 -# NtGdiGetDCDword 3 +NtGdiGetDCDword 3 # NtGdiGetDCforBitmap 1 # NtGdiGetDCObject 2 NtGdiGetDCPoint 3

18 years, 1 month

[tkreuzer] 28233: make NtGdiGetRandomRgn behave more like on XP, 33/34 tests now passing in w32knapi test

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Wed Aug 8 04:28:08 2007 New Revision: 28233 URL: http://svn.reactos.org/svn/reactos?rev=28233&view=rev Log: make NtGdiGetRandomRgn behave more like on XP, 33/34 tests now passing in w32knapi test Modified: trunk/reactos/subsystems/win32/win32k/objects/region.c Modified: trunk/reactos/subsystems/win32/win32k/objects/region.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/region.c (original) +++ trunk/reactos/subsystems/win32/win32k/objects/region.c Wed Aug 8 04:28:08 2007 @@ -2349,22 +2349,15 @@ INT STDCALL NtGdiGetRandomRgn(HDC hDC, HRGN hDest, INT iCode) { + INT ret = 0; PDC pDC; HRGN hSrc = NULL; POINT org; - if ((hDC == NULL) || (hDest == NULL)) - { - return -1; - } - if ((iCode<1 ) || (iCode>4 )) - { - return -1; - } - pDC = DC_LockDc(hDC); if (pDC == NULL) { + SetLastWin32Error(ERROR_INVALID_HANDLE); return -1; } @@ -2375,12 +2368,12 @@ break; case 2: //hSrc = dc->hMetaRgn; - DPRINT1("hMetaRgn not implement\n"); + DPRINT1("hMetaRgn not implemented\n"); DC_UnlockDc(pDC); return -1; break; case 3: - DPRINT1("waring : hMetaRgn not implement\n"); + DPRINT1("hMetaRgn not implemented\n"); //hSrc = dc->hMetaClipRgn; if(!hSrc) { @@ -2390,20 +2383,30 @@ break; case 4: hSrc = pDC->w.hVisRgn; + break; + default: + hSrc = 0; } if (hSrc) { - NtGdiCombineRgn(hDest, hSrc, 0, RGN_COPY); - } - if (iCode == SYSRGN) + if(NtGdiCombineRgn(hDest, hSrc, 0, RGN_COPY) == ERROR) + { + ret = -1; + } + else + { + ret = 1; + } + } + if (iCode == SYSRGN) { IntGdiGetDCOrgEx(pDC, &org); NtGdiOffsetRgn(hDest, org.x, org.y ); } - DC_UnlockDc(pDC); - - return (hSrc != 0); + DC_UnlockDc(pDC); + + return ret; } INT STDCALL

18 years, 1 month

[tkreuzer] 28232: - restructure syscall code, add edi to RosSyscall clobber list - more NtGdiGetRandomRgn tests - more TEST -> RTEST

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Wed Aug 8 03:13:25 2007 New Revision: 28232 URL: http://svn.reactos.org/svn/reactos?rev=28232&view=rev Log: - restructure syscall code, add edi to RosSyscall clobber list - more NtGdiGetRandomRgn tests - more TEST -> RTEST Modified: trunk/rostests/apitests/gdi32api/tests/CreatePen.c trunk/rostests/apitests/gdi32api/tests/GetObject.c trunk/rostests/apitests/gdi32api/tests/GetStockObject.c trunk/rostests/apitests/w32knapi/ntgdi/NtGdiGetRandomRgn.c trunk/rostests/apitests/w32knapi/w32knapi.c trunk/rostests/apitests/w32knapi/w32knapi.h Modified: trunk/rostests/apitests/gdi32api/tests/CreatePen.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32api/tests/C… ============================================================================== --- trunk/rostests/apitests/gdi32api/tests/CreatePen.c (original) +++ trunk/rostests/apitests/gdi32api/tests/CreatePen.c Wed Aug 8 03:13:25 2007 @@ -8,15 +8,15 @@ SetLastError(ERROR_SUCCESS); hPen = CreatePen(PS_DASHDOT, 5, RGB(1,2,3)); - TEST(hPen); + RTEST(hPen); /* Test if we have a PEN */ - TEST(GDI_HANDLE_GET_TYPE(hPen) == GDI_OBJECT_TYPE_PEN); + RTEST(GDI_HANDLE_GET_TYPE(hPen) == GDI_OBJECT_TYPE_PEN); GetObject(hPen, sizeof(logpen), &logpen); - TEST(logpen.lopnStyle == PS_DASHDOT); - TEST(logpen.lopnWidth.x == 5); - TEST(logpen.lopnColor == RGB(1,2,3)); + RTEST(logpen.lopnStyle == PS_DASHDOT); + RTEST(logpen.lopnWidth.x == 5); + RTEST(logpen.lopnColor == RGB(1,2,3)); DeleteObject(hPen); /* PS_GEOMETRIC | PS_DASHDOT = 0x00001011 will become PS_SOLID */ Modified: trunk/rostests/apitests/gdi32api/tests/GetObject.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32api/tests/G… ============================================================================== --- trunk/rostests/apitests/gdi32api/tests/GetObject.c (original) +++ trunk/rostests/apitests/gdi32api/tests/GetObject.c Wed Aug 8 03:13:25 2007 @@ -258,24 +258,24 @@ TEST(GetObject(hPen, 0, NULL) == sizeof(EXTLOGPEN)-sizeof(DWORD)); TEST(GetObject((HANDLE)GDI_HANDLE_GET_INDEX(hPen), 0, NULL) == sizeof(EXTLOGPEN)-sizeof(DWORD)); TEST(GetObject(hPen, 5, NULL) == sizeof(EXTLOGPEN)-sizeof(DWORD)); - TEST(GetObject(hPen, -5, NULL) == sizeof(EXTLOGPEN)-sizeof(DWORD)); - TEST(GetObject(hPen, 0, &extlogpen) == 0); - TEST(GetObject(hPen, 4, &extlogpen) == 0); + RTEST(GetObject(hPen, -5, NULL) == sizeof(EXTLOGPEN)-sizeof(DWORD)); + RTEST(GetObject(hPen, 0, &extlogpen) == 0); + RTEST(GetObject(hPen, 4, &extlogpen) == 0); /* Nothing should be filled */ - TEST(extlogpen.elpPenStyle == 0x77777777); - TEST(extlogpen.elpWidth == 0x77777777); - - TEST(GetObject(hPen, sizeof(EXTLOGPEN), &extlogpen) == sizeof(EXTLOGPEN)-sizeof(DWORD)); - TEST(GetObject(hPen, sizeof(EXTLOGPEN)-sizeof(DWORD), &extlogpen) == sizeof(EXTLOGPEN)-sizeof(DWORD)); - TEST(GetObject(hPen, sizeof(EXTLOGPEN)-sizeof(DWORD)-1, &extlogpen) == 0); - TEST(GetObject(hPen, sizeof(EXTLOGPEN)+2, &extlogpen) == sizeof(EXTLOGPEN)-sizeof(DWORD)); - TEST(GetObject(hPen, -5, &extlogpen) == sizeof(EXTLOGPEN)-sizeof(DWORD)); + RTEST(extlogpen.elpPenStyle == 0x77777777); + RTEST(extlogpen.elpWidth == 0x77777777); + + RTEST(GetObject(hPen, sizeof(EXTLOGPEN), &extlogpen) == sizeof(EXTLOGPEN)-sizeof(DWORD)); + RTEST(GetObject(hPen, sizeof(EXTLOGPEN)-sizeof(DWORD), &extlogpen) == sizeof(EXTLOGPEN)-sizeof(DWORD)); + RTEST(GetObject(hPen, sizeof(EXTLOGPEN)-sizeof(DWORD)-1, &extlogpen) == 0); + RTEST(GetObject(hPen, sizeof(EXTLOGPEN)+2, &extlogpen) == sizeof(EXTLOGPEN)-sizeof(DWORD)); + RTEST(GetObject(hPen, -5, &extlogpen) == sizeof(EXTLOGPEN)-sizeof(DWORD)); /* test if the fields are filled correctly */ - TEST(extlogpen.elpPenStyle == (PS_GEOMETRIC | PS_DASH)); - TEST(extlogpen.elpWidth == 5); - TEST(extlogpen.elpBrushStyle == 0); + RTEST(extlogpen.elpPenStyle == (PS_GEOMETRIC | PS_DASH)); + RTEST(extlogpen.elpWidth == 5); + RTEST(extlogpen.elpBrushStyle == 0); RTEST(extlogpen.elpColor == RGB(1,2,3)); RTEST(extlogpen.elpHatch == 22); RTEST(extlogpen.elpNumEntries == 0); Modified: trunk/rostests/apitests/gdi32api/tests/GetStockObject.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32api/tests/G… ============================================================================== --- trunk/rostests/apitests/gdi32api/tests/GetStockObject.c (original) +++ trunk/rostests/apitests/gdi32api/tests/GetStockObject.c Wed Aug 8 03:13:25 2007 @@ -5,10 +5,10 @@ { /* Test limits and error */ SetLastError(ERROR_SUCCESS); - TEST(GetStockObject(0) != NULL); + RTEST(GetStockObject(0) != NULL); TEST(GetStockObject(21) != NULL); - TEST(GetStockObject(-1) == NULL); - TEST(GetStockObject(9) == NULL); + RTEST(GetStockObject(-1) == NULL); + RTEST(GetStockObject(9) == NULL); RTEST(GetStockObject(22) == NULL); RTEST(GetLastError() == ERROR_SUCCESS); Modified: trunk/rostests/apitests/w32knapi/ntgdi/NtGdiGetRandomRgn.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/w32knapi/ntgdi/N… ============================================================================== --- trunk/rostests/apitests/w32knapi/ntgdi/NtGdiGetRandomRgn.c (original) +++ trunk/rostests/apitests/w32knapi/ntgdi/NtGdiGetRandomRgn.c Wed Aug 8 03:13:25 2007 @@ -31,43 +31,63 @@ hrgn = CreateRectRgn(0,0,0,0); hrgn2 = CreateRectRgn(3,3,10,10); SetLastError(ERROR_SUCCESS); - TEST(NtGdiGetRandomRgn(0, hrgn, 0) == -1); - TEST(GetLastError() == ERROR_INVALID_HANDLE); + RTEST(NtGdiGetRandomRgn(0, hrgn, 0) == -1); + RTEST(GetLastError() == ERROR_INVALID_HANDLE); SetLastError(ERROR_SUCCESS); - TEST(NtGdiGetRandomRgn(hDC, 0, 0) == 0); - TEST(NtGdiGetRandomRgn(hDC, (HRGN)-5, 0) == 0); - TEST(NtGdiGetRandomRgn(hDC, hrgn, 0) == 0); - TEST(NtGdiGetRandomRgn(hDC, hrgn, 1) == 0); + RTEST(NtGdiGetRandomRgn((HDC)2345, hrgn, 1) == -1); + RTEST(GetLastError() == ERROR_INVALID_HANDLE); + + SetLastError(ERROR_SUCCESS); + RTEST(NtGdiGetRandomRgn((HDC)2345, hrgn, 10) == -1); + RTEST(GetLastError() == ERROR_INVALID_HANDLE); + + SetLastError(ERROR_SUCCESS); + RTEST(NtGdiGetRandomRgn((HDC)2345, (HRGN)10, 10) == -1); + RTEST(GetLastError() == ERROR_INVALID_HANDLE); + + SetLastError(ERROR_SUCCESS); + RTEST(NtGdiGetRandomRgn((HDC)2345, 0, 1) == -1); + RTEST(GetLastError() == ERROR_INVALID_HANDLE); + + SetLastError(ERROR_SUCCESS); + RTEST(NtGdiGetRandomRgn(hDC, 0, 0) == 0); + RTEST(NtGdiGetRandomRgn(hDC, 0, 1) == 0); + RTEST(NtGdiGetRandomRgn(hDC, (HRGN)-5, 0) == 0); + RTEST(NtGdiGetRandomRgn(hDC, (HRGN)-5, 1) == 0); + RTEST(NtGdiGetRandomRgn(hDC, hrgn, 0) == 0); + RTEST(NtGdiGetRandomRgn(hDC, hrgn, 1) == 0); TEST(NtGdiGetRandomRgn(hDC, hrgn, 2) == 0); - TEST(NtGdiGetRandomRgn(hDC, hrgn, 3) == 0); - TEST(NtGdiGetRandomRgn(hDC, hrgn, 4) == 1); - TEST(NtGdiGetRandomRgn(hDC, hrgn, 5) == 0); - TEST(NtGdiGetRandomRgn(hDC, hrgn, 10) == 0); - TEST(NtGdiGetRandomRgn(hDC, hrgn, -10) == 0); + RTEST(NtGdiGetRandomRgn(hDC, hrgn, 3) == 0); + RTEST(NtGdiGetRandomRgn(hDC, hrgn, 4) == 1); + RTEST(NtGdiGetRandomRgn(hDC, hrgn, 5) == 0); + RTEST(NtGdiGetRandomRgn(hDC, hrgn, 10) == 0); + RTEST(NtGdiGetRandomRgn(hDC, hrgn, -10) == 0); RTEST(GetLastError() == ERROR_SUCCESS); SelectClipRgn(hDC, hrgn2); - TEST(NtGdiGetRandomRgn(hDC, hrgn, 1) == 1); - TEST(CombineRgn(hrgn, hrgn, hrgn, RGN_OR) == SIMPLEREGION); - TEST(CombineRgn(hrgn, hrgn, hrgn2, RGN_XOR) == NULLREGION); + TEST(NtGdiGetRandomRgn(hDC, 0, 1) == -1); + RTEST(GetLastError() == ERROR_SUCCESS); + RTEST(NtGdiGetRandomRgn(hDC, hrgn, 1) == 1); + RTEST(CombineRgn(hrgn, hrgn, hrgn, RGN_OR) == SIMPLEREGION); + RTEST(CombineRgn(hrgn, hrgn, hrgn2, RGN_XOR) == NULLREGION); SetRectRgn(hrgn2,0,0,0,0); SelectClipRgn(hDC, hrgn2); - TEST(NtGdiGetRandomRgn(hDC, hrgn, 1) == 1); + RTEST(NtGdiGetRandomRgn(hDC, hrgn, 1) == 1); - TEST(CombineRgn(hrgn2, hrgn, hrgn2, RGN_XOR) == NULLREGION); - TEST(CombineRgn(hrgn2, hrgn, hrgn, RGN_OR) == NULLREGION); + RTEST(CombineRgn(hrgn2, hrgn, hrgn2, RGN_XOR) == NULLREGION); + RTEST(CombineRgn(hrgn2, hrgn, hrgn, RGN_OR) == NULLREGION); SelectClipRgn(hDC, NULL); - TEST(NtGdiGetRandomRgn(hDC, hrgn, 1) == 0); + RTEST(NtGdiGetRandomRgn(hDC, hrgn, 1) == 0); - TEST(NtGdiGetRandomRgn(hDC, hrgn, 4) == 1); + RTEST(NtGdiGetRandomRgn(hDC, hrgn, 4) == 1); RTEST(GetLastError() == ERROR_SUCCESS); - DeleteDC(hDC); + ReleaseDC(hWnd, hDC); DestroyWindow(hWnd); return APISTATUS_NORMAL; Modified: trunk/rostests/apitests/w32knapi/w32knapi.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/w32knapi/w32knap… ============================================================================== --- trunk/rostests/apitests/w32knapi/w32knapi.c (original) +++ trunk/rostests/apitests/w32knapi/w32knapi.c Wed Aug 8 03:13:25 2007 @@ -49,37 +49,6 @@ return FALSE; } - -static BOOL -RosSyscall(LPWSTR lpszFunction, int cParams, void* pParams, DWORD* pResult) -{ - DWORD ret; - char szFunctionName[MAX_PATH]; - int ParamSize = cParams * 4; - - sprintf(szFunctionName, "%ls", lpszFunction); - FARPROC proc = (FARPROC)GetProcAddress(g_hModule, szFunctionName); - if (!proc) - { - printf("Couldn't find proc: %s\n", szFunctionName); - return FALSE; - } - - asm volatile - ( - "subl %%eax, %%esp;" // calculate new stack pos - "movl %%esp, %%edi;" // destination is stackpointer - "cld;" // clear direction flag - "rep movsd;" // copy params to the stack - "call *%%edx" // call function - : "=a" (ret) - : "c" (cParams), "a" (ParamSize), "S"(pParams), "d"(proc) - ); - - *pResult = ret; - return TRUE; -} - static PSYSCALL_ENTRY GetSyscallEntry(LPWSTR lpszFunction) { @@ -95,31 +64,60 @@ return NULL; } -static BOOL -WinSyscall(LPWSTR pszFunction, void* pParams, void* pResult) +static DWORD STDCALL +WinSyscall(INT nSyscalNum, PVOID pFirstParam) { - PSYSCALL_ENTRY pEntry = GetSyscallEntry(pszFunction); + DWORD ret; + asm volatile ("int $0x2e\n" : "=a"(ret): "a" (nSyscalNum), "d" (pFirstParam)); + return ret; +} + +static DWORD STDCALL +RosSyscall(FARPROC proc, UINT cParams, PVOID pFirstParam) +{ DWORD ret; - asm volatile ("int $0x2e\n" : "=a"(ret): "a" (pEntry->nSyscallNum), "d" (pParams));\ - *((DWORD*)pResult) = ret; - return FALSE; + asm volatile + ( + "pushfl;" // Save flags + "movl %%ecx, %%eax;" + "shl $2, %%eax;" // Calculate param size + "subl %%eax, %%esp;" // Calculate new stack pos + "movl %%esp, %%edi;" // Destination is stackpointer + "cld;" // Clear direction flag + "rep movsd;" // Copy params to the stack + "call *%%edx;" // Call function + "popfl;" // Restore flags + : "=a" (ret) + : "S" (pFirstParam), "c" (cParams), "d"(proc) + : "%edi" + ); + + return ret; } DWORD Syscall(LPWSTR pszFunction, int cParams, void* pParams) { - DWORD dwRet = 0; + if (g_nOs == OS_REACTOS) + { + char szFunctionName[MAX_PATH]; - if (g_nOs == OS_REACTOS) - { - RosSyscall(pszFunction, cParams, pParams, &dwRet); + sprintf(szFunctionName, "%ls", pszFunction); + FARPROC proc = (FARPROC)GetProcAddress(g_hModule, szFunctionName); + if (!proc) + { + printf("Couldn't find proc: %s\n", szFunctionName); + return FALSE; + } + + return RosSyscall(proc, cParams, pParams); } else { - WinSyscall(pszFunction, pParams, &dwRet); + PSYSCALL_ENTRY pEntry = GetSyscallEntry(pszFunction); + return WinSyscall(pEntry->nSyscallNum, pParams); } - return dwRet; } BOOL Modified: trunk/rostests/apitests/w32knapi/w32knapi.h URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/w32knapi/w32knap… ============================================================================== --- trunk/rostests/apitests/w32knapi/w32knapi.h (original) +++ trunk/rostests/apitests/w32knapi/w32knapi.h Wed Aug 8 03:13:25 2007 @@ -10,6 +10,7 @@ #include <win32k/callback.h> #include <win32k/ntusrtyp.h> #include <win32k/ntgdityp.h> +#include <win32k/ntgdihdl.h> #define OS_UNSUPPORTED 0 #define OS_REACTOS 1

18 years, 1 month

[tkreuzer] 28231: fix build part 2

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Wed Aug 8 03:06:51 2007 New Revision: 28231 URL: http://svn.reactos.org/svn/reactos?rev=28231&view=rev Log: fix build part 2 Modified: trunk/reactos/drivers/base/bootvid/precomp.h Modified: trunk/reactos/drivers/base/bootvid/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/base/bootvid/preco… ============================================================================== --- trunk/reactos/drivers/base/bootvid/precomp.h (original) +++ trunk/reactos/drivers/base/bootvid/precomp.h Wed Aug 8 03:06:51 2007 @@ -1,5 +1,7 @@ +#ifdef _MSC_VER void _enable(void); void _disable(void); +#endif #include "ntddk.h" #include "arc/arc.h" #include "halfuncs.h"

18 years, 1 month

[zguo] 28230: Fix build part 1, add precomp.h into bootvid.rbuild

by zguo＠svn.reactos.org

Author: zguo Date: Wed Aug 8 03:04:19 2007 New Revision: 28230 URL: http://svn.reactos.org/svn/reactos?rev=28230&view=rev Log: Fix build part 1, add precomp.h into bootvid.rbuild Modified: trunk/reactos/drivers/base/bootvid/bootvid.rbuild Modified: trunk/reactos/drivers/base/bootvid/bootvid.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/base/bootvid/bootv… ============================================================================== --- trunk/reactos/drivers/base/bootvid/bootvid.rbuild (original) +++ trunk/reactos/drivers/base/bootvid/bootvid.rbuild Wed Aug 8 03:04:19 2007 @@ -9,4 +9,5 @@ <file>bootdata.c</file> <file>vga.c</file> <file>bootvid.rc</file> + <pch>precomp.h</pch> </module>

18 years, 1 month

[jimtabor] 28229: Don't write to user space after an error. We do write if TRUE.

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Wed Aug 8 02:19:32 2007 New Revision: 28229 URL: http://svn.reactos.org/svn/reactos?rev=28229&view=rev Log: Don't write to user space after an error. We do write if TRUE. Modified: trunk/reactos/subsystems/win32/win32k/objects/dc.c Modified: trunk/reactos/subsystems/win32/win32k/objects/dc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/dc.c (original) +++ trunk/reactos/subsystems/win32/win32k/objects/dc.c Wed Aug 8 02:19:32 2007 @@ -1213,7 +1213,7 @@ break; } - if (!Ret) + if (Ret) { _SEH_TRY {

18 years, 1 month

[cwittich] 28228: add support for Visual Studio 2008 (Orcas)

by cwittich＠svn.reactos.org

Author: cwittich Date: Wed Aug 8 01:19:22 2007 New Revision: 28228 URL: http://svn.reactos.org/svn/reactos?rev=28228&view=rev Log: add support for Visual Studio 2008 (Orcas) Modified: trunk/reactos/Makefile trunk/reactos/tools/rbuild/backend/msvc/msvc.cpp trunk/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp Modified: trunk/reactos/Makefile URL: http://svn.reactos.org/svn/reactos/trunk/reactos/Makefile?rev=28228&r1=2822… ============================================================================== --- trunk/reactos/Makefile (original) +++ trunk/reactos/Makefile Wed Aug 8 01:19:22 2007 @@ -523,6 +523,11 @@ $(ECHO_RBUILD) $(Q)$(RBUILD_TARGET) $(RBUILD_FLAGS) $(ROS_RBUILDFLAGS) -vs8.00 -voversionconfiguration msvc +.PHONY: msvc9 +msvc9: $(RBUILD_TARGET) + $(ECHO_RBUILD) + $(Q)$(RBUILD_TARGET) $(RBUILD_FLAGS) $(ROS_RBUILDFLAGS) -vs9.00 -voversionconfiguration msvc + .PHONY: msvc6_clean msvc6_clean: $(RBUILD_TARGET) $(ECHO_RBUILD) @@ -542,6 +547,11 @@ msvc8_clean: $(RBUILD_TARGET) $(ECHO_RBUILD) $(Q)$(RBUILD_TARGET) $(RBUILD_FLAGS) $(ROS_RBUILDFLAGS) -c -vs8.00 -voversionconfiguration msvc + +.PHONY: msvc9_clean +msvc9_clean: $(RBUILD_TARGET) + $(ECHO_RBUILD) + $(Q)$(RBUILD_TARGET) $(RBUILD_FLAGS) $(ROS_RBUILDFLAGS) -c -vs9.00 -voversionconfiguration msvc .PHONY: msvc_clean msvc_clean: $(RBUILD_TARGET) Modified: trunk/reactos/tools/rbuild/backend/msvc/msvc.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/msvc/… ============================================================================== --- trunk/reactos/tools/rbuild/backend/msvc/msvc.cpp (original) +++ trunk/reactos/tools/rbuild/backend/msvc/msvc.cpp Wed Aug 8 01:19:22 2007 @@ -285,6 +285,8 @@ return "vc70"; else if ( configuration.VSProjectVersion == "7.10" ) return "vc71"; + else if ( configuration.VSProjectVersion == "9.00" ) + return "vc9"; else /* must be VS2005 */ return "vc8"; Modified: trunk/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/msvc/… ============================================================================== --- trunk/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp (original) +++ trunk/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp Wed Aug 8 01:19:22 2007 @@ -416,6 +416,12 @@ fprintf ( OUT, "\t\t\t\tName=\"VCLinkerTool\"\r\n" ); if (module.GetEntryPoint(false) == "0") fprintf ( OUT, "AdditionalOptions=\"/noentry\"" ); + + if (configuration.VSProjectVersion == "9.00") + { + fprintf ( OUT, "\t\t\t\tRandomizedBaseAddress=\"0\"\r\n" ); + fprintf ( OUT, "\t\t\t\tDataExecutionPrevention=\"0\"\r\n" ); + } if (module.importLibrary != NULL) fprintf ( OUT, "\t\t\t\tModuleDefinitionFile=\"%s\"\r\n", module.importLibrary->definition.c_str()); @@ -777,6 +783,9 @@ if (configuration.VSProjectVersion == "8.00") version = "9.00"; + if (configuration.VSProjectVersion == "9.00") + version = "10.00"; + return version; }

18 years, 1 month

← Newer
1
...
47
48
49
50
51
52
53
...
67
Older →

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