Ros-diffs November 2014

ros-diffs@reactos.org

18 participants
373 discussions

[hbelusca] 65535: Fix the fix of the fix (yes, really!) Also, Hervé, I'm not really convinced you need to upcase the first letter in the RtlPathTypeDriveAbsolute case. Can you recheck that (and if ...

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Sun Nov 30 12:06:58 2014 New Revision: 65535 URL: http://svn.reactos.org/svn/reactos?rev=65535&view=rev Log: Fix the fix of the fix (yes, really!) Also, Hervé, I'm not really convinced you need to upcase the first letter in the RtlPathTypeDriveAbsolute case. Can you recheck that (and if unneeded, remove the commented line)? Modified: trunk/reactos/lib/rtl/path.c Modified: trunk/reactos/lib/rtl/path.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/path.c?rev=65535&r… ============================================================================== --- trunk/reactos/lib/rtl/path.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/path.c [iso-8859-1] Sun Nov 30 12:06:58 2014 @@ -487,7 +487,6 @@ PCUNICODE_STRING CurDirName; UNICODE_STRING EnvVarName, EnvVarValue; - WCHAR CurDrive, NewDrive; WCHAR EnvVarNameBuffer[4]; ULONG PrefixCut = 0; // Where the path really starts (after the skipped prefix) @@ -615,9 +614,8 @@ ASSERT(FileNameBuffer[1] == L':'); ASSERT(IS_PATH_SEPARATOR(FileNameBuffer[2])); - NewDrive = RtlUpcaseUnicodeChar(FileNameBuffer[0]); - - Prefix = NewDrive; + // FileNameBuffer[0] = RtlUpcaseUnicodeChar(FileNameBuffer[0]); + Prefix = FileNameBuffer; PrefixLength = 3 * sizeof(WCHAR); Source += 3; SourceLength -= 3 * sizeof(WCHAR); @@ -628,6 +626,8 @@ case RtlPathTypeDriveRelative: /* c:foo */ { + WCHAR CurDrive, NewDrive; + Source += 2; SourceLength -= 2 * sizeof(WCHAR);

10 years

[hbelusca] 65534: Fix the fix.

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Sun Nov 30 11:56:36 2014 New Revision: 65534 URL: http://svn.reactos.org/svn/reactos?rev=65534&view=rev Log: Fix the fix. Modified: trunk/reactos/lib/rtl/path.c Modified: trunk/reactos/lib/rtl/path.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/path.c?rev=65534&r… ============================================================================== --- trunk/reactos/lib/rtl/path.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/path.c [iso-8859-1] Sun Nov 30 11:56:36 2014 @@ -487,6 +487,7 @@ PCUNICODE_STRING CurDirName; UNICODE_STRING EnvVarName, EnvVarValue; + WCHAR CurDrive, NewDrive; WCHAR EnvVarNameBuffer[4]; ULONG PrefixCut = 0; // Where the path really starts (after the skipped prefix) @@ -614,7 +615,9 @@ ASSERT(FileNameBuffer[1] == L':'); ASSERT(IS_PATH_SEPARATOR(FileNameBuffer[2])); - Prefix = RtlUpcaseUnicodeChar(FileNameBuffer[0]); + NewDrive = RtlUpcaseUnicodeChar(FileNameBuffer[0]); + + Prefix = NewDrive; PrefixLength = 3 * sizeof(WCHAR); Source += 3; SourceLength -= 3 * sizeof(WCHAR); @@ -625,8 +628,6 @@ case RtlPathTypeDriveRelative: /* c:foo */ { - WCHAR CurDrive, NewDrive; - Source += 2; SourceLength -= 2 * sizeof(WCHAR);

10 years

