Ros-diffs August 2010

ros-diffs@reactos.org

14 participants
282 discussions

[cgutman] 48491: [WS2_32] - Check the return value of WSPSelect instead of the error number because the error number doesn't have to be initialized if the function doesn't return SOCKET_ERROR
by cgutman＠svn.reactos.org 09 Aug '10

09 Aug '10

Author: cgutman Date: Mon Aug 9 15:42:51 2010 New Revision: 48491 URL: http://svn.reactos.org/svn/reactos?rev=48491&view=rev Log: [WS2_32] - Check the return value of WSPSelect instead of the error number because the error number doesn't have to be initialized if the function doesn't return SOCKET_ERROR Modified: trunk/reactos/dll/win32/ws2_32/misc/dllmain.c Modified: trunk/reactos/dll/win32/ws2_32/misc/dllmain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ws2_32/misc/dllm… ============================================================================== --- trunk/reactos/dll/win32/ws2_32/misc/dllmain.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ws2_32/misc/dllmain.c [iso-8859-1] Mon Aug 9 15:42:51 2010 @@ -459,7 +459,7 @@ DereferenceProviderByPointer(Provider); - if (Errno != NO_ERROR) + if (Count == SOCKET_ERROR) { WSASetLastError(Errno); return SOCKET_ERROR;

1 0

[cgutman] 48490: [MSWSOCK] - Fix a crash in WSPSelect
by cgutman＠svn.reactos.org 09 Aug '10

09 Aug '10

Author: cgutman Date: Mon Aug 9 15:37:12 2010 New Revision: 48490 URL: http://svn.reactos.org/svn/reactos?rev=48490&view=rev Log: [MSWSOCK] - Fix a crash in WSPSelect Modified: branches/aicom-network-branch/dll/win32/mswsock/msafd/select.c Modified: branches/aicom-network-branch/dll/win32/mswsock/msafd/select.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-branch/dll/win32/… ============================================================================== --- branches/aicom-network-branch/dll/win32/mswsock/msafd/select.c [iso-8859-1] (original) +++ branches/aicom-network-branch/dll/win32/mswsock/msafd/select.c [iso-8859-1] Mon Aug 9 15:37:12 2010 @@ -13,7 +13,7 @@ (s->SharedData.AsyncEvents & e)) #define HANDLES_IN_SET(s) \ - s == NULL ? 0 : (s->fd_count & 0xFFFF) +(((s) == NULL) ? 0 : ((s)->fd_count & 0xFFFF)) /* DATA **********************************************************************/

1 0

[cgutman] 48489: [MSWSOCK] - Add a hack to set the connectionless flag for datagram and raw sockets (the previous msafd has the same hack) - The DHCP service can send and receive packets now
by cgutman＠svn.reactos.org 08 Aug '10

08 Aug '10

Author: cgutman Date: Sun Aug 8 16:36:48 2010 New Revision: 48489 URL: http://svn.reactos.org/svn/reactos?rev=48489&view=rev Log: [MSWSOCK] - Add a hack to set the connectionless flag for datagram and raw sockets (the previous msafd has the same hack) - The DHCP service can send and receive packets now Modified: branches/aicom-network-branch/dll/win32/mswsock/msafd/socket.c Modified: branches/aicom-network-branch/dll/win32/mswsock/msafd/socket.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-branch/dll/win32/… ============================================================================== --- branches/aicom-network-branch/dll/win32/mswsock/msafd/socket.c [iso-8859-1] (original) +++ branches/aicom-network-branch/dll/win32/mswsock/msafd/socket.c [iso-8859-1] Sun Aug 8 16:36:48 2010 @@ -693,6 +693,12 @@ ServiceFlags = lpProtocolInfo->dwServiceFlags1; ProviderFlags = lpProtocolInfo->dwProviderFlags; ProviderId = lpProtocolInfo->ProviderId; + + /* HACK: We don't set this flag properly ATM */ + if(SocketType == SOCK_DGRAM || SocketType == SOCK_RAW) + { + ServiceFlags |= XP1_CONNECTIONLESS; + } /* Create the actual socket */ ErrorCode = SockSocket(AddressFamily,

1 0

[jgardou] 48488: [WIN32K] - I watch and I learn : / has precedence over *=. - Also make sure that we divide what we want to divide with the appropriate parentheses. - Do not take care of alpha in other depths than 32 bpp.
by jgardou＠svn.reactos.org 08 Aug '10

08 Aug '10

Author: jgardou Date: Sun Aug 8 16:20:24 2010 New Revision: 48488 URL: http://svn.reactos.org/svn/reactos?rev=48488&view=rev Log: [WIN32K] - I watch and I learn : / has precedence over *=. - Also make sure that we divide what we want to divide with the appropriate parentheses. - Do not take care of alpha in other depths than 32 bpp. Modified: branches/reactos-yarotows/subsystems/win32/win32k/dib/alphablend.c branches/reactos-yarotows/subsystems/win32/win32k/dib/dib24bpp.c branches/reactos-yarotows/subsystems/win32/win32k/dib/dib32bpp.c Modified: branches/reactos-yarotows/subsystems/win32/win32k/dib/alphablend.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/subsystems/win… ============================================================================== --- branches/reactos-yarotows/subsystems/win32/win32k/dib/alphablend.c [iso-8859-1] (original) +++ branches/reactos-yarotows/subsystems/win32/win32k/dib/alphablend.c [iso-8859-1] Sun Aug 8 16:20:24 2010 @@ -90,21 +90,18 @@ while(DstX < DestRect->right) { SrcPixel32.ul = DIB_GetSource(Source, SrcX, SrcY, &exloSrcRGB.xlo); - SrcPixel32.col.red *= BlendFunc.SourceConstantAlpha / 255; - SrcPixel32.col.green *= BlendFunc.SourceConstantAlpha / 255; - SrcPixel32.col.blue *= BlendFunc.SourceConstantAlpha / 255; - SrcPixel32.col.alpha = (32 == SrcBpp) ? - SrcPixel32.col.alpha * BlendFunc.SourceConstantAlpha / 255 : - BlendFunc.SourceConstantAlpha ; + SrcPixel32.col.red = (SrcPixel32.col.red * BlendFunc.SourceConstantAlpha) / 255; + SrcPixel32.col.green = (SrcPixel32.col.green * BlendFunc.SourceConstantAlpha) / 255; + SrcPixel32.col.blue = (SrcPixel32.col.blue * BlendFunc.SourceConstantAlpha) / 255; Alpha = ((BlendFunc.AlphaFormat & AC_SRC_ALPHA) != 0) ? - SrcPixel32.col.alpha : BlendFunc.SourceConstantAlpha ; + (SrcPixel32.col.alpha * BlendFunc.SourceConstantAlpha) / 255 : + BlendFunc.SourceConstantAlpha ; DstPixel32.ul = DIB_GetSource(Dest, DstX, DstY, &exloDstRGB.xlo); - DstPixel32.col.red = Clamp8(DstPixel32.col.red * (255 - Alpha) / 255 + SrcPixel32.col.red) ; - DstPixel32.col.green = Clamp8(DstPixel32.col.green * (255 - Alpha) / 255 + SrcPixel32.col.green) ; - DstPixel32.col.blue = Clamp8(DstPixel32.col.blue * (255 - Alpha) / 255 + SrcPixel32.col.blue) ; - DstPixel32.col.alpha = Clamp8(DstPixel32.col.alpha * (255 - Alpha) / 255 + SrcPixel32.col.alpha) ; + DstPixel32.col.red = Clamp8((DstPixel32.col.red * (255 - Alpha)) / 255 + SrcPixel32.col.red) ; + DstPixel32.col.green = Clamp8((DstPixel32.col.green * (255 - Alpha)) / 255 + SrcPixel32.col.green) ; + DstPixel32.col.blue = Clamp8((DstPixel32.col.blue * (255 - Alpha)) / 255 + SrcPixel32.col.blue) ; DstPixel32.ul = XLATEOBJ_iXlate(&exloRGBSrc.xlo, DstPixel32.ul); pfnDibPutPixel(Dest, DstX, DstY, XLATEOBJ_iXlate(ColorTranslation, DstPixel32.ul)); Modified: branches/reactos-yarotows/subsystems/win32/win32k/dib/dib24bpp.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/subsystems/win… ============================================================================== --- branches/reactos-yarotows/subsystems/win32/win32k/dib/dib24bpp.c [iso-8859-1] (original) +++ branches/reactos-yarotows/subsystems/win32/win32k/dib/dib24bpp.c [iso-8859-1] Sun Aug 8 16:20:24 2010 @@ -509,28 +509,22 @@ SrcX = SourceRect->left; while (++Cols <= DestRect->right - DestRect->left) { + SrcPixel.ul = DIB_GetSource(Source, SrcX, SrcY, ColorTranslation); + SrcPixel.col.red = (SrcPixel.col.red * BlendFunc.SourceConstantAlpha) / 255; + SrcPixel.col.green = (SrcPixel.col.green * BlendFunc.SourceConstantAlpha) / 255; + SrcPixel.col.blue = (SrcPixel.col.blue * BlendFunc.SourceConstantAlpha) / 255; if (!(BlendFunc.AlphaFormat & AC_SRC_ALPHA)) { - SrcPixel.ul = DIB_GetSource(Source, SrcX, SrcY, ColorTranslation); - SrcPixel.col.red *= BlendFunc.SourceConstantAlpha / 255; - SrcPixel.col.green *= BlendFunc.SourceConstantAlpha / 255; - SrcPixel.col.blue *= BlendFunc.SourceConstantAlpha / 255; - Alpha = BlendFunc.SourceConstantAlpha ; + Alpha = BlendFunc.SourceConstantAlpha ; } else { - SrcPixel.ul = DIB_GetSourceIndex(Source, SrcX, SrcY); - SrcPixel.col.red *= BlendFunc.SourceConstantAlpha / 255; - SrcPixel.col.green *= BlendFunc.SourceConstantAlpha / 255; - SrcPixel.col.blue *= BlendFunc.SourceConstantAlpha / 255; - SrcPixel.col.alpha *= BlendFunc.SourceConstantAlpha / 255; - - Alpha = SrcPixel.col.alpha; - } - - DstPixel.col.red = (*Dst) * (255 - Alpha) / 255 + SrcPixel.col.red ; - DstPixel.col.green = *(Dst+1) * (255 - Alpha) / 255 + SrcPixel.col.green ; - DstPixel.col.blue = *(Dst+2) * (255 - Alpha) / 255 + SrcPixel.col.blue ; + Alpha = (SrcPixel.col.alpha * BlendFunc.SourceConstantAlpha) / 255; + } + + DstPixel.col.red = Clamp8((*Dst * (255 - Alpha)) / 255 + SrcPixel.col.red) ; + DstPixel.col.green = Clamp8((*(Dst+1) * (255 - Alpha) / 255 + SrcPixel.col.green)) ; + DstPixel.col.blue = Clamp8((*(Dst+2) * (255 - Alpha)) / 255 + SrcPixel.col.blue) ; *Dst++ = DstPixel.col.red; *Dst++ = DstPixel.col.green; *Dst++ = DstPixel.col.blue; Modified: branches/reactos-yarotows/subsystems/win32/win32k/dib/dib32bpp.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/subsystems/win… ============================================================================== --- branches/reactos-yarotows/subsystems/win32/win32k/dib/dib32bpp.c [iso-8859-1] (original) +++ branches/reactos-yarotows/subsystems/win32/win32k/dib/dib32bpp.c [iso-8859-1] Sun Aug 8 16:20:24 2010 @@ -392,21 +392,21 @@ while (++Cols <= DestRect->right - DestRect->left) { SrcPixel.ul = DIB_GetSource(Source, SrcX, SrcY, ColorTranslation); - SrcPixel.col.red *= BlendFunc.SourceConstantAlpha / 255; - SrcPixel.col.green *= BlendFunc.SourceConstantAlpha / 255; - SrcPixel.col.blue *= BlendFunc.SourceConstantAlpha / 255; + SrcPixel.col.red = (SrcPixel.col.red * BlendFunc.SourceConstantAlpha) / 255; + SrcPixel.col.green = (SrcPixel.col.green * BlendFunc.SourceConstantAlpha) / 255; + SrcPixel.col.blue = (SrcPixel.col.blue * BlendFunc.SourceConstantAlpha) / 255; SrcPixel.col.alpha = (32 == SrcBpp) ? - SrcPixel.col.alpha * BlendFunc.SourceConstantAlpha / 255 : + (SrcPixel.col.alpha * BlendFunc.SourceConstantAlpha) / 255 : BlendFunc.SourceConstantAlpha ; Alpha = ((BlendFunc.AlphaFormat & AC_SRC_ALPHA) != 0) ? SrcPixel.col.alpha : BlendFunc.SourceConstantAlpha ; DstPixel.ul = *Dst; - DstPixel.col.red = Clamp8(DstPixel.col.red * (255 - Alpha) / 255 + SrcPixel.col.red) ; - DstPixel.col.green = Clamp8(DstPixel.col.green * (255 - Alpha) / 255 + SrcPixel.col.green) ; - DstPixel.col.blue = Clamp8(DstPixel.col.blue * (255 - Alpha) / 255 + SrcPixel.col.blue) ; - DstPixel.col.alpha = Clamp8(DstPixel.col.alpha * (255 - Alpha) / 255 + SrcPixel.col.alpha) ; + DstPixel.col.red = Clamp8((DstPixel.col.red * (255 - Alpha)) / 255 + SrcPixel.col.red) ; + DstPixel.col.green = Clamp8((DstPixel.col.green * (255 - Alpha)) / 255 + SrcPixel.col.green) ; + DstPixel.col.blue = Clamp8((DstPixel.col.blue * (255 - Alpha)) / 255 + SrcPixel.col.blue) ; + DstPixel.col.alpha = Clamp8((DstPixel.col.alpha * (255 - Alpha)) / 255 + SrcPixel.col.alpha) ; *Dst++ = DstPixel.ul; SrcX = SourceRect->left + (Cols*(SourceRect->right - SourceRect->left))/(DestRect->right - DestRect->left); }

1 0

[fireball] 48487: [FASTFAT_NEW] - Implement close and cleanup infrastructure. - Add necessary FCB and VCB counters. - Add missing op and file locks initialization. - A lot of small cleanups, improvements, and other things, bringing fastfat_new much closer to a minimally working state.
by fireball＠svn.reactos.org 08 Aug '10

08 Aug '10

