Ros-diffs July 2009

ros-diffs@reactos.org

27 participants
605 discussions

[cfinck] 446: Change the RosCMS Login code and Bugzilla's ROSCMS Login module to determine the client's IP address also from the X-Forwarded-For header. This also readds the IP check to Bugzilla.

by cfinck＠svn.reactos.org

Author: cfinck Date: Thu Jul 9 04:00:45 2009 New Revision: 446 URL: http://svn.reactos.org/svn/reactos?rev=446&view=rev Log: Change the RosCMS Login code and Bugzilla's ROSCMS Login module to determine the client's IP address also from the X-Forwarded-For header. This also readds the IP check to Bugzilla. Modified: branches/danny-web/www/www.reactos.org/bugzilla/Bugzilla/Auth/Login/ROSCMS.… branches/danny-web/www/www.reactos.org/roscms/lib/om/Login.class.php Modified: branches/danny-web/www/www.reactos.org/bugzilla/Bugzilla/Auth/Login/ROSCMS.… URL: http://svn.reactos.org/svn/reactos/branches/danny-web/www/www.reactos.org/b… ============================================================================== --- branches/danny-web/www/www.reactos.org/bugzilla/Bugzilla/Auth/Login/ROSCMS.… [iso-8859-1] (original) +++ branches/danny-web/www/www.reactos.org/bugzilla/Bugzilla/Auth/Login/ROSCMS.… [iso-8859-1] Thu Jul 9 04:00:45 2009 @@ -72,10 +72,24 @@ if ( defined $session_id ) { my $session_id_clean = $session_id; trick_taint($session_id_clean); - + + my $ip_clean; + if ($ENV{'HTTP_X_FORWARDED_FOR'}) { + my @proxies = split(/,/, $ENV{'HTTP_X_FORWARDED_FOR'}); + $ip_clean = $proxies[0]; + } else { + $ip_clean = $ENV{'REMOTE_ADDR'}; + } + + if ($ip_clean =~ m/^(\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3})/) { + $ip_clean = $1; + } else { + $ip_clean = 'invalid'; + } + my $browser_agent_clean = $ENV{'HTTP_USER_AGENT'}; trick_taint($browser_agent_clean); - + my $query = "SELECT m.subsys_user_id, m.user_id " . " FROM $roscms_db_name.roscms_accounts_sessions s " . " JOIN $roscms_db_name.roscms_accounts u ON s.user_id = u.id " . @@ -83,11 +97,13 @@ " WHERE s.id = ? " . " AND (s.expires IS NULL OR " . " NOW() <= s.expires) " . + " AND (s.ip = 'false' OR " . + " s.ip = ?) " . " AND (s.browseragent = 'false' OR " . " s.browseragent = ?) " . " AND m.subsys = 'bugzilla'"; - my @params = ($session_id_clean, $browser_agent_clean); + my @params = ($session_id_clean, $ip_clean, $browser_agent_clean); ($user_id, $roscms_user_id) = $dbh->selectrow_array($query, undef, @params); if ($user_id) { Modified: branches/danny-web/www/www.reactos.org/roscms/lib/om/Login.class.php URL: http://svn.reactos.org/svn/reactos/branches/danny-web/www/www.reactos.org/r… ============================================================================== --- branches/danny-web/www/www.reactos.org/roscms/lib/om/Login.class.php [iso-8859-1] (original) +++ branches/danny-web/www/www.reactos.org/roscms/lib/om/Login.class.php [iso-8859-1] Thu Jul 9 04:00:45 2009 @@ -60,10 +60,18 @@ $session_id = $matches[1]; // get a valid ip - if (isset($_SERVER['REMOTE_ADDR']) && preg_match('/^(\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3})$/', $_SERVER['REMOTE_ADDR'], $matches) ) { - $remote_addr = $matches[1]; - } - else{ + if (array_key_exists('HTTP_X_FORWARDED_FOR', $_SERVER)) + { + $proxies = explode(',', $_SERVER['HTTP_X_FORWARDED_FOR']); + $remote_addr = $proxies[0]; + } + else + { + $remote_addr = $_SERVER['REMOTE_ADDR']; + } + + if (!preg_match('/^(\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3})$/', $remote_addr)) + { $remote_addr = 'invalid'; }

15 years, 5 months

[cfinck] 445: - Remove the IP check from the Bugzilla ROSCMS Login Module. It won't work if the Bugzilla sits behind a proxy and wasn't very effective anyway. - Avoid a PHP notice that a particular array key does not exist in RosCMS v4's Login code.

by cfinck＠svn.reactos.org

