Ros-diffs February 2017

ros-diffs@reactos.org

13 participants
353 discussions

[pschweitzer] 73836: [FASTFAT] Avoid uninit variable usage. CID 1401257, 1401259

by pschweitzer＠svn.reactos.org

Author: pschweitzer Date: Sun Feb 19 11:22:21 2017 New Revision: 73836 URL: http://svn.reactos.org/svn/reactos?rev=73836&view=rev Log: [FASTFAT] Avoid uninit variable usage. CID 1401257, 1401259 Modified: trunk/reactos/drivers/filesystems/fastfat/rw.c Modified: trunk/reactos/drivers/filesystems/fastfat/rw.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat/rw.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat/rw.c [iso-8859-1] Sun Feb 19 11:22:21 2017 @@ -555,6 +555,10 @@ ASSERT(IrpContext->DeviceObject); + PagingIo = BooleanFlagOn(IrpContext->Irp->Flags, IRP_PAGING_IO); + CanWait = BooleanFlagOn(IrpContext->Flags, IRPCONTEXT_CANWAIT); + NoCache = BooleanFlagOn(IrpContext->Irp->Flags, IRP_NOCACHE); + // This request is not allowed on the main device object if (IrpContext->DeviceObject == VfatGlobalData->DeviceObject) { @@ -567,6 +571,8 @@ ASSERT(IrpContext->FileObject); Fcb = IrpContext->FileObject->FsContext; ASSERT(Fcb); + + IsVolume = BooleanFlagOn(Fcb->Flags, FCB_IS_VOLUME); if (BooleanFlagOn(Fcb->Flags, FCB_IS_PAGE_FILE)) { @@ -584,10 +590,6 @@ ByteOffset = IrpContext->Stack->Parameters.Read.ByteOffset; Length = IrpContext->Stack->Parameters.Read.Length; BytesPerSector = IrpContext->DeviceExt->FatInfo.BytesPerSector; - PagingIo = BooleanFlagOn(IrpContext->Irp->Flags, IRP_PAGING_IO); - CanWait = BooleanFlagOn(IrpContext->Flags, IRPCONTEXT_CANWAIT); - IsVolume = BooleanFlagOn(Fcb->Flags, FCB_IS_VOLUME); - NoCache = BooleanFlagOn(IrpContext->Irp->Flags, IRP_NOCACHE); /* fail if file is a directory and no paged read */ if (vfatFCBIsDirectory(Fcb) && !PagingIo) @@ -779,6 +781,10 @@ ASSERT(IrpContext->DeviceObject); + PagingIo = BooleanFlagOn(IrpContext->Irp->Flags, IRP_PAGING_IO); + CanWait = BooleanFlagOn(IrpContext->Flags, IRPCONTEXT_CANWAIT); + NoCache = BooleanFlagOn(IrpContext->Irp->Flags, IRP_NOCACHE); + // This request is not allowed on the main device object if (IrpContext->DeviceObject == VfatGlobalData->DeviceObject) { @@ -791,6 +797,9 @@ ASSERT(IrpContext->FileObject); Fcb = IrpContext->FileObject->FsContext; ASSERT(Fcb); + + IsVolume = BooleanFlagOn(Fcb->Flags, FCB_IS_VOLUME); + IsFAT = BooleanFlagOn(Fcb->Flags, FCB_IS_FAT); if (BooleanFlagOn(Fcb->Flags, FCB_IS_PAGE_FILE)) { @@ -804,12 +813,6 @@ } DPRINT("<%wZ>\n", &Fcb->PathNameU); - - PagingIo = BooleanFlagOn(IrpContext->Irp->Flags, IRP_PAGING_IO); - CanWait = BooleanFlagOn(IrpContext->Flags, IRPCONTEXT_CANWAIT); - IsVolume = BooleanFlagOn(Fcb->Flags, FCB_IS_VOLUME); - IsFAT = BooleanFlagOn(Fcb->Flags, FCB_IS_FAT); - NoCache = BooleanFlagOn(IrpContext->Irp->Flags, IRP_NOCACHE); /* fail if file is a directory and no paged read */ if (vfatFCBIsDirectory(Fcb) && !PagingIo)

7 years, 7 months

[tfaber] 73835: [LOCALMON] - Avoid a potential double free in InitializePrintMonitor2. CID 1401299 - Avoid a use after free in LocalmonClosePort. CID 1401298

by tfaber＠svn.reactos.org

Author: tfaber Date: Sun Feb 19 10:31:37 2017 New Revision: 73835 URL: http://svn.reactos.org/svn/reactos?rev=73835&view=rev Log: [LOCALMON] - Avoid a potential double free in InitializePrintMonitor2. CID 1401299 - Avoid a use after free in LocalmonClosePort. CID 1401298 Modified: trunk/reactos/win32ss/printing/monitors/localmon/main.c trunk/reactos/win32ss/printing/monitors/localmon/ports.c Modified: trunk/reactos/win32ss/printing/monitors/localmon/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/printing/monitors/… ============================================================================== --- trunk/reactos/win32ss/printing/monitors/localmon/main.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/printing/monitors/localmon/main.c [iso-8859-1] Sun Feb 19 10:31:37 2017 @@ -223,6 +223,7 @@ if (!cchPortName || _IsNEPort(pPort->pwszPortName)) { DllFreeSplMem(pPort); + pPort = NULL; continue; } Modified: trunk/reactos/win32ss/printing/monitors/localmon/ports.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/printing/monitors/… ============================================================================== --- trunk/reactos/win32ss/printing/monitors/localmon/ports.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/printing/monitors/localmon/ports.c [iso-8859-1] Sun Feb 19 10:31:37 2017 @@ -541,8 +541,8 @@ { EnterCriticalSection(&pPort->pLocalmon->Section); RemoveEntryList(&pPort->Entry); + LeaveCriticalSection(&pPort->pLocalmon->Section); DllFreeSplMem(pPort); - LeaveCriticalSection(&pPort->pLocalmon->Section); } SetLastError(ERROR_SUCCESS);

7 years, 7 months

[gadamopoulos] 73834: [UXTHEME] -The code to draw the classic style borders was copied from win32k, so imitate what it does and restore two bits that got removed in the copy. CORE-9667

by gadamopoulos＠svn.reactos.org