Author: fireball Date: Sun Aug 8 10:43:28 2010 New Revision: 48487 URL: http://svn.reactos.org/svn/reactos?rev=48487&view=rev Log: [FASTFAT_NEW] - Implement close and cleanup infrastructure. - Add necessary FCB and VCB counters. - Add missing op and file locks initialization. - A lot of small cleanups, improvements, and other things, bringing fastfat_new much closer to a minimally working state. Modified: trunk/reactos/drivers/filesystems/fastfat_new/cleanup.c trunk/reactos/drivers/filesystems/fastfat_new/close.c trunk/reactos/drivers/filesystems/fastfat_new/create.c trunk/reactos/drivers/filesystems/fastfat_new/dir.c trunk/reactos/drivers/filesystems/fastfat_new/fastfat.c trunk/reactos/drivers/filesystems/fastfat_new/fastfat.h trunk/reactos/drivers/filesystems/fastfat_new/fat.c trunk/reactos/drivers/filesystems/fastfat_new/fatstruc.h trunk/reactos/drivers/filesystems/fastfat_new/fcb.c trunk/reactos/drivers/filesystems/fastfat_new/volume.c Modified: trunk/reactos/drivers/filesystems/fastfat_new/cleanup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat_new/cleanup.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat_new/cleanup.c [iso-8859-1] Sun Aug 8 10:43:28 2010 @@ -13,13 +13,431 @@ /* FUNCTIONS ****************************************************************/ +/* Last handle to a file object is closed */ +NTSTATUS +NTAPI +FatiCleanup(PFAT_IRP_CONTEXT IrpContext, PIRP Irp) +{ + PIO_STACK_LOCATION IrpSp; + PFILE_OBJECT FileObject; + TYPE_OF_OPEN TypeOfOpen; + PSHARE_ACCESS ShareAccess; + BOOLEAN SendUnlockNotification = FALSE; + PLARGE_INTEGER TruncateSize = NULL; + //LARGE_INTEGER LocalTruncateSize; + BOOLEAN AcquiredVcb = FALSE, AcquiredFcb = FALSE; + NTSTATUS Status; + PVCB Vcb; + PFCB Fcb; + PCCB Ccb; + + IrpSp = IoGetCurrentIrpStackLocation( Irp ); + + DPRINT("FatiCleanup\n"); + DPRINT("\tIrp = %p\n", Irp); + DPRINT("\t->FileObject = %p\n", IrpSp->FileObject); + + FileObject = IrpSp->FileObject; + TypeOfOpen = FatDecodeFileObject(FileObject, &Vcb, &Fcb, &Ccb); + + if (TypeOfOpen == UnopenedFileObject) + { + DPRINT1("Unopened File Object\n"); + + FatCompleteRequest(IrpContext, Irp, STATUS_SUCCESS); + return STATUS_SUCCESS; + } + + if (FlagOn( FileObject->Flags, FO_CLEANUP_COMPLETE )) + { + /* Just flush the file */ + + if (FlagOn(Vcb->State, VCB_STATE_FLAG_DEFERRED_FLUSH) && + FlagOn(FileObject->Flags, FO_FILE_MODIFIED) && + !FlagOn(Vcb->State, VCB_STATE_FLAG_WRITE_PROTECTED) && + (TypeOfOpen == UserFileOpen)) + { + //Status = FatFlushFile(IrpContext, Fcb, Flush); + //if (!NT_SUCCESS(Status)) FatNormalizeAndRaiseStatus(IrpContext, Status); + UNIMPLEMENTED; + } + + FatCompleteRequest(IrpContext, Irp, STATUS_SUCCESS); + return STATUS_SUCCESS; + } + + if (TypeOfOpen == UserFileOpen || + TypeOfOpen == UserDirectoryOpen) + { + ASSERT(Fcb != NULL); + + (VOID)FatAcquireExclusiveFcb(IrpContext, Fcb); + + AcquiredFcb = TRUE; + + /* Set FCB flags according to DELETE_ON_CLOSE */ + if (FlagOn(Ccb->Flags, CCB_DELETE_ON_CLOSE)) + { + ASSERT(FatNodeType(Fcb) != FAT_NTC_ROOT_DCB); + + SetFlag(Fcb->State, FCB_STATE_DELETE_ON_CLOSE); + + /* Issue a notification */ + if (TypeOfOpen == UserDirectoryOpen) + { + FsRtlNotifyFullChangeDirectory(Vcb->NotifySync, + &Vcb->NotifyList, + FileObject->FsContext, + NULL, + FALSE, + FALSE, + 0, + NULL, + NULL, + NULL); + } + } + + /* If file should be deleted, acquire locks */ + if ((Fcb->UncleanCount == 1) && + FlagOn(Fcb->State, FCB_STATE_DELETE_ON_CLOSE) && + (Fcb->Condition != FcbBad) && + !FlagOn(Vcb->State, VCB_STATE_FLAG_WRITE_PROTECTED)) + { + FatReleaseFcb(IrpContext, Fcb); + AcquiredFcb = FALSE; + + (VOID)FatAcquireExclusiveVcb(IrpContext, Vcb); + AcquiredVcb = TRUE; + + (VOID)FatAcquireExclusiveFcb(IrpContext, Fcb); + AcquiredFcb = TRUE; + } + } + + /* Acquire VCB lock if it was a volume open */ + if (TypeOfOpen == UserVolumeOpen) + { + (VOID)FatAcquireExclusiveVcb(IrpContext, Vcb); + AcquiredVcb = TRUE; + } + + /* Cleanup all notifications */ + if (TypeOfOpen == UserDirectoryOpen) + { + FsRtlNotifyCleanup(Vcb->NotifySync, + &Vcb->NotifyList, + Ccb); + } + + if (Fcb) + { + //TODO: FatVerifyFcb + } + + switch (TypeOfOpen) + { + case DirectoryFile: + case VirtualVolumeFile: + DPRINT1("Cleanup VirtualVolumeFile/DirectoryFile\n"); + ShareAccess = NULL; + break; + + case UserVolumeOpen: + DPRINT("Cleanup UserVolumeOpen\n"); + + if (FlagOn(Ccb->Flags, CCB_COMPLETE_DISMOUNT)) + { + FatCheckForDismount( IrpContext, Vcb, TRUE ); + } else if (FileObject->WriteAccess && + FlagOn(FileObject->Flags, FO_FILE_MODIFIED)) + { + UNIMPLEMENTED; + } + + /* Release the volume and send notification */ + if (FlagOn(Vcb->State, VCB_STATE_FLAG_LOCKED) && + (Vcb->FileObjectWithVcbLocked == FileObject)) + { + UNIMPLEMENTED; + SendUnlockNotification = TRUE; + } + + ShareAccess = &Vcb->ShareAccess; + break; + + case EaFile: + DPRINT1("Cleanup EaFileObject\n"); + ShareAccess = NULL; + break; + + case UserDirectoryOpen: + DPRINT("Cleanup UserDirectoryOpen\n"); + + ShareAccess = &Fcb->ShareAccess; + + /* Should it be a delayed close? */ + if ((Fcb->UncleanCount == 1) && + (Fcb->OpenCount == 1) && + (Fcb->Dcb.DirectoryFileOpenCount == 0) && + !FlagOn(Fcb->State, FCB_STATE_DELETE_ON_CLOSE) && + Fcb->Condition == FcbGood) + { + /* Yes, a delayed one */ + SetFlag(Fcb->State, FCB_STATE_DELAY_CLOSE); + } + + if (VcbGood == Vcb->Condition) + { + //FatUpdateDirentFromFcb( IrpContext, FileObject, Fcb, Ccb ); + //TODO: Actually update dirent + } + + if ((Fcb->UncleanCount == 1) && + (FatNodeType(Fcb) == FAT_NTC_DCB) && + (FlagOn(Fcb->State, FCB_STATE_DELETE_ON_CLOSE)) && + (Fcb->Condition != FcbBad) && + !FlagOn(Vcb->State, VCB_STATE_FLAG_WRITE_PROTECTED)) + { + UNIMPLEMENTED; + } + + /* Decrement unclean counter */ + ASSERT(Fcb->UncleanCount != 0); + Fcb->UncleanCount--; + break; + + case UserFileOpen: + DPRINT("Cleanup UserFileOpen\n"); + + ShareAccess = &Fcb->ShareAccess; + + /* Should it be a delayed close? */ + if ((FileObject->SectionObjectPointer->DataSectionObject == NULL) && + (FileObject->SectionObjectPointer->ImageSectionObject == NULL) && + (Fcb->UncleanCount == 1) && + (Fcb->OpenCount == 1) && + !FlagOn(Fcb->State, FCB_STATE_DELETE_ON_CLOSE) && + Fcb->Condition == FcbGood) + { + /* Yes, a delayed one */ + SetFlag(Fcb->State, FCB_STATE_DELAY_CLOSE); + } + + /* Unlock all file locks */ + FsRtlFastUnlockAll(&Fcb->Fcb.Lock, + FileObject, + IoGetRequestorProcess(Irp), + NULL); + + if (Vcb->Condition == VcbGood) + { + if (Fcb->Condition != FcbBad) + { + //FatUpdateDirentFromFcb( IrpContext, FileObject, Fcb, Ccb ); + // TODO: Update on-disk structures + } + + if (Fcb->UncleanCount == 1 && + Fcb->Condition != FcbBad) + { + //DELETE_CONTEXT DeleteContext; + + /* Should this file be deleted on close? */ + if (FlagOn(Fcb->State, FCB_STATE_DELETE_ON_CLOSE) && + !FlagOn(Vcb->State, VCB_STATE_FLAG_WRITE_PROTECTED)) + { + UNIMPLEMENTED; + } + else + { + if (!FlagOn(Fcb->State, FCB_STATE_PAGEFILE) && + (Fcb->Header.ValidDataLength.LowPart < Fcb->Header.FileSize.LowPart)) + { +#if 0 + ULONG ValidDataLength; + + ValidDataLength = Fcb->Header.ValidDataLength.LowPart; + + if (ValidDataLength < Fcb->ValidDataToDisk) { + ValidDataLength = Fcb->ValidDataToDisk; + } + + if (ValidDataLength < Fcb->Header.FileSize.LowPart) + { + FatZeroData( IrpContext, + Vcb, + FileObject, + ValidDataLength, + Fcb->Header.FileSize.LowPart - + ValidDataLength ); + + Fcb->ValidDataToDisk = + Fcb->Header.ValidDataLength.LowPart = + Fcb->Header.FileSize.LowPart; + + if (CcIsFileCached(FileObject)) + { + CcSetFileSizes(FileObject, (PCC_FILE_SIZES)&Fcb->Header.AllocationSize); + } + } +#endif + DPRINT1("Zeroing out data is not implemented\n"); + } + } + + /* Should the file be truncated on close? */ + if (FlagOn(Fcb->State, FCB_STATE_TRUNCATE_ON_CLOSE)) + { + if (Vcb->Condition == VcbGood) + { + // TODO: Actually truncate the file allocation + UNIMPLEMENTED; + } + + /* Remove truncation flag */ + Fcb->State &= ~FCB_STATE_TRUNCATE_ON_CLOSE; + } + + /* Check again if it should be deleted */ + if (FlagOn(Fcb->State, FCB_STATE_DELETE_ON_CLOSE) && + Fcb->Header.AllocationSize.LowPart == 0) + { + UNIMPLEMENTED; + /*FatNotifyReportChange(IrpContext, + Vcb, + Fcb, + FILE_NOTIFY_CHANGE_FILE_NAME, + FILE_ACTION_REMOVED );*/ + } + + /* Remove the entry from the splay table if the file was deleted */ + if (FlagOn(Fcb->State, FCB_STATE_DELETE_ON_CLOSE)) + { + FatRemoveNames(IrpContext, Fcb); + } + } + } + + ASSERT(Fcb->UncleanCount != 0); + Fcb->UncleanCount--; + if (!FlagOn(FileObject->Flags, FO_CACHE_SUPPORTED)) + { + ASSERT(Fcb->NonCachedUncleanCount != 0); + Fcb->NonCachedUncleanCount--; + } + + if (FlagOn(FileObject->Flags, FO_CACHE_SUPPORTED) && + (Fcb->NonCachedUncleanCount != 0) && + (Fcb->NonCachedUncleanCount == Fcb->UncleanCount) && + (Fcb->SectionObjectPointers.DataSectionObject != NULL)) + { + CcFlushCache(&Fcb->SectionObjectPointers, NULL, 0, NULL); + + /* Acquire and release PagingIo to get in sync with lazy writer */ + ExAcquireResourceExclusiveLite(Fcb->Header.PagingIoResource, TRUE); + ExReleaseResourceLite(Fcb->Header.PagingIoResource); + + CcPurgeCacheSection(&Fcb->SectionObjectPointers, + NULL, + 0, + FALSE); + } + + if (Fcb->Condition == FcbBad) + { + //TruncateSize = &FatLargeZero; + UNIMPLEMENTED; + } + + /* Cleanup the cache map */ + CcUninitializeCacheMap(FileObject, TruncateSize, NULL); + break; + + default: + KeBugCheckEx(FAT_FILE_SYSTEM, __LINE__, (ULONG_PTR)TypeOfOpen, 0, 0); + } + + /* Cleanup the share access */ + + if (ShareAccess) + { + DPRINT("Cleaning up the share access\n"); + IoRemoveShareAccess(FileObject, ShareAccess); + } + + if (TypeOfOpen == UserFileOpen) + { + /* Update oplocks */ + FsRtlCheckOplock(&Fcb->Fcb.Oplock, + Irp, + IrpContext, + NULL, + NULL); + + Fcb->Header.IsFastIoPossible = FatIsFastIoPossible(Fcb); + } + + /* Set the FO_CLEANUP_COMPLETE flag */ + SetFlag(FileObject->Flags, FO_CLEANUP_COMPLETE); + + Status = STATUS_SUCCESS; + + // TODO: Unpin repinned BCBs + //FatUnpinRepinnedBcbs(IrpContext); + + /* Flush the volume if necessary */ + if (FlagOn(Vcb->State, VCB_STATE_FLAG_DEFERRED_FLUSH) && + !FlagOn(Vcb->State, VCB_STATE_FLAG_WRITE_PROTECTED)) + { + UNIMPLEMENTED; + } + + /* Cleanup */ + if (AcquiredFcb) FatReleaseFcb(IrpContext, Fcb); + if (AcquiredVcb) FatReleaseVcb(IrpContext, Vcb); + + /* Send volume notification */ + if (SendUnlockNotification) + FsRtlNotifyVolumeEvent(FileObject, FSRTL_VOLUME_UNLOCK); + + return Status; +} + NTSTATUS NTAPI FatCleanup(PDEVICE_OBJECT DeviceObject, PIRP Irp) { - DPRINT1("FatCleanup(DeviceObject %p, Irp %p)\n", DeviceObject, Irp); - - return STATUS_NOT_IMPLEMENTED; + PFAT_IRP_CONTEXT IrpContext; + NTSTATUS Status; + + DPRINT("FatCleanup(DeviceObject %p, Irp %p)\n", DeviceObject, Irp); + + /* FatCleanup works only with a volume device object */ + if (DeviceObject == FatGlobalData.DiskDeviceObject) + { + /* Complete the request and return success */ + Irp->IoStatus.Status = STATUS_SUCCESS; + Irp->IoStatus.Information = FILE_OPENED; + + IoCompleteRequest(Irp, IO_DISK_INCREMENT); + + return STATUS_SUCCESS; + } + + /* Enter FsRtl critical region */ + FsRtlEnterFileSystem(); + + /* Build an irp context */ + IrpContext = FatBuildIrpContext(Irp, TRUE); + + /* Call internal function */ + Status = FatiCleanup(IrpContext, Irp); + + /* Leave FsRtl critical region */ + FsRtlExitFileSystem(); + + return Status; } /* EOF */ Modified: trunk/reactos/drivers/filesystems/fastfat_new/close.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat_new/close.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat_new/close.c [iso-8859-1] Sun Aug 8 10:43:28 2010 @@ -15,11 +15,340 @@ NTSTATUS NTAPI +FatiCommonClose(IN PVCB Vcb, + IN PFCB Fcb, + IN PCCB Ccb, + IN TYPE_OF_OPEN TypeOfOpen, + IN BOOLEAN Wait, + OUT PBOOLEAN VcbDeleted) +{ + NTSTATUS Status; + PFCB ParentDcb; + BOOLEAN RecursiveClose, VcbDeletedLv = FALSE; + FAT_IRP_CONTEXT IrpContext; + + if (VcbDeleted) *VcbDeleted = FALSE; + + if (TypeOfOpen == UnopenedFileObject) + { + DPRINT1("Closing unopened file object\n"); + Status = STATUS_SUCCESS; + return Status; + } + + RtlZeroMemory(&IrpContext, sizeof(FAT_IRP_CONTEXT)); + + IrpContext.NodeTypeCode = FAT_NTC_IRP_CONTEXT; + IrpContext.NodeByteSize = sizeof(IrpContext); + IrpContext.MajorFunction = IRP_MJ_CLOSE; + + if (Wait) SetFlag(IrpContext.Flags, IRPCONTEXT_CANWAIT); + + if (!ExAcquireResourceExclusiveLite(&Vcb->Resource, Wait)) return STATUS_PENDING; + + if (Vcb->State & VCB_STATE_FLAG_CLOSE_IN_PROGRESS) + { + RecursiveClose = TRUE; + } + else + { + SetFlag(Vcb->State, VCB_STATE_FLAG_CLOSE_IN_PROGRESS); + RecursiveClose = FALSE; + + Vcb->OpenFileCount++; + } + + /* Update on-disk structures */ + switch (TypeOfOpen) + { + case VirtualVolumeFile: + DPRINT1("Close VirtualVolumeFile\n"); + + InterlockedDecrement((PLONG)&(Vcb->InternalOpenCount)); + InterlockedDecrement((PLONG)&(Vcb->ResidualOpenCount)); + + Status = STATUS_SUCCESS; + goto close_done; + break; + + case UserVolumeOpen: + DPRINT1("Close UserVolumeOpen\n"); + + Vcb->DirectAccessOpenCount--; + Vcb->OpenFileCount--; + if (FlagOn(Ccb->Flags, CCB_READ_ONLY)) Vcb->ReadOnlyCount--; + + FatDeleteCcb(&IrpContext, Ccb); + + Status = STATUS_SUCCESS; + goto close_done; + break; + + case EaFile: + UNIMPLEMENTED; + break; + + case DirectoryFile: + DPRINT1("Close DirectoryFile\n"); + + InterlockedDecrement((PLONG)&(Fcb->Dcb.DirectoryFileOpenCount)); + InterlockedDecrement((PLONG)&(Vcb->InternalOpenCount)); + + if (FatNodeType(Fcb) == FAT_NTC_ROOT_DCB) + { + InterlockedDecrement((PLONG)&(Vcb->ResidualOpenCount)); + } + + if (RecursiveClose) + { + Status = STATUS_SUCCESS; + goto close_done; + } + else + { + break; + } + + case UserDirectoryOpen: + case UserFileOpen: + DPRINT("Close UserFileOpen/UserDirectoryOpen\n"); + + if ((FatNodeType(Fcb) == FAT_NTC_DCB) && + IsListEmpty(&Fcb->Dcb.ParentDcbList) && + (Fcb->OpenCount == 1) && + (Fcb->Dcb.DirectoryFile != NULL)) + { + PFILE_OBJECT DirectoryFileObject = Fcb->Dcb.DirectoryFile; + + DPRINT1("Uninitialize the stream file object\n"); + + CcUninitializeCacheMap(DirectoryFileObject, NULL, NULL); + + Fcb->Dcb.DirectoryFile = NULL; + ObDereferenceObject(DirectoryFileObject); + } + + Fcb->OpenCount--; + Vcb->OpenFileCount--; + if (FlagOn(Ccb->Flags, CCB_READ_ONLY)) Vcb->ReadOnlyCount --; + + FatDeleteCcb(&IrpContext, Ccb); + break; + + default: + KeBugCheckEx(FAT_FILE_SYSTEM, __LINE__, (ULONG_PTR)TypeOfOpen, 0, 0); + } + + /* Update in-memory structures */ + if (((FatNodeType(Fcb) == FAT_NTC_FCB) && + (Fcb->OpenCount == 0)) + || + ((FatNodeType(Fcb) == FAT_NTC_DCB) && + (IsListEmpty(&Fcb->Dcb.ParentDcbList)) && + (Fcb->OpenCount == 0) && + (Fcb->Dcb.DirectoryFileOpenCount == 0))) + { + ParentDcb = Fcb->ParentFcb; + + SetFlag(Vcb->State, VCB_STATE_FLAG_DELETED_FCB); + + FatDeleteFcb(&IrpContext, Fcb); + + while ((FatNodeType(ParentDcb) == FAT_NTC_DCB) && + IsListEmpty(&ParentDcb->Dcb.ParentDcbList) && + (ParentDcb->OpenCount == 0) && + (ParentDcb->Dcb.DirectoryFile != NULL)) + { + PFILE_OBJECT DirectoryFileObject; + + DirectoryFileObject = ParentDcb->Dcb.DirectoryFile; + + DPRINT1("Uninitialize parent Stream Cache Map\n"); + + CcUninitializeCacheMap(DirectoryFileObject, NULL, NULL); + + ParentDcb->Dcb.DirectoryFile = NULL; + + ObDereferenceObject(DirectoryFileObject); + + if (ParentDcb->Dcb.DirectoryFileOpenCount == 0) + { + PFCB CurrentDcb; + + CurrentDcb = ParentDcb; + ParentDcb = CurrentDcb->ParentFcb; + + SetFlag(Vcb->State, VCB_STATE_FLAG_DELETED_FCB); + + FatDeleteFcb(&IrpContext, CurrentDcb); + } + else + { + break; + } + } + } + + Status = STATUS_SUCCESS; + +close_done: + /* Closing is done, check if VCB could be closed too */ + if (!RecursiveClose) + { + /* One open left - yes, VCB can go away */ + if (Vcb->OpenFileCount == 1 && + !FlagOn(Vcb->State, VCB_STATE_FLAG_DISMOUNT_IN_PROGRESS) + && VcbDeleted) + { + FatReleaseVcb(&IrpContext, Vcb ); + + SetFlag(IrpContext.Flags, IRPCONTEXT_CANWAIT); + + FatAcquireExclusiveGlobal(&IrpContext); + + FatAcquireExclusiveVcb(&IrpContext, Vcb); + + Vcb->OpenFileCount--; + + VcbDeletedLv = FatCheckForDismount(&IrpContext, Vcb, FALSE); + + FatReleaseGlobal(&IrpContext); + + if (VcbDeleted) *VcbDeleted = VcbDeletedLv; + } + else + { + /* Remove extra referenec */ + Vcb->OpenFileCount --; + } + + /* Clear recursion flag if necessary */ + if (!VcbDeletedLv) + { + ClearFlag(Vcb->State, VCB_STATE_FLAG_CLOSE_IN_PROGRESS); + } + } + + /* Release VCB if it wasn't deleted */ + if (!VcbDeletedLv) + FatReleaseVcb(&IrpContext, Vcb); + + return Status; +} + +NTSTATUS +NTAPI +FatiClose(IN PFAT_IRP_CONTEXT IrpContext, + IN PIRP Irp) +{ + PIO_STACK_LOCATION IrpSp; + TYPE_OF_OPEN TypeOfOpen; + PVCB Vcb; + PFCB Fcb; + PCCB Ccb; + BOOLEAN TopLevel, Wait, VcbDeleted = FALSE; + NTSTATUS Status; + PCLOSE_CONTEXT CloseContext = NULL; + + TopLevel = FatIsTopLevelIrp(Irp); + + /* Get current IRP stack location */ + IrpSp = IoGetCurrentIrpStackLocation(Irp); + + /* Decode incoming file object */ + TypeOfOpen = FatDecodeFileObject(IrpSp->FileObject, &Vcb, &Fcb, &Ccb); + + /* Set CCB read only flag */ + if (Ccb && IsFileObjectReadOnly(IrpSp->FileObject)) + SetFlag(Ccb->Flags, CCB_READ_ONLY); + + /* It's possible to wait only if we are top level or not a system process */ + Wait = TopLevel && (PsGetCurrentProcess() != FatGlobalData.SystemProcess); + + /* Call the common handler */ + Status = FatiCommonClose(Vcb, Fcb, Ccb, TypeOfOpen, Wait, &VcbDeleted); + + if (((TypeOfOpen == UserFileOpen || + TypeOfOpen == UserDirectoryOpen) && + (Fcb->State & FCB_STATE_DELAY_CLOSE) && + !FatGlobalData.ShutdownStarted) || + Status == STATUS_PENDING) + { + DPRINT1("TODO: Queue a pending close request\n"); + } + else + { + /* Close finished right away */ + if (TypeOfOpen == VirtualVolumeFile || + TypeOfOpen == DirectoryFile || + TypeOfOpen == EaFile) + { + if (TypeOfOpen == VirtualVolumeFile) + { + /* Free close context for the not deleted VCB */ + if (!VcbDeleted) + { + CloseContext = Vcb->CloseContext; + Vcb->CloseContext = NULL; + + ASSERT(CloseContext != NULL); + } + } + else + { + //CloseContext = FatAllocateCloseContext(Vcb); + DPRINT1("TODO: Allocate close context!\n"); + ASSERT(CloseContext != NULL); + } + + /* Free close context */ + if (CloseContext) ExFreePool(CloseContext); + } + } + + /* Complete the request */ + FatCompleteRequest(NULL, Irp, Status); + + /* Reset the top level IRP if necessary */ + if (TopLevel) IoSetTopLevelIrp(NULL); + + return Status; +} + +NTSTATUS +NTAPI FatClose(PDEVICE_OBJECT DeviceObject, PIRP Irp) { - DPRINT1("FatClose(DeviceObject %p, Irp %p)\n", DeviceObject, Irp); - - return STATUS_NOT_IMPLEMENTED; + PFAT_IRP_CONTEXT IrpContext; + NTSTATUS Status; + + DPRINT("FatClose(DeviceObject %p, Irp %p)\n", DeviceObject, Irp); + + /* FatClose works only with a volume device object */ + if (DeviceObject == FatGlobalData.DiskDeviceObject) + { + /* Complete the request and return success */ + Irp->IoStatus.Status = STATUS_SUCCESS; + Irp->IoStatus.Information = FILE_OPENED; + + IoCompleteRequest(Irp, IO_DISK_INCREMENT); + + return STATUS_SUCCESS; + } + + /* Enter FsRtl critical region */ + FsRtlEnterFileSystem(); + + /* Build an irp context */ + IrpContext = FatBuildIrpContext(Irp, TRUE); + + /* Call internal function */ + Status = FatiClose(IrpContext, Irp); + + /* Leave FsRtl critical region */ + FsRtlExitFileSystem(); + + return Status; } /* EOF */ Modified: trunk/reactos/drivers/filesystems/fastfat_new/create.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat_new/create.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat_new/create.c [iso-8859-1] Sun Aug 8 10:43:28 2010 @@ -72,7 +72,9 @@ /* Increment counters */ Dcb->OpenCount++; + Dcb->UncleanCount++; Vcb->OpenFileCount++; + if (IsFileObjectReadOnly(FileObject)) Vcb->ReadOnlyCount++; /* Set success statuses */ Iosb.Status = STATUS_SUCCESS; @@ -186,7 +188,7 @@ CcSetFileSizes(FileObject, (PCC_FILE_SIZES)&Fcb->Header.AllocationSize); // TODO: Actually truncate the file - DPRINT1("TODO: Actually truncate the file with a fullfat handle %x\n", Fcb->FatHandle); + DPRINT1("TODO: Actually truncate file '%wZ' with a fullfat handle %x\n", &Fcb->FullFileName, Fcb->FatHandle); /* Release the paging resource */ ExReleaseResourceLite(Fcb->Header.PagingIoResource); @@ -287,6 +289,12 @@ UserDirectoryOpen, Fcb, FatCreateCcb()); + + /* Increase counters */ + Fcb->UncleanCount++; + Fcb->OpenCount++; + Vcb->OpenFileCount++; + if (IsFileObjectReadOnly(FileObject)) Vcb->ReadOnlyCount++; Iosb.Status = STATUS_SUCCESS; Iosb.Information = FILE_OPENED; @@ -319,6 +327,7 @@ PFCB Fcb; NTSTATUS Status; FF_FILE *FileHandle; + FF_ERROR FfError; /* Check for create file option and fail */ if (CreateDisposition == FILE_CREATE) @@ -341,20 +350,22 @@ } /* Open the file with FullFAT */ - FileHandle = FF_Open(Vcb->Ioman, AnsiName.Buffer, FF_MODE_READ, NULL); + FileHandle = FF_Open(Vcb->Ioman, AnsiName.Buffer, FF_MODE_READ, &FfError); if (!FileHandle) { + DPRINT1("Failed to open file '%s', error %ld\n", AnsiName.Buffer, FfError); Iosb.Status = STATUS_OBJECT_NAME_NOT_FOUND; // FIXME: A shortcut for now return Iosb; } + DPRINT1("Succeeded opening file '%s'\n", AnsiName.Buffer); /* Create a new FCB for this file */ Fcb = FatCreateFcb(IrpContext, Vcb, ParentDcb, FileHandle); // TODO: Check if overwrite is needed - // This is usual file open branch, without overwriting! + // TODO: This is usual file open branch, without overwriting! /* Set context and section object pointers */ FatSetFileObject(FileObject, UserFileOpen, @@ -364,6 +375,13 @@ Iosb.Status = STATUS_SUCCESS; Iosb.Information = FILE_OPENED; + + + /* Increase counters */ + Fcb->UncleanCount++; + Fcb->OpenCount++; + if (FlagOn(FileObject->Flags, FO_NO_INTERMEDIATE_BUFFERING)) Fcb->NonCachedUncleanCount++; + if (IsFileObjectReadOnly(FileObject)) Vcb->ReadOnlyCount++; return Iosb; } @@ -397,7 +415,7 @@ // and opened handles count is not 0 //if (!FlagOn(ShareAccess, FILE_SHARE_READ) - DPRINT1("Exclusive voume open\n"); + DPRINT1("Exclusive volume open\n"); // TODO: Flush the volume VolumeFlushed = TRUE; @@ -450,6 +468,7 @@ /* Increase direct open count */ Vcb->DirectOpenCount++; Vcb->OpenFileCount++; + if (IsFileObjectReadOnly(FileObject)) Vcb->ReadOnlyCount++; /* Set no buffering flag */ FileObject->Flags |= FO_NO_INTERMEDIATE_BUFFERING; @@ -720,7 +739,7 @@ /* Set parent DCB */ ParentDcb = RelatedDcb; - DPRINT1("Opening file '%wZ' relatively to '%wZ'\n", &FileName, &ParentDcb->FullFileName); + DPRINT("Opening file '%wZ' relatively to '%wZ'\n", &FileName, &ParentDcb->FullFileName); } else { @@ -1137,6 +1156,12 @@ DeleteOnClose, OpenedAsDos); + /* In case of success set cache supported flag */ + if (NT_SUCCESS(Iosb.Status) && !NoIntermediateBuffering) + { + SetFlag(FileObject->Flags, FO_CACHE_SUPPORTED); + } + Irp->IoStatus.Information = Iosb.Information; /* Unlock VCB */ Modified: trunk/reactos/drivers/filesystems/fastfat_new/dir.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat_new/dir.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat_new/dir.c [iso-8859-1] Sun Aug 8 10:43:28 2010 @@ -81,9 +81,6 @@ /* Initialize advanced FCB header fields */ ExInitializeFastMutex(&Dcb->HeaderMutex); FsRtlSetupAdvancedHeader(&Dcb->Header, &Dcb->HeaderMutex); - - /* Initialize MCB */ - FsRtlInitializeLargeMcb(&Dcb->Mcb, NonPagedPool); /* Set up first cluster field depending on FAT type */ if (TRUE/*FatIsFat32(Vcb)*/) Modified: trunk/reactos/drivers/filesystems/fastfat_new/fastfat.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat_new/fastfat.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat_new/fastfat.c [iso-8859-1] Sun Aug 8 10:43:28 2010 @@ -42,6 +42,7 @@ RtlZeroMemory(&FatGlobalData, sizeof(FAT_GLOBAL_DATA)); FatGlobalData.DriverObject = DriverObject; FatGlobalData.DiskDeviceObject = DeviceObject; + FatGlobalData.SystemProcess = PsGetCurrentProcess(); /* Fill major function handlers */ DriverObject->MajorFunction[IRP_MJ_CLOSE] = FatClose; @@ -317,7 +318,7 @@ TypeOfOpen = (*Ccb == NULL ? DirectoryFile : UserDirectoryOpen); - DPRINT1("Referencing a directory: %wZ\n", &(*FcbOrDcb)->FullFileName); + DPRINT("Referencing a directory: %wZ\n", &(*FcbOrDcb)->FullFileName); break; /* File */ @@ -510,4 +511,17 @@ return MmGetSystemAddressForMdlSafe(Irp->MdlAddress, NormalPagePriority); } +BOOLEAN +NTAPI +FatIsTopLevelIrp(IN PIRP Irp) +{ + if (!IoGetTopLevelIrp()) + { + IoSetTopLevelIrp(Irp); + return TRUE; + } + + return FALSE; +} + /* EOF */ Modified: trunk/reactos/drivers/filesystems/fastfat_new/fastfat.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat_new/fastfat.h [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat_new/fastfat.h [iso-8859-1] Sun Aug 8 10:43:28 2010 @@ -36,6 +36,22 @@ ExReleaseResourceLite(&(FatGlobalData.Resource)); \ } +#define FatIsFastIoPossible(FCB) ((BOOLEAN) \ + (((FCB)->Condition != FcbGood || !FsRtlOplockIsFastIoPossible(&(FCB)->Fcb.Oplock)) ? \ + FastIoIsNotPossible \ + : \ + (!FsRtlAreThereCurrentFileLocks(&(FCB)->Fcb.Lock) && \ + ((FCB)->OutstandingAsyncWrites == 0) && \ + !FlagOn((FCB)->Vcb->State, VCB_STATE_FLAG_WRITE_PROTECTED) ? \ + FastIoIsPossible \ + : \ + FastIoIsQuestionable \ + ) \ + ) \ +) + +#define IsFileObjectReadOnly(FO) (!((FO)->WriteAccess | (FO)->DeleteAccess)) + NTSYSAPI NTSTATUS NTAPI @@ -66,6 +82,12 @@ ULONG ByteSize, PBCB *Bcb, PVOID *Buffer); + +BOOLEAN +NTAPI +FatCheckForDismount(IN PFAT_IRP_CONTEXT IrpContext, + PVCB Vcb, + IN BOOLEAN Force); /* ----------------------------------------------------------- dir.c */ @@ -205,6 +227,9 @@ PVOID FASTCALL FatMapUserBuffer(PIRP Irp); +BOOLEAN NTAPI +FatIsTopLevelIrp(IN PIRP Irp); + /* --------------------------------------------------------- fullfat.c */ FF_T_SINT32 @@ -283,6 +308,10 @@ IN PVCB Vcb, IN PFCB ParentDcb, IN FF_FILE *FileHandle); + +VOID NTAPI +FatDeleteFcb(IN PFAT_IRP_CONTEXT IrpContext, + IN PFCB Fcb); IO_STATUS_BLOCK NTAPI FatiOpenExistingFcb(IN PFAT_IRP_CONTEXT IrpContext, @@ -320,6 +349,10 @@ FatCreateCcb(); VOID NTAPI +FatDeleteCcb(IN PFAT_IRP_CONTEXT IrpContext, + IN PCCB Ccb); + +VOID NTAPI FatSetFullNameInFcb(PFCB Fcb, PUNICODE_STRING Name); Modified: trunk/reactos/drivers/filesystems/fastfat_new/fat.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat_new/fat.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat_new/fat.c [iso-8859-1] Sun Aug 8 10:43:28 2010 @@ -201,6 +201,10 @@ goto FatInitializeVcbCleanup; } + /* Increase internal / residual open counter */ + InterlockedIncrement((PLONG)&(Vcb->InternalOpenCount)); + InterlockedIncrement((PLONG)&(Vcb->ResidualOpenCount)); + /* Set up notifications */ FsRtlNotifyInitializeSync(&Vcb->NotifySync); InitializeListHead(&Vcb->NotifyList); Modified: trunk/reactos/drivers/filesystems/fastfat_new/fatstruc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat_new/fatstruc.h [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat_new/fatstruc.h [iso-8859-1] Sun Aug 8 10:43:28 2010 @@ -14,15 +14,17 @@ #define FatNodeType(Ptr) (*((PFAT_NODE_TYPE)(Ptr))) /* Node type codes */ -#define FAT_NTC_VCB (CSHORT) '00VF' -#define FAT_NTC_FCB (CSHORT) 'CF' -#define FAT_NTC_DCB (CSHORT) 'DF' -#define FAT_NTC_ROOT_DCB (CSHORT) 'RFD' -#define FAT_NTC_CCB (CSHORT) 'BCC' +#define FAT_NTC_VCB (CSHORT) '00VF' +#define FAT_NTC_FCB (CSHORT) 'CF' +#define FAT_NTC_DCB (CSHORT) 'DF' +#define FAT_NTC_ROOT_DCB (CSHORT) 'RFD' +#define FAT_NTC_CCB (CSHORT) 'BCC' +#define FAT_NTC_IRP_CONTEXT (CSHORT) 'PRI' typedef struct _FAT_GLOBAL_DATA { ERESOURCE Resource; + PEPROCESS SystemProcess; PDRIVER_OBJECT DriverObject; PDEVICE_OBJECT DiskDeviceObject; LIST_ENTRY VcbListHead; @@ -33,6 +35,7 @@ CACHE_MANAGER_CALLBACKS CacheMgrCallbacks; CACHE_MANAGER_CALLBACKS CacheMgrNoopCallbacks; BOOLEAN Win31FileSystem; + BOOLEAN ShutdownStarted; /* Jan 1, 1980 System Time */ LARGE_INTEGER DefaultFileTime; @@ -82,6 +85,10 @@ typedef struct _FAT_IRP_CONTEXT { + /* Type and size of this record (must be FAT_NTC_IRP_CONTEXT) */ + FAT_NODE_TYPE NodeTypeCode; + CSHORT NodeByteSize; + PIRP Irp; PDEVICE_OBJECT DeviceObject; UCHAR MajorFunction; @@ -132,10 +139,15 @@ PFAT_SETFAT_VALUE_RUN_ROUTINE SetValueRun; } FAT_METHODS, *PFAT_METHODS; -#define VCB_STATE_FLAG_LOCKED 0x01 -#define VCB_STATE_FLAG_DIRTY 0x02 -#define VCB_STATE_MOUNTED_DIRTY 0x04 -#define VCB_STATE_CREATE_IN_PROGRESS 0x08 +#define VCB_STATE_FLAG_LOCKED 0x001 +#define VCB_STATE_FLAG_DIRTY 0x002 +#define VCB_STATE_MOUNTED_DIRTY 0x004 +#define VCB_STATE_CREATE_IN_PROGRESS 0x008 +#define VCB_STATE_FLAG_CLOSE_IN_PROGRESS 0x010 +#define VCB_STATE_FLAG_DELETED_FCB 0x020 +#define VCB_STATE_FLAG_DISMOUNT_IN_PROGRESS 0x040 +#define VCB_STATE_FLAG_DEFERRED_FLUSH 0x080 +#define VCB_STATE_FLAG_WRITE_PROTECTED 0x100 typedef enum _VCB_CONDITION { @@ -158,10 +170,11 @@ ULONG State; VCB_CONDITION Condition; ERESOURCE Resource; + struct _CLOSE_CONTEXT *CloseContext; /* Direct volume access */ - ULONG DirectOpenCount; SHARE_ACCESS ShareAccess; + PFILE_OBJECT FileObjectWithVcbLocked; /* Notifications support */ PNOTIFY_SYNC NotifySync; @@ -186,8 +199,13 @@ struct _FCB *RootDcb; /* Counters */ + ULONG DirectOpenCount; + ULONG OpenFileCount; + ULONG ReadOnlyCount; + ULONG InternalOpenCount; + ULONG ResidualOpenCount; + ULONG DirectAccessOpenCount; ULONG MediaChangeCount; - ULONG OpenFileCount; /* FullFAT integration */ FF_IOMAN *Ioman; @@ -252,6 +270,7 @@ #define FCB_STATE_PAGEFILE 0x04 #define FCB_STATE_DELAY_CLOSE 0x08 #define FCB_STATE_TRUNCATE_ON_CLOSE 0x10 +#define FCB_STATE_DELETE_ON_CLOSE 0x20 typedef struct _FCB { @@ -281,8 +300,6 @@ FCB_CONDITION Condition; /* Share access */ SHARE_ACCESS ShareAccess; - /* Mcb mapping Vbo->Lbo */ - LARGE_MCB Mcb; ULONG FirstCluster; /* Links into FCB Tree */ FCB_NAME_LINK ShortName; @@ -307,6 +324,8 @@ PKEVENT OutstandingAsyncEvent; /* Counters */ ULONG OpenCount; + ULONG UncleanCount; + ULONG NonCachedUncleanCount; union { struct @@ -318,10 +337,11 @@ struct { - /* A list of all FCBs/DCBs opened under this DCB */ - LIST_ENTRY ParentDcbList; + LIST_ENTRY ParentDcbList; /* A list of all FCBs/DCBs opened under this DCB */ + ULONG DirectoryFileOpenCount; /* Sector-based access to the dir */ + PFILE_OBJECT DirectoryFile; /* Directory data stream (just handy to have it). */ - PFILE_OBJECT StreamFileObject; + //PFILE_OBJECT StreamFileObject; /* Bitmap to search for free dirents. */ RTL_BITMAP FreeBitmap; /* Names */ @@ -390,6 +410,17 @@ EaFile } TYPE_OF_OPEN; +typedef struct _CLOSE_CONTEXT +{ + LIST_ENTRY GlobalLinks; + LIST_ENTRY VcbLinks; + + PVCB Vcb; + PFCB Fcb; + TYPE_OF_OPEN TypeOfOpen; + BOOLEAN Free; +} CLOSE_CONTEXT, *PCLOSE_CONTEXT; + typedef enum _FILE_TIME_INDEX { FileCreationTime = 0, @@ -402,4 +433,8 @@ #define CCB_SEARCH_PATTERN_LEGAL_8DOT3 0x02 #define CCB_SEARCH_PATTERN_HAS_WILD_CARD 0x04 #define CCB_DASD_IO 0x10 +#define CCB_READ_ONLY 0x20 +#define CCB_DELETE_ON_CLOSE 0x40 +#define CCB_COMPLETE_DISMOUNT 0x80 + extern FAT_GLOBAL_DATA FatGlobalData; Modified: trunk/reactos/drivers/filesystems/fastfat_new/fcb.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat_new/fcb.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat_new/fcb.c [iso-8859-1] Sun Aug 8 10:43:28 2010 @@ -149,10 +149,72 @@ Fcb->Header.ValidDataLength.LowPart = FileHandle->Filesize; Fcb->FatHandle = FileHandle; + /* Initialize locks */ + FsRtlInitializeFileLock(&Fcb->Fcb.Lock, NULL, NULL); + FsRtlInitializeOplock(&Fcb->Fcb.Oplock); + /* Set names */ FatSetFcbNames(IrpContext, Fcb); return Fcb; +} + +VOID +NTAPI +FatDeleteFcb(IN PFAT_IRP_CONTEXT IrpContext, + IN PFCB Fcb) +{ + DPRINT("FatDeleteFcb %p\n", Fcb); + + if (Fcb->OpenCount != 0) + { + DPRINT1("Trying to delete FCB with OpenCount %d\n", Fcb->OpenCount); + ASSERT(FALSE); + } + + if ((Fcb->Header.NodeTypeCode == FAT_NTC_DCB) || + (Fcb->Header.NodeTypeCode == FAT_NTC_ROOT_DCB)) + { + /* Make sure it's a valid deletion */ + ASSERT(Fcb->Dcb.DirectoryFileOpenCount == 0); + ASSERT(IsListEmpty(&Fcb->Dcb.ParentDcbList)); + ASSERT(Fcb->Dcb.DirectoryFile == NULL); + } + else + { + /* Free locks */ + FsRtlUninitializeFileLock(&Fcb->Fcb.Lock); + FsRtlUninitializeOplock(&Fcb->Fcb.Oplock); + } + + /* Release any possible filter contexts */ + FsRtlTeardownPerStreamContexts(&Fcb->Header); + + /* Remove from parents queue */ + if (Fcb->Header.NodeTypeCode != FAT_NTC_ROOT_DCB) + { + RemoveEntryList(&(Fcb->ParentDcbLinks)); + } + + /* Free FullFAT handle */ + if (Fcb->FatHandle) FF_Close(Fcb->FatHandle); + + /* Remove from the splay table */ + if (FlagOn(Fcb->State, FCB_STATE_HAS_NAMES)) + FatRemoveNames(IrpContext, Fcb); + + /* Free file name buffers */ + if (Fcb->Header.NodeTypeCode != FAT_NTC_ROOT_DCB) + { + if (Fcb->FullFileName.Buffer) + ExFreePool(Fcb->FullFileName.Buffer); + } + + if (Fcb->ExactCaseLongName.Buffer) + ExFreePool(Fcb->ExactCaseLongName.Buffer); + + /* Free this FCB, finally */ + ExFreePool(Fcb); } PCCB @@ -170,6 +232,17 @@ Ccb->NodeByteSize = sizeof(CCB); return Ccb; +} + +VOID +NTAPI +FatDeleteCcb(IN PFAT_IRP_CONTEXT IrpContext, + IN PCCB Ccb) +{ + // TODO: Deallocate CCB strings, if any + + /* Free the CCB */ + ExFreePool(Ccb); } IO_STATUS_BLOCK @@ -443,8 +516,11 @@ ClearFlag(Fcb->State, FCB_STATE_DELAY_CLOSE); /* Increase counters */ + Fcb->UncleanCount++; Fcb->OpenCount++; Vcb->OpenFileCount++; + if (IsFileObjectReadOnly(FileObject)) Vcb->ReadOnlyCount++; + if (FlagOn(FileObject->Flags, FO_NO_INTERMEDIATE_BUFFERING)) Fcb->NonCachedUncleanCount++; // TODO: Handle DeleteOnClose and OpenedAsDos by storing those flags in CCB } Modified: trunk/reactos/drivers/filesystems/fastfat_new/volume.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat_new/volume.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat_new/volume.c [iso-8859-1] Sun Aug 8 10:43:28 2010 @@ -8,7 +8,7 @@ /* INCLUDES *****************************************************************/ -//#define NDEBUG +#define NDEBUG #include "fastfat.h" /* FUNCTIONS ****************************************************************/ @@ -77,8 +77,8 @@ Buffer->SectorsPerAllocationUnit = Vcb->Bpb.SectorsPerCluster; Buffer->BytesPerSector = Vcb->Bpb.BytesPerSector; - DPRINT1("Total %d, free %d, SPC %d, BPS %d\n", Partition->FreeClusterCount, - Partition->NumClusters, Vcb->Bpb.SectorsPerCluster, Vcb->Bpb.BytesPerSector); + DPRINT1("Total %d, free %d, SPC %d, BPS %d\n", Partition->NumClusters, + Partition->FreeClusterCount, Vcb->Bpb.SectorsPerCluster, Vcb->Bpb.BytesPerSector); return Status; } @@ -228,4 +228,14 @@ } } +BOOLEAN +NTAPI +FatCheckForDismount(IN PFAT_IRP_CONTEXT IrpContext, + PVCB Vcb, + IN BOOLEAN Force) +{ + /* We never allow deletion of a volume for now */ + return FALSE; +} + /* EOF */