Author: cfinck Date: Thu Jul 9 02:51:56 2009 New Revision: 445 URL: http://svn.reactos.org/svn/reactos?rev=445&view=rev Log: - Remove the IP check from the Bugzilla ROSCMS Login Module. It won't work if the Bugzilla sits behind a proxy and wasn't very effective anyway. - Avoid a PHP notice that a particular array key does not exist in RosCMS v4's Login code. Modified: branches/danny-web/www/www.reactos.org/bugzilla/Bugzilla/Auth/Login/ROSCMS.… branches/danny-web/www/www.reactos.org/roscms/lib/om/Login.class.php Modified: branches/danny-web/www/www.reactos.org/bugzilla/Bugzilla/Auth/Login/ROSCMS.… URL: http://svn.reactos.org/svn/reactos/branches/danny-web/www/www.reactos.org/b… ============================================================================== --- branches/danny-web/www/www.reactos.org/bugzilla/Bugzilla/Auth/Login/ROSCMS.… [iso-8859-1] (original) +++ branches/danny-web/www/www.reactos.org/bugzilla/Bugzilla/Auth/Login/ROSCMS.… [iso-8859-1] Thu Jul 9 02:51:56 2009 @@ -72,14 +72,10 @@ if ( defined $session_id ) { my $session_id_clean = $session_id; trick_taint($session_id_clean); - my $remote_addr_clean; - if ($ENV{'REMOTE_ADDR'} =~ m/^(\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3})/) { - $remote_addr_clean = $1; - } else { - $remote_addr_clean = 'invalid'; - } + my $browser_agent_clean = $ENV{'HTTP_USER_AGENT'}; trick_taint($browser_agent_clean); + my $query = "SELECT m.subsys_user_id, m.user_id " . " FROM $roscms_db_name.roscms_accounts_sessions s " . " JOIN $roscms_db_name.roscms_accounts u ON s.user_id = u.id " . @@ -87,13 +83,11 @@ " WHERE s.id = ? " . " AND (s.expires IS NULL OR " . " NOW() <= s.expires) " . - " AND (s.ip = 'false' OR " . - " s.ip = ?) " . " AND (s.browseragent = 'false' OR " . " s.browseragent = ?) " . " AND m.subsys = 'bugzilla'"; - my @params = ($session_id_clean, $remote_addr_clean, $browser_agent_clean); + my @params = ($session_id_clean, $browser_agent_clean); ($user_id, $roscms_user_id) = $dbh->selectrow_array($query, undef, @params); if ($user_id) { Modified: branches/danny-web/www/www.reactos.org/roscms/lib/om/Login.class.php URL: http://svn.reactos.org/svn/reactos/branches/danny-web/www/www.reactos.org/r… ============================================================================== --- branches/danny-web/www/www.reactos.org/roscms/lib/om/Login.class.php [iso-8859-1] (original) +++ branches/danny-web/www/www.reactos.org/roscms/lib/om/Login.class.php [iso-8859-1] Thu Jul 9 02:51:56 2009 @@ -137,7 +137,7 @@ $config = &RosCMS::getInstance(); // do we have a session ? - if ($_COOKIE[$config->cookieUserKey()]) { + if (array_key_exists($config->cookieUserKey(), $_COOKIE)) { // delete cookie, kill session Cookie::write($config->cookieUserKey(), '', time() - 3600);

15 years, 5 months

