Ros-diffs October 2012

ros-diffs@reactos.org

14 participants
211 discussions

[hbelusca] 57500: [NTOSKRNL] Use TAG_FSTUB instead of 'BtsF'

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Sat Oct 6 18:49:23 2012 New Revision: 57500 URL: http://svn.reactos.org/svn/reactos?rev=57500&view=rev Log: [NTOSKRNL] Use TAG_FSTUB instead of 'BtsF' Modified: trunk/reactos/ntoskrnl/fstub/fstubex.c Modified: trunk/reactos/ntoskrnl/fstub/fstubex.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/fstub/fstubex.c?r… ============================================================================== --- trunk/reactos/ntoskrnl/fstub/fstubex.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/fstub/fstubex.c [iso-8859-1] Sat Oct 6 18:49:23 2012 @@ -269,7 +269,7 @@ DriveLayout = ExAllocatePoolWithTag(NonPagedPool, FIELD_OFFSET(DRIVE_LAYOUT_INFORMATION, PartitionEntry) + LayoutEx->PartitionCount * sizeof(PARTITION_INFORMATION), - 'BtsF'); + TAG_FSTUB); if (!DriveLayout) { return NULL; @@ -1605,7 +1605,7 @@ DriveLayout); /* Free allocated structure and return */ - ExFreePoolWithTag(DriveLayout, 'BtsF'); + ExFreePoolWithTag(DriveLayout, TAG_FSTUB); return Status; }

12 years, 2 months

[hbelusca] 57499: [NTOSKRNL] Fix Coverity defects : CID 716579, 716580 and 716582.

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Sat Oct 6 18:46:13 2012 New Revision: 57499 URL: http://svn.reactos.org/svn/reactos?rev=57499&view=rev Log: [NTOSKRNL] Fix Coverity defects : CID 716579, 716580 and 716582. Modified: trunk/reactos/ntoskrnl/fstub/fstubex.c trunk/reactos/ntoskrnl/io/iomgr/driver.c trunk/reactos/ntoskrnl/io/iomgr/error.c Modified: trunk/reactos/ntoskrnl/fstub/fstubex.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/fstub/fstubex.c?r… ============================================================================== --- trunk/reactos/ntoskrnl/fstub/fstubex.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/fstub/fstubex.c [iso-8859-1] Sat Oct 6 18:46:13 2012 @@ -1605,7 +1605,7 @@ DriveLayout); /* Free allocated structure and return */ - ExFreePool(DriveLayout); + ExFreePoolWithTag(DriveLayout, 'BtsF'); return Status; } Modified: trunk/reactos/ntoskrnl/io/iomgr/driver.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/driver.c… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/driver.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/iomgr/driver.c [iso-8859-1] Sat Oct 6 18:46:13 2012 @@ -1770,7 +1770,7 @@ if (!Inserted) { /* Free the entry and fail */ - ExFreePool(NewDriverExtension); + ExFreePoolWithTag(NewDriverExtension, TAG_DRIVER_EXTENSION); return STATUS_OBJECT_NAME_COLLISION; } Modified: trunk/reactos/ntoskrnl/io/iomgr/error.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/error.c?… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/error.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/iomgr/error.c [iso-8859-1] Sat Oct 6 18:46:13 2012 @@ -486,14 +486,33 @@ { PERROR_LOG_ENTRY LogEntry; ULONG LogEntrySize; + PDEVICE_OBJECT DeviceObject; PDRIVER_OBJECT DriverObject; - PDEVICE_OBJECT DeviceObject; /* Make sure we have an object */ if (!IoObject) return NULL; /* Check if we're past our buffer */ if (IopTotalLogSize > PAGE_SIZE) return NULL; + + /* Check if this is a device object or driver object */ + if (((PDEVICE_OBJECT)IoObject)->Type == IO_TYPE_DEVICE) + { + /* It's a device, get the driver */ + DeviceObject = (PDEVICE_OBJECT)IoObject; + DriverObject = DeviceObject->DriverObject; + } + else if (((PDEVICE_OBJECT)IoObject)->Type == IO_TYPE_DRIVER) + { + /* It's a driver, so we don't have a device */ + DeviceObject = NULL; + DriverObject = (PDRIVER_OBJECT)IoObject; + } + else + { + /* Fail */ + return NULL; + } /* Calculate the total size and allocate it */ LogEntrySize = sizeof(ERROR_LOG_ENTRY) + EntrySize; @@ -501,25 +520,6 @@ LogEntrySize, TAG_ERROR_LOG); if (!LogEntry) return NULL; - - /* Check if this is a device object or driver object */ - if (((PDEVICE_OBJECT)IoObject)->Type == IO_TYPE_DEVICE) - { - /* It's a device, get the driver */ - DeviceObject = (PDEVICE_OBJECT)IoObject; - DriverObject = DeviceObject->DriverObject; - } - else if (((PDEVICE_OBJECT)IoObject)->Type == IO_TYPE_DRIVER) - { - /* It's a driver, so we don' thave a device */ - DeviceObject = NULL; - DriverObject = IoObject; - } - else - { - /* Fail */ - return NULL; - } /* Reference the Objects */ if (DeviceObject) ObReferenceObject(DeviceObject);