Author: gadamopoulos Date: Sun Feb 19 10:23:26 2017 New Revision: 73834 URL: http://svn.reactos.org/svn/reactos?rev=73834&view=rev Log: [UXTHEME] -The code to draw the classic style borders was copied from win32k, so imitate what it does and restore two bits that got removed in the copy. CORE-9667 Modified: trunk/reactos/dll/win32/uxtheme/nonclient.c Modified: trunk/reactos/dll/win32/uxtheme/nonclient.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/uxtheme/nonclien… ============================================================================== --- trunk/reactos/dll/win32/uxtheme/nonclient.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/uxtheme/nonclient.c [iso-8859-1] Sun Feb 19 10:23:26 2017 @@ -58,6 +58,7 @@ return FALSE; if (Style & WS_THICKFRAME) return TRUE; + Style &= WS_CAPTION; if (Style == WS_DLGFRAME || Style == WS_CAPTION) return TRUE; return FALSE; @@ -442,9 +443,9 @@ prcCurrent->right - prcCurrent->left, Height, PATCOPY); PatBlt(context->hDC, prcCurrent->left, prcCurrent->top, Width, prcCurrent->bottom - prcCurrent->top, PATCOPY); - PatBlt(context->hDC, prcCurrent->left, prcCurrent->bottom, + PatBlt(context->hDC, prcCurrent->left, prcCurrent->bottom - 1, prcCurrent->right - prcCurrent->left, -Height, PATCOPY); - PatBlt(context->hDC, prcCurrent->right, prcCurrent->top, + PatBlt(context->hDC, prcCurrent->right - 1, prcCurrent->top, -Width, prcCurrent->bottom - prcCurrent->top, PATCOPY); InflateRect(prcCurrent, -Width, -Height); @@ -467,9 +468,9 @@ prcCurrent->right - prcCurrent->left, Height, PATCOPY); PatBlt(context->hDC, prcCurrent->left, prcCurrent->top, Width, prcCurrent->bottom - prcCurrent->top, PATCOPY); - PatBlt(context->hDC, prcCurrent->left, prcCurrent->bottom, + PatBlt(context->hDC, prcCurrent->left, prcCurrent->bottom - 1, prcCurrent->right - prcCurrent->left, -Height, PATCOPY); - PatBlt(context->hDC, prcCurrent->right, prcCurrent->top, + PatBlt(context->hDC, prcCurrent->right - 1, prcCurrent->top, -Width, prcCurrent->bottom - prcCurrent->top, PATCOPY); InflateRect(prcCurrent, -Width, -Height);

7 years, 7 months

[gadamopoulos] 73833: [SHELL32] -Try to fix themes when opening the control panel applet from the control panel.

by gadamopoulos＠svn.reactos.org

Author: gadamopoulos Date: Sun Feb 19 09:10:03 2017 New Revision: 73833 URL: http://svn.reactos.org/svn/reactos?rev=73833&view=rev Log: [SHELL32] -Try to fix themes when opening the control panel applet from the control panel. Modified: trunk/reactos/dll/win32/shell32/wine/control.c Modified: trunk/reactos/dll/win32/shell32/wine/control.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/wine/con… ============================================================================== --- trunk/reactos/dll/win32/shell32/wine/control.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/wine/control.c [iso-8859-1] Sun Feb 19 09:10:03 2017 @@ -90,7 +90,8 @@ #ifdef __REACTOS__ StringCchCopy(fileBuffer, MAX_PATH, applet->cmd); - SearchPath(NULL, fileBuffer, NULL, MAX_PATH, fileBuffer, NULL); + if (PathIsFileSpecW(fileBuffer)) + SearchPath(NULL, fileBuffer, NULL, MAX_PATH, fileBuffer, NULL); ActCtx.lpSource = fileBuffer; ActCtx.lpResourceName = (LPCWSTR)123; applet->hActCtx = CreateActCtx(&ActCtx);

7 years, 7 months

[mjansen] 73832: [KS] Cleanup in the failure path of KsCreateDefaultClock. Patch by Sebastian Gasiorek. CID 1322124 CORE-12784 #resolve #comment Thanks!

by mjansen＠svn.reactos.org

Author: mjansen Date: Sat Feb 18 22:54:31 2017 New Revision: 73832 URL: http://svn.reactos.org/svn/reactos?rev=73832&view=rev Log: [KS] Cleanup in the failure path of KsCreateDefaultClock. Patch by Sebastian Gasiorek. CID 1322124 CORE-12784 #resolve #comment Thanks! Modified: trunk/reactos/drivers/ksfilter/ks/clocks.c Modified: trunk/reactos/drivers/ksfilter/ks/clocks.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/ksfilter/ks/clocks… ============================================================================== --- trunk/reactos/drivers/ksfilter/ks/clocks.c [iso-8859-1] (original) +++ trunk/reactos/drivers/ksfilter/ks/clocks.c [iso-8859-1] Sat Feb 18 22:54:31 2017 @@ -395,7 +395,10 @@ /* let's allocate the clock struct */ Clock = AllocateItem(NonPagedPool, sizeof(KSICLOCK)); if (!Clock) + { + FreeItem(ClockCreate); return STATUS_INSUFFICIENT_RESOURCES; + } /* now allocate the object header */ Status = KsAllocateObjectHeader((PVOID*)&Clock->ObjectHeader, 0, NULL, Irp, &DispatchTable); @@ -404,6 +407,7 @@ if (!NT_SUCCESS(Status)) { /* failed */ + FreeItem(ClockCreate); FreeItem(Clock); return Status; }

7 years, 7 months

[pschweitzer] 73831: [FASTFAT] Get rid of the ENTRY_DELETED2, ENTRY_VOLUME2 and ENTRY_END2 macros.

by pschweitzer＠svn.reactos.org