[tkreuzer] 41820: Get rid of the DCs XlateBrush and XlatePen. The resulting code isn't any better yet, but this step is needed for the upcoming xlateobj rewrite.

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Thu Jul 9 01:53:35 2009 New Revision: 41820 URL: http://svn.reactos.org/svn/reactos?rev=41820&view=rev Log: Get rid of the DCs XlateBrush and XlatePen. The resulting code isn't any better yet, but this step is needed for the upcoming xlateobj rewrite. Modified: trunk/reactos/subsystems/win32/win32k/eng/xlate.c trunk/reactos/subsystems/win32/win32k/include/dc.h trunk/reactos/subsystems/win32/win32k/include/inteng.h trunk/reactos/subsystems/win32/win32k/objects/bitblt.c trunk/reactos/subsystems/win32/win32k/objects/dclife.c trunk/reactos/subsystems/win32/win32k/objects/dcobjs.c Modified: trunk/reactos/subsystems/win32/win32k/eng/xlate.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/en… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/eng/xlate.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/eng/xlate.c [iso-8859-1] Thu Jul 9 01:53:35 2009 @@ -671,4 +671,53 @@ return 0; } +// HACK! +XLATEOBJ* +IntCreateBrushXlate(PDC pdc, BRUSH *pbrush) +{ + SURFACE * psurf; + XLATEOBJ *pxlo = NULL; + HPALETTE hPalette = NULL; + + psurf = pdc->dclevel.pSurface; + if (psurf) + { + hPalette = psurf->hDIBPalette; + } + if (!hPalette) hPalette = pPrimarySurface->DevInfo.hpalDefault; + + if (pbrush->flAttrs & GDIBRUSH_IS_NULL) + { + pxlo = NULL; + } + else if (pbrush->flAttrs & GDIBRUSH_IS_SOLID) + { + pxlo = IntEngCreateXlate(0, PAL_RGB, hPalette, NULL); + } + else + { + SURFACE *psurfPattern = SURFACE_LockSurface(pbrush->hbmPattern); + if (psurfPattern == NULL) + return FALSE; + + /* Special case: 1bpp pattern */ + if (psurfPattern->SurfObj.iBitmapFormat == BMF_1BPP) + { + if (pdc->rosdc.bitsPerPixel != 1) + pxlo = IntEngCreateSrcMonoXlate(hPalette, + pdc->pdcattr->crBackgroundClr, + pbrush->BrushAttr.lbColor); + } + else if (pbrush->flAttrs & GDIBRUSH_IS_DIB) + { + pxlo = IntEngCreateXlate(0, 0, hPalette, psurfPattern->hDIBPalette); + } + + SURFACE_UnlockSurface(psurfPattern); + } + + return pxlo; +} + + /* EOF */ 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 [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/include/dc.h [iso-8859-1] Thu Jul 9 01:53:35 2009 @@ -21,8 +21,6 @@ BYTE bitsPerPixel; CLIPOBJ *CombinedClip; - XLATEOBJ *XlateBrush; - XLATEOBJ *XlatePen; UNICODE_STRING DriverName; Modified: trunk/reactos/subsystems/win32/win32k/include/inteng.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/inteng.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/include/inteng.h [iso-8859-1] Thu Jul 9 01:53:35 2009 @@ -107,6 +107,9 @@ ULONG Color0, ULONG Color1); +XLATEOBJ* +IntCreateBrushXlate(PDC pdc, BRUSH *pbrush); + HPALETTE FASTCALL IntEngGetXlatePalette(XLATEOBJ *XlateObj, ULONG Palette); Modified: trunk/reactos/subsystems/win32/win32k/objects/bitblt.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/bitblt.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/bitblt.c [iso-8859-1] Thu Jul 9 01:53:35 2009 @@ -941,6 +941,7 @@ EBRUSHOBJ eboFill; POINTL BrushOrigin; BOOL ret; + XLATEOBJ *pxlo; ASSERT(pbrush); @@ -988,7 +989,8 @@ BrushOrigin.x = pbrush->ptOrigin.x + pdc->ptlDCOrig.x; BrushOrigin.y = pbrush->ptOrigin.y + pdc->ptlDCOrig.y; - EBRUSHOBJ_vInit(&eboFill, pbrush, pdc->rosdc.XlateBrush); + pxlo = IntCreateBrushXlate(pdc, pbrush); + EBRUSHOBJ_vInit(&eboFill, pbrush, pxlo); ret = IntEngBitBlt( &psurf->SurfObj, @@ -1002,6 +1004,8 @@ &eboFill.BrushObject, // use pDC->eboFill &BrushOrigin, ROP3_TO_ROP4(dwRop)); + + EngDeleteXlate(pxlo); return ret; } Modified: trunk/reactos/subsystems/win32/win32k/objects/dclife.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/dclife.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/dclife.c [iso-8859-1] Thu Jul 9 01:53:35 2009 @@ -500,10 +500,6 @@ NtGdiSelectBrush (DCHandle, STOCK_WHITE_BRUSH); NtGdiSelectFont (DCHandle, STOCK_SYSTEM_FONT); DC_LockDC (DCHandle); NtGdiSelectXxx does not recognize stock objects yet */ - if (DCToDelete->rosdc.XlateBrush != NULL) - EngDeleteXlate(DCToDelete->rosdc.XlateBrush); - if (DCToDelete->rosdc.XlatePen != NULL) - EngDeleteXlate(DCToDelete->rosdc.XlatePen); } if (DCToDelete->rosdc.hClipRgn) { @@ -719,7 +715,7 @@ return GreDeleteObject((HGDIOBJ) DCHandle); default: - return FALSE; + return FALSE; } } return (DCHandle != NULL); Modified: trunk/reactos/subsystems/win32/win32k/objects/dcobjs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/dcobjs.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/dcobjs.c [iso-8859-1] Thu Jul 9 01:53:35 2009 @@ -1,4 +1,4 @@ -/* +/* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel * PURPOSE: Functions for creation and destruction of DCs @@ -10,60 +10,6 @@ #define NDEBUG #include <debug.h> - -// HACK! -static -BOOLEAN -IntUpdateBrushXlate(PDC pdc, XLATEOBJ **ppxlo, BRUSH *pbrush) -{ - SURFACE * psurf; - XLATEOBJ *pxlo = NULL; - HPALETTE hPalette = NULL; - - psurf = pdc->dclevel.pSurface; - if (psurf) - { - hPalette = psurf->hDIBPalette; - } - if (!hPalette) hPalette = pPrimarySurface->DevInfo.hpalDefault; - - if (pbrush->flAttrs & GDIBRUSH_IS_NULL) - { - pxlo = NULL; - } - else if (pbrush->flAttrs & GDIBRUSH_IS_SOLID) - { - pxlo = IntEngCreateXlate(0, PAL_RGB, hPalette, NULL); - } - else - { - SURFACE *psurfPattern = SURFACE_LockSurface(pbrush->hbmPattern); - if (psurfPattern == NULL) - return FALSE; - - /* Special case: 1bpp pattern */ - if (psurfPattern->SurfObj.iBitmapFormat == BMF_1BPP) - { - if (pdc->rosdc.bitsPerPixel != 1) - pxlo = IntEngCreateSrcMonoXlate(hPalette, - pdc->pdcattr->crBackgroundClr, - pbrush->BrushAttr.lbColor); - } - else if (pbrush->flAttrs & GDIBRUSH_IS_DIB) - { - pxlo = IntEngCreateXlate(0, 0, hPalette, psurfPattern->hDIBPalette); - } - - SURFACE_UnlockSurface(psurfPattern); - } - - if (*ppxlo != NULL) - EngDeleteXlate(*ppxlo); - - *ppxlo = pxlo; - return TRUE; -} - VOID FASTCALL @@ -94,27 +40,26 @@ } } + /* ROS HACK, should use surf xlate */ + pxlo = IntCreateBrushXlate(pdc, pdc->dclevel.pbrFill); + /* Check if the EBRUSHOBJ needs update */ if (pdcattr->ulDirty_ & DIRTY_FILL) { pbrFill = pdc->dclevel.pbrFill; - /* ROS HACK, should use surf xlate */ - IntUpdateBrushXlate(pdc, &pdc->rosdc.XlateBrush, pbrFill); - /* Update eboFill, realizing it, if needed */ - EBRUSHOBJ_vUpdate(&pdc->eboFill, pbrFill, pdc->rosdc.XlateBrush); + EBRUSHOBJ_vUpdate(&pdc->eboFill, pbrFill, pxlo); } /* Check for DC brush */ if (pdcattr->hbrush == StockObjects[DC_BRUSH]) { - /* ROS HACK, should use surf xlate */ - pxlo = pdc->rosdc.XlateBrush; - /* Update the eboFill's solid color */ EBRUSHOBJ_vSetSolidBrushColor(&pdc->eboFill, pdcattr->crPenClr, pxlo); } + + EngDeleteXlate(pxlo); /* Clear flags */ pdcattr->ulDirty_ &= ~(DIRTY_FILL | DC_BRUSH_DIRTY); @@ -149,27 +94,26 @@ } } + /* ROS HACK, should use surf xlate */ + pxlo = IntCreateBrushXlate(pdc, pdc->dclevel.pbrFill); + /* Check if the EBRUSHOBJ needs update */ if (pdcattr->ulDirty_ & DIRTY_LINE) { pbrLine = pdc->dclevel.pbrLine; - /* ROS HACK, should use surf xlate */ - IntUpdateBrushXlate(pdc, &pdc->rosdc.XlatePen, pbrLine); - /* Update eboLine, realizing it, if needed */ - EBRUSHOBJ_vUpdate(&pdc->eboLine, pbrLine, pdc->rosdc.XlatePen); + EBRUSHOBJ_vUpdate(&pdc->eboLine, pbrLine, pxlo); } /* Check for DC pen */ if (pdcattr->hpen == StockObjects[DC_PEN]) { - /* ROS HACK, should use surf xlate */ - pxlo = pdc->rosdc.XlatePen; - /* Update the eboLine's solid color */ EBRUSHOBJ_vSetSolidBrushColor(&pdc->eboLine, pdcattr->crPenClr, pxlo); } + + EngDeleteXlate(pxlo); /* Clear flags */ pdcattr->ulDirty_ &= ~(DIRTY_LINE | DC_PEN_DIRTY); @@ -434,7 +378,7 @@ BOOL success = FALSE; PDC_ATTR pdcattr; PDC pdc; - + pdc = DC_LockDc(hDC); if (!pdc) {