12 years, 2 months

[hbelusca] 57498: [NTDLL_APITEST] Initialize Length to default value.

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Sat Oct 6 14:50:18 2012 New Revision: 57498 URL: http://svn.reactos.org/svn/reactos?rev=57498&view=rev Log: [NTDLL_APITEST] Initialize Length to default value. Modified: trunk/rostests/apitests/ntdll/RtlDosSearchPath_U.c Modified: trunk/rostests/apitests/ntdll/RtlDosSearchPath_U.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/ntdll/RtlDosSear… ============================================================================== --- trunk/rostests/apitests/ntdll/RtlDosSearchPath_U.c [iso-8859-1] (original) +++ trunk/rostests/apitests/ntdll/RtlDosSearchPath_U.c [iso-8859-1] Sat Oct 6 14:50:18 2012 @@ -101,7 +101,7 @@ START_TEST(RtlDosSearchPath_U) { NTSTATUS ExceptionStatus; - ULONG Length; + ULONG Length = 0; WCHAR Buffer[MAX_PATH]; PWSTR PartName; BOOLEAN Okay;

12 years, 2 months

[tkreuzer] 57497: [BMFD] - Remove a pointless check (CID 731583) - Add a comment - Simplify code

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Sat Oct 6 14:35:52 2012 New Revision: 57497 URL: http://svn.reactos.org/svn/reactos?rev=57497&view=rev Log: [BMFD] - Remove a pointless check (CID 731583) - Add a comment - Simplify code Modified: trunk/reactos/win32ss/drivers/font/bmfd/font.c trunk/reactos/win32ss/drivers/font/bmfd/glyph.c Modified: trunk/reactos/win32ss/drivers/font/bmfd/font.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/drivers/font/bmfd/… ============================================================================== --- trunk/reactos/win32ss/drivers/font/bmfd/font.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/drivers/font/bmfd/font.c [iso-8859-1] Sat Oct 6 14:35:52 2012 @@ -65,7 +65,7 @@ pface->wA = GETVAL(pFontInfo->dfAspace); pface->wB = GETVAL(pFontInfo->dfBspace); pface->wC = GETVAL(pFontInfo->dfCspace); - pface->pCharTable = pface->pFontInfo->dfCharTable; + pface->pCharTable = pFontInfo->dfCharTable; pface->cjEntrySize = sizeof(GLYPHENTRY30); } else @@ -74,7 +74,7 @@ pface->wA = 0; pface->wB = 0; pface->wC = 0; - pface->pCharTable = &pface->pFontInfo->dfReserved + 1; + pface->pCharTable = &pFontInfo->dfReserved + 1; pface->cjEntrySize = sizeof(GLYPHENTRY20); } Modified: trunk/reactos/win32ss/drivers/font/bmfd/glyph.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/drivers/font/bmfd/… ============================================================================== --- trunk/reactos/win32ss/drivers/font/bmfd/glyph.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/drivers/font/bmfd/glyph.c [iso-8859-1] Sat Oct 6 14:35:52 2012 @@ -80,18 +80,15 @@ ULONG cjSize) { PBMFD_FACE pface = pfont->pface; - PGLYPHENTRY pge = (PGLYPHENTRY)(pface->pCharTable + hg); + PGLYPHENTRY pge; ULONG xSrc, ySrc, cxSrc, cySrc; ULONG xDst, yDst, cxDst, cyDst; ULONG xScale, yScale; ULONG ulGlyphOffset, cjDstRow, color; PVOID pvSrc0, pvDst0; - if (!pge) - { - DbgPrint("no glyph handle given!\n"); - return FD_ERROR; - } + /* The glyph handle is the byte offset to the glyph in the table */ + pge = (PGLYPHENTRY)(pface->pCharTable + hg); /* Get the bitmap offset depending on file version */ if (pface->ulVersion >= 0x300) @@ -151,7 +148,7 @@ /* Verify that the buffer is big enough */ if (cjSize < FIELD_OFFSET(GLYPHBITS, aj) + cyDst * cjDstRow) { - DbgPrint("Buffer too small (%ld), %ld,%ld\n", + DbgPrint("Buffer too small (%ld), %ld,%ld\n", cjSize, cxSrc, cySrc); return FD_ERROR; } @@ -245,7 +242,7 @@ } pFontInfo = pfont->pface->pFontInfo; - + xScale = pfont->xScale; yScale = pfont->yScale; @@ -329,7 +326,7 @@ PBMFD_FACE pface = &pfile->aface[pfo->iFace - 1]; PBMFD_FONT pfont= BmfdGetFontInstance(pfo, pface); - DbgPrint("BmfdQueryFontData(pfo=%p, iMode=%ld, hg=%p, pgd=%p, pv=%p, cjSize=%ld)\n", + DbgPrint("BmfdQueryFontData(pfo=%p, iMode=%ld, hg=%p, pgd=%p, pv=%p, cjSize=%ld)\n", pfo, iMode, hg, pgd, pv, cjSize); // __debugbreak(); @@ -340,7 +337,7 @@ case QFD_MAXEXTENTS: /* 3 */ return BmfdQueryMaxExtents(pfont, pv, cjSize); - + /* we support nothing else */ default: return FD_ERROR;

