Ros-diffs

ros-diffs@reactos.org

81390 discussions

[akhaldi] 66621: [TASKMGR] Do not show negative CPU usage. By Peter Hater. CORE-9050
by akhaldi＠svn.reactos.org 09 Mar '15

09 Mar '15

Author: akhaldi Date: Mon Mar 9 17:38:31 2015 New Revision: 66621 URL: http://svn.reactos.org/svn/reactos?rev=66621&view=rev Log: [TASKMGR] Do not show negative CPU usage. By Peter Hater. CORE-9050 Modified: trunk/reactos/base/applications/taskmgr/perfdata.c Modified: trunk/reactos/base/applications/taskmgr/perfdata.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… ============================================================================== --- trunk/reactos/base/applications/taskmgr/perfdata.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/taskmgr/perfdata.c [iso-8859-1] Mon Mar 9 17:38:31 2015 @@ -298,6 +298,12 @@ /* CurrentCpuUsage% = 100 - (CurrentCpuIdle * 100) / NumberOfProcessors */ dbIdleTime = 100.0 - dbIdleTime * 100.0 / (double)SystemBasicInfo.NumberOfProcessors; /* + 0.5; */ dbKernelTime = 100.0 - dbKernelTime * 100.0 / (double)SystemBasicInfo.NumberOfProcessors; /* + 0.5; */ + + if (dbIdleTime < 0.0) dbIdleTime = 0.0; + if (dbIdleTime > 100.0) dbIdleTime = 100.0; + if (dbKernelTime < 0.0) dbKernelTime = 0.0; + if (dbKernelTime > 100.0) dbKernelTime = 100.0; + } /* Store new CPU's idle and system time */

1 0

[akhaldi] 66620: [KERNEL32_WINETEST] Sync with Wine Staging 1.7.37. CORE-9246
by akhaldi＠svn.reactos.org 09 Mar '15

09 Mar '15

Author: akhaldi Date: Mon Mar 9 17:15:16 2015 New Revision: 66620 URL: http://svn.reactos.org/svn/reactos?rev=66620&view=rev Log: [KERNEL32_WINETEST] Sync with Wine Staging 1.7.37. CORE-9246 Added: trunk/rostests/winetests/kernel32/cpu.c (with props) Modified: trunk/rostests/winetests/kernel32/CMakeLists.txt trunk/rostests/winetests/kernel32/actctx.c trunk/rostests/winetests/kernel32/change.c trunk/rostests/winetests/kernel32/codepage.c trunk/rostests/winetests/kernel32/file.c trunk/rostests/winetests/kernel32/format_msg.c trunk/rostests/winetests/kernel32/loader.c trunk/rostests/winetests/kernel32/locale.c trunk/rostests/winetests/kernel32/module.c trunk/rostests/winetests/kernel32/path.c trunk/rostests/winetests/kernel32/pipe.c trunk/rostests/winetests/kernel32/process.c trunk/rostests/winetests/kernel32/profile.c trunk/rostests/winetests/kernel32/resource.c trunk/rostests/winetests/kernel32/sync.c trunk/rostests/winetests/kernel32/testlist.c trunk/rostests/winetests/kernel32/thread.c trunk/rostests/winetests/kernel32/time.c trunk/rostests/winetests/kernel32/version.c trunk/rostests/winetests/kernel32/virtual.c [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/rostests/winetests/kernel32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/kernel32/CMakeL… Modified: trunk/rostests/winetests/kernel32/actctx.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/kernel32/actctx… Modified: trunk/rostests/winetests/kernel32/change.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/kernel32/change… Modified: trunk/rostests/winetests/kernel32/codepage.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/kernel32/codepa… Added: trunk/rostests/winetests/kernel32/cpu.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/kernel32/cpu.c?… Modified: trunk/rostests/winetests/kernel32/file.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/kernel32/file.c… Modified: trunk/rostests/winetests/kernel32/format_msg.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/kernel32/format… Modified: trunk/rostests/winetests/kernel32/loader.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/kernel32/loader… Modified: trunk/rostests/winetests/kernel32/locale.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/kernel32/locale… Modified: trunk/rostests/winetests/kernel32/module.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/kernel32/module… Modified: trunk/rostests/winetests/kernel32/path.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/kernel32/path.c… Modified: trunk/rostests/winetests/kernel32/pipe.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/kernel32/pipe.c… Modified: trunk/rostests/winetests/kernel32/process.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/kernel32/proces… Modified: trunk/rostests/winetests/kernel32/profile.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/kernel32/profil… Modified: trunk/rostests/winetests/kernel32/resource.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/kernel32/resour… Modified: trunk/rostests/winetests/kernel32/sync.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/kernel32/sync.c… Modified: trunk/rostests/winetests/kernel32/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/kernel32/testli… Modified: trunk/rostests/winetests/kernel32/thread.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/kernel32/thread… Modified: trunk/rostests/winetests/kernel32/time.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/kernel32/time.c… Modified: trunk/rostests/winetests/kernel32/version.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/kernel32/versio… Modified: trunk/rostests/winetests/kernel32/virtual.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/kernel32/virtua…