[hbelusca] 65533: [RTL]: RtlGetFullPathName_Ustr: Do not upcase the drive letter in the source string (that should not be modified), but use a temporary variable.

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Sun Nov 30 11:53:19 2014 New Revision: 65533 URL: http://svn.reactos.org/svn/reactos?rev=65533&view=rev Log: [RTL]: RtlGetFullPathName_Ustr: Do not upcase the drive letter in the source string (that should not be modified), but use a temporary variable. Modified: trunk/reactos/lib/rtl/path.c Modified: trunk/reactos/lib/rtl/path.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/path.c?rev=65533&r… ============================================================================== --- trunk/reactos/lib/rtl/path.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/path.c [iso-8859-1] Sun Nov 30 11:53:19 2014 @@ -598,38 +598,48 @@ switch (*PathType) { case RtlPathTypeUncAbsolute: /* \\foo */ + { PrefixCut = RtlpSkipUNCPrefix(FileNameBuffer); break; + } case RtlPathTypeLocalDevice: /* \\.\foo */ + { PrefixCut = 4; break; + } case RtlPathTypeDriveAbsolute: /* c:\foo */ + { ASSERT(FileNameBuffer[1] == L':'); ASSERT(IS_PATH_SEPARATOR(FileNameBuffer[2])); - FileNameBuffer[0] = RtlUpcaseUnicodeChar(FileNameBuffer[0]); - Prefix = FileNameBuffer; + Prefix = RtlUpcaseUnicodeChar(FileNameBuffer[0]); PrefixLength = 3 * sizeof(WCHAR); Source += 3; SourceLength -= 3 * sizeof(WCHAR); PrefixCut = 3; break; + } case RtlPathTypeDriveRelative: /* c:foo */ + { + WCHAR CurDrive, NewDrive; + Source += 2; SourceLength -= 2 * sizeof(WCHAR); - if (RtlUpcaseUnicodeChar(FileNameBuffer[0]) != RtlUpcaseUnicodeChar(CurDirName->Buffer[0]) || - CurDirName->Buffer[1] != L':') - { - FileNameBuffer[0] = RtlUpcaseUnicodeChar(FileNameBuffer[0]); + + CurDrive = RtlUpcaseUnicodeChar(CurDirName->Buffer[0]); + NewDrive = RtlUpcaseUnicodeChar(FileNameBuffer[0]); + + if ((NewDrive != CurDrive) || CurDirName->Buffer[1] != L':') + { EnvVarNameBuffer[0] = L'='; - EnvVarNameBuffer[1] = FileNameBuffer[0]; + EnvVarNameBuffer[1] = NewDrive; EnvVarNameBuffer[2] = L':'; EnvVarNameBuffer[3] = UNICODE_NULL; - + EnvVarName.Length = 3 * sizeof(WCHAR); EnvVarName.MaximumLength = EnvVarName.Length + sizeof(WCHAR); EnvVarName.Buffer = EnvVarNameBuffer; @@ -670,7 +680,7 @@ default: DPRINT1("RtlQueryEnvironmentVariable_U returned 0x%08lx\n", Status); - EnvVarNameBuffer[0] = FileNameBuffer[0]; + EnvVarNameBuffer[0] = NewDrive; EnvVarNameBuffer[1] = L':'; EnvVarNameBuffer[2] = L'\\'; EnvVarNameBuffer[3] = UNICODE_NULL; @@ -686,8 +696,10 @@ } /* Fall through */ DPRINT("RtlPathTypeDriveRelative - Using fall-through to RtlPathTypeRelative\n"); + } case RtlPathTypeRelative: /* foo */ + { Prefix = CurDirName->Buffer; PrefixLength = CurDirName->Length; if (CurDirName->Buffer[1] != L':') @@ -699,8 +711,10 @@ PrefixCut = 3; } break; + } case RtlPathTypeRooted: /* \xxx */ + { if (CurDirName->Buffer[1] == L':') { // The path starts with "C:\" @@ -719,8 +733,10 @@ Prefix = CurDirName->Buffer; } break; + } case RtlPathTypeRootLocalDevice: /* \\. */ + { Prefix = DeviceRootString.Buffer; PrefixLength = DeviceRootString.Length; Source += 3; @@ -728,6 +744,7 @@ PrefixCut = 4; break; + } case RtlPathTypeUnknown: goto Quit;

10 years

[hpoussin] 65532: [RTL] Upcase drive letter in RtlGetFullPathName_Ustr

by hpoussin＠svn.reactos.org

Author: hpoussin Date: Sat Nov 29 21:56:14 2014 New Revision: 65532 URL: http://svn.reactos.org/svn/reactos?rev=65532&view=rev Log: [RTL] Upcase drive letter in RtlGetFullPathName_Ustr Modified: trunk/reactos/lib/rtl/path.c Modified: trunk/reactos/lib/rtl/path.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/path.c?rev=65532&r… ============================================================================== --- trunk/reactos/lib/rtl/path.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/path.c [iso-8859-1] Sat Nov 29 21:56:14 2014 @@ -609,6 +609,7 @@ ASSERT(FileNameBuffer[1] == L':'); ASSERT(IS_PATH_SEPARATOR(FileNameBuffer[2])); + FileNameBuffer[0] = RtlUpcaseUnicodeChar(FileNameBuffer[0]); Prefix = FileNameBuffer; PrefixLength = 3 * sizeof(WCHAR); Source += 3; @@ -623,6 +624,7 @@ if (RtlUpcaseUnicodeChar(FileNameBuffer[0]) != RtlUpcaseUnicodeChar(CurDirName->Buffer[0]) || CurDirName->Buffer[1] != L':') { + FileNameBuffer[0] = RtlUpcaseUnicodeChar(FileNameBuffer[0]); EnvVarNameBuffer[0] = L'='; EnvVarNameBuffer[1] = FileNameBuffer[0]; EnvVarNameBuffer[2] = L':';

10 years

[hpoussin] 65531: [RTL] Add some missing UNIMPLEMENTED

by hpoussin＠svn.reactos.org

Author: hpoussin Date: Sat Nov 29 21:44:11 2014 New Revision: 65531 URL: http://svn.reactos.org/svn/reactos?rev=65531&view=rev Log: [RTL] Add some missing UNIMPLEMENTED Modified: trunk/reactos/lib/rtl/compress.c Modified: trunk/reactos/lib/rtl/compress.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/compress.c?rev=655… ============================================================================== --- trunk/reactos/lib/rtl/compress.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/compress.c [iso-8859-1] Sat Nov 29 21:44:11 2014 @@ -33,7 +33,8 @@ PULONG FinalCompressedSize, PVOID WorkSpace) { - return(STATUS_NOT_IMPLEMENTED); + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; } @@ -105,7 +106,8 @@ IN ULONG CompressedDataInfoLength, IN PVOID WorkSpace) { - return(STATUS_NOT_IMPLEMENTED); + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; } @@ -120,7 +122,8 @@ IN ULONG CompressedBufferSize, OUT PULONG FinalUncompressedSize) { - return(STATUS_NOT_IMPLEMENTED); + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; } @@ -136,7 +139,8 @@ IN ULONG CompressedTailSize, IN PCOMPRESSED_DATA_INFO CompressedDataInfo) { - return(STATUS_NOT_IMPLEMENTED); + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; } @@ -153,7 +157,8 @@ OUT PULONG FinalUncompressedSize, IN PVOID WorkSpace) { - return(STATUS_NOT_IMPLEMENTED); + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; } @@ -167,7 +172,8 @@ OUT PUCHAR *ChunkBuffer, OUT PULONG ChunkSize) { - return(STATUS_NOT_IMPLEMENTED); + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; } @@ -206,7 +212,8 @@ OUT PUCHAR *ChunkBuffer, IN ULONG ChunkSize) { - return(STATUS_NOT_IMPLEMENTED); + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; } /* EOF */