12 years, 2 months

[tkreuzer] 57496: [WIN32K] - Fix detection of trivial clipping region - CID 731584

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Sat Oct 6 14:23:22 2012 New Revision: 57496 URL: http://svn.reactos.org/svn/reactos?rev=57496&view=rev Log: [WIN32K] - Fix detection of trivial clipping region - CID 731584 Modified: trunk/reactos/win32ss/gdi/eng/stretchblt.c Modified: trunk/reactos/win32ss/gdi/eng/stretchblt.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/eng/stretchblt… ============================================================================== --- trunk/reactos/win32ss/gdi/eng/stretchblt.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/eng/stretchblt.c [iso-8859-1] Sat Oct 6 14:23:22 2012 @@ -440,7 +440,7 @@ return TRUE; } - if (ClipRegion) + if (ClipRegion->iDComplexity != DC_TRIVIAL) { if (!RECTL_bIntersectRect(&OutputRect, &InputClippedRect, &ClipRegion->rclBounds))

12 years, 2 months

[tkreuzer] 57495: [WIN32K] Disable APCs when acquiring the pushlock.

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Sat Oct 6 12:21:41 2012 New Revision: 57495 URL: http://svn.reactos.org/svn/reactos?rev=57495&view=rev Log: [WIN32K] Disable APCs when acquiring the pushlock. Modified: trunk/reactos/win32ss/gdi/ntgdi/text.h Modified: trunk/reactos/win32ss/gdi/ntgdi/text.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/text.h?r… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/text.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/text.h [iso-8859-1] Sat Oct 6 12:21:41 2012 @@ -85,6 +85,7 @@ TEXTOBJ_LockText(HFONT hfont) { PLFONT plfnt = LFONT_ShareLockFont(hfont); + KeEnterCriticalRegion(); ExAcquirePushLockExclusive(&plfnt->lock); return plfnt; } @@ -94,6 +95,7 @@ TEXTOBJ_UnlockText(PLFONT plfnt) { ExReleasePushLockExclusive(&plfnt->lock); + KeLeaveCriticalRegion(); LFONT_ShareUnlockFont(plfnt); }