1 0

[tkreuzer] 66619: [WIN32K] Fix another typo in the same line... Spotted by Jerome.
by tkreuzer＠svn.reactos.org 09 Mar '15

09 Mar '15

Author: tkreuzer Date: Mon Mar 9 01:11:06 2015 New Revision: 66619 URL: http://svn.reactos.org/svn/reactos?rev=66619&view=rev Log: [WIN32K] Fix another typo in the same line... Spotted by Jerome. Modified: trunk/reactos/win32ss/gdi/eng/bitblt.c Modified: trunk/reactos/win32ss/gdi/eng/bitblt.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/eng/bitblt.c?r… ============================================================================== --- trunk/reactos/win32ss/gdi/eng/bitblt.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/eng/bitblt.c [iso-8859-1] Mon Mar 9 01:11:06 2015 @@ -468,7 +468,7 @@ if (psoMask == NULL) { /* We have no mask, assume the mask is all foreground */ - rop4 = (rop4 & 0xFF) || ((rop4 & 0xFF) << 8); + rop4 = (rop4 & 0xFF) | ((rop4 & 0xFF) << 8); UsesMask = FALSE; } }

1 0

[tkreuzer] 66618: [WIN32K] Replace ROUND_UP with ALIGN_UP_BY
by tkreuzer＠svn.reactos.org 08 Mar '15

08 Mar '15

Author: tkreuzer Date: Sun Mar 8 23:37:06 2015 New Revision: 66618 URL: http://svn.reactos.org/svn/reactos?rev=66618&view=rev Log: [WIN32K] Replace ROUND_UP with ALIGN_UP_BY Modified: trunk/reactos/win32ss/gdi/ntgdi/misc.h trunk/reactos/win32ss/user/ntuser/timer.c Modified: trunk/reactos/win32ss/gdi/ntgdi/misc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/misc.h?r… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/misc.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/misc.h [iso-8859-1] Sun Mar 8 23:37:06 2015 @@ -156,8 +156,3 @@ BOOL NTAPI W32kDosPathNameToNtPathName(PCWSTR, PUNICODE_STRING); -#define ROUND_DOWN(n, align) \ - (((ULONG)n) & ~((align) - 1l)) - -#define ROUND_UP(n, align) \ - ROUND_DOWN(((ULONG)n) + (align) - 1, (align)) Modified: trunk/reactos/win32ss/user/ntuser/timer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/timer.… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/timer.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/timer.c [iso-8859-1] Sun Mar 8 23:37:06 2015 @@ -347,7 +347,7 @@ case ID_EVENT_SYSTIMER_FLASHWIN: { - FLASHWINFO fwi = + FLASHWINFO fwi = {sizeof(FLASHWINFO), UserHMGetHandle(pWnd), FLASHW_SYSTIMER,0,0}; @@ -602,7 +602,7 @@ ExInitializeFastMutex(Mutex); - BitmapBytes = ROUND_UP(NUM_WINDOW_LESS_TIMERS, sizeof(ULONG) * 8) / 8; + BitmapBytes = ALIGN_UP_BY(NUM_WINDOW_LESS_TIMERS, sizeof(ULONG) * 8) / 8; WindowLessTimersBitMapBuffer = ExAllocatePoolWithTag(NonPagedPool, BitmapBytes, TAG_TIMERBMP); if (WindowLessTimersBitMapBuffer == NULL) {

1 0

[tkreuzer] 66617: [WIN32K] Improve the situation with ROP handling, trying to make things clearer.
by tkreuzer＠svn.reactos.org 08 Mar '15