Author: pschweitzer Date: Sat Feb 18 21:37:56 2017 New Revision: 73831 URL: http://svn.reactos.org/svn/reactos?rev=73831&view=rev Log: [FASTFAT] Get rid of the ENTRY_DELETED2, ENTRY_VOLUME2 and ENTRY_END2 macros. Modified: trunk/reactos/drivers/filesystems/fastfat/create.c trunk/reactos/drivers/filesystems/fastfat/dirwr.c trunk/reactos/drivers/filesystems/fastfat/fcb.c trunk/reactos/drivers/filesystems/fastfat/fsctl.c trunk/reactos/drivers/filesystems/fastfat/vfat.h trunk/reactos/drivers/filesystems/fastfat/volume.c Modified: trunk/reactos/drivers/filesystems/fastfat/create.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat/create.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat/create.c [iso-8859-1] Sat Feb 18 21:37:56 2017 @@ -115,6 +115,7 @@ UNICODE_STRING PathNameU; UNICODE_STRING FileToFindUpcase; BOOLEAN WildCard; + BOOLEAN IsFatX = vfatVolumeIsFatX(DeviceExt); DPRINT("FindFile(Parent %p, FileToFind '%wZ', DirIndex: %u)\n", Parent, FileToFindU, DirContext->DirIndex); @@ -151,7 +152,7 @@ if (rcFcb) { ULONG startIndex = rcFcb->startIndex; - if (vfatVolumeIsFatX(DeviceExt) && !vfatFCBIsRoot(Parent)) + if (IsFatX && !vfatFCBIsRoot(Parent)) { startIndex += 2; } @@ -194,7 +195,7 @@ { break; } - if (ENTRY_VOLUME(DeviceExt, &DirContext->DirEntry)) + if (ENTRY_VOLUME(IsFatX, &DirContext->DirEntry)) { DirContext->DirIndex++; continue; Modified: trunk/reactos/drivers/filesystems/fastfat/dirwr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat/dirwr.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat/dirwr.c [iso-8859-1] Sat Feb 18 21:37:56 2017 @@ -161,9 +161,10 @@ PVOID Context = NULL; NTSTATUS Status; ULONG SizeDirEntry; + BOOLEAN IsFatX = vfatVolumeIsFatX(DeviceExt); FileOffset.QuadPart = 0; - if (vfatVolumeIsFatX(DeviceExt)) + if (IsFatX) SizeDirEntry = sizeof(FATX_DIR_ENTRY); else SizeDirEntry = sizeof(FAT_DIR_ENTRY); @@ -190,11 +191,11 @@ FileOffset.u.LowPart += DeviceExt->FatInfo.BytesPerCluster; } - if (ENTRY_END(DeviceExt, pFatEntry)) + if (ENTRY_END(IsFatX, pFatEntry)) { break; } - if (ENTRY_DELETED(DeviceExt, pFatEntry)) + if (ENTRY_DELETED(IsFatX, pFatEntry)) { nbFree++; } @@ -249,7 +250,7 @@ } _SEH2_END; - if (vfatVolumeIsFatX(DeviceExt)) + if (IsFatX) memset(pFatEntry, 0xff, DeviceExt->FatInfo.BytesPerCluster); else RtlZeroMemory(pFatEntry, DeviceExt->FatInfo.BytesPerCluster); @@ -268,7 +269,7 @@ } _SEH2_END; - if (vfatVolumeIsFatX(DeviceExt)) + if (IsFatX) memset(pFatEntry, 0xff, SizeDirEntry); else RtlZeroMemory(pFatEntry, SizeDirEntry); Modified: trunk/reactos/drivers/filesystems/fastfat/fcb.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat/fcb.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat/fcb.c [iso-8859-1] Sat Feb 18 21:37:56 2017 @@ -778,6 +778,7 @@ WCHAR ShortNameBuffer[13]; BOOLEAN FoundLong = FALSE; BOOLEAN FoundShort = FALSE; + BOOLEAN IsFatX = vfatVolumeIsFatX(pDeviceExt); ASSERT(pDeviceExt); ASSERT(pDirectoryFCB); @@ -816,7 +817,7 @@ DPRINT(" Index:%u longName:%wZ\n", DirContext.DirIndex, &DirContext.LongNameU); - if (!ENTRY_VOLUME(pDeviceExt, &DirContext.DirEntry)) + if (!ENTRY_VOLUME(IsFatX, &DirContext.DirEntry)) { if (DirContext.LongNameU.Length == 0 || DirContext.ShortNameU.Length == 0) Modified: trunk/reactos/drivers/filesystems/fastfat/fsctl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat/fsctl.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat/fsctl.c [iso-8859-1] Sat Feb 18 21:37:56 2017 @@ -431,7 +431,7 @@ { while (TRUE) { - if (ENTRY_VOLUME2(IsFatX, Entry)) + if (ENTRY_VOLUME(IsFatX, Entry)) { /* copy volume label */ if (IsFatX) @@ -446,7 +446,7 @@ } break; } - if (ENTRY_END2(IsFatX, Entry)) + if (ENTRY_END(IsFatX, Entry)) { break; } Modified: trunk/reactos/drivers/filesystems/fastfat/vfat.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat/vfat.h [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat/vfat.h [iso-8859-1] Sat Feb 18 21:37:56 2017 @@ -197,13 +197,9 @@ #define LONGNAME_MAX_LENGTH 256 // max length for a long filename -#define ENTRY_DELETED(DeviceExt, DirEntry) (vfatVolumeIsFatX(DeviceExt) ? FATX_ENTRY_DELETED(&((DirEntry)->FatX)) : FAT_ENTRY_DELETED(&((DirEntry)->Fat))) -#define ENTRY_VOLUME(DeviceExt, DirEntry) (vfatVolumeIsFatX(DeviceExt) ? FATX_ENTRY_VOLUME(&((DirEntry)->FatX)) : FAT_ENTRY_VOLUME(&((DirEntry)->Fat))) -#define ENTRY_END(DeviceExt, DirEntry) (vfatVolumeIsFatX(DeviceExt) ? FATX_ENTRY_END(&((DirEntry)->FatX)) : FAT_ENTRY_END(&((DirEntry)->Fat))) - -#define ENTRY_DELETED2(IsFatX, DirEntry) (IsFatX ? FATX_ENTRY_DELETED(&((DirEntry)->FatX)) : FAT_ENTRY_DELETED(&((DirEntry)->Fat))) -#define ENTRY_VOLUME2(IsFatX, DirEntry) (IsFatX ? FATX_ENTRY_VOLUME(&((DirEntry)->FatX)) : FAT_ENTRY_VOLUME(&((DirEntry)->Fat))) -#define ENTRY_END2(IsFatX, DirEntry) (IsFatX ? FATX_ENTRY_END(&((DirEntry)->FatX)) : FAT_ENTRY_END(&((DirEntry)->Fat))) +#define ENTRY_DELETED(IsFatX, DirEntry) (IsFatX ? FATX_ENTRY_DELETED(&((DirEntry)->FatX)) : FAT_ENTRY_DELETED(&((DirEntry)->Fat))) +#define ENTRY_VOLUME(IsFatX, DirEntry) (IsFatX ? FATX_ENTRY_VOLUME(&((DirEntry)->FatX)) : FAT_ENTRY_VOLUME(&((DirEntry)->Fat))) +#define ENTRY_END(IsFatX, DirEntry) (IsFatX ? FATX_ENTRY_END(&((DirEntry)->FatX)) : FAT_ENTRY_END(&((DirEntry)->Fat))) #define FAT_ENTRY_DELETED(DirEntry) ((DirEntry)->Filename[0] == 0xe5) #define FAT_ENTRY_END(DirEntry) ((DirEntry)->Filename[0] == 0) Modified: trunk/reactos/drivers/filesystems/fastfat/volume.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat/volume.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat/volume.c [iso-8859-1] Sat Feb 18 21:37:56 2017 @@ -250,17 +250,19 @@ CHAR cString[43]; ULONG SizeDirEntry; ULONG EntriesPerPage; + BOOLEAN IsFatX; DPRINT("FsdSetFsLabelInformation()\n"); DeviceExt = (PDEVICE_EXTENSION)DeviceObject->DeviceExtension; + IsFatX = vfatVolumeIsFatX(DeviceExt); if (sizeof(DeviceObject->Vpb->VolumeLabel) < FsLabelInfo->VolumeLabelLength) { return STATUS_NAME_TOO_LONG; } - if (vfatVolumeIsFatX(DeviceExt)) + if (IsFatX) { if (FsLabelInfo->VolumeLabelLength / sizeof(WCHAR) > 42) return STATUS_NAME_TOO_LONG; @@ -289,7 +291,7 @@ if (!NT_SUCCESS(Status)) return Status; - if (vfatVolumeIsFatX(DeviceExt)) + if (IsFatX) { RtlCopyMemory(VolumeLabelDirEntry.FatX.Filename, cString, LabelLen); memset(&VolumeLabelDirEntry.FatX.Filename[LabelLen], ' ', 42 - LabelLen); @@ -328,7 +330,7 @@ { while (TRUE) { - if (ENTRY_VOLUME(DeviceExt, Entry)) + if (ENTRY_VOLUME(IsFatX, Entry)) { /* Update entry */ LabelFound = TRUE; @@ -338,7 +340,7 @@ break; } - if (ENTRY_END(DeviceExt, Entry)) + if (ENTRY_END(IsFatX, Entry)) { break; }