12 years, 2 months

[tkreuzer] 57494: [WIN23K] - Make LFONTs (for some incomprehensible reason called TEXTOBJ in ros) shared objects, as they are supposed to be. Since that conflicts with our totally broken font code ...

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Sat Oct 6 12:16:06 2012 New Revision: 57494 URL: http://svn.reactos.org/svn/reactos?rev=57494&view=rev Log: [WIN23K] - Make LFONTs (for some incomprehensible reason called TEXTOBJ in ros) shared objects, as they are supposed to be. Since that conflicts with our totally broken font code that happily messes with the LFONT's contents, an additional push lock is aquired to get exclusive ownership. Modified: trunk/reactos/win32ss/gdi/ntgdi/font.c trunk/reactos/win32ss/gdi/ntgdi/freetype.c trunk/reactos/win32ss/gdi/ntgdi/gdiobj.c trunk/reactos/win32ss/gdi/ntgdi/text.h Modified: trunk/reactos/win32ss/gdi/ntgdi/font.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/font.c?r… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/font.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/font.c [iso-8859-1] Sat Oct 6 12:16:06 2012 @@ -1056,7 +1056,7 @@ { ENUMLOGFONTEXDVW SafeLogfont; HFONT hNewFont; - PTEXTOBJ TextObj; + PLFONT plfont; NTSTATUS Status = STATUS_SUCCESS; /* Silence GCC warnings */ @@ -1084,25 +1084,26 @@ return NULL; } - TextObj = TEXTOBJ_AllocTextWithHandle(); - if (!TextObj) + plfont = LFONT_AllocFontWithHandle(); + if (!plfont) { return NULL; } - hNewFont = TextObj->BaseObject.hHmgr; - - TextObj->lft = lft; - TextObj->fl = fl; - RtlCopyMemory (&TextObj->logfont, &SafeLogfont, sizeof(ENUMLOGFONTEXDVW)); + hNewFont = plfont->BaseObject.hHmgr; + + plfont->lft = lft; + plfont->fl = fl; + RtlCopyMemory (&plfont->logfont, &SafeLogfont, sizeof(ENUMLOGFONTEXDVW)); + ExInitializePushLock(&plfont->lock); if (SafeLogfont.elfEnumLogfontEx.elfLogFont.lfEscapement != SafeLogfont.elfEnumLogfontEx.elfLogFont.lfOrientation) { /* This should really depend on whether GM_ADVANCED is set */ - TextObj->logfont.elfEnumLogfontEx.elfLogFont.lfOrientation = - TextObj->logfont.elfEnumLogfontEx.elfLogFont.lfEscapement; - } - TEXTOBJ_UnlockText(TextObj); + plfont->logfont.elfEnumLogfontEx.elfLogFont.lfOrientation = + plfont->logfont.elfEnumLogfontEx.elfLogFont.lfEscapement; + } + LFONT_UnlockFont(plfont); if (pvCliData && hNewFont) { Modified: trunk/reactos/win32ss/gdi/ntgdi/freetype.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/freetype… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/freetype.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/freetype.c [iso-8859-1] Sat Oct 6 12:16:06 2012 @@ -447,23 +447,24 @@ NTSTATUS FASTCALL TextIntCreateFontIndirect(CONST LPLOGFONTW lf, HFONT *NewFont) { - PTEXTOBJ TextObj; - - TextObj = TEXTOBJ_AllocTextWithHandle(); - if (!TextObj) + PLFONT plfont; + + plfont = LFONT_AllocFontWithHandle(); + if (!plfont) { return STATUS_NO_MEMORY; } - *NewFont = TextObj->BaseObject.hHmgr; - RtlCopyMemory(&TextObj->logfont.elfEnumLogfontEx.elfLogFont, lf, sizeof(LOGFONTW)); + ExInitializePushLock(&plfont->lock); + *NewFont = plfont->BaseObject.hHmgr; + RtlCopyMemory(&plfont->logfont.elfEnumLogfontEx.elfLogFont, lf, sizeof(LOGFONTW)); if (lf->lfEscapement != lf->lfOrientation) { /* This should really depend on whether GM_ADVANCED is set */ - TextObj->logfont.elfEnumLogfontEx.elfLogFont.lfOrientation = - TextObj->logfont.elfEnumLogfontEx.elfLogFont.lfEscapement; - } - TEXTOBJ_UnlockText(TextObj); + plfont->logfont.elfEnumLogfontEx.elfLogFont.lfOrientation = + plfont->logfont.elfEnumLogfontEx.elfLogFont.lfEscapement; + } + LFONT_UnlockFont(plfont); return STATUS_SUCCESS; } Modified: trunk/reactos/win32ss/gdi/ntgdi/gdiobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/gdiobj.c… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/gdiobj.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/gdiobj.c [iso-8859-1] Sat Oct 6 12:16:06 2012 @@ -51,8 +51,7 @@ (objt) == GDIObjType_BRUSH_TYPE) #define ASSERT_EXCLUSIVE_OBJECT_TYPE(objt) \ ASSERT((objt) == GDIObjType_DC_TYPE || \ - (objt) == GDIObjType_RGN_TYPE || \ - (objt) == GDIObjType_LFONT_TYPE) + (objt) == GDIObjType_RGN_TYPE) #else #define DBG_INCREASE_LOCK_COUNT(ppi, hobj) #define DBG_DECREASE_LOCK_COUNT(x, y) Modified: trunk/reactos/win32ss/gdi/ntgdi/text.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/text.h?r… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/text.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/text.h [iso-8859-1] Sat Oct 6 12:16:06 2012 @@ -56,7 +56,7 @@ #define TEXTOBJECT_INIT 0x00010000 /* GDI logical font object */ -typedef struct +typedef struct _LFONT { /* Header for all gdi objects in the handle table. Do not (re)move this. */ @@ -70,16 +70,33 @@ DWORD dwOffsetEndArray; // Fixed: ENUMLOGFONTEXDVW logfont; -} TEXTOBJ, *PTEXTOBJ; + EX_PUSH_LOCK lock; +} TEXTOBJ, *PTEXTOBJ, LFONT, *PLFONT; /* Internal interface */ -#define TEXTOBJ_AllocText() ((PTEXTOBJ) GDIOBJ_AllocObj(GDIObjType_LFONT_TYPE)) -#define TEXTOBJ_AllocTextWithHandle() ((PTEXTOBJ) GDIOBJ_AllocObjWithHandle(GDI_OBJECT_TYPE_FONT, sizeof(TEXTOBJ))) -#define TEXTOBJ_FreeText(pBMObj) GDIOBJ_FreeObj((POBJ) pBMObj, GDILoObjType_LO_FONT_TYPE) -#define TEXTOBJ_FreeTextByHandle(hBMObj) GDIOBJ_FreeObj((HGDIOBJ) hBMObj, GDI_OBJECT_TYPE_FONT) -#define TEXTOBJ_LockText(hBMObj) ((PTEXTOBJ) GDIOBJ_LockObject((HGDIOBJ) hBMObj, GDIObjType_LFONT_TYPE)) -#define TEXTOBJ_UnlockText(pBMObj) GDIOBJ_vUnlockObject ((POBJ)pBMObj) +#define LFONT_AllocFontWithHandle() ((PLFONT)GDIOBJ_AllocObjWithHandle(GDI_OBJECT_TYPE_FONT, sizeof(TEXTOBJ))) +#define LFONT_ShareLockFont(hfont) (PLFONT)GDIOBJ_ReferenceObjectByHandle(hfont, GDIObjType_LFONT_TYPE) +#define LFONT_ShareUnlockFont(plfnt) GDIOBJ_vDereferenceObject((POBJ)plfnt) +#define LFONT_UnlockFont(plfnt) GDIOBJ_vUnlockObject((POBJ)plfnt) + +PTEXTOBJ +FORCEINLINE +TEXTOBJ_LockText(HFONT hfont) +{ + PLFONT plfnt = LFONT_ShareLockFont(hfont); + ExAcquirePushLockExclusive(&plfnt->lock); + return plfnt; +} + +VOID +FORCEINLINE +TEXTOBJ_UnlockText(PLFONT plfnt) +{ + ExReleasePushLockExclusive(&plfnt->lock); + LFONT_ShareUnlockFont(plfnt); +} + PTEXTOBJ FASTCALL RealizeFontInit(HFONT); NTSTATUS FASTCALL TextIntRealizeFont(HFONT,PTEXTOBJ);