08 Mar '15

Author: tkreuzer Date: Sun Mar 8 23:36:49 2015 New Revision: 66617 URL: http://svn.reactos.org/svn/reactos?rev=66617&view=rev Log: [WIN32K] Improve the situation with ROP handling, trying to make things clearer. Modified: trunk/reactos/win32ss/gdi/ntgdi/bitblt.c trunk/reactos/win32ss/gdi/ntgdi/dibobj.c trunk/reactos/win32ss/gdi/ntgdi/intgdi.h Modified: trunk/reactos/win32ss/gdi/ntgdi/bitblt.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/bitblt.c… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/bitblt.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/bitblt.c [iso-8859-1] Sun Mar 8 23:36:49 2015 @@ -151,13 +151,13 @@ HDC hDCSrc, INT XSrc, INT YSrc, - DWORD ROP, + DWORD dwRop, IN DWORD crBackColor, IN FLONG fl) { - DWORD dwTRop; - - if (ROP & CAPTUREBLT) + + if (dwRop & CAPTUREBLT) + { return NtGdiStretchBlt(hDCDest, XDest, YDest, @@ -168,10 +168,11 @@ YSrc, Width, Height, - ROP, + dwRop, crBackColor); - - dwTRop = ROP & ~(NOMIRRORBITMAP|CAPTUREBLT); + } + + dwRop = dwRop & ~(NOMIRRORBITMAP|CAPTUREBLT); /* Forward to NtGdiMaskBlt */ // TODO: What's fl for? LOL not to send this to MaskBit! @@ -186,7 +187,7 @@ NULL, 0, 0, - dwTRop, + MAKEROP4(dwRop, dwRop), crBackColor); } @@ -310,7 +311,7 @@ HBITMAP hbmMask, INT xMask, INT yMask, - DWORD dwRop, + DWORD dwRop4, IN DWORD crBackColor) { PDC DCDest; @@ -325,11 +326,11 @@ EXLATEOBJ exlo; XLATEOBJ *XlateObj = NULL; BOOL UsesSource; - - FIXUP_ROP(dwRop); // FIXME: why do we need this??? - - //DPRINT1("dwRop : 0x%08x\n", dwRop); - UsesSource = ROP_USES_SOURCE(dwRop); + ROP4 rop4; + + rop4 = WIN32_ROP4_TO_ENG_ROP4(dwRop4); + + UsesSource = ROP4_USES_SOURCE(rop4); if (!hdcDest || (UsesSource && !hdcSrc)) { EngSetLastError(ERROR_INVALID_PARAMETER); @@ -337,7 +338,7 @@ } /* Check if we need a mask and have a mask bitmap */ - if (ROP_USES_MASK(dwRop) && (hbmMask != NULL)) + if (ROP4_USES_MASK(rop4) && (hbmMask != NULL)) { /* Reference the mask bitmap */ psurfMask = SURFACE_ShareLockSurface(hbmMask); @@ -481,7 +482,7 @@ &MaskPoint, &DCDest->eboFill.BrushObject, &DCDest->dclevel.pbrFill->ptOrigin, - ROP_TO_ROP4(dwRop)); + rop4); if (UsesSource) EXLATEOBJ_vCleanup(&exlo); @@ -516,7 +517,8 @@ return FALSE; } -BOOL APIENTRY +BOOL +NTAPI GreStretchBltMask( HDC hDCDest, INT XOriginDest, @@ -528,7 +530,7 @@ INT YOriginSrc, INT WidthSrc, INT HeightSrc, - DWORD ROP, + DWORD dwRop4, IN DWORD dwBackColor, HDC hDCMask, INT XOriginMask, @@ -551,10 +553,12 @@ POINTL BrushOrigin; BOOL UsesSource; BOOL UsesMask; - - FIXUP_ROP(ROP); - UsesSource = ROP_USES_SOURCE(ROP); - UsesMask = ROP_USES_MASK(ROP); + ROP4 rop4; + + rop4 = WIN32_ROP4_TO_ENG_ROP4(dwRop4); + + UsesSource = ROP4_USES_SOURCE(rop4); + UsesMask = ROP4_USES_MASK(rop4); if (0 == WidthDest || 0 == HeightDest || 0 == WidthSrc || 0 == HeightSrc) { @@ -692,7 +696,7 @@ BitmapMask ? &MaskPoint : NULL, &DCDest->eboFill.BrushObject, &BrushOrigin, - ROP_TO_ROP4(ROP)); + rop4); if (UsesSource) { EXLATEOBJ_vCleanup(&exlo); @@ -726,10 +730,10 @@ INT YOriginSrc, INT WidthSrc, INT HeightSrc, - DWORD ROP, + DWORD dwRop3, IN DWORD dwBackColor) { - DWORD dwTRop = ROP & ~(NOMIRRORBITMAP|CAPTUREBLT); + dwRop3 = dwRop3 & ~(NOMIRRORBITMAP|CAPTUREBLT); return GreStretchBltMask( hDCDest, @@ -742,7 +746,7 @@ YOriginSrc, WidthSrc, HeightSrc, - dwTRop, + MAKEROP4(dwRop3 & 0xFF0000, dwRop3), dwBackColor, NULL, 0, @@ -757,7 +761,7 @@ INT YLeft, INT Width, INT Height, - DWORD dwRop, + DWORD dwRop3, PEBRUSHOBJ pebo) { RECTL DestRect; @@ -769,8 +773,6 @@ ASSERT(pebo); pbrush = pebo->pbrush; ASSERT(pbrush); - - FIXUP_ROP(dwRop); if (pbrush->flAttrs & BR_IS_NULL) { @@ -817,18 +819,17 @@ psurf = pdc->dclevel.pSurface; - ret = IntEngBitBlt( - &psurf->SurfObj, - NULL, - NULL, - &pdc->co.ClipObj, - NULL, - &DestRect, - NULL, - NULL, - &pebo->BrushObject, - &BrushOrigin, - ROP_TO_ROP4(dwRop)); + ret = IntEngBitBlt(&psurf->SurfObj, + NULL, + NULL, + &pdc->co.ClipObj, + NULL, + &DestRect, + NULL, + NULL, + &pebo->BrushObject, + &BrushOrigin, + WIN32_ROP3_TO_ENG_ROP4(dwRop3)); DC_vFinishBlit(pdc, NULL); @@ -906,15 +907,14 @@ BOOL bResult; PDC pdc; - /* Mask away everything except foreground rop index */ - dwRop = dwRop & 0x00FF0000; - dwRop |= dwRop << 8; + /* Convert the ROP3 to a ROP4 */ + dwRop = MAKEROP4(dwRop & 0xFF0000, dwRop); /* Check if the rop uses a source */ - if (ROP_USES_SOURCE(dwRop)) + if (WIN32_ROP4_USES_SOURCE(dwRop)) { /* This is not possible */ - return 0; + return FALSE; } /* Lock the DC */ Modified: trunk/reactos/win32ss/gdi/ntgdi/dibobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/dibobj.c… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/dibobj.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/dibobj.c [iso-8859-1] Sun Mar 8 23:36:49 2015 @@ -1274,10 +1274,6 @@ pdc->pdcattr->crBackgroundClr, pdc->pdcattr->crForegroundClr); - /* Mask away everything except foreground rop index */ - dwRop = dwRop & 0x00FF0000; - dwRop |= dwRop << 8; - /* Perform the stretch operation */ bResult = IntEngStretchBlt(&psurfDst->SurfObj, &psurfTmp->SurfObj, @@ -1290,7 +1286,7 @@ NULL, &pdc->eboFill.BrushObject, NULL, - ROP_TO_ROP4(dwRop)); + WIN32_ROP3_TO_ENG_ROP4(dwRop)); /* Cleanup */ DC_vFinishBlit(pdc, NULL); Modified: trunk/reactos/win32ss/gdi/ntgdi/intgdi.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/intgdi.h… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/intgdi.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/intgdi.h [iso-8859-1] Sun Mar 8 23:36:49 2015 @@ -1,9 +1,10 @@ #pragma once -#define ROP_USES_SOURCE(Rop) (((((Rop) & 0xCC0000) >> 2) != ((Rop) & 0x330000)) || ((((Rop) & 0xCC000000) >> 2) != ((Rop) & 0x33000000))) -#define ROP_USES_MASK(Rop) (((Rop) & 0xFF000000) != (((Rop) & 0xff0000) << 8)) -#define FIXUP_ROP(Rop) if(((Rop) & 0xFF000000) == 0) Rop = MAKEROP4((Rop), (Rop)) -#define ROP_TO_ROP4(Rop) ((Rop) >> 16) +/* Convert WIN32 ROP into an ENG ROP */ +#define WIN32_ROP3_TO_ENG_ROP4(dwRop4) ((((dwRop4) & 0x00FF0000) >> 16) | (((dwRop4) & 0x00FF0000) >> 8)) +#define WIN32_ROP4_TO_ENG_ROP4(dwRop4) ((dwRop4) >> 16) + +#define WIN32_ROP4_USES_SOURCE(Rop) ((((Rop) & 0xCCCC0000) >> 2) != ((Rop) & 0x33330000)) /* The range of valid ROP2 values is 1 .. 16 */ #define FIXUP_ROP2(rop2) ((((rop2) - 1) & 0xF) + 1)