1 0

[fireball] 48486: Pierre Schweitzer - Implemented CdfsIsNameLegalDOS8Dot3 and use it to check filenames. It avoids calling Rtl* functions that need NLS. (Modified merge of 35501). See issue #2404 for more details.
by fireball＠svn.reactos.org 08 Aug '10

08 Aug '10

Author: fireball Date: Sun Aug 8 08:24:19 2010 New Revision: 48486 URL: http://svn.reactos.org/svn/reactos?rev=48486&view=rev Log: Pierre Schweitzer - Implemented CdfsIsNameLegalDOS8Dot3 and use it to check filenames. It avoids calling Rtl* functions that need NLS. (Modified merge of 35501). See issue #2404 for more details. Modified: trunk/reactos/drivers/filesystems/cdfs/misc.c Modified: trunk/reactos/drivers/filesystems/cdfs/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/cdfs/m… ============================================================================== --- trunk/reactos/drivers/filesystems/cdfs/misc.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/cdfs/misc.c [iso-8859-1] Sun Aug 8 08:24:19 2010 @@ -95,6 +95,40 @@ ((Fcb->Entry.FileFlags & FILE_FLAG_READONLY) ? FILE_ATTRIBUTE_READONLY : 0); } +BOOLEAN +CdfsIsNameLegalDOS8Dot3(IN PUNICODE_STRING FileName + ) +{ + ULONG i; + STRING DbcsName; + CHAR DbcsNameBuffer[12]; + + for (i = 0; i < FileName->Length / sizeof(WCHAR) ; i++) + { + /* Don't allow spaces in FileName */ + if (FileName->Buffer[i] == L' ') + return FALSE; + } +#if 0 + /* If FileName is finishing with a dot, remove it */ + if (FileName->Buffer[FileName->Length / sizeof(WCHAR) - 1] == '.') + { + FileName->Length -= sizeof(WCHAR); + } +#endif + /* Finally, convert the string to call the FsRtl function */ + DbcsName.MaximumLength = 12; + DbcsName.Buffer = DbcsNameBuffer; + if (!NT_SUCCESS(RtlUnicodeStringToCountedOemString(&DbcsName, + FileName, + FALSE ))) + { + + return FALSE; + } + return FsRtlIsFatDbcsLegal(DbcsName, FALSE, FALSE, FALSE); +} + VOID CdfsShortNameCacheGet (PFCB DirectoryFcb, @@ -102,7 +136,6 @@ PUNICODE_STRING LongName, PUNICODE_STRING ShortName) { - BOOLEAN HasSpaces; PLIST_ENTRY Entry; PCDFS_SHORT_NAME ShortNameEntry; GENERATE_NAME_CONTEXT Context = { 0 }; @@ -132,8 +165,7 @@ } /* Cache miss */ - if ((RtlIsNameLegalDOS8Dot3(LongName, NULL, &HasSpaces) == FALSE) || - (HasSpaces == TRUE)) + if (!CdfsIsNameLegalDOS8Dot3(LongName)) { RtlGenerate8dot3Name(LongName, FALSE, &Context, ShortName); }