15 years, 5 months

[tkreuzer] 41819: BltMask: remove unnecessary check

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Thu Jul 9 01:35:33 2009 New Revision: 41819 URL: http://svn.reactos.org/svn/reactos?rev=41819&view=rev Log: BltMask: remove unnecessary check Modified: trunk/reactos/subsystems/win32/win32k/eng/bitblt.c Modified: trunk/reactos/subsystems/win32/win32k/eng/bitblt.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/en… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/eng/bitblt.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/eng/bitblt.c [iso-8859-1] Thu Jul 9 01:35:33 2009 @@ -78,7 +78,7 @@ fnDest_PutPixel = DibFunctionsForBitmapFormat[psoDest->iBitmapFormat].DIB_PutPixel; if (psurfPattern) { - XlateObj = pebo ? pebo->XlateObject : NULL; + XlateObj = pebo->XlateObject; PatternY = (prclDest->top - pptlBrush->y) % PatternHeight; if (PatternY < 0) { @@ -101,7 +101,7 @@ if (*pjMskCurrent & fjMaskBit) { fnDest_PutPixel(psoDest, x, y, - XLATEOBJ_iXlate(XlateObj, + XLATEOBJ_iXlate(XlateObj, fnPattern_GetPixel(psoPattern, PatternX, PatternY))); } fjMaskBit = _rotr8(fjMaskBit, 1);