10 years

[hpoussin] 65530: [NTFS] Fix CcInitializeCacheMap call

by hpoussin＠svn.reactos.org

Author: hpoussin Date: Sat Nov 29 21:43:57 2014 New Revision: 65530 URL: http://svn.reactos.org/svn/reactos?rev=65530&view=rev Log: [NTFS] Fix CcInitializeCacheMap call Modified: trunk/reactos/drivers/filesystems/ntfs/fcb.c Modified: trunk/reactos/drivers/filesystems/ntfs/fcb.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ntfs/f… ============================================================================== --- trunk/reactos/drivers/filesystems/ntfs/fcb.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/ntfs/fcb.c [iso-8859-1] Sat Nov 29 21:43:57 2014 @@ -466,8 +466,8 @@ CcInitializeCacheMap(FileObject, (PCC_FILE_SIZES)(&Fcb->RFCB.AllocationSize), FALSE, - NULL, - NULL); + &(NtfsGlobalData->CacheMgrCallbacks), + Fcb); Fcb->Flags |= FCB_CACHE_INITIALIZED; }

10 years

[hpoussin] 65529: [NTOS:CC] Add some debug prints

by hpoussin＠svn.reactos.org

Author: hpoussin Date: Sat Nov 29 21:43:39 2014 New Revision: 65529 URL: http://svn.reactos.org/svn/reactos?rev=65529&view=rev Log: [NTOS:CC] Add some debug prints Modified: trunk/reactos/ntoskrnl/cc/cacheman.c trunk/reactos/ntoskrnl/cc/copy.c trunk/reactos/ntoskrnl/cc/fs.c trunk/reactos/ntoskrnl/cc/mdl.c trunk/reactos/ntoskrnl/cc/pin.c trunk/reactos/ntoskrnl/cc/view.c trunk/reactos/ntoskrnl/include/internal/cc.h Modified: trunk/reactos/ntoskrnl/cc/cacheman.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cc/cacheman.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/cc/cacheman.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/cc/cacheman.c [iso-8859-1] Sat Nov 29 21:43:39 2014 @@ -101,6 +101,9 @@ IN BOOLEAN DisableWriteBehind ) { + CCTRACE(CC_API_DEBUG, "FileObject=%p DisableReadAhead=%d DisableWriteBehind=%d\n", + FileObject, DisableReadAhead, DisableWriteBehind); + UNIMPLEMENTED; } @@ -114,6 +117,9 @@ IN PVOID Owner ) { + CCTRACE(CC_API_DEBUG, "Bcb=%p Owner=%p\n", + Bcb, Owner); + UNIMPLEMENTED; } @@ -127,6 +133,9 @@ IN ULONG DirtyPageThreshold ) { + CCTRACE(CC_API_DEBUG, "FileObject=%p DirtyPageThreshold=%lu\n", + FileObject, DirtyPageThreshold); + UNIMPLEMENTED; } @@ -140,5 +149,8 @@ IN ULONG Granularity ) { + CCTRACE(CC_API_DEBUG, "FileObject=%p Granularity=%lu\n", + FileObject, Granularity); + UNIMPLEMENTED; } Modified: trunk/reactos/ntoskrnl/cc/copy.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cc/copy.c?rev=655… ============================================================================== --- trunk/reactos/ntoskrnl/cc/copy.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/cc/copy.c [iso-8859-1] Sat Nov 29 21:43:39 2014 @@ -26,6 +26,7 @@ CcOperationZero } CC_COPY_OPERATION; +ULONG CcRosTraceLevel = 0; ULONG CcFastMdlReadWait; ULONG CcFastMdlReadNotPossible; ULONG CcFastReadNotPossible; @@ -339,6 +340,8 @@ IN BOOLEAN Wait, IN BOOLEAN Retrying) { + CCTRACE(CC_API_DEBUG, "FileObject=%p BytesToWrite=%lu Wait=%d Retrying=%d\n", + FileObject, BytesToWrite, Wait, Retrying); UNIMPLEMENTED; return FALSE; } @@ -356,6 +359,9 @@ OUT PVOID Buffer, OUT PIO_STATUS_BLOCK IoStatus) { + CCTRACE(CC_API_DEBUG, "FileObject=%p FileOffset=%I64d Length=%lu Wait=%d\n", + FileObject, FileOffset->QuadPart, Length, Wait); + DPRINT("CcCopyRead(FileObject 0x%p, FileOffset %I64x, " "Length %lu, Wait %u, Buffer 0x%p, IoStatus 0x%p)\n", FileObject, FileOffset->QuadPart, Length, Wait, @@ -384,6 +390,9 @@ { IO_STATUS_BLOCK IoStatus; + CCTRACE(CC_API_DEBUG, "FileObject=%p FileOffset=%I64d Length=%lu Wait=%d Buffer=%p\n", + FileObject, FileOffset->QuadPart, Length, Wait, Buffer); + DPRINT("CcCopyWrite(FileObject 0x%p, FileOffset %I64x, " "Length %lu, Wait %u, Buffer 0x%p)\n", FileObject, FileOffset->QuadPart, Length, Wait, Buffer); @@ -410,6 +419,9 @@ IN ULONG BytesToWrite, IN BOOLEAN Retrying) { + CCTRACE(CC_API_DEBUG, "FileObject=%p PostRoutine=%p Context1=%p Context2=%p BytesToWrite=%lu Retrying=%d\n", + FileObject, PostRoutine, Context1, Context2, BytesToWrite, Retrying); + UNIMPLEMENTED; } @@ -426,6 +438,9 @@ OUT PVOID Buffer, OUT PIO_STATUS_BLOCK IoStatus) { + CCTRACE(CC_API_DEBUG, "FileObject=%p FileOffset=%lu Length=%lu PageCount=%lu Buffer=%p\n", + FileObject, FileOffset, Length, PageCount, Buffer); + UNIMPLEMENTED; } /* @@ -439,6 +454,9 @@ IN ULONG Length, IN PVOID Buffer) { + CCTRACE(CC_API_DEBUG, "FileObject=%p FileOffset=%lu Length=%lu Buffer=%p\n", + FileObject, FileOffset, Length, Buffer); + UNIMPLEMENTED; } @@ -474,6 +492,9 @@ IO_STATUS_BLOCK Iosb; KEVENT Event; + CCTRACE(CC_API_DEBUG, "FileObject=%p StartOffset=%I64u EndOffset=%I64u Wait=%d\n", + FileObject, StartOffset->QuadPart, EndOffset->QuadPart, Wait); + DPRINT("CcZeroData(FileObject 0x%p, StartOffset %I64x, EndOffset %I64x, " "Wait %u)\n", FileObject, StartOffset->QuadPart, EndOffset->QuadPart, Wait); Modified: trunk/reactos/ntoskrnl/cc/fs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cc/fs.c?rev=65529… ============================================================================== --- trunk/reactos/ntoskrnl/cc/fs.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/cc/fs.c [iso-8859-1] Sat Nov 29 21:43:39 2014 @@ -38,6 +38,10 @@ IN PVOID Context2) { LARGE_INTEGER i; + + CCTRACE(CC_API_DEBUG, "LogHandle=%p DirtyPageRoutine=%p Context1=%p Context2=%p\n", + LogHandle, DirtyPageRoutine, Context1, Context2); + UNIMPLEMENTED; i.QuadPart = 0; return i; @@ -52,6 +56,9 @@ IN PVOID Bcb) { PINTERNAL_BCB iBcb = (PINTERNAL_BCB)Bcb; + + CCTRACE(CC_API_DEBUG, "Bcb=%p\n", Bcb); + return iBcb->Vacb->SharedCacheMap->FileObject; } @@ -65,6 +72,9 @@ OUT PLARGE_INTEGER OldestLsn OPTIONAL) { LARGE_INTEGER i; + + CCTRACE(CC_API_DEBUG, "FileObject=%p\n", FileObject); + UNIMPLEMENTED; i.QuadPart = 0; return i; @@ -84,6 +94,9 @@ { ASSERT(FileObject); ASSERT(FileSizes); + + CCTRACE(CC_API_DEBUG, "FileObject=%p FileSizes=%p PinAccess=%d CallBacks=%p LazyWriterContext=%p\n", + FileObject, FileSizes, PinAccess, CallBacks, LazyWriterContext); /* Call old ROS cache init function */ CcRosInitializeFileCache(FileObject, @@ -100,6 +113,8 @@ CcIsThereDirtyData ( IN PVPB Vpb) { + CCTRACE(CC_API_DEBUG, "Vpb=%p\n", Vpb); + UNIMPLEMENTED; return FALSE; } @@ -115,6 +130,9 @@ IN ULONG Length, IN BOOLEAN UninitializeCacheMaps) { + CCTRACE(CC_API_DEBUG, "SectionObjectPointer=%p\n FileOffset=%p Length=%lu UninitializeCacheMaps=%d", + SectionObjectPointer, FileOffset, Length, UninitializeCacheMaps); + //UNIMPLEMENTED; return FALSE; } @@ -134,6 +152,9 @@ PROS_VACB current; LIST_ENTRY FreeListHead; NTSTATUS Status; + + CCTRACE(CC_API_DEBUG, "FileObject=%p FileSizes=%p\n", + FileObject, FileSizes); DPRINT("CcSetFileSizes(FileObject 0x%p, FileSizes 0x%p)\n", FileObject, FileSizes); @@ -222,6 +243,9 @@ IN PVOID LogHandle, IN PFLUSH_TO_LSN FlushToLsnRoutine) { + CCTRACE(CC_API_DEBUG, "FileObject=%p LogHandle=%p FlushToLsnRoutine=%p\n", + FileObject, LogHandle, FlushToLsnRoutine); + UNIMPLEMENTED; } @@ -236,6 +260,9 @@ IN PCACHE_UNINITIALIZE_EVENT UninitializeCompleteEvent OPTIONAL) { NTSTATUS Status; + + CCTRACE(CC_API_DEBUG, "FileObject=%p TruncateSize=%p UninitializeCompleteEvent=%p\n", + FileObject, TruncateSize, UninitializeCompleteEvent); Status = CcRosReleaseFileCache(FileObject); if (UninitializeCompleteEvent) Modified: trunk/reactos/ntoskrnl/cc/mdl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cc/mdl.c?rev=6552… ============================================================================== --- trunk/reactos/ntoskrnl/cc/mdl.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/cc/mdl.c [iso-8859-1] Sat Nov 29 21:43:39 2014 @@ -28,6 +28,9 @@ OUT PIO_STATUS_BLOCK IoStatus ) { + CCTRACE(CC_API_DEBUG, "FileObject=%p FileOffset=%I64d Length=%lu\n", + FileObject, FileOffset->QuadPart, Length); + UNIMPLEMENTED; } @@ -173,5 +176,8 @@ OUT PMDL * MdlChain, OUT PIO_STATUS_BLOCK IoStatus) { + CCTRACE(CC_API_DEBUG, "FileObject=%p FileOffset=%I64d Length=%lu\n", + FileObject, FileOffset->QuadPart, Length); + UNIMPLEMENTED; } Modified: trunk/reactos/ntoskrnl/cc/pin.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cc/pin.c?rev=6552… ============================================================================== --- trunk/reactos/ntoskrnl/cc/pin.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/cc/pin.c [iso-8859-1] Sat Nov 29 21:43:39 2014 @@ -59,6 +59,8 @@ if (ReadOffset % VACB_MAPPING_GRANULARITY + Length > VACB_MAPPING_GRANULARITY) { + CCTRACE(CC_API_DEBUG, "FileObject=%p FileOffset=%p Length=%lu Flags=0x%lx -> FALSE\n", + FileObject, FileOffset, Length, Flags); return FALSE; } @@ -70,6 +72,8 @@ &Vacb); if (!NT_SUCCESS(Status)) { + CCTRACE(CC_API_DEBUG, "FileObject=%p FileOffset=%p Length=%lu Flags=0x%lx -> FALSE\n", + FileObject, FileOffset, Length, Flags); return FALSE; } @@ -78,12 +82,16 @@ if (!(Flags & MAP_WAIT)) { CcRosReleaseVacb(SharedCacheMap, Vacb, FALSE, FALSE, FALSE); + CCTRACE(CC_API_DEBUG, "FileObject=%p FileOffset=%p Length=%lu Flags=0x%lx -> FALSE\n", + FileObject, FileOffset, Length, Flags); return FALSE; } if (!NT_SUCCESS(CcReadVirtualAddress(Vacb))) { CcRosReleaseVacb(SharedCacheMap, Vacb, FALSE, FALSE, FALSE); + CCTRACE(CC_API_DEBUG, "FileObject=%p FileOffset=%p Length=%lu Flags=0x%lx -> FALSE\n", + FileObject, FileOffset, Length, Flags); return FALSE; } } @@ -93,6 +101,8 @@ if (iBcb == NULL) { CcRosReleaseVacb(SharedCacheMap, Vacb, TRUE, FALSE, FALSE); + CCTRACE(CC_API_DEBUG, "FileObject=%p FileOffset=%p Length=%lu Flags=0x%lx -> FALSE\n", + FileObject, FileOffset, Length, Flags); return FALSE; } @@ -106,6 +116,8 @@ iBcb->RefCount = 1; *pBcb = (PVOID)iBcb; + CCTRACE(CC_API_DEBUG, "FileObject=%p FileOffset=%p Length=%lu Flags=0x%lx -> TRUE Bcb=%p\n", + FileObject, FileOffset, Length, Flags, iBcb); return TRUE; } @@ -121,6 +133,9 @@ IN ULONG Flags, OUT PVOID * Bcb) { + CCTRACE(CC_API_DEBUG, "FileOffset=%p FileOffset=%p Length=%lu Flags=0x%lx\n", + FileObject, FileOffset, Length, Flags); + /* no-op for current implementation. */ return TRUE; } @@ -138,6 +153,9 @@ OUT PVOID * Bcb, OUT PVOID * Buffer) { + CCTRACE(CC_API_DEBUG, "FileOffset=%p FileOffset=%p Length=%lu Flags=0x%lx\n", + FileObject, FileOffset, Length, Flags); + if (CcMapData(FileObject, FileOffset, Length, Flags, Bcb, Buffer)) { if (CcPinMappedData(FileObject, FileOffset, Length, Flags, Bcb)) @@ -162,6 +180,9 @@ OUT PVOID * Bcb, OUT PVOID * Buffer) { + CCTRACE(CC_API_DEBUG, "FileOffset=%p FileOffset=%p Length=%lu Zero=%d Flags=0x%lx\n", + FileObject, FileOffset, Length, Zero, Flags); + /* * FIXME: This is function is similar to CcPinRead, but doesn't * read the data if they're not present. Instead it should just @@ -182,6 +203,10 @@ IN PLARGE_INTEGER Lsn) { PINTERNAL_BCB iBcb = Bcb; + + CCTRACE(CC_API_DEBUG, "Bcb=%p Lsn=%p\n", + Bcb, Lsn); + iBcb->Dirty = TRUE; } @@ -194,6 +219,8 @@ IN PVOID Bcb) { PINTERNAL_BCB iBcb = Bcb; + + CCTRACE(CC_API_DEBUG, "Bcb=%p\n", Bcb); CcRosReleaseVacb(iBcb->Vacb->SharedCacheMap, iBcb->Vacb, @@ -215,6 +242,8 @@ IN PVOID Bcb, IN ERESOURCE_THREAD ResourceThreadId) { + CCTRACE(CC_API_DEBUG, "Bcb=%p ResourceThreadId=%lu\n", Bcb, ResourceThreadId); + UNIMPLEMENTED; } @@ -227,6 +256,9 @@ IN PVOID Bcb) { PINTERNAL_BCB iBcb = Bcb; + + CCTRACE(CC_API_DEBUG, "Bcb=%p\n", Bcb); + iBcb->RefCount++; } @@ -241,6 +273,8 @@ IN PIO_STATUS_BLOCK IoStatus) { PINTERNAL_BCB iBcb = Bcb; + + CCTRACE(CC_API_DEBUG, "Bcb=%p WriteThrough=%d\n", Bcb, WriteThrough); IoStatus->Status = STATUS_SUCCESS; if (--iBcb->RefCount == 0) Modified: trunk/reactos/ntoskrnl/cc/view.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cc/view.c?rev=655… ============================================================================== --- trunk/reactos/ntoskrnl/cc/view.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/cc/view.c [iso-8859-1] Sat Nov 29 21:43:39 2014 @@ -909,6 +909,9 @@ NTSTATUS Status; KIRQL oldIrql; + CCTRACE(CC_API_DEBUG, "SectionObjectPointers=%p FileOffset=%p Length=%lu\n", + SectionObjectPointers, FileOffset, Length); + DPRINT("CcFlushCache(SectionObjectPointers 0x%p, FileOffset 0x%p, Length %lu, IoStatus 0x%p)\n", SectionObjectPointers, FileOffset, Length, IoStatus); @@ -1209,6 +1212,9 @@ IN PSECTION_OBJECT_POINTERS SectionObjectPointers) { PROS_SHARED_CACHE_MAP SharedCacheMap; + + CCTRACE(CC_API_DEBUG, "SectionObjectPointers=%p\n", SectionObjectPointers); + if (SectionObjectPointers && SectionObjectPointers->SharedCacheMap) { SharedCacheMap = SectionObjectPointers->SharedCacheMap; Modified: trunk/reactos/ntoskrnl/include/internal/cc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/cc.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/cc.h [iso-8859-1] Sat Nov 29 21:43:39 2014 @@ -1,4 +1,45 @@ #pragma once + +// +// Define this if you want debugging support +// +#define _CC_DEBUG_ 0x00 + +// +// These define the Debug Masks Supported +// +#define CC_API_DEBUG 0x01 + +// +// Debug/Tracing support +// +#if _CC_DEBUG_ +#ifdef NEW_DEBUG_SYSTEM_IMPLEMENTED // enable when Debug Filters are implemented +#define CCTRACE(x, ...) \ + { \ + DbgPrintEx("%s [%.16s] - ", \ + __FUNCTION__, \ + PsGetCurrentProcess()->ImageFileName); \ + DbgPrintEx(__VA_ARGS__); \ + } +#else +#define CCTRACE(x, ...) \ + if (x & CcRosTraceLevel) \ + { \ + DbgPrint("%s [%.16s] - ", \ + __FUNCTION__, \ + PsGetCurrentProcess()->ImageFileName); \ + DbgPrint(__VA_ARGS__); \ + } +#endif +#else +#define CCTRACE(x, fmt, ...) DPRINT(fmt, ##__VA_ARGS__) +#endif + +// +// Global Cc Data +// +extern ULONG CcRosTraceLevel; typedef struct _PF_SCENARIO_ID {

