Ros-diffs

ros-diffs@reactos.org

81390 discussions

[tkreuzer] 65919: [WIN32K] Rewrite IntEngMaskBlt to work with device managed surfaces. Should fix CORE-7821 and CORE-8711
by tkreuzer＠svn.reactos.org 31 Dec '14

31 Dec '14

Author: tkreuzer Date: Wed Dec 31 15:15:44 2014 New Revision: 65919 URL: http://svn.reactos.org/svn/reactos?rev=65919&view=rev Log: [WIN32K] Rewrite IntEngMaskBlt to work with device managed surfaces. Should fix CORE-7821 and CORE-8711 Modified: trunk/reactos/win32ss/gdi/eng/bitblt.c trunk/reactos/win32ss/gdi/eng/inteng.h 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] Wed Dec 31 15:15:44 2014 @@ -65,6 +65,7 @@ DWORD fgndRop, bkgndRop; ASSERT(IS_VALID_ROP4(Rop4)); + ASSERT(psoMask->iBitmapFormat == BMF_1BPP); if (!psoMask) return FALSE; @@ -984,64 +985,141 @@ return Ret; } -BOOL APIENTRY -IntEngMaskBlt(SURFOBJ *psoDest, - SURFOBJ *psoMask, - CLIPOBJ *ClipRegion, - XLATEOBJ *DestColorTranslation, - XLATEOBJ *SourceColorTranslation, - RECTL *DestRect, - POINTL *pptlMask, - BRUSHOBJ *pbo, - POINTL *BrushOrigin) +BOOL +APIENTRY +IntEngMaskBlt( + _Inout_ SURFOBJ *psoDest, + _In_ SURFOBJ *psoMask, + _In_ CLIPOBJ *pco, + _In_ XLATEOBJ *pxloDest, + _In_ XLATEOBJ *pxloSource, + _In_ RECTL *prclDest, + _In_ POINTL *pptlMask, + _In_ BRUSHOBJ *pbo, + _In_ POINTL *pptlBrushOrg) { BOOLEAN ret; - RECTL OutputRect; - POINTL InputPoint = {0,0}; - //SURFACE *psurfDest; - + RECTL rcDest; + POINTL ptMask = {0,0}; + PSURFACE psurfTemp; + RECTL rcTemp; + + ASSERT(psoDest); ASSERT(psoMask); + /* Is this a 1 BPP mask? */ + if (psoMask->iBitmapFormat == BMF_1BPP) + { + /* Use IntEngBitBlt with an appropriate ROP4 */ + return IntEngBitBlt(psoDest, + NULL, + psoMask, + pco, + pxloDest, + prclDest, + NULL, + pptlMask, + pbo, + pptlBrushOrg, + ROP4_MASKPAINT); + } + + ASSERT(psoMask->iBitmapFormat == BMF_8BPP); + if (pptlMask) { - InputPoint = *pptlMask; + ptMask = *pptlMask; } /* Clip against the bounds of the clipping region so we won't try to write * outside the surface */ - if (NULL != ClipRegion) - { - if (!RECTL_bIntersectRect(&OutputRect, DestRect, &ClipRegion->rclBounds)) + if (pco != NULL) + { + /* Intersect with the clip bounds and check if everything was clipped */ + if (!RECTL_bIntersectRect(&rcDest, prclDest, &pco->rclBounds)) { return TRUE; } - InputPoint.x += OutputRect.left - DestRect->left; - InputPoint.y += OutputRect.top - DestRect->top; - } - else - { - OutputRect = *DestRect; - } - - /* No success yet */ - ret = FALSE; - ASSERT(psoDest); - //psurfDest = CONTAINING_RECORD(psoDest, SURFACE, SurfObj); - - /* Dummy BitBlt to let driver know that it should flush its changes. - This should really be done using a call to DrvSynchronizeSurface, - but the VMware driver doesn't hook that call. */ - IntEngBitBlt(psoDest, NULL, psoMask, ClipRegion, DestColorTranslation, - DestRect, pptlMask, pptlMask, pbo, BrushOrigin, - ROP4_NOOP); - - ret = EngMaskBitBlt(psoDest, psoMask, ClipRegion, DestColorTranslation, SourceColorTranslation, - &OutputRect, &InputPoint, pbo, BrushOrigin); - - /* Dummy BitBlt to let driver know that something has changed. */ - IntEngBitBlt(psoDest, NULL, psoMask, ClipRegion, DestColorTranslation, - DestRect, pptlMask, pptlMask, pbo, BrushOrigin, - ROP4_NOOP); + + /* Adjust the mask point */ + ptMask.x += rcDest.left - prclDest->left; + ptMask.y += rcDest.top - prclDest->top; + } + else + { + rcDest = *prclDest; + } + + /* Check if the target surface is device managed */ + if (psoDest->iType != STYPE_BITMAP) + { + rcTemp.left = 0; + rcTemp.top = 0; + rcTemp.right = rcDest.right - rcDest.left; + rcTemp.bottom = rcDest.bottom - rcDest.top; + + /* Allocate a temporary surface */ + psurfTemp = SURFACE_AllocSurface(STYPE_BITMAP, + rcTemp.right, + rcTemp.bottom, + psoDest->iBitmapFormat, + 0, + 0, + NULL); + if (psurfTemp == NULL) + { + return FALSE; + } + + /* Copy the current target surface bits to the temp surface */ + ret = EngCopyBits(&psurfTemp->SurfObj, + psoDest, + NULL, // pco + NULL, // pxlo + &rcTemp, + (PPOINTL)&rcDest); + + if (ret) + { + /* Do the operation on the temp surface */ + ret = EngMaskBitBlt(&psurfTemp->SurfObj, + psoMask, + NULL, + pxloDest, + pxloSource, + &rcTemp, + &ptMask, + pbo, + pptlBrushOrg); + } + + if (ret) + { + /* Copy the result back to the dest surface */ + ret = EngCopyBits(psoDest, + &psurfTemp->SurfObj, + pco, + NULL, + &rcDest, + (PPOINTL)&rcTemp); + } + + /* Delete the temp surface */ + GDIOBJ_vDeleteObject(&psurfTemp->BaseObject); + } + else + { + /* Do the operation on the target surface */ + ret = EngMaskBitBlt(psoDest, + psoMask, + pco, + pxloDest, + pxloSource, + &rcDest, + &ptMask, + pbo, + pptlBrushOrg); + } return ret; } Modified: trunk/reactos/win32ss/gdi/eng/inteng.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/eng/inteng.h?r… ============================================================================== --- trunk/reactos/win32ss/gdi/eng/inteng.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/eng/inteng.h [iso-8859-1] Wed Dec 31 15:15:44 2014 @@ -53,6 +53,7 @@ #define ROP4_NOOP (R3_OPINDEX_NOOP | (R3_OPINDEX_NOOP << 8)) #define ROP4_MASK (R3_OPINDEX_SRCCOPY | (R3_OPINDEX_NOOP << 8)) +#define ROP4_MASKPAINT (R3_OPINDEX_PATCOPY | (R3_OPINDEX_NOOP << 8)) /* Definitions of IntEngXxx functions */

1 0

[tkreuzer] 65918: [WIN32K] Fix calculation of the source point in EngCopyBits for complex clipping regions. One might assume that this function is so essential, that it would do at least the most b...
by tkreuzer＠svn.reactos.org 31 Dec '14

31 Dec '14