12 years, 2 months

[tkreuzer] 57493: [NTOSKRNL] Add missing break in KdpServiceDispatcher

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Sat Oct 6 09:47:15 2012 New Revision: 57493 URL: http://svn.reactos.org/svn/reactos?rev=57493&view=rev Log: [NTOSKRNL] Add missing break in KdpServiceDispatcher Modified: trunk/reactos/ntoskrnl/kd/kdmain.c Modified: trunk/reactos/ntoskrnl/kd/kdmain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/kd/kdmain.c?rev=5… ============================================================================== --- trunk/reactos/ntoskrnl/kd/kdmain.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/kd/kdmain.c [iso-8859-1] Sat Oct 6 09:47:15 2012 @@ -103,6 +103,7 @@ case 'RbdK': { Result = KdbRegisterCliCallback(Buffer1, Buffer1Length); + break; } #endif /* KDBG */ #endif /* DBG */

12 years, 2 months

[tkreuzer] 57492: [GDI32] - Use GdiAllocBatchCommand in DeleteObject instead of doing all manually

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Sat Oct 6 08:33:17 2012 New Revision: 57492 URL: http://svn.reactos.org/svn/reactos?rev=57492&view=rev Log: [GDI32] - Use GdiAllocBatchCommand in DeleteObject instead of doing all manually Modified: trunk/reactos/win32ss/gdi/gdi32/include/gdi32p.h trunk/reactos/win32ss/gdi/gdi32/objects/dc.c Modified: trunk/reactos/win32ss/gdi/gdi32/include/gdi32p.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/gdi32/include/… ============================================================================== --- trunk/reactos/win32ss/gdi/gdi32/include/gdi32p.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/gdi32/include/gdi32p.h [iso-8859-1] Sat Oct 6 08:33:17 2012 @@ -334,7 +334,7 @@ /* Check if the buffer is full */ if ((pTeb->GdiBatchCount >= GDI_BatchLimit) || - ((pTeb->GdiTebBatch.Offset + cjSize) > GDIBATCHBUFSIZE)) + ((pTeb->GdiTebBatch.Offset + cjSize) > GDIBATCHBUFSIZE)) { /* Call win32k, the kernel will call NtGdiFlushUserBatch to flush the current batch */ Modified: trunk/reactos/win32ss/gdi/gdi32/objects/dc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/gdi32/objects/… ============================================================================== --- trunk/reactos/win32ss/gdi/gdi32/objects/dc.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/gdi32/objects/dc.c [iso-8859-1] Sat Oct 6 08:33:17 2012 @@ -320,27 +320,28 @@ WINAPI DeleteObject(HGDIOBJ hObject) { - UINT Type = 0; + DWORD dwType = 0; /* From Wine: DeleteObject does not SetLastError() on a null object */ if(!hObject) return FALSE; - if (0 != ((DWORD) hObject & GDI_HANDLE_STOCK_MASK)) + if ((DWORD)hObject & GDI_HANDLE_STOCK_MASK) { // Relax! This is a normal return! DPRINT("Trying to delete system object 0x%x\n", hObject); return TRUE; } + // If you dont own it?! Get OUT! if(!GdiIsHandleValid(hObject)) return FALSE; - Type = GDI_HANDLE_GET_TYPE(hObject); - - if ((Type == GDI_OBJECT_TYPE_METAFILE) || - (Type == GDI_OBJECT_TYPE_ENHMETAFILE)) + dwType = GDI_HANDLE_GET_TYPE(hObject); + + if ((dwType == GDI_OBJECT_TYPE_METAFILE) || + (dwType == GDI_OBJECT_TYPE_ENHMETAFILE)) return FALSE; - switch (Type) + switch (dwType) { case GDI_OBJECT_TYPE_DC: return DeleteDC((HDC) hObject); @@ -367,33 +368,30 @@ { PBRUSH_ATTR Brh_Attr; PTEB pTeb; - - if ((!GdiGetHandleUserData(hObject, (DWORD)Type, (PVOID) &Brh_Attr)) || - (Brh_Attr == NULL) ) break; + PGDIBSOBJECT pgO; + + if ((!GdiGetHandleUserData(hObject, dwType, (PVOID) &Brh_Attr)) || + (Brh_Attr == NULL)) break; pTeb = NtCurrentTeb(); if (pTeb->Win32ThreadInfo == NULL) break; - if ((pTeb->GdiTebBatch.Offset + sizeof(GDIBSOBJECT)) <= GDIBATCHBUFSIZE) - { - PGDIBSOBJECT pgO = (PGDIBSOBJECT)(&pTeb->GdiTebBatch.Buffer[0] + - pTeb->GdiTebBatch.Offset); - pgO->gbHdr.Cmd = GdiBCDelObj; - pgO->gbHdr.Size = sizeof(GDIBSOBJECT); + pgO = GdiAllocBatchCommand(NULL, GdiBCDelObj); + if (pgO) + { pgO->hgdiobj = hObject; - - pTeb->GdiTebBatch.Offset += sizeof(GDIBSOBJECT); - pTeb->GdiBatchCount++; - if (pTeb->GdiBatchCount >= GDI_BatchLimit) NtGdiFlush(); return TRUE; } + break; } + case GDI_OBJECT_TYPE_BITMAP: default: break; } + return NtGdiDeleteObjectApp(hObject); }