10 years

[hbelusca] 65528: [USER32] - On Win2k3, the EXIT_(ROS)_EX csr message has 3 parameters, instead of 2 (as on win2k), and the dwReserved is in fact unused. [USERSRV] - Add CSR shutdown callback UserC...

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Sat Nov 29 21:19:01 2014 New Revision: 65528 URL: http://svn.reactos.org/svn/reactos?rev=65528&view=rev Log: [USER32] - On Win2k3, the EXIT_(ROS)_EX csr message has 3 parameters, instead of 2 (as on win2k), and the dwReserved is in fact unused. [USERSRV] - Add CSR shutdown callback UserClientShutdown (stub). [CONSRV|USERSRV] - The CSR shutdown callbacks are just stubs currently. Part 5/X CORE-8322 Modified: trunk/reactos/include/reactos/subsys/win/winmsg.h trunk/reactos/win32ss/user/user32/misc/exit.c trunk/reactos/win32ss/user/winsrv/consrv/shutdown.c trunk/reactos/win32ss/user/winsrv/usersrv/api.h trunk/reactos/win32ss/user/winsrv/usersrv/harderror.c trunk/reactos/win32ss/user/winsrv/usersrv/init.c trunk/reactos/win32ss/user/winsrv/usersrv/shutdown.c Modified: trunk/reactos/include/reactos/subsys/win/winmsg.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/subsys/win… ============================================================================== --- trunk/reactos/include/reactos/subsys/win/winmsg.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/subsys/win/winmsg.h [iso-8859-1] Sat Nov 29 21:19:01 2014 @@ -38,8 +38,9 @@ typedef struct _USER_EXIT_REACTOS { - UINT Flags; - DWORD Reserved; + DWORD LastError; + UINT Flags; + BOOL Success; } USER_EXIT_REACTOS, *PUSER_EXIT_REACTOS; typedef struct _USER_END_TASK Modified: trunk/reactos/win32ss/user/user32/misc/exit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/misc/e… ============================================================================== --- trunk/reactos/win32ss/user/user32/misc/exit.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/user32/misc/exit.c [iso-8859-1] Sat Nov 29 21:19:01 2014 @@ -60,6 +60,7 @@ * - when every environment subsystem has gone to bed, the SM actually initiates * the kernel and executive shutdown by calling NtShutdownSystem. */ + /* * @implemented */ @@ -71,7 +72,7 @@ USER_API_MESSAGE ApiMessage; ApiMessage.Data.ExitReactosRequest.Flags = uFlags; - ApiMessage.Data.ExitReactosRequest.Reserved = dwReserved; + // ApiMessage.Data.ExitReactosRequest.Reserved = dwReserved; Status = CsrClientCallServer((PCSR_API_MESSAGE)&ApiMessage, NULL, @@ -79,7 +80,7 @@ sizeof(USER_EXIT_REACTOS)); if (!NT_SUCCESS(Status)) { - SetLastError(RtlNtStatusToDosError(Status)); + UserSetLastNTError(Status); return FALSE; } Modified: trunk/reactos/win32ss/user/winsrv/consrv/shutdown.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv… ============================================================================== --- trunk/reactos/win32ss/user/winsrv/consrv/shutdown.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/winsrv/consrv/shutdown.c [iso-8859-1] Sat Nov 29 21:19:01 2014 @@ -23,6 +23,8 @@ IN BOOLEAN FirstPhase) { PCONSOLE_PROCESS_DATA ProcessData = ConsoleGetPerProcessData(CsrProcess); + + UNIMPLEMENTED; if ( ProcessData->ConsoleHandle != NULL || ProcessData->HandleTable != NULL ) Modified: trunk/reactos/win32ss/user/winsrv/usersrv/api.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/usersr… ============================================================================== --- trunk/reactos/win32ss/user/winsrv/usersrv/api.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/winsrv/usersrv/api.h [iso-8859-1] Sat Nov 29 21:19:01 2014 @@ -16,14 +16,22 @@ CSR_API(SrvDeviceEvent); /* harderror.c */ -VOID WINAPI UserServerHardError(IN PCSR_THREAD ThreadData, - IN PHARDERROR_MSG Message); +VOID +NTAPI +UserServerHardError(IN PCSR_THREAD ThreadData, + IN PHARDERROR_MSG Message); /* register.c */ CSR_API(SrvRegisterServicesProcess); CSR_API(SrvRegisterLogonProcess); /* shutdown.c */ +ULONG +NTAPI +UserClientShutdown(IN PCSR_PROCESS CsrProcess, + IN ULONG Flags, + IN BOOLEAN FirstPhase); + CSR_API(SrvExitWindowsEx); CSR_API(SrvEndTask); CSR_API(SrvLogon); Modified: trunk/reactos/win32ss/user/winsrv/usersrv/harderror.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/usersr… ============================================================================== --- trunk/reactos/win32ss/user/winsrv/usersrv/harderror.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/winsrv/usersrv/harderror.c [iso-8859-1] Sat Nov 29 21:19:01 2014 @@ -510,7 +510,7 @@ } VOID -WINAPI +NTAPI UserServerHardError( IN PCSR_THREAD ThreadData, IN PHARDERROR_MSG Message) Modified: trunk/reactos/win32ss/user/winsrv/usersrv/init.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/usersr… ============================================================================== --- trunk/reactos/win32ss/user/winsrv/usersrv/init.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/winsrv/usersrv/init.c [iso-8859-1] Sat Nov 29 21:19:01 2014 @@ -151,7 +151,7 @@ UserServerHeap = RtlGetProcessHeap(); /* Initialize the video */ - NtUserInitialize(0, NULL, NULL); // + NtUserInitialize(0, NULL, NULL); PrivateCsrssManualGuiCheck(0); /* Setup the DLL Object */ @@ -166,7 +166,7 @@ LoadedServerDll->ConnectCallback = NULL; LoadedServerDll->DisconnectCallback = NULL; LoadedServerDll->HardErrorCallback = UserServerHardError; - LoadedServerDll->ShutdownProcessCallback = NULL; + LoadedServerDll->ShutdownProcessCallback = UserClientShutdown; UserServerDllInstance = LoadedServerDll->ServerHandle; Modified: trunk/reactos/win32ss/user/winsrv/usersrv/shutdown.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/usersr… ============================================================================== --- trunk/reactos/win32ss/user/winsrv/usersrv/shutdown.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/winsrv/usersrv/shutdown.c [iso-8859-1] Sat Nov 29 21:19:01 2014 @@ -919,6 +919,21 @@ } +ULONG +NTAPI +UserClientShutdown(IN PCSR_PROCESS CsrProcess, + IN ULONG Flags, + IN BOOLEAN FirstPhase) +{ + DPRINT1("UserClientShutdown(0x%p, 0x%x, %s)\n", + CsrProcess, Flags, FirstPhase ? "FirstPhase" : "LastPhase"); + + UNIMPLEMENTED; + + return CsrShutdownNonCsrProcess; +} + + /* PUBLIC SERVER APIS *********************************************************/ CSR_API(SrvExitWindowsEx)