15 years, 5 months

[tkreuzer] 41818: IntGdiPolyPatBlt: Don't unnecessarily update the dc's brush, improve and simplyfy code,

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Thu Jul 9 01:05:37 2009 New Revision: 41818 URL: http://svn.reactos.org/svn/reactos?rev=41818&view=rev Log: IntGdiPolyPatBlt: Don't unnecessarily update the dc's brush, improve and simplyfy code, Modified: trunk/reactos/subsystems/win32/win32k/objects/bitblt.c Modified: trunk/reactos/subsystems/win32/win32k/objects/bitblt.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/bitblt.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/bitblt.c [iso-8859-1] Thu Jul 9 01:05:37 2009 @@ -928,78 +928,80 @@ BOOL FASTCALL IntPatBlt( - PDC dc, + PDC pdc, INT XLeft, INT YLeft, INT Width, INT Height, - DWORD ROP, - PBRUSH BrushObj) + DWORD dwRop, + PBRUSH pbrush) { RECTL DestRect; SURFACE *psurf; EBRUSHOBJ eboFill; POINTL BrushOrigin; - BOOL ret = TRUE; - - ASSERT(BrushObj); - - psurf = dc->dclevel.pSurface; + BOOL ret; + + ASSERT(pbrush); + + psurf = pdc->dclevel.pSurface; if (psurf == NULL) { SetLastWin32Error(ERROR_INVALID_HANDLE); return FALSE; } - if (!(BrushObj->flAttrs & GDIBRUSH_IS_NULL)) - { - if (Width > 0) - { - DestRect.left = XLeft; - DestRect.right = XLeft + Width; - } - else - { - DestRect.left = XLeft + Width + 1; - DestRect.right = XLeft + 1; - } - - if (Height > 0) - { - DestRect.top = YLeft; - DestRect.bottom = YLeft + Height; - } - else - { - DestRect.top = YLeft + Height + 1; - DestRect.bottom = YLeft + 1; - } - - IntLPtoDP(dc, (LPPOINT)&DestRect, 2); - - DestRect.left += dc->ptlDCOrig.x; - DestRect.top += dc->ptlDCOrig.y; - DestRect.right += dc->ptlDCOrig.x; - DestRect.bottom += dc->ptlDCOrig.y; - - BrushOrigin.x = BrushObj->ptOrigin.x + dc->ptlDCOrig.x; - BrushOrigin.y = BrushObj->ptOrigin.y + dc->ptlDCOrig.y; - - EBRUSHOBJ_vInit(&eboFill, BrushObj, dc->rosdc.XlateBrush); - - ret = IntEngBitBlt( - &psurf->SurfObj, - NULL, - NULL, - dc->rosdc.CombinedClip, - NULL, - &DestRect, - NULL, - NULL, - &eboFill.BrushObject, // use pDC->eboFill - &BrushOrigin, - ROP3_TO_ROP4(ROP)); - } + if (pbrush->flAttrs & GDIBRUSH_IS_NULL) + { + return TRUE; + } + + if (Width > 0) + { + DestRect.left = XLeft; + DestRect.right = XLeft + Width; + } + else + { + DestRect.left = XLeft + Width + 1; + DestRect.right = XLeft + 1; + } + + if (Height > 0) + { + DestRect.top = YLeft; + DestRect.bottom = YLeft + Height; + } + else + { + DestRect.top = YLeft + Height + 1; + DestRect.bottom = YLeft + 1; + } + + IntLPtoDP(pdc, (LPPOINT)&DestRect, 2); + + DestRect.left += pdc->ptlDCOrig.x; + DestRect.top += pdc->ptlDCOrig.y; + DestRect.right += pdc->ptlDCOrig.x; + DestRect.bottom += pdc->ptlDCOrig.y; + + BrushOrigin.x = pbrush->ptOrigin.x + pdc->ptlDCOrig.x; + BrushOrigin.y = pbrush->ptOrigin.y + pdc->ptlDCOrig.y; + + EBRUSHOBJ_vInit(&eboFill, pbrush, pdc->rosdc.XlateBrush); + + ret = IntEngBitBlt( + &psurf->SurfObj, + NULL, + NULL, + pdc->rosdc.CombinedClip, + NULL, + &DestRect, + NULL, + NULL, + &eboFill.BrushObject, // use pDC->eboFill + &BrushOrigin, + ROP3_TO_ROP4(dwRop)); return ret; } @@ -1009,52 +1011,46 @@ HDC hDC, DWORD dwRop, PPATRECT pRects, - int cRects, + INT cRects, ULONG Reserved) { - int i; - PPATRECT r; + INT i; PBRUSH pbrush; - PDC_ATTR pdcattr; - DC *dc; - - dc = DC_LockDc(hDC); - if (dc == NULL) + PDC pdc; + + pdc = DC_LockDc(hDC); + if (!pdc) { SetLastWin32Error(ERROR_INVALID_HANDLE); return FALSE; } - if (dc->dctype == DC_TYPE_INFO) - { - DC_UnlockDc(dc); + + if (pdc->dctype == DC_TYPE_INFO) + { + DC_UnlockDc(pdc); /* Yes, Windows really returns TRUE in this case */ return TRUE; } - pdcattr = dc->pdcattr; - - if (pdcattr->ulDirty_ & (DIRTY_FILL | DC_BRUSH_DIRTY)) - DC_vUpdateFillBrush(dc); - - for (r = pRects, i = 0; i < cRects; i++) - { - pbrush = BRUSH_LockBrush(r->hBrush); + for (i = 0; i < cRects; i++) + { + pbrush = BRUSH_LockBrush(pRects->hBrush); if(pbrush != NULL) { IntPatBlt( - dc, - r->r.left, - r->r.top, - r->r.right, - r->r.bottom, + pdc, + pRects->r.left, + pRects->r.top, + pRects->r.right, + pRects->r.bottom, dwRop, pbrush); BRUSH_UnlockBrush(pbrush); } - r++; - } - - DC_UnlockDc(dc); + pRects++; + } + + DC_UnlockDc(pdc); return TRUE; }