12 years, 2 months

[jimtabor] 57491: [NtUser] - Tested wine win test_scrollwindow, test_scrollvalidate, test_scrolldc, and test_scroll plus ReactOS API tests. Pass all but three region tests in test_scrollvalidate. -...

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Sat Oct 6 02:36:46 2012 New Revision: 57491 URL: http://svn.reactos.org/svn/reactos?rev=57491&view=rev Log: [NtUser] - Tested wine win test_scrollwindow, test_scrollvalidate, test_scrolldc, and test_scroll plus ReactOS API tests. Pass all but three region tests in test_scrollvalidate. - Dedicated to Víctor Martínez Calvo. Modified: trunk/reactos/win32ss/user/ntuser/painting.c Modified: trunk/reactos/win32ss/user/ntuser/painting.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/painti… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/painting.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/painting.c [iso-8859-1] Sat Oct 6 02:36:46 2012 @@ -1611,9 +1611,11 @@ INT Result; PWND Window = NULL, CaretWnd; HDC hDC; - HRGN hrgnOwn = NULL, hrgnTemp; + HRGN hrgnOwn = NULL, hrgnTemp, hrgnWinupd = NULL; HWND hwndCaret; DWORD dcxflags = 0; + int rdw_flags; + BOOL bOwnRgn = TRUE; NTSTATUS Status = STATUS_SUCCESS; DECLARE_RETURN(DWORD); USER_REFERENCE_ENTRY Ref, CaretRef; @@ -1666,7 +1668,10 @@ } if (hrgnUpdate) + { hrgnOwn = hrgnUpdate; + bOwnRgn = FALSE; + } else hrgnOwn = IntSysCreateRectRgn(0, 0, 0, 0); @@ -1694,6 +1699,8 @@ /* FIXME: SetLastError? */ RETURN(ERROR); } + + rdw_flags = (flags & SW_ERASE) && (flags & SW_INVALIDATE) ? RDW_INVALIDATE | RDW_ERASE : RDW_INVALIDATE ; rcCaret = rcScroll; hwndCaret = co_IntFixCaret(Window, &rcCaret, flags); @@ -1710,16 +1717,22 @@ /* * Take into account the fact that some damage may have occurred during - * the scroll. + * the scroll. Keep a copy in hrgnWinupd to be added to hrngUpdate at the end. */ hrgnTemp = IntSysCreateRectRgn(0, 0, 0, 0); if (co_UserGetUpdateRgn(Window, hrgnTemp, FALSE) != NULLREGION) { HRGN hrgnClip = IntSysCreateRectRgnIndirect(&rcClip); + if (!bOwnRgn) + { + hrgnWinupd = IntSysCreateRectRgn( 0, 0, 0, 0); + NtGdiCombineRgn( hrgnWinupd, hrgnTemp, 0, RGN_COPY); + } NtGdiOffsetRgn(hrgnTemp, dx, dy); NtGdiCombineRgn(hrgnTemp, hrgnTemp, hrgnClip, RGN_AND); - co_UserRedrawWindow(Window, NULL, hrgnTemp, RDW_INVALIDATE | RDW_ERASE); + if (!bOwnRgn) NtGdiCombineRgn( hrgnWinupd, hrgnWinupd, hrgnTemp, RGN_OR ); + co_UserRedrawWindow(Window, NULL, hrgnTemp, rdw_flags ); GreDeleteObject(hrgnClip); } GreDeleteObject(hrgnTemp); @@ -1746,7 +1759,7 @@ UserRefObjectCo(Child, &WndRef); co_WinPosSetWindowPos(Child, 0, rcChild.left + dx, rcChild.top + dy, 0, 0, SWP_NOZORDER | SWP_NOSIZE | SWP_NOACTIVATE | - SWP_NOREDRAW); + SWP_NOREDRAW | SWP_DEFERERASE); UserDerefObjectCo(Child); } } @@ -1754,7 +1767,7 @@ if (flags & (SW_INVALIDATE | SW_ERASE)) { - co_UserRedrawWindow(Window, NULL, hrgnOwn, RDW_INVALIDATE | RDW_ERASE | + co_UserRedrawWindow(Window, NULL, hrgnOwn, rdw_flags | ((flags & SW_ERASE) ? RDW_ERASENOW : 0) | ((flags & SW_SCROLLCHILDREN) ? RDW_ALLCHILDREN : 0)); } @@ -1793,6 +1806,12 @@ RETURN(Result); CLEANUP: + if (hrgnWinupd && !bOwnRgn) + { + NtGdiCombineRgn( hrgnOwn, hrgnOwn, hrgnWinupd, RGN_OR); + GreDeleteObject(hrgnWinupd); + } + if (hrgnOwn && !hrgnUpdate) { GreDeleteObject(hrgnOwn);

12 years, 2 months

← Newer
1
...
14
15
16
17
18
19
20
21
22
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 October 2012