1 0

[tkreuzer] 48485: [WIN32K] Fix a bug when premultiplying the color values: The / operator has a higher precedence than *=, so "x *= byte / 0xff", is always 0 unless byte == 0xff.
by tkreuzer＠svn.reactos.org 08 Aug '10

08 Aug '10

Author: tkreuzer Date: Sun Aug 8 07:14:11 2010 New Revision: 48485 URL: http://svn.reactos.org/svn/reactos?rev=48485&view=rev Log: [WIN32K] Fix a bug when premultiplying the color values: The / operator has a higher precedence than *=, so "x *= byte / 0xff", is always 0 unless byte == 0xff. Modified: branches/reactos-yarotows/subsystems/win32/win32k/ntuser/cursoricon.c Modified: branches/reactos-yarotows/subsystems/win32/win32k/ntuser/cursoricon.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/subsystems/win… ============================================================================== --- branches/reactos-yarotows/subsystems/win32/win32k/ntuser/cursoricon.c [iso-8859-1] (original) +++ branches/reactos-yarotows/subsystems/win32/win32k/ntuser/cursoricon.c [iso-8859-1] Sun Aug 8 07:14:11 2010 @@ -1352,9 +1352,9 @@ for (j = 0; j < psurf->SurfObj.sizlBitmap.cx; j++) { Alpha = ptr[3]; - ptr[0] *= Alpha / 0xff; - ptr[1] *= Alpha / 0xff; - ptr[2] *= Alpha / 0xff; + ptr[0] = (ptr[0] * Alpha) / 0xff; + ptr[1] = (ptr[1] * Alpha) / 0xff; + ptr[2] = (ptr[2] * Alpha) / 0xff; ptr += 4; }

1 0

[tkreuzer] 48484: [TASKMGR] - Use messages instead of events to notify the update threads - Fixes a handle leak - Fix some typos - Patch by Carlo Bramini (carlo.bramix at libero dot it) See issue #3104 for more details.
by tkreuzer＠svn.reactos.org 08 Aug '10

08 Aug '10