10 years

[pschweitzer] 65527: [FASTFAT] - Add a flag to enable (or disable depends on your reading ; -)) the VPB swapout process for volume umount. - By default, disable it for MSVC builds. This *might* lolf...

by pschweitzer＠svn.reactos.org

Author: pschweitzer Date: Sat Nov 29 20:26:07 2014 New Revision: 65527 URL: http://svn.reactos.org/svn/reactos?rev=65527&view=rev Log: [FASTFAT] - Add a flag to enable (or disable depends on your reading ;-)) the VPB swapout process for volume umount. - By default, disable it for MSVC builds. This *might* lolfix the MSVC builds. Just for the record, we also have a bug in the GCC builds but it doesn't seem to show up. The main issue is that after formatting, we close handle to the volume, and IRP_MJ_CLEANUP is properly received and initiates a bit of dismount. But then, the IRP_MJ_CLOSE is never received (why????) and thus, dismount cannot properly end. This is a real & serious issue. Modified: trunk/reactos/drivers/filesystems/fastfat/cleanup.c trunk/reactos/drivers/filesystems/fastfat/close.c trunk/reactos/drivers/filesystems/fastfat/fsctl.c trunk/reactos/drivers/filesystems/fastfat/vfat.h Modified: trunk/reactos/drivers/filesystems/fastfat/cleanup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat/cleanup.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat/cleanup.c [iso-8859-1] Sat Nov 29 20:26:07 2014 @@ -110,10 +110,12 @@ ExReleaseResourceLite(&pFcb->MainResource); } +#ifdef ENABLE_SWAPOUT if (DeviceExt->Flags & VCB_DISMOUNT_PENDING) { VfatCheckForDismount(DeviceExt, FALSE); } +#endif return STATUS_SUCCESS; } Modified: trunk/reactos/drivers/filesystems/fastfat/close.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat/close.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat/close.c [iso-8859-1] Sat Nov 29 20:26:07 2014 @@ -82,10 +82,12 @@ vfatDestroyCCB(pCcb); } +#ifdef ENABLE_SWAPOUT if (DeviceExt->OpenHandleCount == 0) { VfatCheckForDismount(DeviceExt, FALSE); } +#endif return Status; } 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 Nov 29 20:26:07 2014 @@ -977,6 +977,9 @@ /* Mark we're being dismounted */ DeviceExt->Flags |= VCB_DISMOUNT_PENDING; +#ifndef ENABLE_SWAPOUT + IrpContext->DeviceObject->Vpb->Flags &= ~VPB_MOUNTED; +#endif ExReleaseResourceLite(&DeviceExt->FatResource); 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 Nov 29 20:26:07 2014 @@ -7,6 +7,9 @@ #include <pseh/pseh2.h> #define USE_ROS_CC_AND_FS +#ifndef _MSC_VER +#define ENABLE_SWAPOUT +#endif #define ROUND_DOWN(n, align) \ (((ULONG)n) & ~((align) - 1l))