1 0

[tkreuzer] 66616: [WIN32K] - Pass size in bytes to UnsafeSetBitmapBits from NtGdiCreateBitmap - In NtGdiSetBitmapBits check for stock bitmap and non-API bitmap.
by tkreuzer＠svn.reactos.org 08 Mar '15

08 Mar '15

Author: tkreuzer Date: Sun Mar 8 23:36:36 2015 New Revision: 66616 URL: http://svn.reactos.org/svn/reactos?rev=66616&view=rev Log: [WIN32K] - Pass size in bytes to UnsafeSetBitmapBits from NtGdiCreateBitmap - In NtGdiSetBitmapBits check for stock bitmap and non-API bitmap. Modified: trunk/reactos/win32ss/gdi/ntgdi/bitmaps.c Modified: trunk/reactos/win32ss/gdi/ntgdi/bitmaps.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/bitmaps.… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/bitmaps.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/bitmaps.c [iso-8859-1] Sun Mar 8 23:36:36 2015 @@ -53,6 +53,8 @@ PUCHAR pjDst, pjSrc; LONG lDeltaDst, lDeltaSrc; ULONG nWidth, nHeight, cBitsPixel; + NT_ASSERT(psurf->flags & API_BITMAP); + NT_ASSERT(psurf->SurfObj.iBitmapFormat <= BMF_32BPP); nWidth = psurf->SurfObj.sizlBitmap.cx; nHeight = psurf->SurfObj.sizlBitmap.cy; @@ -63,8 +65,10 @@ pjSrc = pvBits; lDeltaDst = psurf->SurfObj.lDelta; lDeltaSrc = WIDTH_BYTES_ALIGN16(nWidth, cBitsPixel); - - if (cjBits && (cjBits < (lDeltaSrc * nHeight))) + NT_ASSERT(lDeltaSrc <= abs(lDeltaDst)); + + /* Make sure the buffer is large enough*/ + if (cjBits < (lDeltaSrc * nHeight)) return 0; while (nHeight--) @@ -227,7 +231,7 @@ _SEH2_TRY { ProbeForRead(pUnsafeBits, (SIZE_T)cjSize, 1); - UnsafeSetBitmapBits(psurf, 0, pUnsafeBits); + UnsafeSetBitmapBits(psurf, cjSize, pUnsafeBits); } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { @@ -568,10 +572,26 @@ return 0; } + if (GDI_HANDLE_IS_STOCKOBJ(hBitmap)) + { + return 0; + } + psurf = SURFACE_ShareLockSurface(hBitmap); if (psurf == NULL) { EngSetLastError(ERROR_INVALID_HANDLE); + return 0; + } + + if (((psurf->flags & API_BITMAP) == 0) || + (psurf->SurfObj.iBitmapFormat > BMF_32BPP)) + { + DPRINT1("Invalid bitmap: iBitmapFormat = %lu, flags = 0x%lx\n", + psurf->SurfObj.iBitmapFormat, + psurf->flags); + EngSetLastError(ERROR_INVALID_HANDLE); + SURFACE_ShareUnlockSurface(psurf); return 0; }