15 years, 5 months

[sginsberg] 41817: - Revert 41788, replaced by a real fix in 41815. See issue #4663 for more details.

by sginsberg＠svn.reactos.org

Author: sginsberg Date: Thu Jul 9 01:04:54 2009 New Revision: 41817 URL: http://svn.reactos.org/svn/reactos?rev=41817&view=rev Log: - Revert 41788, replaced by a real fix in 41815. See issue #4663 for more details. Modified: trunk/reactos/ntoskrnl/mm/ARM3/mdlsup.c Modified: trunk/reactos/ntoskrnl/mm/ARM3/mdlsup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/mdlsup.c?… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/mdlsup.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/mdlsup.c [iso-8859-1] Thu Jul 9 01:04:54 2009 @@ -679,7 +679,6 @@ // Oops :( // ProbeStatus = _SEH2_GetExceptionCode(); - _SEH2_YIELD(break); } _SEH2_END;

15 years, 5 months

[sginsberg] 41816: - NtUserMessageCall: Fix probe-and-capture for the FNID_BROADCASTSYSTEMMESSAGE case -- win32k must copy user mode buffers to safe memory before reading from them (or wrap the operations in SEH). Copy the buffer to the stack as it is small.

by sginsberg＠svn.reactos.org

Author: sginsberg Date: Thu Jul 9 00:41:58 2009 New Revision: 41816 URL: http://svn.reactos.org/svn/reactos?rev=41816&view=rev Log: - NtUserMessageCall: Fix probe-and-capture for the FNID_BROADCASTSYSTEMMESSAGE case -- win32k must copy user mode buffers to safe memory before reading from them (or wrap the operations in SEH). Copy the buffer to the stack as it is small. Modified: trunk/reactos/subsystems/win32/win32k/ntuser/message.c Modified: trunk/reactos/subsystems/win32/win32k/ntuser/message.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/message.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/message.c [iso-8859-1] Thu Jul 9 00:41:58 2009 @@ -2051,7 +2051,7 @@ break; case FNID_BROADCASTSYSTEMMESSAGE: { - PBROADCASTPARM parm; + BROADCASTPARM parm; DWORD_PTR RetVal = 0; if (ResultInfo) @@ -2061,7 +2061,7 @@ ProbeForWrite((PVOID)ResultInfo, sizeof(BROADCASTPARM), 1); - parm = (PBROADCASTPARM)ResultInfo; + RtlCopyMemory(&parm, (PVOID)ResultInfo, sizeof(BROADCASTPARM)); } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { @@ -2073,15 +2073,15 @@ else break; - if ( parm->recipients & BSM_ALLDESKTOPS || - parm->recipients == BSM_ALLCOMPONENTS ) - { - } - else if (parm->recipients & BSM_APPLICATIONS) - { - if (parm->flags & BSF_QUERY) + if ( parm.recipients & BSM_ALLDESKTOPS || + parm.recipients == BSM_ALLCOMPONENTS ) + { + } + else if (parm.recipients & BSM_APPLICATIONS) + { + if (parm.flags & BSF_QUERY) { - if (parm->flags & BSF_FORCEIFHUNG || parm->flags & BSF_NOHANG) + if (parm.flags & BSF_FORCEIFHUNG || parm.flags & BSF_NOHANG) { co_IntSendMessageTimeout( HWND_BROADCAST, Msg, @@ -2091,7 +2091,7 @@ 2000, &RetVal); } - else if (parm->flags & BSF_NOTIMEOUTIFNOTHUNG) + else if (parm.flags & BSF_NOTIMEOUTIFNOTHUNG) { co_IntSendMessageTimeout( HWND_BROADCAST, Msg, @@ -2112,11 +2112,11 @@ &RetVal); } } - else if (parm->flags & BSF_POSTMESSAGE) + else if (parm.flags & BSF_POSTMESSAGE) { Ret = UserPostMessage(HWND_BROADCAST, Msg, wParam, lParam); } - else if ( parm->flags & BSF_SENDNOTIFYMESSAGE) + else if ( parm.flags & BSF_SENDNOTIFYMESSAGE) { Ret = UserSendNotifyMessage(HWND_BROADCAST, Msg, wParam, lParam); }