10 years

[pschweitzer] 65526: [FASTFAT] Fix a FIXME in fastfat: - Implement support for device buffers flush in VfatFlushVolume(). Unlike Windows SDK, we don't divert the current IRP to pass it to storage d...

by pschweitzer＠svn.reactos.org

Author: pschweitzer Date: Sat Nov 29 20:15:44 2014 New Revision: 65526 URL: http://svn.reactos.org/svn/reactos?rev=65526&view=rev Log: [FASTFAT] Fix a FIXME in fastfat: - Implement support for device buffers flush in VfatFlushVolume(). Unlike Windows SDK, we don't divert the current IRP to pass it to storage device. Here, we allocate a new IRP and call the device so that it flushes buffers. Modified: trunk/reactos/drivers/filesystems/fastfat/flush.c Modified: trunk/reactos/drivers/filesystems/fastfat/flush.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat/flush.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat/flush.c [iso-8859-1] Sat Nov 29 20:15:44 2014 @@ -52,6 +52,9 @@ PLIST_ENTRY ListEntry; PVFATFCB Fcb; NTSTATUS Status, ReturnStatus = STATUS_SUCCESS; + PIRP Irp; + KEVENT Event; + IO_STATUS_BLOCK IoStatusBlock; DPRINT("VfatFlushVolume(DeviceExt %p, FatFcb %p)\n", DeviceExt, VolumeFcb); @@ -99,7 +102,34 @@ Status = VfatFlushFile(DeviceExt, Fcb); ExReleaseResourceLite(&DeviceExt->FatResource); - /* FIXME: Flush the buffers from storage device */ + /* Prepare an IRP to flush device buffers */ + Irp = IoBuildSynchronousFsdRequest(IRP_MJ_FLUSH_BUFFERS, + DeviceExt->StorageDevice, + NULL, 0, NULL, &Event, + &IoStatusBlock); + if (Irp != NULL) + { + KeInitializeEvent(&Event, NotificationEvent, FALSE); + + Status = IoCallDriver(DeviceExt->StorageDevice, Irp); + if (Status == STATUS_PENDING) + { + KeWaitForSingleObject(&Event, Executive, KernelMode, FALSE, NULL); + Status = Irp->IoStatus.Status; + } + + /* Ignore device not supporting flush operation */ + if (Status == STATUS_INVALID_DEVICE_REQUEST) + { + DPRINT1("Flush not supported, ignored\n"); + Status = STATUS_SUCCESS; + + } + } + else + { + Status = STATUS_INSUFFICIENT_RESOURCES; + } if (!NT_SUCCESS(Status)) {

10 years

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 November 2014