7 years, 7 months

[pschweitzer] 73830: [FASTFAT] Modify ReadVolumeLabel() so that it is able to read the volume label, even without using the VCB, the root FCB, Cc, the universe. This is important, because in case o...

by pschweitzer＠svn.reactos.org

Author: pschweitzer Date: Sat Feb 18 21:24:31 2017 New Revision: 73830 URL: http://svn.reactos.org/svn/reactos?rev=73830&view=rev Log: [FASTFAT] Modify ReadVolumeLabel() so that it is able to read the volume label, even without using the VCB, the root FCB, Cc, the universe. This is important, because in case of device verifying, you cannot rely on these elements anylonger, but you need to read the label. A readme has been attached to the function, to indicate how to call it (I wish I could have put more asserts!). It's ugly, I know. This allows fixing a FIXME in VfatVerify(): we can also check the volume label for FATX volumes. The FIXME comment was misleading: MS FastFAT doesn't make any checksum or whatever of FAT root. Let's not do it. Modified: trunk/reactos/drivers/filesystems/fastfat/fsctl.c trunk/reactos/drivers/filesystems/fastfat/vfat.h Modified: trunk/reactos/drivers/filesystems/fastfat/fsctl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat/fsctl.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat/fsctl.c [iso-8859-1] Sat Feb 18 21:24:31 2017 @@ -340,31 +340,38 @@ /* * FUNCTION: Read the volume label + * WARNING: Read this comment carefully before using it (and using it wrong) + * Device parameter is expected to be the lower DO is start isn't 0 + * otherwise, it is expected to be the VCB is start is 0 + * Start parameter is expected to be, in bytes, the beginning of the root start. + * Set it to 0 if you wish to use the associated FCB with caching. + * In that specific case, Device parameter is expected to be the VCB! + * VolumeLabel parameter is expected to be a preallocated UNICODE_STRING (ie, with buffer) + * Its buffer has to be able to contain MAXIMUM_VOLUME_LABEL_LENGTH bytes */ static NTSTATUS ReadVolumeLabel( - PDEVICE_EXTENSION DeviceExt, - PVPB Vpb) + PVOID Device, + ULONG Start, + BOOLEAN IsFatX, + PUNICODE_STRING VolumeLabel) { + PDEVICE_EXTENSION DeviceExt; + PDEVICE_OBJECT DeviceObject; PVOID Context = NULL; ULONG DirIndex = 0; PDIR_ENTRY Entry; PVFATFCB pFcb; LARGE_INTEGER FileOffset; - UNICODE_STRING NameU; ULONG SizeDirEntry; ULONG EntriesPerPage; OEM_STRING StringO; + BOOLEAN NoCache = (Start != 0); + PVOID Buffer; NTSTATUS Status = STATUS_SUCCESS; - NameU.Buffer = Vpb->VolumeLabel; - NameU.Length = 0; - NameU.MaximumLength = sizeof(Vpb->VolumeLabel); - *(Vpb->VolumeLabel) = 0; - Vpb->VolumeLabelLength = 0; - - if (vfatVolumeIsFatX(DeviceExt)) + if (IsFatX) { SizeDirEntry = sizeof(FATX_DIR_ENTRY); EntriesPerPage = FATX_ENTRIES_PER_PAGE; @@ -375,41 +382,71 @@ EntriesPerPage = FAT_ENTRIES_PER_PAGE; } - ExAcquireResourceExclusiveLite(&DeviceExt->DirResource, TRUE); - pFcb = vfatOpenRootFCB(DeviceExt); - ExReleaseResourceLite(&DeviceExt->DirResource); - - FileOffset.QuadPart = 0; - _SEH2_TRY - { - CcMapData(pFcb->FileObject, &FileOffset, SizeDirEntry, MAP_WAIT, &Context, (PVOID*)&Entry); - } - _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) - { - Status = _SEH2_GetExceptionCode(); - } - _SEH2_END; + FileOffset.QuadPart = Start; + if (!NoCache) + { + DeviceExt = Device; + + /* FIXME: Check we really have a VCB + ASSERT(); + */ + + ExAcquireResourceExclusiveLite(&DeviceExt->DirResource, TRUE); + pFcb = vfatOpenRootFCB(DeviceExt); + ExReleaseResourceLite(&DeviceExt->DirResource); + + _SEH2_TRY + { + CcMapData(pFcb->FileObject, &FileOffset, SizeDirEntry, MAP_WAIT, &Context, (PVOID*)&Entry); + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + Status = _SEH2_GetExceptionCode(); + } + _SEH2_END; + } + else + { + DeviceObject = Device; + + ASSERT(DeviceObject->Type == 3); + + Buffer = ExAllocatePoolWithTag(NonPagedPool, PAGE_SIZE, TAG_VFAT); + if (Buffer != NULL) + { + Status = VfatReadDisk(DeviceObject, &FileOffset, PAGE_SIZE, (PUCHAR)Buffer, TRUE); + if (!NT_SUCCESS(Status)) + { + ExFreePoolWithTag(Entry, TAG_VFAT); + } + Entry = Buffer; + } + else + { + Status = STATUS_INSUFFICIENT_RESOURCES; + } + } + if (NT_SUCCESS(Status)) { while (TRUE) { - if (ENTRY_VOLUME(DeviceExt, Entry)) + if (ENTRY_VOLUME2(IsFatX, Entry)) { /* copy volume label */ - if (vfatVolumeIsFatX(DeviceExt)) + if (IsFatX) { StringO.Buffer = (PCHAR)Entry->FatX.Filename; StringO.MaximumLength = StringO.Length = Entry->FatX.FilenameLength; - RtlOemStringToUnicodeString(&NameU, &StringO, FALSE); + RtlOemStringToUnicodeString(VolumeLabel, &StringO, FALSE); } else { - vfat8Dot3ToString(&Entry->Fat, &NameU); - } - Vpb->VolumeLabelLength = NameU.Length; + vfat8Dot3ToString(&Entry->Fat, VolumeLabel); + } break; } - if (ENTRY_END(DeviceExt, Entry)) + if (ENTRY_END2(IsFatX, Entry)) { break; } @@ -417,21 +454,35 @@ Entry = (PDIR_ENTRY)((ULONG_PTR)Entry + SizeDirEntry); if ((DirIndex % EntriesPerPage) == 0) { - CcUnpinData(Context); FileOffset.u.LowPart += PAGE_SIZE; - _SEH2_TRY - { - CcMapData(pFcb->FileObject, &FileOffset, SizeDirEntry, MAP_WAIT, &Context, (PVOID*)&Entry); - } - _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) - { - Status = _SEH2_GetExceptionCode(); - } - _SEH2_END; - if (!NT_SUCCESS(Status)) - { - Context = NULL; - break; + + if (!NoCache) + { + CcUnpinData(Context); + + _SEH2_TRY + { + CcMapData(pFcb->FileObject, &FileOffset, SizeDirEntry, MAP_WAIT, &Context, (PVOID*)&Entry); + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + Status = _SEH2_GetExceptionCode(); + } + _SEH2_END; + if (!NT_SUCCESS(Status)) + { + Context = NULL; + break; + } + } + else + { + Status = VfatReadDisk(DeviceObject, &FileOffset, PAGE_SIZE, (PUCHAR)Buffer, TRUE); + if (!NT_SUCCESS(Status)) + { + break; + } + Entry = Buffer; } } } @@ -439,10 +490,18 @@ { CcUnpinData(Context); } - } - ExAcquireResourceExclusiveLite(&DeviceExt->DirResource, TRUE); - vfatReleaseFCB(DeviceExt, pFcb); - ExReleaseResourceLite(&DeviceExt->DirResource); + else if (NoCache) + { + ExFreePoolWithTag(Buffer, TAG_VFAT); + } + } + + if (!NoCache) + { + ExAcquireResourceExclusiveLite(&DeviceExt->DirResource, TRUE); + vfatReleaseFCB(DeviceExt, pFcb); + ExReleaseResourceLite(&DeviceExt->DirResource); + } return STATUS_SUCCESS; } @@ -467,6 +526,7 @@ PVPB Vpb; UNICODE_STRING NameU = RTL_CONSTANT_STRING(L"\\$$Fat$$"); UNICODE_STRING VolumeNameU = RTL_CONSTANT_STRING(L"\\$$Volume$$"); + UNICODE_STRING VolumeLabelU; ULONG HashTableSize; ULONG eocMark; FATINFO FatInfo; @@ -676,7 +736,11 @@ DeviceObject->Vpb->SerialNumber = DeviceExt->FatInfo.VolumeID; /* read volume label */ - ReadVolumeLabel(DeviceExt, DeviceObject->Vpb); + VolumeLabelU.Buffer = DeviceObject->Vpb->VolumeLabel; + VolumeLabelU.Length = 0; + VolumeLabelU.MaximumLength = sizeof(DeviceObject->Vpb->VolumeLabel); + ReadVolumeLabel(DeviceExt, 0, vfatVolumeIsFatX(DeviceExt), &VolumeLabelU); + Vpb->VolumeLabelLength = VolumeLabelU.Length; /* read clean shutdown bit status */ Status = GetNextCluster(DeviceExt, 1, &eocMark); @@ -769,21 +833,41 @@ if (!NT_SUCCESS(Status) || RecognizedFS == FALSE) { if (NT_SUCCESS(Status) || AllowRaw) + { Status = STATUS_WRONG_VOLUME; + } } else if (sizeof(FATINFO) == RtlCompareMemory(&FatInfo, &DeviceExt->FatInfo, sizeof(FATINFO))) { - DPRINT1("Same volume\n"); - /* - * FIXME: - * Preformatted floppy disks have very often a serial number of 0000:0000. - * We should calculate a crc sum over the sectors from the root directory as secondary volume number. - * Each write to the root directory must update this crc sum. - */ - /* HACK */ - if (!FatInfo.FixedMedia && FatInfo.FatType >= FATX16) - { - Status = STATUS_WRONG_VOLUME; + WCHAR BufferU[MAXIMUM_VOLUME_LABEL_LENGTH / sizeof(WCHAR)]; + UNICODE_STRING VolumeLabelU; + UNICODE_STRING VpbLabelU; + + VolumeLabelU.Buffer = BufferU; + VolumeLabelU.Length = 0; + VolumeLabelU.MaximumLength = sizeof(BufferU); + Status = ReadVolumeLabel(DeviceExt->StorageDevice, FatInfo.rootStart * FatInfo.BytesPerSector, (FatInfo.FatType >= FATX16), &VolumeLabelU); + if (!NT_SUCCESS(Status)) + { + if (AllowRaw) + { + Status = STATUS_WRONG_VOLUME; + } + } + else + { + VpbLabelU.Buffer = Vpb->VolumeLabel; + VpbLabelU.Length = Vpb->VolumeLabelLength; + VpbLabelU.MaximumLength = sizeof(Vpb->VolumeLabel); + + if (RtlCompareUnicodeString(&VpbLabelU, &VolumeLabelU, FALSE) != 0) + { + Status = STATUS_WRONG_VOLUME; + } + else + { + DPRINT1("Same volume\n"); + } } } else Modified: trunk/reactos/drivers/filesystems/fastfat/vfat.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat/vfat.h [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat/vfat.h [iso-8859-1] Sat Feb 18 21:24:31 2017 @@ -201,6 +201,10 @@ #define ENTRY_VOLUME(DeviceExt, DirEntry) (vfatVolumeIsFatX(DeviceExt) ? FATX_ENTRY_VOLUME(&((DirEntry)->FatX)) : FAT_ENTRY_VOLUME(&((DirEntry)->Fat))) #define ENTRY_END(DeviceExt, DirEntry) (vfatVolumeIsFatX(DeviceExt) ? FATX_ENTRY_END(&((DirEntry)->FatX)) : FAT_ENTRY_END(&((DirEntry)->Fat))) +#define ENTRY_DELETED2(IsFatX, DirEntry) (IsFatX ? FATX_ENTRY_DELETED(&((DirEntry)->FatX)) : FAT_ENTRY_DELETED(&((DirEntry)->Fat))) +#define ENTRY_VOLUME2(IsFatX, DirEntry) (IsFatX ? FATX_ENTRY_VOLUME(&((DirEntry)->FatX)) : FAT_ENTRY_VOLUME(&((DirEntry)->Fat))) +#define ENTRY_END2(IsFatX, DirEntry) (IsFatX ? FATX_ENTRY_END(&((DirEntry)->FatX)) : FAT_ENTRY_END(&((DirEntry)->Fat))) + #define FAT_ENTRY_DELETED(DirEntry) ((DirEntry)->Filename[0] == 0xe5) #define FAT_ENTRY_END(DirEntry) ((DirEntry)->Filename[0] == 0) #define FAT_ENTRY_LONG(DirEntry) (((DirEntry)->Attrib & 0x3f) == 0x0f)