Author: tkreuzer Date: Sun Aug 8 03:41:33 2010 New Revision: 48484 URL: http://svn.reactos.org/svn/reactos?rev=48484&view=rev Log: [TASKMGR] - Use messages instead of events to notify the update threads - Fixes a handle leak - Fix some typos - Patch by Carlo Bramini (carlo.bramix at libero dot it) See issue #3104 for more details. Modified: trunk/reactos/base/applications/taskmgr/applpage.c trunk/reactos/base/applications/taskmgr/debug.c trunk/reactos/base/applications/taskmgr/endproc.c trunk/reactos/base/applications/taskmgr/graph.c trunk/reactos/base/applications/taskmgr/graphctl.c trunk/reactos/base/applications/taskmgr/graphctl.h trunk/reactos/base/applications/taskmgr/optnmenu.c trunk/reactos/base/applications/taskmgr/perfdata.c trunk/reactos/base/applications/taskmgr/perfpage.c trunk/reactos/base/applications/taskmgr/procpage.c trunk/reactos/base/applications/taskmgr/taskmgr.c trunk/reactos/base/applications/taskmgr/taskmgr.h Modified: trunk/reactos/base/applications/taskmgr/applpage.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… ============================================================================== --- trunk/reactos/base/applications/taskmgr/applpage.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/taskmgr/applpage.c [iso-8859-1] Sun Aug 8 03:41:33 2010 @@ -38,7 +38,6 @@ HWND hApplicationPageNewTaskButton; /* Application New Task button */ static int nApplicationPageWidth; static int nApplicationPageHeight; -static HANDLE hApplicationPageEvent = NULL; /* When this event becomes signaled then we refresh the app list */ static BOOL bSortAscending = TRUE; DWORD WINAPI ApplicationPageRefreshThread(void *lpParameter); BOOL noApps; @@ -51,6 +50,11 @@ int CALLBACK ApplicationPageCompareFunc(LPARAM lParam1, LPARAM lParam2, LPARAM lParamSort); int ProcGetIndexByProcessId(DWORD dwProcessId); +#ifdef RUN_APPS_PAGE +static HANDLE hApplicationThread = NULL; +static DWORD dwApplicationThread; +#endif + #if 0 void SwitchToThisWindow ( HWND hWnd, /* Handle to the window that should be activated */ @@ -92,7 +96,6 @@ LV_COLUMN column; WCHAR szTemp[256]; int cx, cy; - HANDLE hRefreshThread = NULL; switch (message) { case WM_INITDIALOG: @@ -132,15 +135,16 @@ UpdateApplicationListControlViewSetting(); /* Start our refresh thread */ - hRefreshThread = CreateThread(NULL, 0, ApplicationPageRefreshThread, NULL, 0, NULL); - +#ifdef RUN_APPS_PAGE + hApplicationThread = CreateThread(NULL, 0, ApplicationPageRefreshThread, NULL, 0, &dwApplicationThread); +#endif return TRUE; case WM_DESTROY: - /* Close the event handle, this will make the */ - /* refresh thread exit when the wait fails */ - CloseHandle(hApplicationPageEvent); - CloseHandle(hRefreshThread); + /* Close refresh thread */ +#ifdef RUN_APPS_PAGE + EndLocalThread(&hApplicationThread, dwApplicationThread); +#endif break; case WM_COMMAND: @@ -213,9 +217,11 @@ void RefreshApplicationPage(void) { +#ifdef RUN_APPS_PAGE /* Signal the event so that our refresh thread */ /* will wake up and refresh the application page */ - SetEvent(hApplicationPageEvent); + PostThreadMessage(dwApplicationThread, WM_TIMER, 0, 0); +#endif } void UpdateApplicationListControlViewSetting(void) @@ -236,6 +242,7 @@ DWORD WINAPI ApplicationPageRefreshThread(void *lpParameter) { + MSG msg; INT i; BOOL bItemRemoved = FALSE; LV_ITEM item; @@ -243,30 +250,15 @@ HIMAGELIST hImageListLarge; HIMAGELIST hImageListSmall; - /* Create the event */ - hApplicationPageEvent = CreateEventW(NULL, TRUE, TRUE, NULL); - /* If we couldn't create the event then exit the thread */ - if (!hApplicationPageEvent) - return 0; - while (1) { - DWORD dwWaitVal; - - /* Wait on the event */ - dwWaitVal = WaitForSingleObject(hApplicationPageEvent, INFINITE); - - /* If the wait failed then the event object must have been */ - /* closed and the task manager is exiting so exit this thread */ - if (dwWaitVal == WAIT_FAILED) + /* Wait for an the event or application close */ + if (GetMessage(&msg, NULL, 0, 0) <= 0) return 0; - if (dwWaitVal == WAIT_OBJECT_0) + if (msg.message == WM_TIMER) { - /* Reset our event */ - ResetEvent(hApplicationPageEvent); - /* * FIXME: * Modified: trunk/reactos/base/applications/taskmgr/debug.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… ============================================================================== --- trunk/reactos/base/applications/taskmgr/debug.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/taskmgr/debug.c [iso-8859-1] Sun Aug 8 03:41:33 2010 @@ -1,7 +1,7 @@ /* * ReactOS Task Manager * - * debug.cpp + * debug.c * * Copyright (C) 1999 - 2001 Brian Palmer <brianp(a)reactos.org> * 2005 Klemens Friedl <frik85(a)reactos.at> Modified: trunk/reactos/base/applications/taskmgr/endproc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… ============================================================================== --- trunk/reactos/base/applications/taskmgr/endproc.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/taskmgr/endproc.c [iso-8859-1] Sun Aug 8 03:41:33 2010 @@ -1,7 +1,7 @@ /* * ReactOS Task Manager * - * endproc.cpp + * endproc.c * * Copyright (C) 1999 - 2001 Brian Palmer <brianp(a)reactos.org> * 2005 Klemens Friedl <frik85(a)reactos.at> Modified: trunk/reactos/base/applications/taskmgr/graph.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… ============================================================================== --- trunk/reactos/base/applications/taskmgr/graph.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/taskmgr/graph.c [iso-8859-1] Sun Aug 8 03:41:33 2010 @@ -1,7 +1,7 @@ /* * ReactOS Task Manager * - * graph.cpp + * graph.c * * Copyright (C) 1999 - 2001 Brian Palmer <brianp(a)reactos.org> * Modified: trunk/reactos/base/applications/taskmgr/graphctl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… ============================================================================== --- trunk/reactos/base/applications/taskmgr/graphctl.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/taskmgr/graphctl.c [iso-8859-1] Sun Aug 8 03:41:33 2010 @@ -1,7 +1,7 @@ /* * ReactOS Task Manager * - * GraphCtrl.cpp + * graphctl.c * * Copyright (C) 2002 Robert Dickenson <robd(a)reactos.org> * @@ -425,7 +425,7 @@ * note: the m_dcPlot covers the entire client * but we only shift bitmap that is the size * of the plot rectangle - * grab the right side of the plot (exluding m_nShiftPixels on the left) + * grab the right side of the plot (excluding m_nShiftPixels on the left) * move this grabbed bitmap to the left by m_nShiftPixels */ BitBlt(this->m_dcPlot, this->m_rectPlot.left, this->m_rectPlot.top+1, Modified: trunk/reactos/base/applications/taskmgr/graphctl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… ============================================================================== --- trunk/reactos/base/applications/taskmgr/graphctl.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/taskmgr/graphctl.h [iso-8859-1] Sun Aug 8 03:41:33 2010 @@ -1,7 +1,7 @@ /* * ReactOS Task Manager * - * GraphCtrl.h + * graphctl.h * * Copyright (C) 2002 Robert Dickenson <robd(a)reactos.org> * Modified: trunk/reactos/base/applications/taskmgr/optnmenu.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… ============================================================================== --- trunk/reactos/base/applications/taskmgr/optnmenu.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/taskmgr/optnmenu.c [iso-8859-1] Sun Aug 8 03:41:33 2010 @@ -1,7 +1,7 @@ /* * ReactOS Task Manager * - * optnmenu.cpp + * optnmenu.c * * Copyright (C) 1999 - 2001 Brian Palmer <brianp(a)reactos.org> * @@ -110,7 +110,7 @@ /* * FIXME: Currently this is useless because the - * current implemetation doesn't list the 16-bit + * current implementation doesn't list the 16-bit * processes. I believe that would require querying * each ntvdm.exe process for it's children. */ 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] Sun Aug 8 03:41:33 2010 @@ -1,7 +1,7 @@ /* * ReactOS Task Manager * - * perfdata.cpp + * perfdata.c * * Copyright (C) 1999 - 2001 Brian Palmer <brianp(a)reactos.org> * Modified: trunk/reactos/base/applications/taskmgr/perfpage.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… ============================================================================== --- trunk/reactos/base/applications/taskmgr/perfpage.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/taskmgr/perfpage.c [iso-8859-1] Sun Aug 8 03:41:33 2010 @@ -51,11 +51,14 @@ HWND hPerformancePageTotalsProcessCountEdit; /* Total Processes Edit Control */ HWND hPerformancePageTotalsThreadCountEdit; /* Total Threads Edit Control */ +#ifdef RUN_PERF_PAGE +static HANDLE hPerformanceThread = NULL; +static DWORD dwPerformanceThread; +#endif static int nPerformancePageWidth; static int nPerformancePageHeight; static int lastX, lastY; -static HANDLE hPerformancePageEvent = NULL; /* When this event becomes signaled then we refresh the performance page */ DWORD WINAPI PerformancePageRefreshThread(void *lpParameter); void AdjustFrameSize(HWND hCntrl, HWND hDlg, int nXDifference, int nYDifference, int pos) @@ -94,12 +97,12 @@ InvalidateRect(hCntrl, NULL, TRUE); } -void AdjustControlPostion(HWND hCntrl, HWND hDlg, int nXDifference, int nYDifference) +static void AdjustControlPostion(HWND hCntrl, HWND hDlg, int nXDifference, int nYDifference) { AdjustFrameSize(hCntrl, hDlg, nXDifference, nYDifference, 0); } -void AdjustCntrlPos(int ctrl_id, HWND hDlg, int nXDifference, int nYDifference) +static void AdjustCntrlPos(int ctrl_id, HWND hDlg, int nXDifference, int nYDifference) { AdjustFrameSize(GetDlgItem(hDlg, ctrl_id), hDlg, nXDifference, nYDifference, 0); } @@ -110,9 +113,6 @@ RECT rc; int nXDifference; int nYDifference; -#ifdef RUN_PERF_PAGE - HANDLE hRefreshThread = NULL; -#endif /* HDC hdc; */ /* PAINTSTRUCT ps; */ @@ -121,7 +121,7 @@ GraphCtrl_Dispose(&PerformancePageCpuUsageHistoryGraph); GraphCtrl_Dispose(&PerformancePageMemUsageHistoryGraph); #ifdef RUN_PERF_PAGE - CloseHandle(hRefreshThread); + EndLocalThread(&hPerformanceThread, dwPerformanceThread); #endif break; @@ -192,7 +192,7 @@ GraphCtrl_SetPlotColor(&PerformancePageMemUsageHistoryGraph, 0, RGB(255, 255, 0)) ; /* Start our refresh thread */ #ifdef RUN_PERF_PAGE - hRefreshThread = CreateThread(NULL, 0, PerformancePageRefreshThread, NULL, 0, NULL); + hPerformanceThread = CreateThread(NULL, 0, PerformancePageRefreshThread, NULL, 0, &dwPerformanceThread); #endif /* @@ -303,9 +303,11 @@ void RefreshPerformancePage(void) { +#ifdef RUN_PERF_PAGE /* Signal the event so that our refresh thread */ /* will wake up and refresh the performance page */ - SetEvent(hPerformancePageEvent); + PostThreadMessage(dwPerformanceThread, WM_TIMER, 0, 0); +#endif } DWORD WINAPI PerformancePageRefreshThread(void *lpParameter) @@ -332,35 +334,21 @@ WCHAR Text[260]; WCHAR szMemUsage[256]; - /* Create the event */ - hPerformancePageEvent = CreateEventW(NULL, TRUE, TRUE, NULL); - - /* If we couldn't create the event then exit the thread */ - if (!hPerformancePageEvent) - return 0; + MSG msg; LoadStringW(hInst, IDS_STATUS_MEMUSAGE, szMemUsage, 256); while (1) { - DWORD dwWaitVal; - int nBarsUsed1; int nBarsUsed2; - /* Wait on the event */ - dwWaitVal = WaitForSingleObject(hPerformancePageEvent, INFINITE); - - /* If the wait failed then the event object must have been */ - /* closed and the task manager is exiting so exit this thread */ - if (dwWaitVal == WAIT_FAILED) + /* Wait for an the event or application close */ + if (GetMessage(&msg, NULL, 0, 0) <= 0) return 0; - if (dwWaitVal == WAIT_OBJECT_0) + if (msg.message == WM_TIMER) { - /* Reset our event */ - ResetEvent(hPerformancePageEvent); - /* * Update the commit charge info */ @@ -449,8 +437,6 @@ PhysicalMemoryAvailable = PerfDataGetPhysicalMemoryAvailableK(); nBarsUsed2 = PhysicalMemoryTotal ? ((PhysicalMemoryAvailable * 100) / PhysicalMemoryTotal) : 0; - - GraphCtrl_AppendPoint(&PerformancePageCpuUsageHistoryGraph, CpuUsage, CpuKernelUsage, 0.0, 0.0); GraphCtrl_AppendPoint(&PerformancePageMemUsageHistoryGraph, nBarsUsed1, nBarsUsed2, 0.0, 0.0); /* PerformancePageMemUsageHistoryGraph.SetRange(0.0, 100.0, 10) ; */ @@ -458,7 +444,7 @@ InvalidateRect(hPerformancePageCpuUsageHistoryGraph, NULL, FALSE); } } - return 0; + return 0; } void PerformancePage_OnViewShowKernelTimes(void) Modified: trunk/reactos/base/applications/taskmgr/procpage.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… ============================================================================== --- trunk/reactos/base/applications/taskmgr/procpage.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/taskmgr/procpage.c [iso-8859-1] Sun Aug 8 03:41:33 2010 @@ -40,7 +40,10 @@ static int nProcessPageWidth; static int nProcessPageHeight; -static HANDLE hProcessPageEvent = NULL; /* When this event becomes signaled then we refresh the process list */ +#ifdef RUN_PROC_PAGE +static HANDLE hProcessThread = NULL; +static DWORD dwProcessThread; +#endif int CALLBACK ProcessPageCompareFunc(LPARAM lParam1, LPARAM lParam2, LPARAM lParamSort); void AddProcess(ULONG Index); @@ -104,7 +107,6 @@ int nXDifference; int nYDifference; int cx, cy; - HANDLE hRefreshThread = NULL; switch (message) { case WM_INITDIALOG: @@ -139,19 +141,19 @@ */ OldProcessListWndProc = (WNDPROC)(LONG_PTR) SetWindowLongPtrW(hProcessPageListCtrl, GWL_WNDPROC, (LONG_PTR)ProcessListWndProc); +#ifdef RUN_PROC_PAGE /* Start our refresh thread */ - hRefreshThread = CreateThread(NULL, 0, ProcessPageRefreshThread, NULL, 0, NULL); - + hProcessThread = CreateThread(NULL, 0, ProcessPageRefreshThread, NULL, 0, &dwProcessThread); +#endif return TRUE; case WM_DESTROY: /* Close the event handle, this will make the */ /* refresh thread exit when the wait fails */ - CloseHandle(hProcessPageEvent); - CloseHandle(hRefreshThread); - +#ifdef RUN_PROC_PAGE + EndLocalThread(&hProcessThread, dwProcessThread); +#endif SaveColumnSettings(); - break; case WM_COMMAND: @@ -194,11 +196,9 @@ cy = rc.top + nYDifference; SetWindowPos(hProcessPageShowAllProcessesButton, NULL, cx, cy, 0, 0, SWP_NOACTIVATE|SWP_NOOWNERZORDER|SWP_NOSIZE|SWP_NOZORDER); InvalidateRect(hProcessPageShowAllProcessesButton, NULL, TRUE); - break; case WM_NOTIFY: - ProcessPageOnNotify(wParam, lParam); break; } @@ -372,9 +372,11 @@ void RefreshProcessPage(void) { +#ifdef RUN_PROC_PAGE /* Signal the event so that our refresh thread */ /* will wake up and refresh the process page */ - SetEvent(hProcessPageEvent); + PostThreadMessage(dwProcessThread, WM_TIMER, 0, 0); +#endif } DWORD WINAPI ProcessPageRefreshThread(void *lpParameter) @@ -382,33 +384,18 @@ ULONG OldProcessorUsage = 0; ULONG OldProcessCount = 0; WCHAR szCpuUsage[256], szProcesses[256]; - - /* Create the event */ - hProcessPageEvent = CreateEventW(NULL, TRUE, TRUE, NULL); - - /* If we couldn't create the event then exit the thread */ - if (!hProcessPageEvent) - return 0; + MSG msg; LoadStringW(hInst, IDS_STATUS_CPUUSAGE, szCpuUsage, 256); LoadStringW(hInst, IDS_STATUS_PROCESSES, szProcesses, 256); while (1) { - DWORD dwWaitVal; - - /* Wait on the event */ - dwWaitVal = WaitForSingleObject(hProcessPageEvent, INFINITE); - - /* If the wait failed then the event object must have been */ - /* closed and the task manager is exiting so exit this thread */ - if (dwWaitVal == WAIT_FAILED) + /* Wait for an the event or application close */ + if (GetMessage(&msg, NULL, 0, 0) <= 0) return 0; - if (dwWaitVal == WAIT_OBJECT_0) { + if (msg.message == WM_TIMER) { WCHAR text[260]; - - /* Reset our event */ - ResetEvent(hProcessPageEvent); UpdateProcesses(); Modified: trunk/reactos/base/applications/taskmgr/taskmgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… ============================================================================== --- trunk/reactos/base/applications/taskmgr/taskmgr.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/taskmgr/taskmgr.c [iso-8859-1] Sun Aug 8 03:41:33 2010 @@ -1,7 +1,7 @@ /* * ReactOS Task Manager * - * TaskMgr.c : Defines the entry point for the application. + * taskmgr.c : Defines the entry point for the application. * * Copyright (C) 1999 - 2001 Brian Palmer <brianp(a)reactos.org> * 2005 Klemens Friedl <frik85(a)reactos.at> @@ -856,11 +856,6 @@ SetUpdateSpeed(hMainWnd); } -void TaskManager_OnViewRefresh(void) -{ - PostMessageW(hMainWnd, WM_TIMER, 0, 0); -} - void TaskManager_OnTabWndSelChange(void) { int i; @@ -1012,3 +1007,27 @@ } return lpszBuf; } + +DWORD EndLocalThread(HANDLE *hThread, DWORD dwThread) +{ + DWORD dwExitCodeThread = 0; + + if (*hThread != NULL) { + PostThreadMessage(dwThread,WM_QUIT,0,0); + for (;;) { + MSG msg; + + if (WAIT_OBJECT_0 == WaitForSingleObject(*hThread, 500)) + break; + while (PeekMessage(&msg, NULL, 0, 0, PM_REMOVE)) { + TranslateMessage(&msg); + DispatchMessage(&msg); + } + } + GetExitCodeThread(*hThread, &dwExitCodeThread); + CloseHandle(*hThread); + *hThread = NULL; + } + return dwExitCodeThread; +} + Modified: trunk/reactos/base/applications/taskmgr/taskmgr.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… ============================================================================== --- trunk/reactos/base/applications/taskmgr/taskmgr.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/taskmgr/taskmgr.h [iso-8859-1] Sun Aug 8 03:41:33 2010 @@ -116,9 +116,9 @@ void TaskManager_OnExitMenuLoop(HWND hWnd); void TaskManager_OnMenuSelect(HWND hWnd, UINT nItemID, UINT nFlags, HMENU hSysMenu); void TaskManager_OnViewUpdateSpeed(DWORD); -void TaskManager_OnViewRefresh(void); void TaskManager_OnTabWndSelChange(void); LPTSTR GetLastErrorText( LPTSTR lpszBuf, DWORD dwSize ); +DWORD EndLocalThread(HANDLE *hThread, DWORD dwThread); #ifdef __cplusplus }

1 0

[jgardou] 48483: [WIN32K] - work directly with bitmap bits when alpha blending icons. This is permitted, those are API bitmaps. - Do not create a stretched copy of source surface in EngAlphaBlend, handle stretching in DIB functions. - Do so. - Simplify DIB alpha blending for 24 and 32 bpp, implement generic alpha blend support for other depth.
by jgardou＠svn.reactos.org 08 Aug '10

08 Aug '10