Author: tkreuzer Date: Wed Dec 31 15:15:39 2014 New Revision: 65918 URL: http://svn.reactos.org/svn/reactos?rev=65918&view=rev Log: [WIN32K] Fix calculation of the source point in EngCopyBits for complex clipping regions. One might assume that this function is so essential, that it would do at least the most basic stuff correctly, but ... Modified: trunk/reactos/win32ss/gdi/eng/copybits.c Modified: trunk/reactos/win32ss/gdi/eng/copybits.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/eng/copybits.c… ============================================================================== --- trunk/reactos/win32ss/gdi/eng/copybits.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/eng/copybits.c [iso-8859-1] Wed Dec 31 15:15:39 2014 @@ -146,8 +146,8 @@ { RECTL_bIntersectRect(&BltInfo.DestRect, prcl, DestRect); - BltInfo.SourcePoint.x = SourcePoint->x + prcl->left - DestRect->left; - BltInfo.SourcePoint.y = SourcePoint->y + prcl->top - DestRect->top; + BltInfo.SourcePoint.x = SourcePoint->x + BltInfo.DestRect.left - DestRect->left; + BltInfo.SourcePoint.y = SourcePoint->y + BltInfo.DestRect.top - DestRect->top; if (!DibFunctionsForBitmapFormat[psoDest->iBitmapFormat].DIB_BitBltSrcCopy(&BltInfo)) {

1 0

[pschweitzer] 65917: [FREELDR] Display an error message with the file name in case we cannot get a file size over PXE. This makes the error message "(../../boot/freeldr/freeldr/fs/pxe.c:107) err: P...
by pschweitzer＠svn.reactos.org 31 Dec '14

31 Dec '14

Author: pschweitzer Date: Wed Dec 31 13:04:04 2014 New Revision: 65917 URL: http://svn.reactos.org/svn/reactos?rev=65917&view=rev Log: [FREELDR] Display an error message with the file name in case we cannot get a file size over PXE. This makes the error message "(../../boot/freeldr/freeldr/fs/pxe.c:107) err: PxeCall(0x25, 0000E8DE) failed with exit=1 status=0x1" in case of PXE boot less dramatic: it is expected not to find NTBOOTDD.SYS Modified: trunk/reactos/boot/freeldr/freeldr/fs/pxe.c Modified: trunk/reactos/boot/freeldr/freeldr/fs/pxe.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/fs/px… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/fs/pxe.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/fs/pxe.c [iso-8859-1] Wed Dec 31 13:04:04 2014 @@ -162,7 +162,11 @@ sizeData.ServerIPAddress = _ServerIP; strncpy((CHAR*)sizeData.FileName, Path, sizeof(sizeData.FileName)); if (!CallPxe(PXENV_TFTP_GET_FSIZE, &sizeData)) + { + ERR("Failed to get '%s' size\n", Path); return EIO; + } + _FileSize = sizeData.FileSize; if (_FileSize < 1024 * 1024) {

1 0

[ekohl] 65916: [USETUP] Move the code that updates the partition type from FormatPartitionPage to a separate function (UpdatePartitionType) and call it from SelectPartitionPage. This fixes the crea...
by ekohl＠svn.reactos.org 31 Dec '14

31 Dec '14

Author: ekohl Date: Wed Dec 31 10:09:28 2014 New Revision: 65916 URL: http://svn.reactos.org/svn/reactos?rev=65916&view=rev Log: [USETUP] Move the code that updates the partition type from FormatPartitionPage to a separate function (UpdatePartitionType) and call it from SelectPartitionPage. This fixes the creation of primary partitions. Modified: trunk/reactos/base/setup/usetup/interface/usetup.c Modified: trunk/reactos/base/setup/usetup/interface/usetup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/interfac… ============================================================================== --- trunk/reactos/base/setup/usetup/interface/usetup.c [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/interface/usetup.c [iso-8859-1] Wed Dec 31 10:09:28 2014 @@ -1834,7 +1834,6 @@ ULONGLONG DiskSize; ULONGLONG SectorCount; PCHAR Unit; - NTSTATUS Status; if (PartitionList == NULL || PartitionList->CurrentDisk == NULL || @@ -1960,14 +1959,6 @@ CreatePrimaryPartition(PartitionList, SectorCount, FALSE); - - Status = WriteDirtyPartitions(PartitionList); - if (!NT_SUCCESS(Status)) - { - DPRINT("WriteDirtyPartitions() failed\n"); - MUIDisplayError(ERROR_WRITE_PTABLE, Ir, POPUP_WAIT_ENTER); - return QUIT_PAGE; - } return SELECT_FILE_SYSTEM_PAGE; } @@ -2145,7 +2136,6 @@ ULONGLONG DiskSize; ULONGLONG SectorCount; PCHAR Unit; - NTSTATUS Status; if (PartitionList == NULL || PartitionList->CurrentDisk == NULL || @@ -2271,14 +2261,6 @@ CreateLogicalPartition(PartitionList, SectorCount); - Status = WriteDirtyPartitions(PartitionList); - if (!NT_SUCCESS(Status)) - { - DPRINT("WriteDirtyPartitions() failed\n"); - MUIDisplayError(ERROR_WRITE_PTABLE, Ir, POPUP_WAIT_ENTER); - return QUIT_PAGE; - } - return SELECT_FILE_SYSTEM_PAGE; } } @@ -2465,6 +2447,67 @@ } +static +VOID +UpdatePartitionType( + PPARTENTRY PartEntry, + LPCWSTR FileSystem) +{ + if (wcscmp(FileSystem, L"FAT") == 0) + { + if (PartEntry->SectorCount.QuadPart < 8192) + { + /* FAT12 CHS partition (disk is smaller than 4.1MB) */ + PartEntry->PartitionType = PARTITION_FAT_12; + } + else if (PartEntry->StartSector.QuadPart < 1450560) + { + /* Partition starts below the 8.4GB boundary ==> CHS partition */ + + if (PartEntry->SectorCount.QuadPart < 65536) + { + /* FAT16 CHS partition (partiton size < 32MB) */ + PartEntry->PartitionType = PARTITION_FAT_16; + } + else if (PartEntry->SectorCount.QuadPart < 1048576) + { + /* FAT16 CHS partition (partition size < 512MB) */ + PartEntry->PartitionType = PARTITION_HUGE; + } + else + { + /* FAT32 CHS partition (partition size >= 512MB) */ + PartEntry->PartitionType = PARTITION_FAT32; + } + } + else + { + /* Partition starts above the 8.4GB boundary ==> LBA partition */ + + if (PartEntry->SectorCount.QuadPart < 1048576) + { + /* FAT16 LBA partition (partition size < 512MB) */ + PartEntry->PartitionType = PARTITION_XINT13; + } + else + { + /* FAT32 LBA partition (partition size >= 512MB) */ + PartEntry->PartitionType = PARTITION_FAT32_XINT13; + } + } + + PartEntry->DiskEntry->LayoutBuffer->PartitionEntry[PartEntry->PartitionIndex].PartitionType = PartEntry->PartitionType; + } +#if 0 + else if (wcscmp(FileSystemList->Selected->FileSystem, L"EXT2") == 0) + { + PartEntry->PartitionType = PARTITION_EXT2; + PartEntry->DiskEntry->LayoutBuffer->PartitionEntry[PartEntry->PartitionIndex].PartitionType = PartEntry->PartitionType; + } +#endif +} + + static PAGE_NUMBER SelectFileSystemPage(PINPUT_RECORD Ir) { @@ -2475,6 +2518,7 @@ PCHAR DiskUnit; PCHAR PartUnit; PCHAR PartType; + NTSTATUS Status; if (PartitionList == NULL || PartitionList->CurrentDisk == NULL || @@ -2635,6 +2679,17 @@ { if (UnattendFormatPartition) { + UpdatePartitionType(PartEntry, + FileSystemList->Selected->FileSystem); + + Status = WriteDirtyPartitions(PartitionList); + if (!NT_SUCCESS(Status)) + { + DPRINT1("WriteDirtyPartitions() failed (Status 0x%08lx)\n", Status); + MUIDisplayError(ERROR_WRITE_PTABLE, Ir, POPUP_WAIT_ENTER); + return QUIT_PAGE; + } + return FORMAT_PARTITION_PAGE; } @@ -2678,6 +2733,19 @@ } else { + UpdatePartitionType(PartEntry, + FileSystemList->Selected->FileSystem); + + CheckActiveBootPartition(PartitionList); + + Status = WriteDirtyPartitions(PartitionList); + if (!NT_SUCCESS(Status)) + { + DPRINT("WriteDirtyPartitions() failed (Status 0x%08lx)\n", Status); + MUIDisplayError(ERROR_WRITE_PTABLE, Ir, POPUP_WAIT_ENTER); + return QUIT_PAGE; + } + return FORMAT_PARTITION_PAGE; } } @@ -2691,7 +2759,7 @@ FormatPartitionPage(PINPUT_RECORD Ir) { WCHAR PathBuffer[MAX_PATH]; - PDISKENTRY DiskEntry; +// PDISKENTRY DiskEntry; PPARTENTRY PartEntry; NTSTATUS Status; @@ -2711,7 +2779,7 @@ return QUIT_PAGE; } - DiskEntry = PartitionList->CurrentDisk; +// DiskEntry = PartitionList->CurrentDisk; PartEntry = PartitionList->CurrentPartition; while (TRUE) @@ -2735,59 +2803,7 @@ { CONSOLE_SetStatusText(MUIGetString(STRING_PLEASEWAIT)); - if (wcscmp(FileSystemList->Selected->FileSystem, L"FAT") == 0) - { - if (PartEntry->SectorCount.QuadPart < 8192) - { - /* FAT12 CHS partition (disk is smaller than 4.1MB) */ - PartEntry->PartitionType = PARTITION_FAT_12; - } - else if (PartEntry->StartSector.QuadPart < 1450560) - { - /* Partition starts below the 8.4GB boundary ==> CHS partition */ - - if (PartEntry->SectorCount.QuadPart < 65536) - { - /* FAT16 CHS partition (partiton size < 32MB) */ - PartEntry->PartitionType = PARTITION_FAT_16; - } - else if (PartEntry->SectorCount.QuadPart < 1048576) - { - /* FAT16 CHS partition (partition size < 512MB) */ - PartEntry->PartitionType = PARTITION_HUGE; - } - else - { - /* FAT32 CHS partition (partition size >= 512MB) */ - PartEntry->PartitionType = PARTITION_FAT32; - } - } - else - { - /* Partition starts above the 8.4GB boundary ==> LBA partition */ - - if (PartEntry->SectorCount.QuadPart < 1048576) - { - /* FAT16 LBA partition (partition size < 512MB) */ - PartEntry->PartitionType = PARTITION_XINT13; - } - else - { - /* FAT32 LBA partition (partition size >= 512MB) */ - PartEntry->PartitionType = PARTITION_FAT32_XINT13; - } - } - - DiskEntry->LayoutBuffer->PartitionEntry[PartEntry->PartitionIndex].PartitionType = PartEntry->PartitionType; - } -#if 0 - else if (wcscmp(FileSystemList->Selected->FileSystem, L"EXT2") == 0) - { - PartEntry->PartitionType = PARTITION_EXT2; - DiskEntry->LayoutBuffer->PartitionEntry[PartEntry->PartitionIndex].PartitionType = PartEntry->PartitionType; - } -#endif - else if (!FileSystemList->Selected->FormatFunc) + if (!FileSystemList->Selected->FormatFunc) return QUIT_PAGE; #ifndef NDEBUG @@ -2826,16 +2842,6 @@ PartEntry = PartitionList->CurrentPartition; #endif - CheckActiveBootPartition(PartitionList); - - Status = WriteDirtyPartitions(PartitionList); - if (!NT_SUCCESS(Status)) - { - DPRINT("WriteDirtyPartitions() failed\n"); - MUIDisplayError(ERROR_WRITE_PTABLE, Ir, POPUP_WAIT_ENTER); - return QUIT_PAGE; - } - /* Set DestinationRootPath */ RtlFreeUnicodeString(&DestinationRootPath); swprintf(PathBuffer,