15 years, 5 months

[hyperion] 41815: modified lib/pseh/i386/framebased-gcchack.c Notorious ass-clown Arch Blackmann forgot to pop the trylevel that handled an exception. Subsequent throws would keep being caught by the same trylevel over and over again, and infinite loops are indeed possible. Eat shit and die, Arch If test_bug_4663 test in the PSEH2 test suite is actually representative of the bug, the bug itself may have been fixed

by hyperion＠svn.reactos.org

Author: hyperion Date: Thu Jul 9 00:32:50 2009 New Revision: 41815 URL: http://svn.reactos.org/svn/reactos?rev=41815&view=rev Log: modified lib/pseh/i386/framebased-gcchack.c Notorious ass-clown Arch Blackmann forgot to pop the trylevel that handled an exception. Subsequent throws would keep being caught by the same trylevel over and over again, and infinite loops are indeed possible. Eat shit and die, Arch If test_bug_4663 test in the PSEH2 test suite is actually representative of the bug, the bug itself may have been fixed Modified: trunk/reactos/lib/pseh/i386/framebased-gcchack.c Modified: trunk/reactos/lib/pseh/i386/framebased-gcchack.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/pseh/i386/framebased-g… ============================================================================== --- trunk/reactos/lib/pseh/i386/framebased-gcchack.c [iso-8859-1] (original) +++ trunk/reactos/lib/pseh/i386/framebased-gcchack.c [iso-8859-1] Thu Jul 9 00:32:50 2009 @@ -192,6 +192,7 @@ _SEH2GlobalUnwind(frame); _SEH2LocalUnwind(frame, &fulltrylevel->SHT_Common); + frame->SF_TopTryLevel = fulltrylevel->SHT_Common.ST_Next; __SEH2Handle (

15 years, 5 months

[hyperion] 41814: modified pseh2/psehtest.c We need a bigger boat. Improve the test for bug #4663

by hyperion＠svn.reactos.org

Author: hyperion Date: Thu Jul 9 00:28:33 2009 New Revision: 41814 URL: http://svn.reactos.org/svn/reactos?rev=41814&view=rev Log: modified pseh2/psehtest.c We need a bigger boat. Improve the test for bug #4663 Modified: trunk/rostests/tests/pseh2/psehtest.c Modified: trunk/rostests/tests/pseh2/psehtest.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/tests/pseh2/psehtest.c?re… ============================================================================== --- trunk/rostests/tests/pseh2/psehtest.c [iso-8859-1] (original) +++ trunk/rostests/tests/pseh2/psehtest.c [iso-8859-1] Thu Jul 9 00:28:33 2009 @@ -2310,37 +2310,37 @@ { int i1, i2; - i1 = return_zero(); - i2 = return_zero(); - - _SEH2_TRY - { - _SEH2_TRY - { - RaiseException(0xE00DEAD0, 0, 0, NULL); + i1 = return_positive(); + i2 = return_positive(); + + _SEH2_TRY + { + _SEH2_TRY + { + RaiseException(0xE00DEAD0, 0, 0, 0); } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { - if (i1 == return_zero()) + if (i1 == return_positive()) { - i1 = return_one(); + i1 = return_positive() + 1; } } _SEH2_END; - if (i1 == return_one()) - { - i1 = return_minusone(); - RaiseException(0xE00DEAD0, 0, 0, NULL); - } - } - _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) - { - i2 = return_one(); - } - _SEH2_END; - - return ((i1 == return_minusone()) && (i2 == return_one())); + if (i1 == return_positive() + 1) + { + i1 = return_negative(); + RaiseException(0xE00DEAD0, 0, 0, 0); + } + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + i2 = return_negative(); + } + _SEH2_END; + + return ((i1 == return_negative()) && (i2 == return_negative())); } //}}} //}}} @@ -2574,10 +2574,7 @@ size_t i; for(i = 0; i < sizeof(testsuite) / sizeof(testsuite[0]); ++ i) - { - //printf("%s\n", testsuite[i].name); ok(call_test(testsuite[i].func), "%s failed\n", testsuite[i].name); - } } const struct test winetest_testlist[] = {

15 years, 5 months

[gschneider] 41813: According to http://msdn.microsoft.com/en-us/library/tcxf1dw6(VS.71).aspx and http://www.cplusplus.com/reference/clibrary/cstdio/printf/ there are no %le and %lf printf formats. The 'l' specifier is used for integers or wide characters, 'L' for long double. Outputting a double doesn't require any additional specifier (see http://msdn.microsoft.com/en-us/library/hf4y5e3w(VS.71).aspx).

by gschneider＠svn.reactos.org

Author: gschneider Date: Thu Jul 9 00:06:11 2009 New Revision: 41813 URL: http://svn.reactos.org/svn/reactos?rev=41813&view=rev Log: According to http://msdn.microsoft.com/en-us/library/tcxf1dw6(VS.71).aspx and http://www.cplusplus.com/reference/clibrary/cstdio/printf/ there are no %le and %lf printf formats. The 'l' specifier is used for integers or wide characters, 'L' for long double. Outputting a double doesn't require any additional specifier (see http://msdn.microsoft.com/en-us/library/hf4y5e3w(VS.71).aspx). Modified: trunk/reactos/base/applications/calc/utl.c Modified: trunk/reactos/base/applications/calc/utl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/utl… ============================================================================== --- trunk/reactos/base/applications/calc/utl.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/calc/utl.c [iso-8859-1] Thu Jul 9 00:06:11 2009 @@ -21,9 +21,9 @@ /* calculate the width of integer number */ width = (rpn->f==0) ? 1 : (int)log10(fabs(rpn->f))+1; if (calc.sci_out == TRUE || width > MAX_LD_WIDTH || width < -MAX_LD_WIDTH) - ptr = buffer + _stprintf(buffer, TEXT("%#le"), rpn->f); + ptr = buffer + _stprintf(buffer, TEXT("%#e"), rpn->f); else { - ptr = buffer + _stprintf(buffer, TEXT("%#*.*lf"), width, ((MAX_LD_WIDTH-width-1)>=0) ? MAX_LD_WIDTH-width-1 : 0, rpn->f); + ptr = buffer + _stprintf(buffer, TEXT("%#*.*f"), width, ((MAX_LD_WIDTH-width-1)>=0) ? MAX_LD_WIDTH-width-1 : 0, rpn->f); dst = _tcschr(buffer, TEXT('.')); while (--ptr > dst) if (*ptr != TEXT('0'))

15 years, 5 months

← Newer
1
...
48
49
50
51
52
53
54
...
61
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs July 2009