7 years, 7 months

[pschweitzer] 73829: [FASTFAT] Move ReadVolumeLabel() to fsctl.c close to functions that need it

by pschweitzer＠svn.reactos.org

Author: pschweitzer Date: Sat Feb 18 18:35:48 2017 New Revision: 73829 URL: http://svn.reactos.org/svn/reactos?rev=73829&view=rev Log: [FASTFAT] Move ReadVolumeLabel() to fsctl.c close to functions that need it Modified: trunk/reactos/drivers/filesystems/fastfat/create.c trunk/reactos/drivers/filesystems/fastfat/fsctl.c trunk/reactos/drivers/filesystems/fastfat/vfat.h Modified: trunk/reactos/drivers/filesystems/fastfat/create.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat/create.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat/create.c [iso-8859-1] Sat Feb 18 18:35:48 2017 @@ -95,114 +95,6 @@ } /* - * FUNCTION: Read the volume label - */ -NTSTATUS -ReadVolumeLabel( - PDEVICE_EXTENSION DeviceExt, - PVPB Vpb) -{ - PVOID Context = NULL; - ULONG DirIndex = 0; - PDIR_ENTRY Entry; - PVFATFCB pFcb; - LARGE_INTEGER FileOffset; - UNICODE_STRING NameU; - ULONG SizeDirEntry; - ULONG EntriesPerPage; - OEM_STRING StringO; - NTSTATUS Status = STATUS_SUCCESS; - - NameU.Buffer = Vpb->VolumeLabel; - NameU.Length = 0; - NameU.MaximumLength = sizeof(Vpb->VolumeLabel); - *(Vpb->VolumeLabel) = 0; - Vpb->VolumeLabelLength = 0; - - if (vfatVolumeIsFatX(DeviceExt)) - { - SizeDirEntry = sizeof(FATX_DIR_ENTRY); - EntriesPerPage = FATX_ENTRIES_PER_PAGE; - } - else - { - SizeDirEntry = sizeof(FAT_DIR_ENTRY); - EntriesPerPage = FAT_ENTRIES_PER_PAGE; - } - - ExAcquireResourceExclusiveLite(&DeviceExt->DirResource, TRUE); - pFcb = vfatOpenRootFCB(DeviceExt); - ExReleaseResourceLite(&DeviceExt->DirResource); - - FileOffset.QuadPart = 0; - _SEH2_TRY - { - CcMapData(pFcb->FileObject, &FileOffset, SizeDirEntry, MAP_WAIT, &Context, (PVOID*)&Entry); - } - _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) - { - Status = _SEH2_GetExceptionCode(); - } - _SEH2_END; - if (NT_SUCCESS(Status)) - { - while (TRUE) - { - if (ENTRY_VOLUME(DeviceExt, Entry)) - { - /* copy volume label */ - if (vfatVolumeIsFatX(DeviceExt)) - { - StringO.Buffer = (PCHAR)Entry->FatX.Filename; - StringO.MaximumLength = StringO.Length = Entry->FatX.FilenameLength; - RtlOemStringToUnicodeString(&NameU, &StringO, FALSE); - } - else - { - vfat8Dot3ToString(&Entry->Fat, &NameU); - } - Vpb->VolumeLabelLength = NameU.Length; - break; - } - if (ENTRY_END(DeviceExt, Entry)) - { - break; - } - DirIndex++; - Entry = (PDIR_ENTRY)((ULONG_PTR)Entry + SizeDirEntry); - if ((DirIndex % EntriesPerPage) == 0) - { - CcUnpinData(Context); - FileOffset.u.LowPart += PAGE_SIZE; - _SEH2_TRY - { - CcMapData(pFcb->FileObject, &FileOffset, SizeDirEntry, MAP_WAIT, &Context, (PVOID*)&Entry); - } - _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) - { - Status = _SEH2_GetExceptionCode(); - } - _SEH2_END; - if (!NT_SUCCESS(Status)) - { - Context = NULL; - break; - } - } - } - if (Context) - { - CcUnpinData(Context); - } - } - ExAcquireResourceExclusiveLite(&DeviceExt->DirResource, TRUE); - vfatReleaseFCB(DeviceExt, pFcb); - ExReleaseResourceLite(&DeviceExt->DirResource); - - return STATUS_SUCCESS; -} - -/* * FUNCTION: Find a file */ NTSTATUS Modified: trunk/reactos/drivers/filesystems/fastfat/fsctl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat/fsctl.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat/fsctl.c [iso-8859-1] Sat Feb 18 18:35:48 2017 @@ -338,6 +338,115 @@ return Status; } +/* + * FUNCTION: Read the volume label + */ +static +NTSTATUS +ReadVolumeLabel( + PDEVICE_EXTENSION DeviceExt, + PVPB Vpb) +{ + PVOID Context = NULL; + ULONG DirIndex = 0; + PDIR_ENTRY Entry; + PVFATFCB pFcb; + LARGE_INTEGER FileOffset; + UNICODE_STRING NameU; + ULONG SizeDirEntry; + ULONG EntriesPerPage; + OEM_STRING StringO; + NTSTATUS Status = STATUS_SUCCESS; + + NameU.Buffer = Vpb->VolumeLabel; + NameU.Length = 0; + NameU.MaximumLength = sizeof(Vpb->VolumeLabel); + *(Vpb->VolumeLabel) = 0; + Vpb->VolumeLabelLength = 0; + + if (vfatVolumeIsFatX(DeviceExt)) + { + SizeDirEntry = sizeof(FATX_DIR_ENTRY); + EntriesPerPage = FATX_ENTRIES_PER_PAGE; + } + else + { + SizeDirEntry = sizeof(FAT_DIR_ENTRY); + EntriesPerPage = FAT_ENTRIES_PER_PAGE; + } + + ExAcquireResourceExclusiveLite(&DeviceExt->DirResource, TRUE); + pFcb = vfatOpenRootFCB(DeviceExt); + ExReleaseResourceLite(&DeviceExt->DirResource); + + FileOffset.QuadPart = 0; + _SEH2_TRY + { + CcMapData(pFcb->FileObject, &FileOffset, SizeDirEntry, MAP_WAIT, &Context, (PVOID*)&Entry); + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + Status = _SEH2_GetExceptionCode(); + } + _SEH2_END; + if (NT_SUCCESS(Status)) + { + while (TRUE) + { + if (ENTRY_VOLUME(DeviceExt, Entry)) + { + /* copy volume label */ + if (vfatVolumeIsFatX(DeviceExt)) + { + StringO.Buffer = (PCHAR)Entry->FatX.Filename; + StringO.MaximumLength = StringO.Length = Entry->FatX.FilenameLength; + RtlOemStringToUnicodeString(&NameU, &StringO, FALSE); + } + else + { + vfat8Dot3ToString(&Entry->Fat, &NameU); + } + Vpb->VolumeLabelLength = NameU.Length; + break; + } + if (ENTRY_END(DeviceExt, Entry)) + { + break; + } + DirIndex++; + Entry = (PDIR_ENTRY)((ULONG_PTR)Entry + SizeDirEntry); + if ((DirIndex % EntriesPerPage) == 0) + { + CcUnpinData(Context); + FileOffset.u.LowPart += PAGE_SIZE; + _SEH2_TRY + { + CcMapData(pFcb->FileObject, &FileOffset, SizeDirEntry, MAP_WAIT, &Context, (PVOID*)&Entry); + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + Status = _SEH2_GetExceptionCode(); + } + _SEH2_END; + if (!NT_SUCCESS(Status)) + { + Context = NULL; + break; + } + } + } + if (Context) + { + CcUnpinData(Context); + } + } + ExAcquireResourceExclusiveLite(&DeviceExt->DirResource, TRUE); + vfatReleaseFCB(DeviceExt, pFcb); + ExReleaseResourceLite(&DeviceExt->DirResource); + + return STATUS_SUCCESS; +} + /* * FUNCTION: Mount the filesystem Modified: trunk/reactos/drivers/filesystems/fastfat/vfat.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat/vfat.h [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat/vfat.h [iso-8859-1] Sat Feb 18 18:35:48 2017 @@ -662,11 +662,6 @@ PFAT_DIR_ENTRY pEntry, PUNICODE_STRING NameU); -NTSTATUS -ReadVolumeLabel( - PDEVICE_EXTENSION DeviceExt, - PVPB Vpb); - /* dir.c */ NTSTATUS