Author: jgardou Date: Sun Aug 8 00:08:39 2010 New Revision: 48483 URL: http://svn.reactos.org/svn/reactos?rev=48483&view=rev Log: [WIN32K] - work directly with bitmap bits when alpha blending icons. This is permitted, those are API bitmaps. - Do not create a stretched copy of source surface in EngAlphaBlend, handle stretching in DIB functions. - Do so. - Simplify DIB alpha blending for 24 and 32 bpp, implement generic alpha blend support for other depth. Added: branches/reactos-yarotows/subsystems/win32/win32k/dib/alphablend.c (with props) Modified: branches/reactos-yarotows/subsystems/win32/win32k/dib/dib.c branches/reactos-yarotows/subsystems/win32/win32k/dib/dib.h branches/reactos-yarotows/subsystems/win32/win32k/dib/dib16bpp.c branches/reactos-yarotows/subsystems/win32/win32k/dib/dib1bpp.c branches/reactos-yarotows/subsystems/win32/win32k/dib/dib24bpp.c branches/reactos-yarotows/subsystems/win32/win32k/dib/dib32bpp.c branches/reactos-yarotows/subsystems/win32/win32k/dib/dib4bpp.c branches/reactos-yarotows/subsystems/win32/win32k/dib/dib8bpp.c branches/reactos-yarotows/subsystems/win32/win32k/eng/alphablend.c branches/reactos-yarotows/subsystems/win32/win32k/ntuser/cursoricon.c branches/reactos-yarotows/subsystems/win32/win32k/win32k.rbuild Added: branches/reactos-yarotows/subsystems/win32/win32k/dib/alphablend.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/subsystems/win… ============================================================================== --- branches/reactos-yarotows/subsystems/win32/win32k/dib/alphablend.c (added) +++ branches/reactos-yarotows/subsystems/win32/win32k/dib/alphablend.c [iso-8859-1] Sun Aug 8 00:08:39 2010 @@ -1,0 +1,126 @@ +/* + * PROJECT: Win32 subsystem + * LICENSE: See COPYING in the top level directory + * FILE: subsystems/win32/win32k/dib/stretchblt.c + * PURPOSE: AlphaBlend implementation suitable for all bit depths + * PROGRAMMERS: JÃ©rÃ´me Gardou + */ + +#include <win32k.h> + +#define NDEBUG +#include <debug.h> + +typedef union +{ + ULONG ul; + struct + { + UCHAR red; + UCHAR green; + UCHAR blue; + UCHAR alpha; + } col; +} NICEPIXEL32; + +static __inline UCHAR +Clamp8(ULONG val) +{ + return (val > 255) ? 255 : val; +} + +BOOLEAN +DIB_XXBPP_AlphaBlend(SURFOBJ* Dest, SURFOBJ* Source, RECTL* DestRect, + RECTL* SourceRect, CLIPOBJ* ClipRegion, + XLATEOBJ* ColorTranslation, BLENDOBJ* BlendObj) +{ + INT DstX, DstY, SrcX, SrcY; + BLENDFUNCTION BlendFunc; + register NICEPIXEL32 DstPixel32; + register NICEPIXEL32 SrcPixel32; + UCHAR Alpha, SrcBpp = BitsPerFormat(Source->iBitmapFormat); + EXLATEOBJ* pexlo; + EXLATEOBJ exloSrcRGB, exloDstRGB, exloRGBSrc; + PFN_DIB_PutPixel pfnDibPutPixel = DibFunctionsForBitmapFormat[Dest->iBitmapFormat].DIB_PutPixel; + + DPRINT("DIB_16BPP_AlphaBlend: srcRect: (%d,%d)-(%d,%d), dstRect: (%d,%d)-(%d,%d)\n", + SourceRect->left, SourceRect->top, SourceRect->right, SourceRect->bottom, + DestRect->left, DestRect->top, DestRect->right, DestRect->bottom); + + BlendFunc = BlendObj->BlendFunction; + if (BlendFunc.BlendOp != AC_SRC_OVER) + { + DPRINT1("BlendOp != AC_SRC_OVER\n"); + return FALSE; + } + if (BlendFunc.BlendFlags != 0) + { + DPRINT1("BlendFlags != 0\n"); + return FALSE; + } + if ((BlendFunc.AlphaFormat & ~AC_SRC_ALPHA) != 0) + { + DPRINT1("Unsupported AlphaFormat (0x%x)\n", BlendFunc.AlphaFormat); + return FALSE; + } + if ((BlendFunc.AlphaFormat & AC_SRC_ALPHA) != 0 && + SrcBpp != 32) + { + DPRINT1("Source bitmap must be 32bpp when AC_SRC_ALPHA is set\n"); + return FALSE; + } + + if (!ColorTranslation) + { + DPRINT1("ColorTranslation must not be NULL!\n"); + return FALSE; + } + + pexlo = CONTAINING_RECORD(ColorTranslation, EXLATEOBJ, xlo); + EXLATEOBJ_vInitialize(&exloSrcRGB, pexlo->ppalSrc, &gpalRGB, 0, 0, 0); + EXLATEOBJ_vInitialize(&exloDstRGB, pexlo->ppalDst, &gpalRGB, 0, 0, 0); + EXLATEOBJ_vInitialize(&exloRGBSrc, &gpalRGB, pexlo->ppalSrc, 0, 0, 0); + + SrcY = SourceRect->top; + DstY = DestRect->top; + while ( DstY < DestRect->bottom ) + { + SrcX = SourceRect->left; + DstX = DestRect->left; + while(DstX < DestRect->right) + { + SrcPixel32.ul = DIB_GetSource(Source, SrcX, SrcY, &exloSrcRGB.xlo); + SrcPixel32.col.red *= BlendFunc.SourceConstantAlpha / 255; + SrcPixel32.col.green *= BlendFunc.SourceConstantAlpha / 255; + SrcPixel32.col.blue *= BlendFunc.SourceConstantAlpha / 255; + SrcPixel32.col.alpha = (32 == SrcBpp) ? + SrcPixel32.col.alpha * BlendFunc.SourceConstantAlpha / 255 : + BlendFunc.SourceConstantAlpha ; + + Alpha = ((BlendFunc.AlphaFormat & AC_SRC_ALPHA) != 0) ? + SrcPixel32.col.alpha : BlendFunc.SourceConstantAlpha ; + + DstPixel32.ul = DIB_GetSource(Dest, DstX, DstY, &exloDstRGB.xlo); + DstPixel32.col.red = Clamp8(DstPixel32.col.red * (255 - Alpha) / 255 + SrcPixel32.col.red) ; + DstPixel32.col.green = Clamp8(DstPixel32.col.green * (255 - Alpha) / 255 + SrcPixel32.col.green) ; + DstPixel32.col.blue = Clamp8(DstPixel32.col.blue * (255 - Alpha) / 255 + SrcPixel32.col.blue) ; + DstPixel32.col.alpha = Clamp8(DstPixel32.col.alpha * (255 - Alpha) / 255 + SrcPixel32.col.alpha) ; + DstPixel32.ul = XLATEOBJ_iXlate(&exloRGBSrc.xlo, DstPixel32.ul); + pfnDibPutPixel(Dest, DstX, DstY, XLATEOBJ_iXlate(ColorTranslation, DstPixel32.ul)); + + DstX++; + SrcX = SourceRect->left + ((DstX-DestRect->left)*(SourceRect->right - SourceRect->left)) + /(DestRect->right-DestRect->left); + } + DstY++; + SrcY = SourceRect->top + ((DstY-DestRect->top)*(SourceRect->bottom - SourceRect->top)) + /(DestRect->bottom-DestRect->top); + } + + EXLATEOBJ_vCleanup(&exloDstRGB); + EXLATEOBJ_vCleanup(&exloRGBSrc); + EXLATEOBJ_vCleanup(&exloSrcRGB); + + return TRUE; +} + Propchange: branches/reactos-yarotows/subsystems/win32/win32k/dib/alphablend.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: branches/reactos-yarotows/subsystems/win32/win32k/dib/dib.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/subsystems/win… ============================================================================== --- branches/reactos-yarotows/subsystems/win32/win32k/dib/dib.c [iso-8859-1] (original) +++ branches/reactos-yarotows/subsystems/win32/win32k/dib/dib.c [iso-8859-1] Sun Aug 8 00:08:39 2010 @@ -29,25 +29,25 @@ { DIB_1BPP_PutPixel, DIB_1BPP_GetPixel, DIB_1BPP_HLine, DIB_1BPP_VLine, DIB_1BPP_BitBlt, DIB_1BPP_BitBltSrcCopy, DIB_XXBPP_StretchBlt, - DIB_1BPP_TransparentBlt, DIB_1BPP_ColorFill, DIB_1BPP_AlphaBlend + DIB_1BPP_TransparentBlt, DIB_1BPP_ColorFill, DIB_XXBPP_AlphaBlend }, /* BMF_4BPP */ { DIB_4BPP_PutPixel, DIB_4BPP_GetPixel, DIB_4BPP_HLine, DIB_4BPP_VLine, DIB_4BPP_BitBlt, DIB_4BPP_BitBltSrcCopy, DIB_XXBPP_StretchBlt, - DIB_4BPP_TransparentBlt, DIB_4BPP_ColorFill, DIB_4BPP_AlphaBlend + DIB_4BPP_TransparentBlt, DIB_4BPP_ColorFill, DIB_XXBPP_AlphaBlend }, /* BMF_8BPP */ { DIB_8BPP_PutPixel, DIB_8BPP_GetPixel, DIB_8BPP_HLine, DIB_8BPP_VLine, DIB_8BPP_BitBlt, DIB_8BPP_BitBltSrcCopy, DIB_XXBPP_StretchBlt, - DIB_8BPP_TransparentBlt, DIB_8BPP_ColorFill, DIB_8BPP_AlphaBlend + DIB_8BPP_TransparentBlt, DIB_8BPP_ColorFill, DIB_XXBPP_AlphaBlend }, /* BMF_16BPP */ { DIB_16BPP_PutPixel, DIB_16BPP_GetPixel, DIB_16BPP_HLine, DIB_16BPP_VLine, DIB_16BPP_BitBlt, DIB_16BPP_BitBltSrcCopy, DIB_XXBPP_StretchBlt, - DIB_16BPP_TransparentBlt, DIB_16BPP_ColorFill, DIB_16BPP_AlphaBlend + DIB_16BPP_TransparentBlt, DIB_16BPP_ColorFill, DIB_XXBPP_AlphaBlend }, /* BMF_24BPP */ { Modified: branches/reactos-yarotows/subsystems/win32/win32k/dib/dib.h URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/subsystems/win… ============================================================================== --- branches/reactos-yarotows/subsystems/win32/win32k/dib/dib.h [iso-8859-1] (original) +++ branches/reactos-yarotows/subsystems/win32/win32k/dib/dib.h [iso-8859-1] Sun Aug 8 00:08:39 2010 @@ -78,7 +78,6 @@ BOOLEAN DIB_1BPP_BitBltSrcCopy(PBLTINFO); BOOLEAN DIB_1BPP_TransparentBlt(SURFOBJ*,SURFOBJ*,RECTL*,RECTL*,XLATEOBJ*,ULONG); BOOLEAN DIB_1BPP_ColorFill(SURFOBJ*, RECTL*, ULONG); -BOOLEAN DIB_1BPP_AlphaBlend(SURFOBJ*, SURFOBJ*, RECTL*, RECTL*, CLIPOBJ*, XLATEOBJ*, BLENDOBJ*); VOID DIB_4BPP_PutPixel(SURFOBJ*,LONG,LONG,ULONG); ULONG DIB_4BPP_GetPixel(SURFOBJ*,LONG,LONG); @@ -88,7 +87,6 @@ BOOLEAN DIB_4BPP_BitBltSrcCopy(PBLTINFO); BOOLEAN DIB_4BPP_TransparentBlt(SURFOBJ*,SURFOBJ*,RECTL*,RECTL*,XLATEOBJ*,ULONG); BOOLEAN DIB_4BPP_ColorFill(SURFOBJ*, RECTL*, ULONG); -BOOLEAN DIB_4BPP_AlphaBlend(SURFOBJ*, SURFOBJ*, RECTL*, RECTL*, CLIPOBJ*, XLATEOBJ*, BLENDOBJ*); VOID DIB_8BPP_PutPixel(SURFOBJ*,LONG,LONG,ULONG); ULONG DIB_8BPP_GetPixel(SURFOBJ*,LONG,LONG); @@ -98,7 +96,6 @@ BOOLEAN DIB_8BPP_BitBltSrcCopy(PBLTINFO); BOOLEAN DIB_8BPP_TransparentBlt(SURFOBJ*,SURFOBJ*,RECTL*,RECTL*,XLATEOBJ*,ULONG); BOOLEAN DIB_8BPP_ColorFill(SURFOBJ*, RECTL*, ULONG); -BOOLEAN DIB_8BPP_AlphaBlend(SURFOBJ*, SURFOBJ*, RECTL*, RECTL*, CLIPOBJ*, XLATEOBJ*, BLENDOBJ*); VOID DIB_16BPP_PutPixel(SURFOBJ*,LONG,LONG,ULONG); ULONG DIB_16BPP_GetPixel(SURFOBJ*,LONG,LONG); @@ -108,7 +105,6 @@ BOOLEAN DIB_16BPP_BitBltSrcCopy(PBLTINFO); BOOLEAN DIB_16BPP_TransparentBlt(SURFOBJ*,SURFOBJ*,RECTL*,RECTL*,XLATEOBJ*,ULONG); BOOLEAN DIB_16BPP_ColorFill(SURFOBJ*, RECTL*, ULONG); -BOOLEAN DIB_16BPP_AlphaBlend(SURFOBJ*, SURFOBJ*, RECTL*, RECTL*, CLIPOBJ*, XLATEOBJ*, BLENDOBJ*); VOID DIB_24BPP_PutPixel(SURFOBJ*,LONG,LONG,ULONG); ULONG DIB_24BPP_GetPixel(SURFOBJ*,LONG,LONG); @@ -132,6 +128,7 @@ BOOLEAN DIB_XXBPP_StretchBlt(SURFOBJ*,SURFOBJ*,SURFOBJ*,SURFOBJ*,RECTL*,RECTL*,POINTL*,BRUSHOBJ*,POINTL*,XLATEOBJ*,ROP4); BOOLEAN DIB_XXBPP_FloodFillSolid(SURFOBJ*, BRUSHOBJ*, RECTL*, POINTL*, ULONG, UINT); +BOOLEAN DIB_XXBPP_AlphaBlend(SURFOBJ*, SURFOBJ*, RECTL*, RECTL*, CLIPOBJ*, XLATEOBJ*, BLENDOBJ*); extern unsigned char notmask[2]; extern unsigned char altnotmask[2]; Modified: branches/reactos-yarotows/subsystems/win32/win32k/dib/dib16bpp.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/subsystems/win… ============================================================================== --- branches/reactos-yarotows/subsystems/win32/win32k/dib/dib16bpp.c [iso-8859-1] (original) +++ branches/reactos-yarotows/subsystems/win32/win32k/dib/dib16bpp.c [iso-8859-1] Sun Aug 8 00:08:39 2010 @@ -525,174 +525,4 @@ return TRUE; } -typedef union -{ - ULONG ul; - struct - { - UCHAR red; - UCHAR green; - UCHAR blue; - UCHAR alpha; - } col; -} NICEPIXEL32; - -typedef union -{ - USHORT us; - struct - { - USHORT red:5, - green:6, - blue:5; - } col; -} NICEPIXEL16; - -static __inline UCHAR -Clamp5(ULONG val) -{ - return (val > 31) ? 31 : val; -} - -static __inline UCHAR -Clamp8(ULONG val) -{ - return (val > 255) ? 255 : val; -} - -static __inline UCHAR -Clamp6(ULONG val) -{ - return (val > 63) ? 63 : val; -} - -BOOLEAN -DIB_16BPP_AlphaBlend(SURFOBJ* Dest, SURFOBJ* Source, RECTL* DestRect, - RECTL* SourceRect, CLIPOBJ* ClipRegion, - XLATEOBJ* ColorTranslation, BLENDOBJ* BlendObj) -{ - INT Rows, Cols, SrcX, SrcY; - register PUSHORT Dst; - ULONG DstDelta; - BLENDFUNCTION BlendFunc; - register NICEPIXEL16 SrcPixel16; - register NICEPIXEL16 DstPixel16; - register NICEPIXEL32 SrcPixel32; - register NICEPIXEL32 DstPixel32; - UCHAR Alpha, SrcBpp; - EXLATEOBJ *pexlo; - EXLATEOBJ exloDst2Src; - - DPRINT("DIB_16BPP_AlphaBlend: srcRect: (%d,%d)-(%d,%d), dstRect: (%d,%d)-(%d,%d)\n", - SourceRect->left, SourceRect->top, SourceRect->right, SourceRect->bottom, - DestRect->left, DestRect->top, DestRect->right, DestRect->bottom); - - ASSERT(DestRect->bottom - DestRect->top == SourceRect->bottom - SourceRect->top && - DestRect->right - DestRect->left == SourceRect->right - SourceRect->left); - - BlendFunc = BlendObj->BlendFunction; - if (BlendFunc.BlendOp != AC_SRC_OVER) - { - DPRINT1("BlendOp != AC_SRC_OVER\n"); - return FALSE; - } - if (BlendFunc.BlendFlags != 0) - { - DPRINT1("BlendFlags != 0\n"); - return FALSE; - } - if ((BlendFunc.AlphaFormat & ~AC_SRC_ALPHA) != 0) - { - DPRINT1("Unsupported AlphaFormat (0x%x)\n", BlendFunc.AlphaFormat); - return FALSE; - } - if ((BlendFunc.AlphaFormat & AC_SRC_ALPHA) != 0 && - BitsPerFormat(Source->iBitmapFormat) != 32) - { - DPRINT1("Source bitmap must be 32bpp when AC_SRC_ALPHA is set\n"); - return FALSE; - } - - if (!ColorTranslation) - { - DPRINT1("ColorTranslation must not be NULL!\n"); - return FALSE; - } - - pexlo = CONTAINING_RECORD(ColorTranslation, EXLATEOBJ, xlo); - EXLATEOBJ_vInitialize(&exloDst2Src, pexlo->ppalDst, pexlo->ppalSrc, 0, 0, 0); - - Dst = (PUSHORT)((ULONG_PTR)Dest->pvScan0 + (DestRect->top * Dest->lDelta) + - (DestRect->left << 1)); - DstDelta = Dest->lDelta - ((DestRect->right - DestRect->left) << 1); - SrcBpp = BitsPerFormat(Source->iBitmapFormat); - - Rows = DestRect->bottom - DestRect->top; - SrcY = SourceRect->top; - while (--Rows >= 0) - { - Cols = DestRect->right - DestRect->left; - SrcX = SourceRect->left; - while (--Cols >= 0) - { - if (SrcBpp <= 16) - { - SrcPixel16.us = DIB_GetSource(Source, SrcX++, SrcY, ColorTranslation); - SrcPixel32.col.red = (SrcPixel16.col.red << 3); - SrcPixel32.col.green = (SrcPixel16.col.green << 2); - SrcPixel32.col.blue = (SrcPixel16.col.blue << 3); - - SrcPixel32.col.red = SrcPixel32.col.red * BlendFunc.SourceConstantAlpha / 255; - SrcPixel32.col.green = SrcPixel32.col.green * BlendFunc.SourceConstantAlpha / 255; - SrcPixel32.col.blue = SrcPixel32.col.blue * BlendFunc.SourceConstantAlpha / 255; - SrcPixel32.col.alpha = (SrcBpp == 32) ? - (SrcPixel32.col.alpha * BlendFunc.SourceConstantAlpha / 255) : - BlendFunc.SourceConstantAlpha; - - Alpha = ((BlendFunc.AlphaFormat & AC_SRC_ALPHA) != 0) ? - SrcPixel32.col.alpha : BlendFunc.SourceConstantAlpha; - - DstPixel16.us = *Dst; - DstPixel16.col.red = Clamp5(DstPixel16.col.red * (255 - Alpha) / 255 + - (SrcPixel32.col.red >> 3)); - - DstPixel16.col.green = Clamp6(DstPixel16.col.green * (255 - Alpha) / 255 + - (SrcPixel32.col.green >> 2)); - - DstPixel16.col.blue = Clamp5(DstPixel16.col.blue * (255 - Alpha) / 255 + - (SrcPixel32.col.blue >> 3)); - - *Dst++ = DstPixel16.us; - } - else - { - SrcPixel32.ul = DIB_GetSourceIndex(Source, SrcX++, SrcY); - - SrcPixel32.col.red = SrcPixel32.col.red * BlendFunc.SourceConstantAlpha / 255; - SrcPixel32.col.green = SrcPixel32.col.green * BlendFunc.SourceConstantAlpha / 255; - SrcPixel32.col.blue = SrcPixel32.col.blue * BlendFunc.SourceConstantAlpha / 255; - SrcPixel32.col.alpha = (SrcBpp == 32) ? - (SrcPixel32.col.alpha * BlendFunc.SourceConstantAlpha / 255) : - BlendFunc.SourceConstantAlpha; - - Alpha = ((BlendFunc.AlphaFormat & AC_SRC_ALPHA) != 0) ? - SrcPixel32.col.alpha : BlendFunc.SourceConstantAlpha; - - DstPixel32.ul = XLATEOBJ_iXlate(&exloDst2Src.xlo, *Dst); - SrcPixel32.col.red = Clamp8(DstPixel32.col.red * (255 - Alpha) / 255 + SrcPixel32.col.red); - SrcPixel32.col.green = Clamp8(DstPixel32.col.green * (255 - Alpha) / 255 + SrcPixel32.col.green); - SrcPixel32.col.blue = Clamp8(DstPixel32.col.blue * (255 - Alpha) / 255 + SrcPixel32.col.blue); - *Dst++ = XLATEOBJ_iXlate(ColorTranslation, SrcPixel32.ul); - } - } - - Dst = (PUSHORT)((ULONG_PTR)Dst + DstDelta); - SrcY++; - } - - EXLATEOBJ_vCleanup(&exloDst2Src); - - return TRUE; -} - /* EOF */ Modified: branches/reactos-yarotows/subsystems/win32/win32k/dib/dib1bpp.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/subsystems/win… ============================================================================== --- branches/reactos-yarotows/subsystems/win32/win32k/dib/dib1bpp.c [iso-8859-1] (original) +++ branches/reactos-yarotows/subsystems/win32/win32k/dib/dib1bpp.c [iso-8859-1] Sun Aug 8 00:08:39 2010 @@ -33,7 +33,7 @@ VOID DIB_1BPP_HLine(SURFOBJ *SurfObj, LONG x1, LONG x2, LONG y, ULONG c) { - while(x1 < x2) + while(x1 < x2) { DIB_1BPP_PutPixel(SurfObj, x1, y, c); x1++; @@ -43,7 +43,7 @@ VOID DIB_1BPP_VLine(SURFOBJ *SurfObj, LONG x, LONG y1, LONG y2, ULONG c) { - while(y1 < y2) + while(y1 < y2) { DIB_1BPP_PutPixel(SurfObj, x, y1, c); y1++; @@ -477,13 +477,4 @@ return FALSE; } -BOOLEAN -DIB_1BPP_AlphaBlend(SURFOBJ* Dest, SURFOBJ* Source, RECTL* DestRect, - RECTL* SourceRect, CLIPOBJ* ClipRegion, - XLATEOBJ* ColorTranslation, BLENDOBJ* BlendObj) -{ - UNIMPLEMENTED; - return FALSE; -} - /* EOF */ Modified: branches/reactos-yarotows/subsystems/win32/win32k/dib/dib24bpp.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/subsystems/win… ============================================================================== --- branches/reactos-yarotows/subsystems/win32/win32k/dib/dib24bpp.c [iso-8859-1] (original) +++ branches/reactos-yarotows/subsystems/win32/win32k/dib/dib24bpp.c [iso-8859-1] Sun Aug 8 00:08:39 2010 @@ -37,7 +37,7 @@ LONG lDelta = SurfObj->lDelta; c &= 0xFFFFFF; - while(y1++ < y2) + while(y1++ < y2) { *(PUSHORT)(addr) = c & 0xFFFF; *(addr + 2) = c >> 16; @@ -466,7 +466,6 @@ { INT Rows, Cols, SrcX, SrcY; register PUCHAR Dst; - ULONG DstDelta; BLENDFUNCTION BlendFunc; register NICEPIXEL32 DstPixel, SrcPixel; UCHAR Alpha, SrcBpp; @@ -474,9 +473,6 @@ DPRINT("DIB_24BPP_AlphaBlend: srcRect: (%d,%d)-(%d,%d), dstRect: (%d,%d)-(%d,%d)\n", SourceRect->left, SourceRect->top, SourceRect->right, SourceRect->bottom, DestRect->left, DestRect->top, DestRect->right, DestRect->bottom); - - ASSERT(DestRect->bottom - DestRect->top == SourceRect->bottom - SourceRect->top && - DestRect->right - DestRect->left == SourceRect->right - SourceRect->left); BlendFunc = BlendObj->BlendFunction; if (BlendFunc.BlendOp != AC_SRC_OVER) @@ -503,39 +499,47 @@ Dst = (PUCHAR)((ULONG_PTR)Dest->pvScan0 + (DestRect->top * Dest->lDelta) + (DestRect->left * 3)); - DstDelta = Dest->lDelta - ((DestRect->right - DestRect->left) * 3); SrcBpp = BitsPerFormat(Source->iBitmapFormat); - Rows = DestRect->bottom - DestRect->top; + Rows = 0; SrcY = SourceRect->top; - while (--Rows >= 0) - { - Cols = DestRect->right - DestRect->left; - SrcX = SourceRect->left; - while (--Cols >= 0) - { - SrcPixel.ul = DIB_GetSource(Source, SrcX++, SrcY, ColorTranslation); - SrcPixel.col.red = SrcPixel.col.red * BlendFunc.SourceConstantAlpha / 255; - SrcPixel.col.green = SrcPixel.col.green * BlendFunc.SourceConstantAlpha / 255; - SrcPixel.col.blue = SrcPixel.col.blue * BlendFunc.SourceConstantAlpha / 255; - SrcPixel.col.alpha = (SrcBpp == 32) ? (SrcPixel.col.alpha * BlendFunc.SourceConstantAlpha / 255) : BlendFunc.SourceConstantAlpha; - - Alpha = ((BlendFunc.AlphaFormat & AC_SRC_ALPHA) != 0) ? - SrcPixel.col.alpha : BlendFunc.SourceConstantAlpha; - - /* copy only 24bits of dst */ - DstPixel.ul = *(PUSHORT)(Dst) + (*(Dst+2) << 16); - DstPixel.col.red = Clamp8(DstPixel.col.red * (255 - Alpha) / 255 + SrcPixel.col.red); - DstPixel.col.green = Clamp8(DstPixel.col.green * (255 - Alpha) / 255 + SrcPixel.col.green); - DstPixel.col.blue = Clamp8(DstPixel.col.blue * (255 - Alpha) / 255 + SrcPixel.col.blue); - /* copy back 24bits of result */ - *(PUSHORT)(Dst) = (USHORT)(DstPixel.ul & 0xFFFF); - *(Dst + 2) = (UCHAR)((DstPixel.ul >> 16) & 0xFF); - Dst = (PUCHAR)((ULONG_PTR)Dst + 3); - } - Dst = (PUCHAR)((ULONG_PTR)Dst + DstDelta); - SrcY++; - } + while (++Rows <= DestRect->bottom - DestRect->top) + { + Cols = 0; + SrcX = SourceRect->left; + while (++Cols <= DestRect->right - DestRect->left) + { + if (!(BlendFunc.AlphaFormat & AC_SRC_ALPHA)) + { + SrcPixel.ul = DIB_GetSource(Source, SrcX, SrcY, ColorTranslation); + SrcPixel.col.red *= BlendFunc.SourceConstantAlpha / 255; + SrcPixel.col.green *= BlendFunc.SourceConstantAlpha / 255; + SrcPixel.col.blue *= BlendFunc.SourceConstantAlpha / 255; + Alpha = BlendFunc.SourceConstantAlpha ; + } + else + { + SrcPixel.ul = DIB_GetSourceIndex(Source, SrcX, SrcY); + SrcPixel.col.red *= BlendFunc.SourceConstantAlpha / 255; + SrcPixel.col.green *= BlendFunc.SourceConstantAlpha / 255; + SrcPixel.col.blue *= BlendFunc.SourceConstantAlpha / 255; + SrcPixel.col.alpha *= BlendFunc.SourceConstantAlpha / 255; + + Alpha = SrcPixel.col.alpha; + } + + DstPixel.col.red = (*Dst) * (255 - Alpha) / 255 + SrcPixel.col.red ; + DstPixel.col.green = *(Dst+1) * (255 - Alpha) / 255 + SrcPixel.col.green ; + DstPixel.col.blue = *(Dst+2) * (255 - Alpha) / 255 + SrcPixel.col.blue ; + *Dst++ = DstPixel.col.red; + *Dst++ = DstPixel.col.green; + *Dst++ = DstPixel.col.blue; + SrcX = SourceRect->left + (Cols*(SourceRect->right - SourceRect->left))/(DestRect->right - DestRect->left); + } + Dst = (PUCHAR)((ULONG_PTR)Dest->pvScan0 + ((DestRect->top + Rows) * Dest->lDelta) + + (DestRect->left*3)); + SrcY = SourceRect->top + (Rows*(SourceRect->bottom - SourceRect->top))/(DestRect->bottom - DestRect->top); + } return TRUE; } Modified: branches/reactos-yarotows/subsystems/win32/win32k/dib/dib32bpp.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/subsystems/win… ============================================================================== --- branches/reactos-yarotows/subsystems/win32/win32k/dib/dib32bpp.c [iso-8859-1] (original) +++ branches/reactos-yarotows/subsystems/win32/win32k/dib/dib32bpp.c [iso-8859-1] Sun Aug 8 00:08:39 2010 @@ -54,8 +54,8 @@ PBYTE SourceBits_4BPP, SourceLine_4BPP; PDWORD Source32, Dest32; - DestBits = (PBYTE)BltInfo->DestSurface->pvScan0 - + (BltInfo->DestRect.top * BltInfo->DestSurface->lDelta) + DestBits = (PBYTE)BltInfo->DestSurface->pvScan0 + + (BltInfo->DestRect.top * BltInfo->DestSurface->lDelta) + 4 * BltInfo->DestRect.left; switch (BltInfo->SourceSurface->iBitmapFormat) @@ -83,8 +83,8 @@ break; case BMF_4BPP: - SourceBits_4BPP = (PBYTE)BltInfo->SourceSurface->pvScan0 - + (BltInfo->SourcePoint.y * BltInfo->SourceSurface->lDelta) + SourceBits_4BPP = (PBYTE)BltInfo->SourceSurface->pvScan0 + + (BltInfo->SourcePoint.y * BltInfo->SourceSurface->lDelta) + (BltInfo->SourcePoint.x >> 1); for (j=BltInfo->DestRect.top; j<BltInfo->DestRect.bottom; j++) @@ -156,8 +156,8 @@ break; case BMF_24BPP: - SourceLine = (PBYTE)BltInfo->SourceSurface->pvScan0 - + (BltInfo->SourcePoint.y * BltInfo->SourceSurface->lDelta) + SourceLine = (PBYTE)BltInfo->SourceSurface->pvScan0 + + (BltInfo->SourcePoint.y * BltInfo->SourceSurface->lDelta) + 3 * BltInfo->SourcePoint.x; DestLine = DestBits; @@ -182,7 +182,7 @@ break; case BMF_32BPP: - if (NULL == BltInfo->XlateSourceToDest || + if (NULL == BltInfo->XlateSourceToDest || 0 != (BltInfo->XlateSourceToDest->flXlate & XO_TRIVIAL)) { if (BltInfo->DestRect.top < BltInfo->SourcePoint.y) @@ -197,10 +197,10 @@ } else { - SourceBits = (PBYTE)BltInfo->SourceSurface->pvScan0 - + ((BltInfo->SourcePoint.y - + BltInfo->DestRect.bottom - - BltInfo->DestRect.top - 1) * BltInfo->SourceSurface->lDelta) + SourceBits = (PBYTE)BltInfo->SourceSurface->pvScan0 + + ((BltInfo->SourcePoint.y + + BltInfo->DestRect.bottom + - BltInfo->DestRect.top - 1) * BltInfo->SourceSurface->lDelta) + 4 * BltInfo->SourcePoint.x; DestBits = (PBYTE)BltInfo->DestSurface->pvScan0 + ((BltInfo->DestRect.bottom - 1) * BltInfo->DestSurface->lDelta) + 4 * BltInfo->DestRect.left; for (j = BltInfo->DestRect.bottom - 1; BltInfo->DestRect.top <= j; j--) @@ -348,7 +348,6 @@ { INT Rows, Cols, SrcX, SrcY; register PULONG Dst; - ULONG DstDelta; BLENDFUNCTION BlendFunc; register NICEPIXEL32 DstPixel, SrcPixel; UCHAR Alpha, SrcBpp; @@ -357,9 +356,6 @@ SourceRect->left, SourceRect->top, SourceRect->right, SourceRect->bottom, DestRect->left, DestRect->top, DestRect->right, DestRect->bottom); - ASSERT(DestRect->bottom - DestRect->top == SourceRect->bottom - SourceRect->top && - DestRect->right - DestRect->left == SourceRect->right - SourceRect->left); - BlendFunc = BlendObj->BlendFunction; if (BlendFunc.BlendOp != AC_SRC_OVER) { @@ -385,35 +381,38 @@ Dst = (PULONG)((ULONG_PTR)Dest->pvScan0 + (DestRect->top * Dest->lDelta) + (DestRect->left << 2)); - DstDelta = Dest->lDelta - ((DestRect->right - DestRect->left) << 2); SrcBpp = BitsPerFormat(Source->iBitmapFormat); - Rows = DestRect->bottom - DestRect->top; - SrcY = SourceRect->top; - while (--Rows >= 0) - { - Cols = DestRect->right - DestRect->left; + Rows = 0; + SrcY = SourceRect->top; + while (++Rows <= DestRect->bottom - DestRect->top) + { + Cols = 0; SrcX = SourceRect->left; - while (--Cols >= 0) - { - SrcPixel.ul = DIB_GetSource(Source, SrcX++, SrcY, ColorTranslation); - SrcPixel.col.red = SrcPixel.col.red * BlendFunc.SourceConstantAlpha / 255; - SrcPixel.col.green = SrcPixel.col.green * BlendFunc.SourceConstantAlpha / 255; - SrcPixel.col.blue = SrcPixel.col.blue * BlendFunc.SourceConstantAlpha / 255; - SrcPixel.col.alpha = (SrcBpp == 32) ? (SrcPixel.col.alpha * BlendFunc.SourceConstantAlpha / 255) : BlendFunc.SourceConstantAlpha; + while (++Cols <= DestRect->right - DestRect->left) + { + SrcPixel.ul = DIB_GetSource(Source, SrcX, SrcY, ColorTranslation); + SrcPixel.col.red *= BlendFunc.SourceConstantAlpha / 255; + SrcPixel.col.green *= BlendFunc.SourceConstantAlpha / 255; + SrcPixel.col.blue *= BlendFunc.SourceConstantAlpha / 255; + SrcPixel.col.alpha = (32 == SrcBpp) ? + SrcPixel.col.alpha * BlendFunc.SourceConstantAlpha / 255 : + BlendFunc.SourceConstantAlpha ; Alpha = ((BlendFunc.AlphaFormat & AC_SRC_ALPHA) != 0) ? - SrcPixel.col.alpha : BlendFunc.SourceConstantAlpha; + SrcPixel.col.alpha : BlendFunc.SourceConstantAlpha ; DstPixel.ul = *Dst; - DstPixel.col.red = Clamp8(DstPixel.col.red * (255 - Alpha) / 255 + SrcPixel.col.red); - DstPixel.col.green = Clamp8(DstPixel.col.green * (255 - Alpha) / 255 + SrcPixel.col.green); - DstPixel.col.blue = Clamp8(DstPixel.col.blue * (255 - Alpha) / 255 + SrcPixel.col.blue); - DstPixel.col.alpha = Clamp8(DstPixel.col.alpha * (255 - Alpha) / 255 + SrcPixel.col.alpha); + DstPixel.col.red = Clamp8(DstPixel.col.red * (255 - Alpha) / 255 + SrcPixel.col.red) ; + DstPixel.col.green = Clamp8(DstPixel.col.green * (255 - Alpha) / 255 + SrcPixel.col.green) ; + DstPixel.col.blue = Clamp8(DstPixel.col.blue * (255 - Alpha) / 255 + SrcPixel.col.blue) ; + DstPixel.col.alpha = Clamp8(DstPixel.col.alpha * (255 - Alpha) / 255 + SrcPixel.col.alpha) ; *Dst++ = DstPixel.ul; - } - Dst = (PULONG)((ULONG_PTR)Dst + DstDelta); - SrcY++; + SrcX = SourceRect->left + (Cols*(SourceRect->right - SourceRect->left))/(DestRect->right - DestRect->left); + } + Dst = (PULONG)((ULONG_PTR)Dest->pvScan0 + ((DestRect->top + Rows) * Dest->lDelta) + + (DestRect->left << 2)); + SrcY = SourceRect->top + (Rows*(SourceRect->bottom - SourceRect->top))/(DestRect->bottom - DestRect->top); } return TRUE; Modified: branches/reactos-yarotows/subsystems/win32/win32k/dib/dib4bpp.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/subsystems/win… ============================================================================== --- branches/reactos-yarotows/subsystems/win32/win32k/dib/dib4bpp.c [iso-8859-1] (original) +++ branches/reactos-yarotows/subsystems/win32/win32k/dib/dib4bpp.c [iso-8859-1] Sun Aug 8 00:08:39 2010 @@ -32,7 +32,7 @@ PBYTE addr = (PBYTE)SurfObj->pvScan0 + (x1>>1) + y * SurfObj->lDelta; LONG cx = x1; - while(cx < x2) + while(cx < x2) { *addr = (*addr & notmask[x1&1]) | (c << ((1-(x1&1))<<2)); if((++x1 & 1) == 0) @@ -48,7 +48,7 @@ int lDelta = SurfObj->lDelta; addr += (x>>1) + y1 * lDelta; - while(y1++ < y2) + while(y1++ < y2) { *addr = (*addr & notmask[x&1]) | (c << ((1-(x&1))<<2)); addr += lDelta; @@ -81,8 +81,8 @@ if(DIB_1BPP_GetPixel(BltInfo->SourceSurface, sx, sy) == 0) { DIB_4BPP_PutPixel(BltInfo->DestSurface, i, j, XLATEOBJ_iXlate(BltInfo->XlateSourceToDest, 0)); - } - else + } + else { DIB_4BPP_PutPixel(BltInfo->DestSurface, i, j, XLATEOBJ_iXlate(BltInfo->XlateSourceToDest, 1)); } @@ -375,13 +375,4 @@ return FALSE; } -BOOLEAN -DIB_4BPP_AlphaBlend(SURFOBJ* Dest, SURFOBJ* Source, RECTL* DestRect, - RECTL* SourceRect, CLIPOBJ* ClipRegion, - XLATEOBJ* ColorTranslation, BLENDOBJ* BlendObj) -{ - UNIMPLEMENTED; - return FALSE; -} - /* EOF */ Modified: branches/reactos-yarotows/subsystems/win32/win32k/dib/dib8bpp.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/subsystems/win… ============================================================================== --- branches/reactos-yarotows/subsystems/win32/win32k/dib/dib8bpp.c [iso-8859-1] (original) +++ branches/reactos-yarotows/subsystems/win32/win32k/dib/dib8bpp.c [iso-8859-1] Sun Aug 8 00:08:39 2010 @@ -43,7 +43,7 @@ LONG lDelta = SurfObj->lDelta; byteaddr = addr; - while(y1++ < y2) + while(y1++ < y2) { *addr = c; @@ -74,8 +74,8 @@ if(DIB_1BPP_GetPixel(BltInfo->SourceSurface, sx, sy) == 0) { DIB_8BPP_PutPixel(BltInfo->DestSurface, i, j, XLATEOBJ_iXlate(BltInfo->XlateSourceToDest, 0)); - } - else + } + else { DIB_8BPP_PutPixel(BltInfo->DestSurface, i, j, XLATEOBJ_iXlate(BltInfo->XlateSourceToDest, 1)); } @@ -363,130 +363,4 @@ return TRUE; } -typedef union { - ULONG ul; - struct { - UCHAR red; - UCHAR green; - UCHAR blue; - UCHAR alpha; - } col; -} NICEPIXEL32; - -typedef union { - USHORT us; - struct { - USHORT red:5, - green:6, - blue:5; - } col; -} NICEPIXEL16; - -static __inline UCHAR -Clamp8(ULONG val) -{ - return (val > 255) ? 255 : val; -} - -BOOLEAN -DIB_8BPP_AlphaBlend(SURFOBJ* Dest, SURFOBJ* Source, RECTL* DestRect, - RECTL* SourceRect, CLIPOBJ* ClipRegion, - XLATEOBJ* ColorTranslation, BLENDOBJ* BlendObj) -{ - INT Rows, Cols, SrcX, SrcY; - register PUCHAR Dst; - ULONG DstDelta; - BLENDFUNCTION BlendFunc; - register NICEPIXEL32 DstPixel32; - register NICEPIXEL32 SrcPixel32; - register NICEPIXEL16 SrcPixel16; - UCHAR Alpha, SrcBpp; - EXLATEOBJ exloDst2Src; - EXLATEOBJ* pexlo; - - DPRINT("DIB_8BPP_AlphaBlend: srcRect: (%d,%d)-(%d,%d), dstRect: (%d,%d)-(%d,%d)\n", - SourceRect->left, SourceRect->top, SourceRect->right, SourceRect->bottom, - DestRect->left, DestRect->top, DestRect->right, DestRect->bottom); - - ASSERT(DestRect->bottom - DestRect->top == SourceRect->bottom - SourceRect->top && - DestRect->right - DestRect->left == SourceRect->right - SourceRect->left); - - BlendFunc = BlendObj->BlendFunction; - if (BlendFunc.BlendOp != AC_SRC_OVER) - { - DPRINT1("BlendOp != AC_SRC_OVER\n"); - return FALSE; - } - if (BlendFunc.BlendFlags != 0) - { - DPRINT1("BlendFlags != 0\n"); - return FALSE; - } - if ((BlendFunc.AlphaFormat & ~AC_SRC_ALPHA) != 0) - { - DPRINT1("Unsupported AlphaFormat (0x%x)\n", BlendFunc.AlphaFormat); - return FALSE; - } - if ((BlendFunc.AlphaFormat & AC_SRC_ALPHA) != 0 && - BitsPerFormat(Source->iBitmapFormat) != 32) - { - DPRINT1("Source bitmap must be 32bpp when AC_SRC_ALPHA is set\n"); - return FALSE; - } - if (!ColorTranslation) - { - DPRINT1("ColorTranslation must not be NULL!\n"); - return FALSE; - } - - pexlo = CONTAINING_RECORD(ColorTranslation, EXLATEOBJ, xlo); - EXLATEOBJ_vInitialize(&exloDst2Src, pexlo->ppalDst, pexlo->ppalSrc, 0, 0, 0); - - Dst = (PUCHAR)((ULONG_PTR)Dest->pvScan0 + (DestRect->top * Dest->lDelta) + - DestRect->left); - DstDelta = Dest->lDelta - (DestRect->right - DestRect->left); - SrcBpp = BitsPerFormat(Source->iBitmapFormat); - - Rows = DestRect->bottom - DestRect->top; - SrcY = SourceRect->top; - while (--Rows >= 0) - { - Cols = DestRect->right - DestRect->left; - SrcX = SourceRect->left; - while (--Cols >= 0) - { - if (SrcBpp <= 16) - { - SrcPixel16.us = DIB_GetSource(Source, SrcX++, SrcY, ColorTranslation); - SrcPixel32.col.red = (SrcPixel16.col.red << 3) | (SrcPixel16.col.red >> 2); - SrcPixel32.col.green = (SrcPixel16.col.green << 2) | (SrcPixel16.col.green >> 4); - SrcPixel32.col.blue = (SrcPixel16.col.blue << 3) | (SrcPixel16.col.blue >> 2); - } - else - { - SrcPixel32.ul = DIB_GetSourceIndex(Source, SrcX++, SrcY); - } - SrcPixel32.col.red = SrcPixel32.col.red * BlendFunc.SourceConstantAlpha / 255; - SrcPixel32.col.green = SrcPixel32.col.green * BlendFunc.SourceConstantAlpha / 255; - SrcPixel32.col.blue = SrcPixel32.col.blue * BlendFunc.SourceConstantAlpha / 255; - SrcPixel32.col.alpha = (SrcBpp == 32) ? (SrcPixel32.col.alpha * BlendFunc.SourceConstantAlpha / 255) : BlendFunc.SourceConstantAlpha; - - Alpha = ((BlendFunc.AlphaFormat & AC_SRC_ALPHA) != 0) ? - SrcPixel32.col.alpha : BlendFunc.SourceConstantAlpha; - - DstPixel32.ul = XLATEOBJ_iXlate(&exloDst2Src.xlo, *Dst); - SrcPixel32.col.red = Clamp8(DstPixel32.col.red * (255 - Alpha) / 255 + SrcPixel32.col.red); - SrcPixel32.col.green = Clamp8(DstPixel32.col.green * (255 - Alpha) / 255 + SrcPixel32.col.green); - SrcPixel32.col.blue = Clamp8(DstPixel32.col.blue * (255 - Alpha) / 255 + SrcPixel32.col.blue); - *Dst++ = XLATEOBJ_iXlate(ColorTranslation, SrcPixel32.ul); - } - Dst = (PUCHAR)((ULONG_PTR)Dst + DstDelta); - SrcY++; - } - - EXLATEOBJ_vCleanup(&exloDst2Src); - - return TRUE; -} - /* EOF */ Modified: branches/reactos-yarotows/subsystems/win32/win32k/eng/alphablend.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/subsystems/win… ============================================================================== --- branches/reactos-yarotows/subsystems/win32/win32k/eng/alphablend.c [iso-8859-1] (original) +++ branches/reactos-yarotows/subsystems/win32/win32k/eng/alphablend.c [iso-8859-1] Sun Aug 8 00:08:39 2010 @@ -25,10 +25,6 @@ IN PRECTL SourceRect, IN BLENDOBJ *BlendObj) { - RECTL SourceStretchedRect; - SIZEL SourceStretchedSize; - HBITMAP SourceStretchedBitmap = 0; - SURFOBJ* SourceStretchedObj = NULL; RECTL InputRect; RECTL OutputRect; RECTL ClipRect; @@ -39,7 +35,6 @@ INTENG_ENTER_LEAVE EnterLeaveDest; SURFOBJ* InputObj; SURFOBJ* OutputObj; - LONG Width; LONG ClippingType; RECT_ENUM RectEnum; BOOL EnumMore; @@ -111,61 +106,9 @@ return TRUE; } - /* Stretch source if needed */ - if (OutputRect.right - OutputRect.left != InputRect.right - InputRect.left || - OutputRect.bottom - OutputRect.top != InputRect.bottom - InputRect.top) - { - SourceStretchedSize.cx = OutputRect.right - OutputRect.left; - SourceStretchedSize.cy = OutputRect.bottom - OutputRect.top; - Width = DIB_GetDIBWidthBytes(SourceStretchedSize.cx, BitsPerFormat(psoSource->iBitmapFormat)); - /* FIXME: Maybe it is a good idea to use EngCreateDeviceBitmap and IntEngStretchBlt - if possible to get a HW accelerated stretch. */ - SourceStretchedBitmap = EngCreateBitmap(SourceStretchedSize, Width, psoSource->iBitmapFormat, - BMF_TOPDOWN | BMF_NOZEROINIT, NULL); - if (SourceStretchedBitmap == 0) - { - DPRINT1("EngCreateBitmap failed!\n"); - return FALSE; - } - SourceStretchedObj = EngLockSurface((HSURF)SourceStretchedBitmap); - if (SourceStretchedObj == NULL) - { - DPRINT1("EngLockSurface failed!\n"); - EngDeleteSurface((HSURF)SourceStretchedBitmap); - return FALSE; - } - - SourceStretchedRect.left = 0; - SourceStretchedRect.right = SourceStretchedSize.cx; - SourceStretchedRect.top = 0; - SourceStretchedRect.bottom = SourceStretchedSize.cy; - if (!IntEngStretchBlt(SourceStretchedObj, psoSource, NULL, NULL, NULL, - &SourceStretchedRect, SourceRect, - NULL, NULL, NULL, ROP3_TO_ROP4(SRCCOPY))) - { - DPRINT1("EngStretchBlt failed!\n"); - EngUnlockSurface(SourceStretchedObj); - EngDeleteSurface((HSURF)SourceStretchedBitmap); - return FALSE; - } - InputRect.top = SourceStretchedRect.top; - InputRect.bottom = SourceStretchedRect.bottom; - InputRect.left = SourceStretchedRect.left; - InputRect.right = SourceStretchedRect.right; - psoSource = SourceStretchedObj; - } - /* Now call the DIB function */ if (!IntEngEnter(&EnterLeaveSource, psoSource, &InputRect, TRUE, &Translate, &InputObj)) { - if (SourceStretchedObj != NULL) - { - EngUnlockSurface(SourceStretchedObj); - } - if (SourceStretchedBitmap != 0) - { - EngDeleteSurface((HSURF)SourceStretchedBitmap); - } return FALSE; } InputRect.left += Translate.x; @@ -175,15 +118,6 @@ if (!IntEngEnter(&EnterLeaveDest, psoDest, &OutputRect, FALSE, &Translate, &OutputObj)) { - IntEngLeave(&EnterLeaveSource); - if (SourceStretchedObj != NULL) - { - EngUnlockSurface(SourceStretchedObj); - } - if (SourceStretchedBitmap != 0) - { - EngDeleteSurface((HSURF)SourceStretchedBitmap); - } return FALSE; } OutputRect.left += Translate.x; @@ -253,15 +187,6 @@ IntEngLeave(&EnterLeaveDest); IntEngLeave(&EnterLeaveSource); - if (SourceStretchedObj != NULL) - { - EngUnlockSurface(SourceStretchedObj); - } - if (SourceStretchedBitmap != 0) - { - EngDeleteSurface((HSURF)SourceStretchedBitmap); - } - return Ret; } Modified: branches/reactos-yarotows/subsystems/win32/win32k/ntuser/cursoricon.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/subsystems/win… ============================================================================== --- branches/reactos-yarotows/subsystems/win32/win32k/ntuser/cursoricon.c [iso-8859-1] (original) +++ branches/reactos-yarotows/subsystems/win32/win32k/ntuser/cursoricon.c [iso-8859-1] Sun Aug 8 00:08:39 2010 @@ -1328,17 +1328,8 @@ BYTE Alpha; INT i, j; PSURFACE psurf; - PBYTE pBits, ptr ; + PBYTE ptr ; HBITMAP hMemBmp = NULL; - - pBits = ExAllocatePoolWithTag(PagedPool, - bmpColor.bmWidthBytes * abs(bmpColor.bmHeight), - TAG_BITMAP); - if (pBits == NULL) - { - Ret = FALSE; - goto CleanupAlpha; - } hMemBmp = BITMAP_CopyBitmap(hbmColor); if(!hMemBmp) @@ -1353,16 +1344,12 @@ DPRINT1("SURFACE_LockSurface failed!\n"); goto CleanupAlpha; } - /* get color bits */ - IntGetBitmapBits(psurf, - bmpColor.bmWidthBytes * abs(bmpColor.bmHeight), - pBits); /* premultiply with the alpha channel value */ - for (i = 0; i < abs(bmpColor.bmHeight); i++) - { - ptr = pBits + i*bmpColor.bmWidthBytes; - for (j = 0; j < bmpColor.bmWidth; j++) + for (i = 0; i < psurf->SurfObj.sizlBitmap.cy; i++) + { + ptr = (PBYTE)psurf->SurfObj.pvScan0 + i*psurf->SurfObj.lDelta; + for (j = 0; j < psurf->SurfObj.sizlBitmap.cx; j++) { Alpha = ptr[3]; ptr[0] *= Alpha / 0xff; @@ -1373,10 +1360,6 @@ } } - /* set mem bits */ - IntSetBitmapBits(psurf, - bmpColor.bmWidthBytes * abs(bmpColor.bmHeight), - pBits); SURFACE_UnlockSurface(psurf); hTmpBmp = NtGdiSelectBitmap(hMemDC, hMemBmp); @@ -1395,11 +1378,9 @@ NULL); NtGdiSelectBitmap(hMemDC, hTmpBmp); CleanupAlpha: - if(pBits) ExFreePoolWithTag(pBits, TAG_BITMAP); if(hMemBmp) NtGdiDeleteObjectApp(hMemBmp); if(Ret) goto done; } - if (diFlags & DI_MASK) { Modified: branches/reactos-yarotows/subsystems/win32/win32k/win32k.rbuild URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/subsystems/win… ============================================================================== --- branches/reactos-yarotows/subsystems/win32/win32k/win32k.rbuild [iso-8859-1] (original) +++ branches/reactos-yarotows/subsystems/win32/win32k/win32k.rbuild [iso-8859-1] Sun Aug 8 00:08:39 2010 @@ -38,6 +38,7 @@ <file>dib.c</file> <file>floodfill.c</file> <file>stretchblt.c</file> + <file>alphablend.c</file> <if property="ARCH" value="i386"> <directory name="i386">