1 0

[hbelusca] 65915: [WIN32K]: Some whitespace fixes. This gives me also the occasion to test few things: ░░░░░░█ █ █▀▀ █ █ █▀█░░░░░ ░░░░░░█▀█ █▀▀ █ ▄ █ ▄ █ █░░░░░ ░░░░░░▀ ▀ ▀▀▀ ▀▀▀ ▀▀▀ ▀▀▀░░░░░ ░░░░░...
by hbelusca＠svn.reactos.org 30 Dec '14

30 Dec '14

Author: hbelusca Date: Tue Dec 30 21:58:12 2014 New Revision: 65915 URL: http://svn.reactos.org/svn/reactos?rev=65915&view=rev Log: [WIN32K]: Some whitespace fixes. This gives me also the occasion to test few things: ░░░░░░█ █ █▀▀ █ █ █▀█░░░░░ ░░░░░░█▀█ █▀▀ █ ▄ █ ▄ █ █░░░░░ ░░░░░░▀ ▀ ▀▀▀ ▀▀▀ ▀▀▀ ▀▀▀░░░░░ ░░░░░░█ █ █▀▀ █ █ █▀█░░░░░ ░░░░░░█▀█ █▀▀ █ ▄ █ ▄ █ █░░░░░ ░░░░░░▀ ▀ ▀▀▀ ▀▀▀ ▀▀▀ ▀▀▀░░░░░ !error RosBuild: dance RosBuild: dance RosKGB: hi! Modified: trunk/reactos/win32ss/user/ntuser/useratom.c Modified: trunk/reactos/win32ss/user/ntuser/useratom.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/userat… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/useratom.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/useratom.c [iso-8859-1] Tue Dec 30 21:58:12 2014 @@ -12,69 +12,70 @@ RTL_ATOM FASTCALL IntAddAtom(LPWSTR AtomName) { - NTSTATUS Status = STATUS_SUCCESS; - PTHREADINFO pti; - RTL_ATOM Atom; + NTSTATUS Status = STATUS_SUCCESS; + PTHREADINFO pti; + RTL_ATOM Atom; - pti = PsGetCurrentThreadWin32Thread(); - if (pti->rpdesk == NULL) - { - SetLastNtError(Status); - return (RTL_ATOM)0; - } + pti = PsGetCurrentThreadWin32Thread(); + if (pti->rpdesk == NULL) + { + SetLastNtError(Status); + return (RTL_ATOM)0; + } - Status = RtlAddAtomToAtomTable(gAtomTable, AtomName, &Atom); + Status = RtlAddAtomToAtomTable(gAtomTable, AtomName, &Atom); - if (!NT_SUCCESS(Status)) - { - SetLastNtError(Status); - return (RTL_ATOM)0; - } - return Atom; + if (!NT_SUCCESS(Status)) + { + SetLastNtError(Status); + return (RTL_ATOM)0; + } + return Atom; } ULONG FASTCALL IntGetAtomName(RTL_ATOM nAtom, LPWSTR lpBuffer, ULONG cjBufSize) { - NTSTATUS Status = STATUS_SUCCESS; - PTHREADINFO pti; - ULONG Size = cjBufSize; + NTSTATUS Status = STATUS_SUCCESS; + PTHREADINFO pti; + ULONG Size = cjBufSize; - pti = PsGetCurrentThreadWin32Thread(); - if (pti->rpdesk == NULL) - { - SetLastNtError(Status); - return 0; - } + pti = PsGetCurrentThreadWin32Thread(); + if (pti->rpdesk == NULL) + { + SetLastNtError(Status); + return 0; + } - Status = RtlQueryAtomInAtomTable(gAtomTable, nAtom, NULL, NULL, lpBuffer, &Size); + Status = RtlQueryAtomInAtomTable(gAtomTable, nAtom, NULL, NULL, lpBuffer, &Size); - if (!NT_SUCCESS(Status)) - { - SetLastNtError(Status); - return 0; - } + if (!NT_SUCCESS(Status)) + { + SetLastNtError(Status); + return 0; + } - return Size; + return Size; } RTL_ATOM FASTCALL IntAddGlobalAtom(LPWSTR lpBuffer, BOOL PinAtom) { - RTL_ATOM Atom; - NTSTATUS Status = STATUS_SUCCESS; + RTL_ATOM Atom; + NTSTATUS Status = STATUS_SUCCESS; - Status = RtlAddAtomToAtomTable(gAtomTable, lpBuffer, &Atom); + Status = RtlAddAtomToAtomTable(gAtomTable, lpBuffer, &Atom); - if (!NT_SUCCESS(Status)) - { - ERR("Error init Global Atom.\n"); - return 0; - } + if (!NT_SUCCESS(Status)) + { + ERR("Error init Global Atom.\n"); + return 0; + } - if ( Atom && PinAtom ) RtlPinAtomInAtomTable(gAtomTable, Atom); + if (Atom && PinAtom) + RtlPinAtomInAtomTable(gAtomTable, Atom); - return Atom; + return Atom; } /*!