1 0

[tkreuzer] 66615: [WIN32K] - Remove wrong flags when initializing a DC - Set DC::prgnattr before potentially passing it to the cleanup function after failure to create a handle. Add a comment that ...
by tkreuzer＠svn.reactos.org 08 Mar '15

08 Mar '15

Author: tkreuzer Date: Sun Mar 8 23:36:25 2015 New Revision: 66615 URL: http://svn.reactos.org/svn/reactos?rev=66615&view=rev Log: [WIN32K] - Remove wrong flags when initializing a DC - Set DC::prgnattr before potentially passing it to the cleanup function after failure to create a handle. Add a comment that this is not actually enough. Will be fixed, once we use C++ - Increase GDI object stack levels to 20 Modified: trunk/reactos/win32ss/gdi/ntgdi/dclife.c trunk/reactos/win32ss/gdi/ntgdi/gdiobj.h Modified: trunk/reactos/win32ss/gdi/ntgdi/dclife.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/dclife.c… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/dclife.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/dclife.c [iso-8859-1] Sun Mar 8 23:36:25 2015 @@ -86,15 +86,16 @@ /* Set the actual DC type */ pdc->BaseObject.hHmgr = UlongToHandle(eDcObjType); + pdc->pdcattr = &pdc->dcattr; + /* Insert the object */ if (!GDIOBJ_hInsertObject(&pdc->BaseObject, GDI_OBJ_HMGR_POWNED)) { + /// FIXME: this is broken, since the DC is not initialized yet... DPRINT1("Could not insert DC into handle table.\n"); GDIOBJ_vFreeObject(&pdc->BaseObject); return NULL; } - - pdc->pdcattr = &pdc->dcattr; return pdc; } @@ -177,8 +178,6 @@ pdc->erclBoundsApp.bottom = 0x00000333; // FIXME pdc->erclClip = pdc->erclBounds; pdc->co = gxcoTrivial; - - pdc->fs |= DC_SYNCHRONIZEACCESS | DC_ACCUM_APP | DC_PERMANANT | DC_DISPLAY; } else { @@ -891,11 +890,13 @@ if (!GreDeleteObject(hDC)) { DPRINT1("DC_FreeDC failed\n"); + return FALSE; } } else { DPRINT1("Attempted to Delete 0x%p currently being destroyed!!!\n", hDC); + return FALSE; } return TRUE; Modified: trunk/reactos/win32ss/gdi/ntgdi/gdiobj.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/gdiobj.h… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/gdiobj.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/gdiobj.h [iso-8859-1] Sun Mar 8 23:36:25 2015 @@ -5,7 +5,7 @@ #pragma once -#define GDI_OBJECT_STACK_LEVELS 10 +#define GDI_OBJECT_STACK_LEVELS 20 /* The first 10 entries are never used in windows, they are empty */ static const unsigned RESERVE_ENTRIES_COUNT = 10;