7 years, 7 months

[gadamopoulos] 73828: [DESK.CPL] -Apparently the second parameter of ApplyTheme is not a string. One case is that it is not a pointer and another case that it is a pointer to a struct. What I'm sur...

by gadamopoulos＠svn.reactos.org

Author: gadamopoulos Date: Sat Feb 18 18:14:32 2017 New Revision: 73828 URL: http://svn.reactos.org/svn/reactos?rev=73828&view=rev Log: [DESK.CPL] -Apparently the second parameter of ApplyTheme is not a string. One case is that it is not a pointer and another case that it is a pointer to a struct. What I'm sure of is that as it is now the position of the string in the binary affects the behavior of ApplyTheme. Thankfully 0 works great on windows. Modified: trunk/reactos/dll/cpl/desk/theme.c Modified: trunk/reactos/dll/cpl/desk/theme.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/theme.c?rev=7… ============================================================================== --- trunk/reactos/dll/cpl/desk/theme.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/desk/theme.c [iso-8859-1] Sat Feb 18 18:14:32 2017 @@ -879,7 +879,7 @@ if (!SUCCEEDED(hret)) return FALSE; } - hret = ApplyTheme(hThemeFile, "", 0); + hret = ApplyTheme(hThemeFile, 0, 0); if (pSelectedTheme->ThemeActive) {