1 0

[tkreuzer] 65914: [WIN32K] - Fix definition of ROP_TO_ROP4 - Move some macros to intgdi.h - Fix coordinate space mismatch in IntGdiBitBltRgn and IntGdiFillRgn Fixes console window selection
by tkreuzer＠svn.reactos.org 30 Dec '14

30 Dec '14

Author: tkreuzer Date: Tue Dec 30 21:03:13 2014 New Revision: 65914 URL: http://svn.reactos.org/svn/reactos?rev=65914&view=rev Log: [WIN32K] - Fix definition of ROP_TO_ROP4 - Move some macros to intgdi.h - Fix coordinate space mismatch in IntGdiBitBltRgn and IntGdiFillRgn Fixes console window selection 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] Tue Dec 30 21:03:13 2014 @@ -8,12 +8,6 @@ #include <win32k.h> DBG_DEFAULT_CHANNEL(GdiBlt); - -#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) BOOL APIENTRY NtGdiAlphaBlend( @@ -1038,7 +1032,7 @@ BOOL bResult; NT_ASSERT((pdc != NULL) && (prgn != NULL)); - /* Get the surface */ + /* Check if we have a surface */ if (pdc->dclevel.pSurface == NULL) { return TRUE; @@ -1052,18 +1046,27 @@ } /* Transform given region into device coordinates */ - if (!REGION_LPTODP(pdc, prgnClip, prgn) || - !REGION_bOffsetRgn(prgnClip, pdc->ptlDCOrig.x, pdc->ptlDCOrig.y)) + if (!REGION_LPTODP(pdc, prgnClip, prgn)) { REGION_Delete(prgnClip); return FALSE; } - /* Intersect with the system or RAO region */ + /* Intersect with the system or RAO region (these are (atm) without DC-origin) */ if (pdc->prgnRao) IntGdiCombineRgn(prgnClip, prgnClip, pdc->prgnRao, RGN_AND); else IntGdiCombineRgn(prgnClip, prgnClip, pdc->prgnVis, RGN_AND); + + /* Now account for the DC-origin */ + if (!REGION_bOffsetRgn(prgnClip, pdc->ptlDCOrig.x, pdc->ptlDCOrig.y)) + { + REGION_Delete(prgnClip); + return FALSE; + } + + /* Prepare the DC */ + DC_vPrepareDCsForBlit(pdc, &prgnClip->rdh.rcBound, NULL, NULL); /* Initialize a clip object */ IntEngInitClipObj(&xcoClip); @@ -1071,9 +1074,6 @@ prgnClip->rdh.nCount, prgnClip->Buffer, &prgnClip->rdh.rcBound); - - /* Prepare the DC */ - DC_vPrepareDCsForBlit(pdc, &prgnClip->rdh.rcBound, NULL, NULL); /* Call the Eng or Drv function */ bResult = IntEngBitBlt(&pdc->dclevel.pSurface->SurfObj, @@ -1125,18 +1125,24 @@ } /* Transform region into device coordinates */ - if (!REGION_LPTODP(pdc, prgnClip, prgn) || - !REGION_bOffsetRgn(prgnClip, pdc->ptlDCOrig.x, pdc->ptlDCOrig.y)) + if (!REGION_LPTODP(pdc, prgnClip, prgn)) { REGION_Delete(prgnClip); return FALSE; } - /* Intersect with the system or RAO region */ + /* Intersect with the system or RAO region (these are (atm) without DC-origin) */ if (pdc->prgnRao) IntGdiCombineRgn(prgnClip, prgnClip, pdc->prgnRao, RGN_AND); else IntGdiCombineRgn(prgnClip, prgnClip, pdc->prgnVis, RGN_AND); + + /* Now account for the DC-origin */ + if (!REGION_bOffsetRgn(prgnClip, pdc->ptlDCOrig.x, pdc->ptlDCOrig.y)) + { + REGION_Delete(prgnClip); + return FALSE; + } IntEngInitClipObj(&xcoClip); IntEngUpdateClipRegion(&xcoClip, 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] Tue Dec 30 21:03:13 2014 @@ -1109,8 +1109,6 @@ } -#define ROP_TO_ROP4(Rop) ((Rop) >> 16) - W32KAPI INT APIENTRY 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] Tue Dec 30 21:03:13 2014 @@ -1,4 +1,9 @@ #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) >> 8) & 0xFF00) | ((Rop) >> 16) /* Brush functions */

1 0

[ekohl] 65913: [USETUP] InstallDirectoryPage1: Initialize DestinationRootPath. ReactOS can be installed on an existing partition again. CORE-8984 #resolve
by ekohl＠svn.reactos.org 30 Dec '14

30 Dec '14

Author: ekohl Date: Tue Dec 30 20:17:27 2014 New Revision: 65913 URL: http://svn.reactos.org/svn/reactos?rev=65913&view=rev Log: [USETUP] InstallDirectoryPage1: Initialize DestinationRootPath. ReactOS can be installed on an existing partition again. CORE-8984 #resolve Modified: trunk/reactos/base/setup/usetup/interface/usetup.c Modified: trunk/reactos/base/setup/usetup/interface/usetup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/interfac… ============================================================================== --- trunk/reactos/base/setup/usetup/interface/usetup.c [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/interface/usetup.c [iso-8859-1] Tue Dec 30 20:17:27 2014 @@ -2969,6 +2969,16 @@ RtlCreateUnicodeString(&InstallPath, InstallDir); + /* Set DestinationRootPath */ + RtlFreeUnicodeString(&DestinationRootPath); + swprintf(PathBuffer, + L"\\Device\\Harddisk%lu\\Partition%lu", + DiskEntry->DiskNumber, + PartEntry->PartitionNumber); + RtlCreateUnicodeString(&DestinationRootPath, + PathBuffer); + DPRINT("DestinationRootPath: %wZ\n", &DestinationRootPath); + /* Create 'DestinationPath' string */ RtlFreeUnicodeString(&DestinationPath); wcscpy(PathBuffer, DestinationRootPath.Buffer);

1 0

[tkreuzer] 65912: [WIN32K] Make sure the PDEV is locked before dereferencing the DC's surface
by tkreuzer＠svn.reactos.org 30 Dec '14