1 0

[tkreuzer] 66614: [WIN32K] Make sure a region is reasonably initialized, before potentially passing it to the cleanup function, when failing to create a handle.
by tkreuzer＠svn.reactos.org 08 Mar '15

08 Mar '15

Author: tkreuzer Date: Sun Mar 8 23:36:14 2015 New Revision: 66614 URL: http://svn.reactos.org/svn/reactos?rev=66614&view=rev Log: [WIN32K] Make sure a region is reasonably initialized, before potentially passing it to the cleanup function, when failing to create a handle. Modified: trunk/reactos/win32ss/gdi/ntgdi/region.c Modified: trunk/reactos/win32ss/gdi/ntgdi/region.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/region.c… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/region.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/region.c [iso-8859-1] Sun Mar 8 23:36:14 2015 @@ -2187,13 +2187,6 @@ return NULL; } - if (!GDIOBJ_hInsertObject(&pReg->BaseObject, GDI_OBJ_HMGR_POWNED)) - { - DPRINT1("Could not insert palette into handle table.\n"); - GDIOBJ_vFreeObject(&pReg->BaseObject); - return NULL; - } - //hReg = pReg->BaseObject.hHmgr; if ((nReg == 0) || (nReg == 1)) @@ -2221,6 +2214,19 @@ pReg->rdh.nRgnSize = nReg * sizeof(RECT); pReg->prgnattr = &pReg->rgnattr; + /* Initialize the region attribute */ + pReg->rgnattr.AttrFlags = 0; + pReg->rgnattr.iComplexity = SIMPLEREGION; + pReg->rgnattr.Rect = pReg->rdh.rcBound; + + /* Finally insert the region into the handle table */ + if (!GDIOBJ_hInsertObject(&pReg->BaseObject, GDI_OBJ_HMGR_POWNED)) + { + DPRINT1("Could not insert palette into handle table.\n"); + GDIOBJ_vFreeObject(&pReg->BaseObject); + return NULL; + } + return pReg; } @@ -2232,6 +2238,8 @@ PPROCESSINFO ppi; PRGN_ATTR prgnattr; + NT_ASSERT(prgn->prgnattr == &prgn->rgnattr); + ppi = PsGetCurrentProcessWin32Process(); ASSERT(ppi); @@ -2241,6 +2249,9 @@ DPRINT1("Could not allocate RGN attr\n"); return FALSE; } + + /* Copy the current region attribute */ + *prgnattr = prgn->rgnattr; /* Set the object attribute in the handle table */ prgn->prgnattr = prgnattr; @@ -3928,105 +3939,112 @@ INT APIENTRY NtGdiOffsetRgn( - HRGN hRgn, - INT XOffset, - INT YOffset) -{ - PREGION rgn; - INT ret; - - DPRINT("NtGdiOffsetRgn: hRgn %p Xoffs %d Yoffs %d rgn %p\n", hRgn, XOffset, YOffset, rgn ); - - rgn = REGION_LockRgn(hRgn); - if (rgn == NULL) - { - DPRINT("NtGdiOffsetRgn: hRgn error\n"); + _In_ HRGN hrgn, + _In_ INT cx, + _In_ INT cy) +{ + PREGION prgn; + INT iResult; + + DPRINT("NtGdiOffsetRgn: hrgn %p cx %d cy %d\n", hrgn, cx, cy); + + /* Lock the region */ + prgn = REGION_LockRgn(hrgn); + if (prgn == NULL) + { + DPRINT1("NtGdiOffsetRgn: failed to lock region %p\n", hrgn); return ERROR; } - if (!REGION_bOffsetRgn(rgn, XOffset, YOffset)) - { - ret = ERROR; + /* Call the internal function */ + if (!REGION_bOffsetRgn(prgn, cx, cy)) + { + iResult = ERROR; } else { - ret = REGION_Complexity(rgn); - } - - REGION_UnlockRgn(rgn); - return ret; + iResult = REGION_Complexity(prgn); + } + + /* Unlock and return the result */ + REGION_UnlockRgn(prgn); + return iResult; } BOOL APIENTRY NtGdiPtInRegion( - HRGN hRgn, - INT X, - INT Y) + _In_ HRGN hrgn, + _In_ INT x, + _In_ INT y) { PREGION prgn; - BOOL ret; - - prgn = REGION_LockRgn(hRgn); + BOOL bResult; + + /* Lock the region */ + prgn = REGION_LockRgn(hrgn); if (prgn == NULL) + { + DPRINT1("NtGdiPtInRegion: hrgn error\n"); return FALSE; - - ret = REGION_PtInRegion(prgn, X, Y); - + } + + /* Call the internal function */ + bResult = REGION_PtInRegion(prgn, x, y); + + /* Unlock and return the result */ REGION_UnlockRgn(prgn); - return ret; + return bResult; } BOOL APIENTRY NtGdiRectInRegion( - HRGN hRgn, - LPRECTL unsaferc) -{ - RECTL rc = { 0 }; - NTSTATUS Status = STATUS_SUCCESS; - + _In_ HRGN hrgn, + _In_ LPRECT prclUnsafe) +{ + RECTL rcTemp; + + /* Probe and copy the rect */ _SEH2_TRY { - ProbeForRead(unsaferc, sizeof(RECT), 1); - rc = *unsaferc; + ProbeForRead(prclUnsafe, sizeof(RECT), 1); + rcTemp = *prclUnsafe; } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { - Status = _SEH2_GetExceptionCode(); + DPRINT1("NtGdiRectInRegion: Exception accessing the rect\n"); + return FALSE; } _SEH2_END; - if (!NT_SUCCESS(Status)) - { - SetLastNtError(Status); - DPRINT1("NtGdiRectInRegion: Bogus rc\n"); - return ERROR; - } - - return IntRectInRegion(hRgn, &rc); + /* Call the internal function */ + return IntRectInRegion(hrgn, &rcTemp); } BOOL APIENTRY NtGdiSetRectRgn( - HRGN hRgn, - INT LeftRect, - INT TopRect, - INT RightRect, - INT BottomRect) -{ - PREGION rgn; - - rgn = REGION_LockRgn(hRgn); - if (rgn == NULL) - { - return 0; // Per documentation - } - - REGION_SetRectRgn(rgn, LeftRect, TopRect, RightRect, BottomRect); - - REGION_UnlockRgn(rgn); + _In_ HRGN hrgn, + _In_ INT xLeft, + _In_ INT yTop, + _In_ INT xRight, + _In_ INT yBottom) +{ + PREGION prgn; + + /* Lock the region */ + prgn = REGION_LockRgn(hrgn); + if (prgn == NULL) + { + return FALSE; + } + + /* Call the internal API */ + REGION_SetRectRgn(prgn, xLeft, yTop, xRight, yBottom); + + /* Unlock the region and return success */ + REGION_UnlockRgn(prgn); return TRUE; }