7 years, 7 months

[tfaber] 73827: [KMTESTS:MM] - Add some stricter checks and improved error handling in NtCreateSection_user

by tfaber＠svn.reactos.org

Author: tfaber Date: Sat Feb 18 14:22:44 2017 New Revision: 73827 URL: http://svn.reactos.org/svn/reactos?rev=73827&view=rev Log: [KMTESTS:MM] - Add some stricter checks and improved error handling in NtCreateSection_user Modified: trunk/rostests/kmtests/ntos_mm/NtCreateSection_user.c Modified: trunk/rostests/kmtests/ntos_mm/NtCreateSection_user.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/kmtests/ntos_mm/NtCreateS… ============================================================================== --- trunk/rostests/kmtests/ntos_mm/NtCreateSection_user.c [iso-8859-1] (original) +++ trunk/rostests/kmtests/ntos_mm/NtCreateSection_user.c [iso-8859-1] Sat Feb 18 14:22:44 2017 @@ -33,7 +33,9 @@ Status = NtCreateSection(&SectionHandle, SECTION_ALL_ACCESS, 0, &MaxFileSize, PAGE_READWRITE, SEC_COMMIT, Handle); ok_eq_hex(Status, STATUS_INVALID_FILE_FOR_SECTION); - NtClose(Handle); + if (NT_SUCCESS(Status)) NtClose(SectionHandle); + Status = NtClose(Handle); + ok_eq_hex(Status, STATUS_SUCCESS); /* Test 1 */ InitializeObjectAttributes(&ObjectAttributes, &InitOnCreate, OBJ_CASE_INSENSITIVE, NULL, NULL); @@ -57,9 +59,12 @@ memset(Buffer, 0xBA, 512); KmtEndSeh(STATUS_SUCCESS); - NtUnmapViewOfSection(NtCurrentProcess(), Buffer); - NtClose(SectionHandle); - NtClose(Handle); + Status = NtUnmapViewOfSection(NtCurrentProcess(), Buffer); + ok_eq_hex(Status, STATUS_SUCCESS); + Status = NtClose(SectionHandle); + ok_eq_hex(Status, STATUS_SUCCESS); + Status = NtClose(Handle); + ok_eq_hex(Status, STATUS_SUCCESS); /* Test 2 */ InitializeObjectAttributes(&ObjectAttributes, &InitOnCreate, OBJ_CASE_INSENSITIVE, NULL, NULL); @@ -83,9 +88,12 @@ memset(Buffer, 0xBA, 4096); KmtEndSeh(STATUS_SUCCESS); - NtUnmapViewOfSection(NtCurrentProcess(), Buffer); - NtClose(SectionHandle); - NtClose(Handle); + Status = NtUnmapViewOfSection(NtCurrentProcess(), Buffer); + ok_eq_hex(Status, STATUS_SUCCESS); + Status = NtClose(SectionHandle); + ok_eq_hex(Status, STATUS_SUCCESS); + Status = NtClose(Handle); + ok_eq_hex(Status, STATUS_SUCCESS); /* Test 3 */ InitializeObjectAttributes(&ObjectAttributes, &InitOnRW, OBJ_CASE_INSENSITIVE, NULL, NULL); @@ -109,9 +117,12 @@ memset(Buffer, 0xBA, 512); KmtEndSeh(STATUS_SUCCESS); - NtUnmapViewOfSection(NtCurrentProcess(), Buffer); - NtClose(SectionHandle); - NtClose(Handle); + Status = NtUnmapViewOfSection(NtCurrentProcess(), Buffer); + ok_eq_hex(Status, STATUS_SUCCESS); + Status = NtClose(SectionHandle); + ok_eq_hex(Status, STATUS_SUCCESS); + Status = NtClose(Handle); + ok_eq_hex(Status, STATUS_SUCCESS); /* Test 4 */ InitializeObjectAttributes(&ObjectAttributes, &InitOnRW, OBJ_CASE_INSENSITIVE, NULL, NULL); @@ -135,9 +146,12 @@ memset(Buffer, 0xBA, 4096); KmtEndSeh(STATUS_SUCCESS); - NtUnmapViewOfSection(NtCurrentProcess(), Buffer); - NtClose(SectionHandle); - NtClose(Handle); + Status = NtUnmapViewOfSection(NtCurrentProcess(), Buffer); + ok_eq_hex(Status, STATUS_SUCCESS); + Status = NtClose(SectionHandle); + ok_eq_hex(Status, STATUS_SUCCESS); + Status = NtClose(Handle); + ok_eq_hex(Status, STATUS_SUCCESS); /* Test 10 */ InitializeObjectAttributes(&ObjectAttributes, &InvalidInit, OBJ_CASE_INSENSITIVE, NULL, NULL); @@ -149,7 +163,9 @@ Status = NtCreateSection(&SectionHandle, SECTION_ALL_ACCESS, 0, &MaxFileSize, PAGE_READWRITE, SEC_COMMIT, Handle); ok_eq_hex(Status, STATUS_INVALID_FILE_FOR_SECTION); - NtClose(Handle); + if (NT_SUCCESS(Status)) NtClose(SectionHandle); + Status = NtClose(Handle); + ok_eq_hex(Status, STATUS_SUCCESS); /* Test 11 */ InitializeObjectAttributes(&ObjectAttributes, &InitOnCreate, OBJ_CASE_INSENSITIVE, NULL, NULL); @@ -173,9 +189,12 @@ memset(Buffer, 0xBA, 512); KmtEndSeh(STATUS_SUCCESS); - NtUnmapViewOfSection(NtCurrentProcess(), Buffer); - NtClose(SectionHandle); - NtClose(Handle); + Status = NtUnmapViewOfSection(NtCurrentProcess(), Buffer); + ok_eq_hex(Status, STATUS_SUCCESS); + Status = NtClose(SectionHandle); + ok_eq_hex(Status, STATUS_SUCCESS); + Status = NtClose(Handle); + ok_eq_hex(Status, STATUS_SUCCESS); /* Test 12 */ InitializeObjectAttributes(&ObjectAttributes, &InitOnCreate, OBJ_CASE_INSENSITIVE, NULL, NULL); @@ -199,9 +218,12 @@ memset(Buffer, 0xBA, 4096); KmtEndSeh(STATUS_SUCCESS); - NtUnmapViewOfSection(NtCurrentProcess(), Buffer); - NtClose(SectionHandle); - NtClose(Handle); + Status = NtUnmapViewOfSection(NtCurrentProcess(), Buffer); + ok_eq_hex(Status, STATUS_SUCCESS); + Status = NtClose(SectionHandle); + ok_eq_hex(Status, STATUS_SUCCESS); + Status = NtClose(Handle); + ok_eq_hex(Status, STATUS_SUCCESS); /* Test 13 */ InitializeObjectAttributes(&ObjectAttributes, &InitOnRW, OBJ_CASE_INSENSITIVE, NULL, NULL); @@ -225,9 +247,12 @@ memset(Buffer, 0xBA, 512); KmtEndSeh(STATUS_SUCCESS); - NtUnmapViewOfSection(NtCurrentProcess(), Buffer); - NtClose(SectionHandle); - NtClose(Handle); + Status = NtUnmapViewOfSection(NtCurrentProcess(), Buffer); + ok_eq_hex(Status, STATUS_SUCCESS); + Status = NtClose(SectionHandle); + ok_eq_hex(Status, STATUS_SUCCESS); + Status = NtClose(Handle); + ok_eq_hex(Status, STATUS_SUCCESS); /* Test 14 */ InitializeObjectAttributes(&ObjectAttributes, &InitOnRW, OBJ_CASE_INSENSITIVE, NULL, NULL); @@ -251,9 +276,12 @@ memset(Buffer, 0xBA, 4096); KmtEndSeh(STATUS_SUCCESS); - NtUnmapViewOfSection(NtCurrentProcess(), Buffer); - NtClose(SectionHandle); - NtClose(Handle); + Status = NtUnmapViewOfSection(NtCurrentProcess(), Buffer); + ok_eq_hex(Status, STATUS_SUCCESS); + Status = NtClose(SectionHandle); + ok_eq_hex(Status, STATUS_SUCCESS); + Status = NtClose(Handle); + ok_eq_hex(Status, STATUS_SUCCESS); KmtCloseDriver(); KmtUnloadDriver();

7 years, 7 months

← Newer
1
...
15
16
17
18
19
20
21
...
36
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs February 2017