30 Dec '14

Author: tkreuzer Date: Tue Dec 30 19:38:41 2014 New Revision: 65912 URL: http://svn.reactos.org/svn/reactos?rev=65912&view=rev Log: [WIN32K] Make sure the PDEV is locked before dereferencing the DC's surface Modified: trunk/reactos/win32ss/gdi/ntgdi/bitblt.c trunk/reactos/win32ss/gdi/ntgdi/dc.h trunk/reactos/win32ss/gdi/ntgdi/dclife.c trunk/reactos/win32ss/gdi/ntgdi/drawing.c trunk/reactos/win32ss/gdi/ntgdi/fillshap.c trunk/reactos/win32ss/gdi/ntgdi/freetype.c trunk/reactos/win32ss/gdi/ntgdi/line.c trunk/reactos/win32ss/gdi/ntgdi/palette.c trunk/reactos/win32ss/gdi/ntgdi/print.c 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] Tue Dec 30 19:38:41 2014 @@ -946,7 +946,7 @@ return TRUE; } - /* Update the fill brush, if neccessary */ + /* Update the fill brush, if necessary */ if (pdc->pdcattr->ulDirty_ & (DIRTY_FILL | DC_BRUSH_DIRTY)) DC_vUpdateFillBrush(pdc); @@ -1036,12 +1036,10 @@ PREGION prgnClip; XCLIPOBJ xcoClip; BOOL bResult; - PSURFACE psurf; NT_ASSERT((pdc != NULL) && (prgn != NULL)); /* Get the surface */ - psurf = pdc->dclevel.pSurface; - if (psurf == NULL) + if (pdc->dclevel.pSurface == NULL) { return TRUE; } @@ -1078,7 +1076,7 @@ DC_vPrepareDCsForBlit(pdc, &prgnClip->rdh.rcBound, NULL, NULL); /* Call the Eng or Drv function */ - bResult = IntEngBitBlt(&psurf->SurfObj, + bResult = IntEngBitBlt(&pdc->dclevel.pSurface->SurfObj, NULL, NULL, &xcoClip.ClipObj, @@ -1103,19 +1101,19 @@ IntGdiFillRgn( _In_ PDC pdc, _In_ PREGION prgn, - _In_ BRUSHOBJ *pbo) + _In_ PBRUSH pbrFill) { PREGION prgnClip; XCLIPOBJ xcoClip; + EBRUSHOBJ eboFill; + BRUSHOBJ *pbo; BOOL bRet; - PSURFACE psurf; DWORD rop2Fg; MIX mix; - NT_ASSERT((pdc != NULL) && (prgn != NULL)); - - psurf = pdc->dclevel.pSurface; - if (psurf == NULL) + ASSERT_DC_PREPARED(pdc); + + if (pdc->dclevel.pSurface == NULL) { return TRUE; } @@ -1150,13 +1148,35 @@ rop2Fg = pdc->pdcattr->jROP2; mix = rop2Fg | (pdc->pdcattr->jBkMode == OPAQUE ? rop2Fg : R2_NOP) << 8; + /* Prepare DC for blit */ + DC_vPrepareDCsForBlit(pdc, &prgnClip->rdh.rcBound, NULL, NULL); + + /* Check if we have a fill brush */ + if (pbrFill != NULL) + { + /* Initialize the brush object */ + /// \todo Check parameters + EBRUSHOBJ_vInit(&eboFill, pbrFill, pdc->dclevel.pSurface, 0x00FFFFFF, 0, NULL); + pbo = &eboFill.BrushObject; + } + else + { + /* Update the fill brush if needed */ + if (pdc->pdcattr->ulDirty_ & (DIRTY_FILL | DC_BRUSH_DIRTY)) + DC_vUpdateFillBrush(pdc); + + /* Use the DC brush object */ + pbo = &pdc->eboFill.BrushObject; + } + /* Call the internal function */ - bRet = IntEngPaint(&psurf->SurfObj, + bRet = IntEngPaint(&pdc->dclevel.pSurface->SurfObj, &xcoClip.ClipObj, pbo, &pdc->pdcattr->ptlBrushOrigin, mix); + DC_vFinishBlit(pdc, NULL); REGION_Delete(prgnClip); IntEngFreeClipResources(&xcoClip); @@ -1170,10 +1190,7 @@ _In_ PDC pdc, _In_ PREGION prgn) { - if (pdc->pdcattr->ulDirty_ & (DIRTY_FILL | DC_BRUSH_DIRTY)) - DC_vUpdateFillBrush(pdc); - - return IntGdiFillRgn(pdc, prgn, &pdc->eboFill.BrushObject); + return IntGdiFillRgn(pdc, prgn, NULL); } BOOL @@ -1186,7 +1203,6 @@ PDC pdc; PREGION prgn; PBRUSH pbrFill; - EBRUSHOBJ eboFill; BOOL bResult; /* Lock the DC */ @@ -1223,12 +1239,8 @@ return FALSE; } - /* Initialize the brush object */ - /// \todo Check parameters - EBRUSHOBJ_vInit(&eboFill, pbrFill, pdc->dclevel.pSurface, 0x00FFFFFF, 0, NULL); - /* Call the internal function */ - bResult = IntGdiFillRgn(pdc, prgn, &eboFill.BrushObject); + bResult = IntGdiFillRgn(pdc, prgn, pbrFill); /* Cleanup locks */ BRUSH_ShareUnlockBrush(pbrFill); @@ -1360,6 +1372,7 @@ EBRUSHOBJ_iSetSolidColor(pebo, iOldColor); pdc->pdcattr->ulDirty_ = ulDirty; + /// FIXME: we shouldn't dereference pSurface while the PDEV is not locked! /* Initialize an XLATEOBJ from the target surface to RGB */ EXLATEOBJ_vInitialize(&exlo, pdc->dclevel.pSurface->ppal, @@ -1391,6 +1404,7 @@ PDC pdc; ULONG ulRGBColor = CLR_INVALID; POINTL ptlSrc; + RECT rcDest; PSURFACE psurfSrc, psurfDest; /* Lock the DC */ @@ -1402,8 +1416,7 @@ } /* Check if the DC has no surface (empty mem or info DC) */ - psurfSrc = pdc->dclevel.pSurface; - if (psurfSrc == NULL) + if (pdc->dclevel.pSurface == NULL) { /* Fail! */ goto leave; @@ -1418,7 +1431,16 @@ ptlSrc.x += pdc->ptlDCOrig.x; ptlSrc.y += pdc->ptlDCOrig.y; + rcDest.left = x; + rcDest.top = y; + rcDest.right = x + 1; + rcDest.bottom = y + 1; + + /* Prepare DC for blit */ + DC_vPrepareDCsForBlit(pdc, &rcDest, NULL, NULL); + /* Check if the pixel is outside the surface */ + psurfSrc = pdc->dclevel.pSurface; if ((ptlSrc.x >= psurfSrc->SurfObj.sizlBitmap.cx) || (ptlSrc.y >= psurfSrc->SurfObj.sizlBitmap.cy)) { @@ -1463,7 +1485,9 @@ } leave: + /* Unlock the DC */ + DC_vFinishBlit(pdc, NULL); DC_UnlockDc(pdc); /* Return the new RGB color or -1 on failure */ Modified: trunk/reactos/win32ss/gdi/ntgdi/dc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/dc.h?rev… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/dc.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/dc.h [iso-8859-1] Tue Dec 30 19:38:41 2014 @@ -33,7 +33,10 @@ DC_FULLSCREEN = 0x0800, DC_IN_CLONEPDEV = 0x1000, DC_REDIRECTION = 0x2000, - DC_SHAREACCESS = 0x4000 + DC_SHAREACCESS = 0x4000, +#ifdef DBG + DC_PREPARED = 0x8000 +#endif }; typedef enum _DCTYPE @@ -96,7 +99,7 @@ BASEOBJECT BaseObject; DHPDEV dhpdev; /* <- PDEVOBJ.hPDev DHPDEV for device. */ - INT dctype; + DCTYPE dctype; INT fs; PPDEVOBJ ppdev; PVOID hsem; /* PERESOURCE aka HSEMAPHORE */ @@ -293,4 +296,6 @@ extern _Notnull_ PBRUSH pbrDefaultBrush; extern _Notnull_ PSURFACE psurfDefaultBitmap; +#define ASSERT_DC_PREPARED(pdc) NT_ASSERT((pdc)->fs & DC_PREPARED) + #endif /* not __WIN32K_DC_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] Tue Dec 30 19:38:41 2014 @@ -504,7 +504,7 @@ DC_vUpdateTextBrush(pdcDest); /* Lock them in good order */ - if(pdcSrc) + if (pdcSrc) { if((ULONG_PTR)pdcDest->ppdev->hsemDevLock >= (ULONG_PTR)pdcSrc->ppdev->hsemDevLock) @@ -524,7 +524,7 @@ } else { - pdcFirst = pdcDest ; + pdcFirst = pdcDest; prcFirst = rcDest; pdcSecond = NULL; prcSecond = NULL; @@ -537,8 +537,9 @@ if (pdcFirst->dctype == DCTYPE_DIRECT) { EngAcquireSemaphore(pdcFirst->ppdev->hsemDevLock); + /* Update surface if needed */ - if(pdcFirst->ppdev->pSurface != pdcFirst->dclevel.pSurface) + if (pdcFirst->ppdev->pSurface != pdcFirst->dclevel.pSurface) { DC_vUpdateDC(pdcFirst); } @@ -556,6 +557,10 @@ prcFirst->bottom) ; } +#ifdef DBG + pdcFirst->fs |= DC_PREPARED; +#endif + if (!pdcSecond) return; @@ -565,7 +570,7 @@ EngAcquireSemaphore(pdcSecond->ppdev->hsemDevLock); /* Update surface if needed */ - if(pdcSecond->ppdev->pSurface != pdcSecond->dclevel.pSurface) + if (pdcSecond->ppdev->pSurface != pdcSecond->dclevel.pSurface) { DC_vUpdateDC(pdcSecond); } @@ -581,6 +586,10 @@ prcSecond->right, prcSecond->bottom) ; } + +#ifdef DBG + pdcSecond->fs |= DC_PREPARED; +#endif } /* Finishes a blit for one or two DCs */ @@ -588,19 +597,25 @@ FASTCALL DC_vFinishBlit(PDC pdc1, PDC pdc2) { - if(pdc1->dctype == DCTYPE_DIRECT) + if (pdc1->dctype == DCTYPE_DIRECT) { MouseSafetyOnDrawEnd(pdc1->ppdev); EngReleaseSemaphore(pdc1->ppdev->hsemDevLock); } - - if(pdc2) - { - if(pdc2->dctype == DCTYPE_DIRECT) +#ifdef DBG + pdc1->fs &= ~DC_PREPARED; +#endif + + if (pdc2) + { + if (pdc2->dctype == DCTYPE_DIRECT) { MouseSafetyOnDrawEnd(pdc2->ppdev); EngReleaseSemaphore(pdc2->ppdev->hsemDevLock); } +#ifdef DBG + pdc2->fs &= ~DC_PREPARED; +#endif } } Modified: trunk/reactos/win32ss/gdi/ntgdi/drawing.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/drawing.… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/drawing.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/drawing.c [iso-8859-1] Tue Dec 30 19:38:41 2014 @@ -1255,6 +1255,7 @@ PDC_ATTR pdcattr; ASSERT(pbrush); + ASSERT_DC_PREPARED(dc); psurf = dc->dclevel.pSurface; if (psurf == NULL) Modified: trunk/reactos/win32ss/gdi/ntgdi/fillshap.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/fillshap… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/fillshap.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/fillshap.c [iso-8859-1] Tue Dec 30 19:38:41 2014 @@ -931,8 +931,7 @@ return TRUE; } - psurf = pdc->dclevel.pSurface; - if(!psurf) + if (!pdc->dclevel.pSurface) { /* Memory DC with no surface selected */ DC_UnlockDc(pdc); @@ -962,9 +961,11 @@ ptlDitherOrg.x += pdc->ptlDCOrig.x; ptlDitherOrg.y += pdc->ptlDCOrig.y; + DC_vPrepareDCsForBlit(pdc, &rclExtent, NULL, NULL); + + psurf = pdc->dclevel.pSurface; + EXLATEOBJ_vInitialize(&exlo, &gpalRGB, psurf->ppal, 0, 0, 0); - - DC_vPrepareDCsForBlit(pdc, &rclExtent, NULL, NULL); bRet = IntEngGradientFill(&psurf->SurfObj, &pdc->co.ClipObj, @@ -1091,37 +1092,38 @@ return TRUE; } - psurf = dc->dclevel.pSurface; - if (!psurf) + if (!dc->dclevel.pSurface) { Ret = FALSE; goto cleanup; } pdcattr = dc->pdcattr; - - if (pdcattr->ulDirty_ & (DIRTY_FILL | DC_BRUSH_DIRTY)) - DC_vUpdateFillBrush(dc); - - if (pdcattr->ulDirty_ & (DIRTY_LINE | DC_PEN_DIRTY)) - DC_vUpdateLineBrush(dc); Pt.x = XStart; Pt.y = YStart; IntLPtoDP(dc, (LPPOINT)&Pt, 1); + DC_vPrepareDCsForBlit(dc, &DestRect, NULL, NULL); + + /// FIXME: what about prgnVIS? And what about REAL clipping? if (dc->prgnRao) { Ret = REGION_PtInRegion(dc->prgnRao, Pt.x, Pt.y); if (Ret) - REGION_GetRgnBox(dc->prgnRao ,(LPRECT)&DestRect); + REGION_GetRgnBox(dc->prgnRao, (LPRECT)&DestRect); else + { + DC_vFinishBlit(dc, NULL); goto cleanup; + } } else + { RECTL_vSetRect(&DestRect, 0, 0, psurf->SurfObj.sizlBitmap.cx, psurf->SurfObj.sizlBitmap.cy); - - DC_vPrepareDCsForBlit(dc, &DestRect, NULL, NULL); + } + + psurf = dc->dclevel.pSurface; EXLATEOBJ_vInitialize(&exlo, &gpalRGB, psurf->ppal, 0, 0xffffff, 0); 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] Tue Dec 30 19:38:41 2014 @@ -3366,10 +3366,10 @@ BrushOrigin.x = 0; BrushOrigin.y = 0; - psurf = dc->dclevel.pSurface; - - if(!psurf) - psurf = psurfDefaultBitmap; + if (!dc->dclevel.pSurface) + { + goto fail; + } if ((fuOptions & ETO_OPAQUE) && lprc) { @@ -3388,6 +3388,7 @@ if (pdcattr->ulDirty_ & DIRTY_BACKGROUND) DC_vUpdateBackgroundBrush(dc); + psurf = dc->dclevel.pSurface; IntEngBitBlt( &psurf->SurfObj, NULL, @@ -3579,12 +3580,13 @@ /* Lock blit with a dummy rect */ DC_vPrepareDCsForBlit(dc, NULL, NULL, NULL); + psurf = dc->dclevel.pSurface; SurfObj = &psurf->SurfObj ; EXLATEOBJ_vInitialize(&exloRGB2Dst, &gpalRGB, psurf->ppal, 0, 0, 0); EXLATEOBJ_vInitialize(&exloDst2RGB, psurf->ppal, &gpalRGB, 0, 0, 0); - if ((fuOptions & ETO_OPAQUE) && (dc->pdcattr->ulDirty_ & DIRTY_BACKGROUND)) + if ((fuOptions & ETO_OPAQUE) && (dc->pdcattr->ulDirty_ & DIRTY_BACKGROUND)) DC_vUpdateBackgroundBrush(dc) ; if(dc->pdcattr->ulDirty_ & DIRTY_TEXT) Modified: trunk/reactos/win32ss/gdi/ntgdi/line.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/line.c?r… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/line.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/line.c [iso-8859-1] Tue Dec 30 19:38:41 2014 @@ -100,6 +100,7 @@ RECTL Bounds; POINT Points[2]; PDC_ATTR pdcattr = dc->pdcattr; + ASSERT_DC_PREPARED(dc); if (PATH_IsPathOpen(dc->dclevel)) { @@ -248,8 +249,7 @@ LONG i; PDC_ATTR pdcattr = dc->pdcattr; - psurf = dc->dclevel.pSurface; - if (!psurf) + if (!dc->dclevel.pSurface) { return FALSE; } @@ -258,12 +258,7 @@ return PATH_Polyline(dc, pt, Count); DC_vPrepareDCsForBlit(dc, NULL, NULL, NULL); - - if (pdcattr->ulDirty_ & (DIRTY_FILL | DC_BRUSH_DIRTY)) - DC_vUpdateFillBrush(dc); - - if (pdcattr->ulDirty_ & (DIRTY_LINE | DC_PEN_DIRTY)) - DC_vUpdateLineBrush(dc); + psurf = dc->dclevel.pSurface; /* Get BRUSHOBJ from current pen. */ pbrLine = dc->dclevel.pbrLine; @@ -411,9 +406,6 @@ rcLockRect.bottom += dc->ptlDCOrig.y; DC_vPrepareDCsForBlit(dc, &rcLockRect, NULL, NULL); - - if (dc->pdcattr->ulDirty_ & (DIRTY_LINE | DC_PEN_DIRTY)) - DC_vUpdateLineBrush(dc); Ret = IntGdiLineTo(dc, XEnd, YEnd); Modified: trunk/reactos/win32ss/gdi/ntgdi/palette.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/palette.… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/palette.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/palette.c [iso-8859-1] Tue Dec 30 19:38:41 2014 @@ -673,6 +673,7 @@ return CLR_INVALID; } + /// FIXME: shouldn't dereference pSurface while the PDEV is not locked if(dc->dclevel.pSurface == NULL) ppal = gppalMono; else @@ -731,7 +732,7 @@ PALETTE *ppalSurf, *ppalDC; pdc = DC_LockDc(hDC); - if(!pdc) + if (!pdc) { EngSetLastError(ERROR_INVALID_HANDLE); return 0; @@ -742,16 +743,17 @@ goto cleanup; } - if(pdc->dctype == DCTYPE_DIRECT) - { - UNIMPLEMENTED; - goto cleanup; - } - + if (pdc->dctype == DCTYPE_DIRECT) + { + UNIMPLEMENTED; + goto cleanup; + } + + /// FIXME: shouldn't dereference pSurface while the PDEV is not locked ppalSurf = pdc->dclevel.pSurface->ppal; ppalDC = pdc->dclevel.ppal; - if(!(ppalSurf->flFlags & PAL_INDEXED)) + if (!(ppalSurf->flFlags & PAL_INDEXED)) { // FIXME: Set error? goto cleanup; @@ -762,7 +764,7 @@ // FIXME: Should we resize ppalSurf if it's too small? realize = (ppalDC->NumColors < ppalSurf->NumColors) ? ppalDC->NumColors : ppalSurf->NumColors; - for(i=0; i<realize; i++) + for (i=0; i<realize; i++) { InterlockedExchange((LONG*)&ppalSurf->IndexedColors[i], *(LONG*)&ppalDC->IndexedColors[i]); } @@ -993,14 +995,15 @@ return 0; } - /* Get the surace from the DC */ + /* Get the surface from the DC */ psurf = pdc->dclevel.pSurface; /* Check if we have the default surface */ if (psurf == NULL) { /* Use a mono palette */ - if(!bSet) ppal = gppalMono; + if (!bSet) + ppal = gppalMono; } else if (psurf->SurfObj.iType == STYPE_BITMAP) { Modified: trunk/reactos/win32ss/gdi/ntgdi/print.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/print.c?… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/print.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/print.c [iso-8859-1] Tue Dec 30 19:38:41 2014 @@ -85,15 +85,19 @@ INT OutSize, LPSTR OutData) { - SURFACE *psurf = dc->dclevel.pSurface; + SURFACE *psurf; INT Result; - if (!dc->ppdev->DriverFunctions.Escape || !psurf) + if ((dc->ppdev->DriverFunctions.Escape == NULL) || + (dc->dclevel.pSurface == NULL)) { Result = 0; } else { + DC_vPrepareDCsForBlit(dc, NULL, NULL, NULL); + psurf = dc->dclevel.pSurface; + Result = dc->ppdev->DriverFunctions.Escape( &psurf->SurfObj, Escape, @@ -101,6 +105,8 @@ (PVOID)InData, OutSize, (PVOID)OutData ); + + DC_vFinishBlit(dc, NULL); } return Result;