1 0

[tkreuzer] 66613: [WIN32K] Fix a typo
by tkreuzer＠svn.reactos.org 08 Mar '15

08 Mar '15

Author: tkreuzer Date: Sun Mar 8 23:36:04 2015 New Revision: 66613 URL: http://svn.reactos.org/svn/reactos?rev=66613&view=rev Log: [WIN32K] Fix a typo Modified: trunk/reactos/win32ss/gdi/eng/bitblt.c Modified: trunk/reactos/win32ss/gdi/eng/bitblt.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/eng/bitblt.c?r… ============================================================================== --- trunk/reactos/win32ss/gdi/eng/bitblt.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/eng/bitblt.c [iso-8859-1] Sun Mar 8 23:36:04 2015 @@ -468,7 +468,7 @@ if (psoMask == NULL) { /* We have no mask, assume the mask is all foreground */ - rop4 &= (rop4 & 0xFF) || ((rop4 & 0xFF) << 8); + rop4 = (rop4 & 0xFF) || ((rop4 & 0xFF) << 8); UsesMask = FALSE; } }

1 0

[tkreuzer] 66612: [WIN32K] NtGdiSetDIBitsToDeviceInternal: Check for ScanLines == 0 and clean up exit pathes. Fixes assertion failure in gdi32_winetest:bitmap
by tkreuzer＠svn.reactos.org 08 Mar '15