1 0

[tkreuzer] 48481: [DDK] Make functions in ntstrsafe.h static, so they can be used in more than one file. Maybe that encourages people using it instead of unsafe and banned apis.
by tkreuzer＠svn.reactos.org 07 Aug '10

07 Aug '10

Author: tkreuzer Date: Sat Aug 7 21:29:00 2010 New Revision: 48481 URL: http://svn.reactos.org/svn/reactos?rev=48481&view=rev Log: [DDK] Make functions in ntstrsafe.h static, so they can be used in more than one file. Maybe that encourages people using it instead of unsafe and banned apis. Modified: trunk/reactos/include/ddk/ntstrsafe.h Modified: trunk/reactos/include/ddk/ntstrsafe.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/ntstrsafe.h?re… ============================================================================== --- trunk/reactos/include/ddk/ntstrsafe.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/ntstrsafe.h [iso-8859-1] Sat Aug 7 21:29:00 2010 @@ -33,7 +33,7 @@ /* PRIVATE FUNCTIONS *********************************************************/ -__inline +static __inline NTSTATUS NTAPI RtlStringLengthWorkerA(IN LPCSTR String, @@ -66,7 +66,7 @@ return Status; } -__inline +static __inline NTSTATUS NTAPI RtlStringValidateDestA(IN LPSTR Destination, @@ -95,7 +95,7 @@ return Status; } -__inline +static __inline NTSTATUS NTAPI RtlStringExValidateDestA(IN OUT LPSTR *Destination, @@ -111,7 +111,7 @@ MaxLength); } -__inline +static __inline NTSTATUS NTAPI RtlStringExValidateSrcA(IN OUT LPCSTR *Source OPTIONAL, @@ -130,7 +130,7 @@ return Status; } -__inline +static __inline NTSTATUS NTAPI RtlStringVPrintfWorkerA(OUT LPSTR Destination, @@ -171,7 +171,7 @@ return Status; } -__inline +static __inline NTSTATUS NTAPI RtlStringCopyWorkerA(OUT LPSTR Destination, @@ -208,7 +208,7 @@ /* PUBLIC FUNCTIONS **********************************************************/ -__inline +static __inline NTSTATUS NTAPI RtlStringCchCopyA(IN LPSTR Destination, @@ -219,7 +219,7 @@ return STATUS_NOT_IMPLEMENTED; } -__inline +static __inline NTSTATUS NTAPI RtlStringCbPrintfA(OUT LPSTR Destination, @@ -249,7 +249,7 @@ return Status; } -__inline +static __inline NTSTATUS NTAPI RtlStringCbPrintfExA(OUT LPSTR Destination, @@ -330,7 +330,7 @@ return Status; } -__inline +static __inline NTSTATUS NTAPI RtlStringCbCopyExA(OUT LPSTR Destination, @@ -407,7 +407,7 @@ return Status; } -__inline +static __inline NTSTATUS NTAPI RtlStringCbPrintfW( @@ -420,7 +420,7 @@ return STATUS_NOT_IMPLEMENTED; } -__inline +static __inline NTSTATUS NTAPI RtlStringCbCatExA(IN OUT LPSTR Destination, @@ -494,7 +494,7 @@ return Status; } -__inline +static __inline NTSTATUS NTAPI RtlStringCbCopyA(OUT LPSTR Destination,

1 0

← Newer
1
...
16
17
18
19
20
21
22
...
29
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs August 2010