1 0

[tkreuzer] 65911: [WIN32K] Simplify updating prgnVis in NtGdiSelectBitmap
by tkreuzer＠svn.reactos.org 30 Dec '14

30 Dec '14

Author: tkreuzer Date: Tue Dec 30 19:38:37 2014 New Revision: 65911 URL: http://svn.reactos.org/svn/reactos?rev=65911&view=rev Log: [WIN32K] Simplify updating prgnVis in NtGdiSelectBitmap Modified: trunk/reactos/win32ss/gdi/ntgdi/dcobjs.c Modified: trunk/reactos/win32ss/gdi/ntgdi/dcobjs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/dcobjs.c… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/dcobjs.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/dcobjs.c [iso-8859-1] Tue Dec 30 19:38:37 2014 @@ -230,6 +230,7 @@ return NULL; } + /// FIXME: we shouldn't dereference pSurface when the PDEV is not locked /* Is this a valid palette for this depth? */ if ((!pdc->dclevel.pSurface) || (BitsPerFormat(pdc->dclevel.pSurface->SurfObj.iBitmapFormat) <= 8 @@ -356,7 +357,6 @@ PDC pdc; HBITMAP hbmpOld; PSURFACE psurfNew, psurfOld; - PREGION VisRgn; HDC hdcOld; ASSERT_NOGDILOCKS(); @@ -419,7 +419,7 @@ return NULL; } - /* Check if the bitmap is compatile with the dc */ + /* Check if the bitmap is compatible with the dc */ if (!DC_bIsBitmapCompatible(pdc, psurfNew)) { /* Dereference the bitmap, unlock the DC and fail. */ @@ -470,20 +470,15 @@ SURFACE_ShareUnlockSurface(psurfOld); } - /* Mark the dc brushes invalid */ + /* Mark the DC brushes invalid */ pdc->pdcattr->ulDirty_ |= DIRTY_FILL | DIRTY_LINE; - /* FIXME: Improve by using a region without a handle and selecting it */ - VisRgn = IntSysCreateRectpRgn( 0, - 0, - pdc->dclevel.sizl.cx, - pdc->dclevel.sizl.cy); - - if (VisRgn) - { - GdiSelectVisRgn(hdc, VisRgn); - REGION_Delete(VisRgn); - } + /* Update the system region */ + REGION_SetRectRgn(pdc->prgnVis, + 0, + 0, + pdc->dclevel.sizl.cx, + pdc->dclevel.sizl.cy); /* Unlock the DC */ DC_UnlockDc(pdc);

1 0

[tkreuzer] 65910: [WIN32K] - Rewrite NtGdiInvertRgn to not violate locking order - Remove DceUpdateVisRgn from DC_vPrepareDCsForBlit: It is not GDI's task to handle Window clipping, it violates loc...
by tkreuzer＠svn.reactos.org 30 Dec '14

30 Dec '14

Author: tkreuzer Date: Tue Dec 30 19:38:07 2014 New Revision: 65910 URL: http://svn.reactos.org/svn/reactos?rev=65910&view=rev Log: [WIN32K] - Rewrite NtGdiInvertRgn to not violate locking order - Remove DceUpdateVisRgn from DC_vPrepareDCsForBlit: It is not GDI's task to handle Window clipping, it violates locking order, it's slow, it's ugly to call USER functions from GDI internals, it's a hack. I couldn't see any clipping regression, if you find anything, let me know. Modified: trunk/reactos/win32ss/gdi/ntgdi/bitblt.c trunk/reactos/win32ss/gdi/ntgdi/dclife.c 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] Tue Dec 30 19:38:07 2014 @@ -1025,6 +1025,81 @@ } BOOL +APIENTRY +IntGdiBitBltRgn( + _In_ PDC pdc, + _In_ PREGION prgn, + _In_opt_ BRUSHOBJ *pbo, + _In_opt_ POINTL *pptlBrush, + _In_ ROP4 rop4) +{ + PREGION prgnClip; + XCLIPOBJ xcoClip; + BOOL bResult; + PSURFACE psurf; + NT_ASSERT((pdc != NULL) && (prgn != NULL)); + + /* Get the surface */ + psurf = pdc->dclevel.pSurface; + if (psurf == NULL) + { + return TRUE; + } + + /* Create an empty clip region */ + prgnClip = IntSysCreateRectpRgn(0, 0, 0, 0); + if (prgnClip == NULL) + { + return FALSE; + } + + /* Transform given region into device coordinates */ + if (!REGION_LPTODP(pdc, prgnClip, prgn) || + !REGION_bOffsetRgn(prgnClip, pdc->ptlDCOrig.x, pdc->ptlDCOrig.y)) + { + REGION_Delete(prgnClip); + return FALSE; + } + + /* Intersect with the system or RAO region */ + if (pdc->prgnRao) + IntGdiCombineRgn(prgnClip, prgnClip, pdc->prgnRao, RGN_AND); + else + IntGdiCombineRgn(prgnClip, prgnClip, pdc->prgnVis, RGN_AND); + + /* Initialize a clip object */ + IntEngInitClipObj(&xcoClip); + IntEngUpdateClipRegion(&xcoClip, + prgnClip->rdh.nCount, + prgnClip->Buffer, + &prgnClip->rdh.rcBound); + + /* Prepare the DC */ + DC_vPrepareDCsForBlit(pdc, &prgnClip->rdh.rcBound, NULL, NULL); + + /* Call the Eng or Drv function */ + bResult = IntEngBitBlt(&psurf->SurfObj, + NULL, + NULL, + &xcoClip.ClipObj, + NULL, + &prgnClip->rdh.rcBound, + NULL, + NULL, + pbo, + pptlBrush, + rop4); + + /* Cleanup */ + DC_vFinishBlit(pdc, NULL); + REGION_Delete(prgnClip); + IntEngFreeClipResources(&xcoClip); + + /* Return the result */ + return bResult; +} + +BOOL IntGdiFillRgn( _In_ PDC pdc, _In_ PREGION prgn, @@ -1190,34 +1265,48 @@ BOOL APIENTRY NtGdiInvertRgn( - HDC hDC, - HRGN hRgn) -{ - PREGION RgnData; - ULONG i; - PRECTL rc; - - RgnData = REGION_LockRgn(hRgn); - if (RgnData == NULL) + _In_ HDC hdc, + _In_ HRGN hrgn) +{ + BOOL bResult; + PDC pdc; + PREGION prgn; + + /* Lock the DC */ + pdc = DC_LockDc(hdc); + if (pdc == NULL) { EngSetLastError(ERROR_INVALID_HANDLE); return FALSE; } - rc = RgnData->Buffer; - for (i = 0; i < RgnData->rdh.nCount; i++) - { - - if (!NtGdiPatBlt(hDC, rc->left, rc->top, rc->right - rc->left, rc->bottom - rc->top, DSTINVERT)) - { - REGION_UnlockRgn(RgnData); - return FALSE; - } - rc++; - } - - REGION_UnlockRgn(RgnData); - return TRUE; + /* Check if the DC has no surface (empty mem or info DC) */ + if (pdc->dclevel.pSurface == NULL) + { + /* Nothing to do, Windows returns TRUE! */ + DC_UnlockDc(pdc); + return TRUE; + } + + /* Lock the region */ + prgn = REGION_LockRgn(hrgn); + if (prgn == NULL) + { + DC_UnlockDc(pdc); + return FALSE; + } + + /* Call the internal function */ + bResult = IntGdiBitBltRgn(pdc, + prgn, + NULL, // pbo + NULL, // pptlBrush, + ROP_TO_ROP4(DSTINVERT)); + + /* Unlock the region and DC and return the result */ + REGION_UnlockRgn(prgn); + DC_UnlockDc(pdc); + return bResult; } COLORREF 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] Tue Dec 30 19:38:07 2014 @@ -506,7 +506,8 @@ /* Lock them in good order */ if(pdcSrc) { - if((ULONG_PTR)pdcDest->ppdev->hsemDevLock >= (ULONG_PTR)pdcSrc->ppdev->hsemDevLock) + if((ULONG_PTR)pdcDest->ppdev->hsemDevLock >= + (ULONG_PTR)pdcSrc->ppdev->hsemDevLock) { pdcFirst = pdcDest; prcFirst = rcDest; @@ -529,19 +530,11 @@ prcSecond = NULL; } - /* Update clipping of dest DC if needed */ - if (pdcDest->dctype == DCTYPE_DIRECT) - { - DCE* dce = DceGetDceFromDC(pdcDest->BaseObject.hHmgr); - if (dce) - DceUpdateVisRgn(dce, dce->pwndOrg, dce->DCXFlags); - } - if (pdcDest->fs & DC_FLAG_DIRTY_RAO) CLIPPING_UpdateGCRegion(pdcDest); /* Lock and update first DC */ - if(pdcFirst->dctype == DCTYPE_DIRECT) + if (pdcFirst->dctype == DCTYPE_DIRECT) { EngAcquireSemaphore(pdcFirst->ppdev->hsemDevLock); /* Update surface if needed */ @@ -551,7 +544,7 @@ } } - if(pdcFirst->dctype == DCTYPE_DIRECT) + if (pdcFirst->dctype == DCTYPE_DIRECT) { if (!prcFirst) prcFirst = &pdcFirst->erclClip; @@ -567,9 +560,10 @@ return; /* Lock and update second DC */ - if(pdcSecond->dctype == DCTYPE_DIRECT) + if (pdcSecond->dctype == DCTYPE_DIRECT) { EngAcquireSemaphore(pdcSecond->ppdev->hsemDevLock); + /* Update surface if needed */ if(pdcSecond->ppdev->pSurface != pdcSecond->dclevel.pSurface) { @@ -577,7 +571,7 @@ } } - if(pdcSecond->dctype == DCTYPE_DIRECT) + if (pdcSecond->dctype == DCTYPE_DIRECT) { if (!prcSecond) prcSecond = &pdcSecond->erclClip;

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