08 Mar '15

Author: tkreuzer Date: Sun Mar 8 22:44:36 2015 New Revision: 66612 URL: http://svn.reactos.org/svn/reactos?rev=66612&view=rev Log: [WIN32K] NtGdiSetDIBitsToDeviceInternal: Check for ScanLines == 0 and clean up exit pathes. Fixes assertion failure in gdi32_winetest:bitmap Modified: trunk/reactos/win32ss/gdi/ntgdi/dibobj.c Modified: trunk/reactos/win32ss/gdi/ntgdi/dibobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/dibobj.c… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/dibobj.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/dibobj.c [iso-8859-1] Sun Mar 8 22:44:36 2015 @@ -461,7 +461,7 @@ { INT ret = 0; NTSTATUS Status = STATUS_SUCCESS; - PDC pDC; + PDC pDC = NULL; HBITMAP hSourceBitmap = NULL, hMaskBitmap = NULL; SURFOBJ *pDestSurf, *pSourceSurf = NULL, *pMaskSurf = NULL; SURFACE *pSurf; @@ -493,21 +493,25 @@ if (!NT_SUCCESS(Status)) { - goto Exit2; + goto Exit; } ScanLines = min(ScanLines, abs(bmi->bmiHeader.biHeight) - StartScan); + if (ScanLines == 0) + { + DPRINT1("ScanLines == 0\n"); + goto Exit; + } pDC = DC_LockDc(hDC); if (!pDC) { EngSetLastError(ERROR_INVALID_HANDLE); - goto Exit2; + goto Exit; } if (pDC->dctype == DC_TYPE_INFO) { - DC_UnlockDc(pDC); goto Exit; } @@ -637,14 +641,13 @@ } if (ppalDIB) PALETTE_ShareUnlockPalette(ppalDIB); - if (pSourceSurf) EngUnlockSurface(pSourceSurf); if (hSourceBitmap) EngDeleteSurface((HSURF)hSourceBitmap); if (pMaskSurf) EngUnlockSurface(pMaskSurf); if (hMaskBitmap) EngDeleteSurface((HSURF)hMaskBitmap); - DC_UnlockDc(pDC); -Exit2: + if (pDC) DC_UnlockDc(pDC); ExFreePoolWithTag(pbmiSafe, 'pmTG'); + return ret; }

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs