Ros-diffs October 2014

ros-diffs@reactos.org

19 participants
730 discussions

[tfaber] 64762: [NPFS] - Don't call RtlEqualUnicodeString (paged code) while holding a spin lock. Powered by Driver Verifier.

by tfaber＠svn.reactos.org

Author: tfaber Date: Thu Oct 16 16:40:13 2014 New Revision: 64762 URL: http://svn.reactos.org/svn/reactos?rev=64762&view=rev Log: [NPFS] - Don't call RtlEqualUnicodeString (paged code) while holding a spin lock. Powered by Driver Verifier. Modified: trunk/reactos/drivers/filesystems/npfs/waitsup.c Modified: trunk/reactos/drivers/filesystems/npfs/waitsup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/npfs/w… ============================================================================== --- trunk/reactos/drivers/filesystems/npfs/waitsup.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/npfs/waitsup.c [iso-8859-1] Thu Oct 16 16:40:13 2014 @@ -97,6 +97,22 @@ { InitializeListHead(&WaitQueue->WaitList); KeInitializeSpinLock(&WaitQueue->WaitLock); +} + +static +BOOLEAN +NpEqualUnicodeString(IN PCUNICODE_STRING String1, + IN PCUNICODE_STRING String2) +{ + SIZE_T EqualLength; + + if (String1->Length != String2->Length) + return FALSE; + + EqualLength = RtlCompareMemory(String1->Buffer, + String2->Buffer, + String1->Length); + return EqualLength == String1->Length; } NTSTATUS @@ -156,7 +172,8 @@ PipeName.MaximumLength = PipeName.Length; } - if (RtlEqualUnicodeString(&WaitName, &PipeName, FALSE)) + /* Can't use RtlEqualUnicodeString with a spinlock held */ + if (NpEqualUnicodeString(&WaitName, &PipeName)) { /* Found a matching wait. Cancel it */ RemoveEntryList(&WaitIrp->Tail.Overlay.ListEntry);

9 years, 11 months

[tfaber] 64761: [NPFS] - Use NpAcquire*Vcb/NpReleaseVcb instead of using NpVcb directly - CaseInsensitiveIndex is integer, not boolean - Minor fixes involving unnecessary casts and magic numbers

by tfaber＠svn.reactos.org

Author: tfaber Date: Thu Oct 16 16:36:17 2014 New Revision: 64761 URL: http://svn.reactos.org/svn/reactos?rev=64761&view=rev Log: [NPFS] - Use NpAcquire*Vcb/NpReleaseVcb instead of using NpVcb directly - CaseInsensitiveIndex is integer, not boolean - Minor fixes involving unnecessary casts and magic numbers Modified: trunk/reactos/drivers/filesystems/npfs/create.c trunk/reactos/drivers/filesystems/npfs/datasup.c trunk/reactos/drivers/filesystems/npfs/fileinfo.c trunk/reactos/drivers/filesystems/npfs/fsctrl.c trunk/reactos/drivers/filesystems/npfs/secursup.c trunk/reactos/drivers/filesystems/npfs/volinfo.c trunk/reactos/drivers/filesystems/npfs/writesup.c Modified: trunk/reactos/drivers/filesystems/npfs/create.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/npfs/c… ============================================================================== --- trunk/reactos/drivers/filesystems/npfs/create.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/npfs/create.c [iso-8859-1] Thu Oct 16 16:36:17 2014 @@ -384,7 +384,7 @@ IoStatus.Information = 0; FsRtlEnterFileSystem(); - ExAcquireResourceExclusiveLite(&NpVcb->Lock, TRUE); + NpAcquireExclusiveVcb(); if (RelatedFileObject) { @@ -462,7 +462,7 @@ goto Quickie; } - Fcb = NpFindPrefix(&FileName, TRUE, &Prefix); + Fcb = NpFindPrefix(&FileName, 1, &Prefix); } if (Prefix.Length) @@ -499,7 +499,7 @@ &DeferredList); Quickie: - ExReleaseResourceLite(&NpVcb->Lock); + NpReleaseVcb(); NpCompleteDeferredIrps(&DeferredList); FsRtlExitFileSystem(); @@ -852,7 +852,7 @@ goto Quickie; } - Fcb = NpFindPrefix(&FileName, TRUE, &Prefix); + Fcb = NpFindPrefix(&FileName, 1, &Prefix); } if (Prefix.Length) Modified: trunk/reactos/drivers/filesystems/npfs/datasup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/npfs/d… ============================================================================== --- trunk/reactos/drivers/filesystems/npfs/datasup.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/npfs/datasup.c [iso-8859-1] Thu Oct 16 16:36:17 2014 @@ -85,7 +85,7 @@ { DataQueueEntry->Irp = NULL; - Irp->IoStatus.Status = 0; + Irp->IoStatus.Status = STATUS_SUCCESS; Irp->IoStatus.Information = DataQueueEntry->DataSize; InsertTailList(List, &Irp->Tail.Overlay.ListEntry); @@ -216,7 +216,7 @@ InitializeListHead(&DeferredList); - DataQueue = (PNP_DATA_QUEUE)Irp->Tail.Overlay.DriverContext[2]; + DataQueue = Irp->Tail.Overlay.DriverContext[2]; ClientSecurityContext = NULL; if (DeviceObject) Modified: trunk/reactos/drivers/filesystems/npfs/fileinfo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/npfs/f… ============================================================================== --- trunk/reactos/drivers/filesystems/npfs/fileinfo.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/npfs/fileinfo.c [iso-8859-1] Thu Oct 16 16:36:17 2014 @@ -27,13 +27,13 @@ NTSTATUS NTAPI NpSetPipeInfo(IN PNP_FCB Fcb, - IN PNP_CCB Ccb, + IN PNP_CCB Ccb, IN PFILE_PIPE_INFORMATION Buffer, - IN ULONG NamedPipeEnd, + IN ULONG NamedPipeEnd, IN PLIST_ENTRY List) { NTSTATUS Status; - PNP_DATA_QUEUE ReadQueue, WriteQueue; + PNP_DATA_QUEUE ReadQueue, WriteQueue; PAGED_CODE(); if (Buffer->ReadMode == FILE_PIPE_MESSAGE_MODE && Fcb->NamedPipeType == FILE_PIPE_BYTE_STREAM_TYPE) @@ -103,7 +103,7 @@ Buffer = Irp->AssociatedIrp.SystemBuffer; if (InfoClass == FileBasicInformation) return NpSetBasicInfo(Ccb, Buffer); - + if (InfoClass != FilePipeInformation) return STATUS_INVALID_PARAMETER; return NpSetPipeInfo(Fcb, Ccb, Buffer, NamedPipeEnd, List); Modified: trunk/reactos/drivers/filesystems/npfs/fsctrl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/npfs/f… ============================================================================== --- trunk/reactos/drivers/filesystems/npfs/fsctrl.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/npfs/fsctrl.c [iso-8859-1] Thu Oct 16 16:36:17 2014 @@ -369,7 +369,7 @@ return STATUS_INVALID_PARAMETER; } - PeekBuffer = (PFILE_PIPE_PEEK_BUFFER)Irp->AssociatedIrp.SystemBuffer; + PeekBuffer = Irp->AssociatedIrp.SystemBuffer; if (NamedPipeEnd != FILE_PIPE_CLIENT_END) { if (NamedPipeEnd != FILE_PIPE_SERVER_END) @@ -714,7 +714,7 @@ //Status = NpTranslateAlias(&SourceString); if (!NT_SUCCESS(Status)) goto Quickie; - Fcb = NpFindPrefix(&SourceString, TRUE, &Prefix); + Fcb = NpFindPrefix(&SourceString, 1, &Prefix); Fcb = (PNP_FCB)((ULONG_PTR)Fcb & ~1); NodeTypeCode = Fcb ? Fcb->NodeType : 0; Modified: trunk/reactos/drivers/filesystems/npfs/secursup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/npfs/s… ============================================================================== --- trunk/reactos/drivers/filesystems/npfs/secursup.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/npfs/secursup.c [iso-8859-1] Thu Oct 16 16:36:17 2014 @@ -127,7 +127,6 @@ IN PETHREAD Thread, IN PSECURITY_CLIENT_CONTEXT *Context) { - PSECURITY_CLIENT_CONTEXT NewContext; NTSTATUS Status; PAGED_CODE(); Modified: trunk/reactos/drivers/filesystems/npfs/volinfo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/npfs/v… ============================================================================== --- trunk/reactos/drivers/filesystems/npfs/volinfo.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/npfs/volinfo.c [iso-8859-1] Thu Oct 16 16:36:17 2014 @@ -191,11 +191,11 @@ TRACE("Entered\n"); FsRtlEnterFileSystem(); - ExAcquireResourceSharedLite(&NpVcb->Lock, TRUE); + NpAcquireSharedVcb(); Status = NpCommonQueryVolumeInformation(DeviceObject, Irp); - ExReleaseResourceLite(&NpVcb->Lock); + NpReleaseVcb(); FsRtlExitFileSystem(); if (Status != STATUS_PENDING) Modified: trunk/reactos/drivers/filesystems/npfs/writesup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/npfs/w… ============================================================================== --- trunk/reactos/drivers/filesystems/npfs/writesup.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/npfs/writesup.c [iso-8859-1] Thu Oct 16 16:36:17 2014 @@ -15,7 +15,7 @@ /* FUNCTIONS ******************************************************************/ -NTSTATUS +NTSTATUS NTAPI NpWriteDataQueue(IN PNP_DATA_QUEUE WriteQueue, IN ULONG Mode, @@ -57,9 +57,9 @@ { DataSize = DataEntry->DataSize; - IoStack = IoGetCurrentIrpStackLocation( DataEntry->Irp); + IoStack = IoGetCurrentIrpStackLocation(DataEntry->Irp); - if (IoStack->MajorFunction == IRP_MJ_FILE_SYSTEM_CONTROL && + if (IoStack->MajorFunction == IRP_MJ_FILE_SYSTEM_CONTROL && IoStack->Parameters.FileSystemControl.FsControlCode == FSCTL_PIPE_INTERNAL_READ_OVFLOW && (DataSize < OutBufferSize || MoreProcessing)) { @@ -76,7 +76,7 @@ { DataEntry->Irp->Overlay.AllocationSize.QuadPart = 0; } - + BufferSize = *BytesNotWritten; if (BufferSize >= DataSize) BufferSize = DataSize;

9 years, 11 months

[jgardou] 64760: [SPEC2DEF] - Fix typo: PRix64 --> PRIx64 - Use GUID to trace 'int128' arguments, as that's what they almost always are.

by jgardou＠svn.reactos.org

Author: jgardou Date: Thu Oct 16 09:23:33 2014 New Revision: 64760 URL: http://svn.reactos.org/svn/reactos?rev=64760&view=rev Log: [SPEC2DEF] - Fix typo: PRix64 --> PRIx64 - Use GUID to trace 'int128' arguments, as that's what they almost always are. Modified: trunk/reactos/tools/spec2def/spec2def.c Modified: trunk/reactos/tools/spec2def/spec2def.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/spec2def/spec2def.c?… ============================================================================== --- trunk/reactos/tools/spec2def/spec2def.c [iso-8859-1] (original) +++ trunk/reactos/tools/spec2def/spec2def.c [iso-8859-1] Thu Oct 16 09:23:33 2014 @@ -250,7 +250,8 @@ case ARG_WSTR: fprintf(file, "wchar_t*"); break; case ARG_DBL: fprintf(file, "double"); break; case ARG_INT64 : fprintf(file, "__int64"); break; - case ARG_INT128 : fprintf(file, "__int128"); break; + /* __int128 is not supported on x86, and int128 in spec files most often represents a GUID */ + case ARG_INT128 : fprintf(file, "GUID"); break; case ARG_FLOAT: fprintf(file, "float"); break; } fprintf(file, " a%d", i); @@ -296,8 +297,8 @@ case ARG_STR: fprintf(file, "'%%s'"); break; case ARG_WSTR: fprintf(file, "'%%ws'"); break; case ARG_DBL: fprintf(file, "%%f"); break; - case ARG_INT64: fprintf(file, "%%\"PRix64\""); break; - case ARG_INT128: fprintf(file, "%%\"PRix128\""); break; + case ARG_INT64: fprintf(file, "%%\"PRIx64\""); break; + case ARG_INT128: fprintf(file, "'%%s'"); break; case ARG_FLOAT: fprintf(file, "%%f"); break; } } @@ -314,7 +315,7 @@ case ARG_WSTR: fprintf(file, "(wchar_t*)a%d", i); break; case ARG_DBL: fprintf(file, "(double)a%d", i); break; case ARG_INT64: fprintf(file, "(__int64)a%d", i); break; - case ARG_INT128: fprintf(file, "(__int128)a%d", i); break; + case ARG_INT128: fprintf(file, "wine_dbgstr_guid(&a%d)", i); break; case ARG_FLOAT: fprintf(file, "(float)a%d", i); break; } }

9 years, 11 months

[tkreuzer] 64758: [RunTmChk] Fix a typo, remove a spare int 3, add file headers with BSD license

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Wed Oct 15 22:44:26 2014 New Revision: 64758 URL: http://svn.reactos.org/svn/reactos?rev=64758&view=rev Log: [RunTmChk] Fix a typo, remove a spare int 3, add file headers with BSD license Modified: trunk/reactos/lib/sdk/RunTmChk/i386/_RTC_CheckEsp.S trunk/reactos/lib/sdk/RunTmChk/rtcapi.c Modified: trunk/reactos/lib/sdk/RunTmChk/i386/_RTC_CheckEsp.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/RunTmChk/i386/_RTC… ============================================================================== --- trunk/reactos/lib/sdk/RunTmChk/i386/_RTC_CheckEsp.S [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/RunTmChk/i386/_RTC_CheckEsp.S [iso-8859-1] Wed Oct 15 22:44:26 2014 @@ -1,4 +1,9 @@ - +/* + * PROJECT: MSVC runtime check support library + * LICENSE: BSD - See COPYING.ARM in the top level directory + * PURPOSE: Provides support functions for MSVC runtime checks + * PROGRAMMER: Timo Kreuzer (timo.kreuzer(a)reactos.org) + */ #include <asm.inc> .code @@ -32,7 +37,6 @@ push dword ptr [esp + 4] // retaddr call __RTC_Failure add esp, 8 - int 3 popa pop ebp Modified: trunk/reactos/lib/sdk/RunTmChk/rtcapi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/RunTmChk/rtcapi.c?… ============================================================================== --- trunk/reactos/lib/sdk/RunTmChk/rtcapi.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/RunTmChk/rtcapi.c [iso-8859-1] Wed Oct 15 22:44:26 2014 @@ -1,3 +1,9 @@ +/* + * PROJECT: MSVC runtime check support library + * LICENSE: BSD - See COPYING.ARM in the top level directory + * PURPOSE: Provides support functions for MSVC runtime checks + * PROGRAMMER: Timo Kreuzer (timo.kreuzer(a)reactos.org) + */ #include <rtcapi.h> @@ -53,7 +59,7 @@ guard2 = (int*)((char*)_Esp + _Fd->variables[i].addr +_Fd->variables[i].size); /* Check if they contain the guard bytes */ - if ((*guard1 != 0xCCCCCCCC) || (*guard1 != 0xCCCCCCCC)) + if ((*guard1 != 0xCCCCCCCC) || (*guard2 != 0xCCCCCCCC)) { DbgPrint("Stack corruption near '%s'\n", _Fd->variables[i].name); __debugbreak();

9 years, 11 months

[tkreuzer] 64757: [NTOSKRNL] Don't use an uninitialized variable in MmArmAccessFault (Alex, please review). Brought to you by MSVC runtime checks.

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Wed Oct 15 22:03:50 2014 New Revision: 64757 URL: http://svn.reactos.org/svn/reactos?rev=64757&view=rev Log: [NTOSKRNL] Don't use an uninitialized variable in MmArmAccessFault (Alex, please review). Brought to you by MSVC runtime checks. Modified: trunk/reactos/ntoskrnl/mm/ARM3/pagfault.c Modified: trunk/reactos/ntoskrnl/mm/ARM3/pagfault.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/pagfault.… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/pagfault.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/pagfault.c [iso-8859-1] Wed Oct 15 22:03:50 2014 @@ -1511,7 +1511,7 @@ NTSTATUS Status; PMMSUPPORT WorkingSet; ULONG ProtectionCode; - PMMVAD Vad; + PMMVAD Vad = NULL; PFN_NUMBER PageFrameIndex; ULONG Color; BOOLEAN IsSessionAddress;

9 years, 11 months

[tkreuzer] 64756: [RunTmChk] Implement a simple version of RunTmChk.lib for MSVC runtime check support, which can also be used in kernel mode. This one is good enough to compile ntoskrnl with it.

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Wed Oct 15 21:54:12 2014 New Revision: 64756 URL: http://svn.reactos.org/svn/reactos?rev=64756&view=rev Log: [RunTmChk] Implement a simple version of RunTmChk.lib for MSVC runtime check support, which can also be used in kernel mode. This one is good enough to compile ntoskrnl with it. Added: trunk/reactos/lib/sdk/RunTmChk/ (with props) trunk/reactos/lib/sdk/RunTmChk/CMakeLists.txt (with props) trunk/reactos/lib/sdk/RunTmChk/i386/ (with props) trunk/reactos/lib/sdk/RunTmChk/i386/_RTC_CheckEsp.S (with props) trunk/reactos/lib/sdk/RunTmChk/rtcapi.c (with props) Modified: trunk/reactos/lib/sdk/CMakeLists.txt Modified: trunk/reactos/lib/sdk/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/CMakeLists.txt?rev… ============================================================================== --- trunk/reactos/lib/sdk/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/CMakeLists.txt [iso-8859-1] Wed Oct 15 21:54:12 2014 @@ -2,6 +2,7 @@ add_subdirectory(comsupp) if(MSVC) add_subdirectory(cpprt) + add_subdirectory(RunTmChk) endif() add_subdirectory(crt) add_subdirectory(delayimp) Propchange: trunk/reactos/lib/sdk/RunTmChk/ ------------------------------------------------------------------------------ --- bugtraq:logregex (added) +++ bugtraq:logregex Wed Oct 15 21:54:12 2014 @@ -0,0 +1,2 @@ +([Ii]ssue|[Bb]ug)s? #?(\d+)(,? ?#?(\d+))*(,? ?(and |or )?#?(\d+))? +(\d+) Propchange: trunk/reactos/lib/sdk/RunTmChk/ ------------------------------------------------------------------------------ bugtraq:message = See issue #%BUGID% for more details. Propchange: trunk/reactos/lib/sdk/RunTmChk/ ------------------------------------------------------------------------------ bugtraq:url = http://www.reactos.org/bugzilla/show_bug.cgi?id=%BUGID% Propchange: trunk/reactos/lib/sdk/RunTmChk/ ------------------------------------------------------------------------------ tsvn:logminsize = 10 Added: trunk/reactos/lib/sdk/RunTmChk/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/RunTmChk/CMakeList… ============================================================================== --- trunk/reactos/lib/sdk/RunTmChk/CMakeLists.txt (added) +++ trunk/reactos/lib/sdk/RunTmChk/CMakeLists.txt [iso-8859-1] Wed Oct 15 21:54:12 2014 @@ -0,0 +1,15 @@ + +list(APPEND SOURCE + rtcapi.c +) + +if(ARCH STREQUAL "i386") + list(APPEND ASM_SOURCE + i386/_RTC_CheckEsp.S +) +endif() + +add_asm_files(RunTmChk_asm ${ASM_SOURCE}) +add_library(RunTmChk ${SOURCE} ${RunTmChk_asm}) + +add_dependencies(RunTmChk asm) Propchange: trunk/reactos/lib/sdk/RunTmChk/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/lib/sdk/RunTmChk/i386/ ------------------------------------------------------------------------------ --- bugtraq:logregex (added) +++ bugtraq:logregex Wed Oct 15 21:54:12 2014 @@ -0,0 +1,2 @@ +([Ii]ssue|[Bb]ug)s? #?(\d+)(,? ?#?(\d+))*(,? ?(and |or )?#?(\d+))? +(\d+) Propchange: trunk/reactos/lib/sdk/RunTmChk/i386/ ------------------------------------------------------------------------------ bugtraq:message = See issue #%BUGID% for more details. Propchange: trunk/reactos/lib/sdk/RunTmChk/i386/ ------------------------------------------------------------------------------ bugtraq:url = http://www.reactos.org/bugzilla/show_bug.cgi?id=%BUGID% Propchange: trunk/reactos/lib/sdk/RunTmChk/i386/ ------------------------------------------------------------------------------ tsvn:logminsize = 10 Added: trunk/reactos/lib/sdk/RunTmChk/i386/_RTC_CheckEsp.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/RunTmChk/i386/_RTC… ============================================================================== --- trunk/reactos/lib/sdk/RunTmChk/i386/_RTC_CheckEsp.S (added) +++ trunk/reactos/lib/sdk/RunTmChk/i386/_RTC_CheckEsp.S [iso-8859-1] Wed Oct 15 21:54:12 2014 @@ -0,0 +1,45 @@ + + +#include <asm.inc> +.code + +EXTERN __RTC_Failure:PROC + +/* + + This function is invoked like this: + + mov esi, esp + // Do the actual function call + cmp esp, esi + call __RTC_CheckEsp + + http://stackoverflow.com/questions/3914750/hows-rtc-checkesp-implemented +*/ +PUBLIC __RTC_CheckEsp +__RTC_CheckEsp: + + /* We check if the zero flag is set, and if it is, everything is fine + and we return to the caller */ + je __RTC_CheckEsp_return + + push ebp + mov ebp, esp + pusha + + // void _RTC_Failure(void* retaddr, int errnum); + push 0 // errnum + push dword ptr [esp + 4] // retaddr + call __RTC_Failure + add esp, 8 + int 3 + + popa + pop ebp + +__RTC_CheckEsp_return: + ret + +END + + Propchange: trunk/reactos/lib/sdk/RunTmChk/i386/_RTC_CheckEsp.S ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/lib/sdk/RunTmChk/rtcapi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/RunTmChk/rtcapi.c?… ============================================================================== --- trunk/reactos/lib/sdk/RunTmChk/rtcapi.c (added) +++ trunk/reactos/lib/sdk/RunTmChk/rtcapi.c [iso-8859-1] Wed Oct 15 21:54:12 2014 @@ -0,0 +1,124 @@ + +#include <rtcapi.h> + +unsigned long +__cdecl +DbgPrint( + const char *fmt, ...); + +void +_RTC_InitBase(void) +{ + __debugbreak(); +} + +void +_RTC_Shutdown(void) +{ + __debugbreak(); +} + +void +__cdecl +_RTC_Failure( + void* retaddr, + int errnum) +{ + DbgPrint("Invalid stack pointer value caught at %p, error %d\n", retaddr, errnum); + __debugbreak(); +} + +void +__cdecl +_RTC_UninitUse( + const char *_Varname) +{ + DbgPrint("Use of uninitialized variable %s!\n", _Varname); + __debugbreak(); +} + +void +__fastcall +_RTC_CheckStackVars( + void *_Esp, + _RTC_framedesc *_Fd) +{ + int i, *guard1, *guard2; + + /* Loop all variables in the descriptor */ + for (i = 0; i < _Fd->varCount; i++) + { + /* Get the 2 guards below and above the variable */ + guard1 = (int*)((char*)_Esp + _Fd->variables[i].addr - sizeof(*guard1)); + guard2 = (int*)((char*)_Esp + _Fd->variables[i].addr +_Fd->variables[i].size); + + /* Check if they contain the guard bytes */ + if ((*guard1 != 0xCCCCCCCC) || (*guard1 != 0xCCCCCCCC)) + { + DbgPrint("Stack corruption near '%s'\n", _Fd->variables[i].name); + __debugbreak(); + } + } +} + +void +__fastcall +_RTC_CheckStackVars2( + void *_Esp, + _RTC_framedesc *_Fd, + _RTC_ALLOCA_NODE *_AllocaList) +{ + _RTC_ALLOCA_NODE *current; + int *guard; + + /* Process normal variables */ + _RTC_CheckStackVars(_Esp, _Fd); + + /* Process the alloca list */ + for (current = _AllocaList; current != 0; current = current->next) + { + /* Get the upper guard */ + guard = (int*)((char*)current + current->allocaSize - sizeof(*guard)); + + /* Check if all guard locations are still ok */ + if ((current->guard1 != 0xCCCCCCCC) || + (current->guard2[0] != 0xCCCCCCCC) || + (current->guard2[1] != 0xCCCCCCCC) || + (current->guard2[2] != 0xCCCCCCCC) || + (*guard != 0xCCCCCCCC)) + { + __debugbreak(); + } + } +} + +void +__fastcall +_RTC_AllocaHelper( + _RTC_ALLOCA_NODE *_PAllocaBase, + size_t _CbSize, + _RTC_ALLOCA_NODE **_PAllocaInfoList) +{ + unsigned long i; + + /* Check if we got any allocation */ + if ((_PAllocaBase != 0) && + (_CbSize != 0) && + (_PAllocaInfoList != 0)) + { + /* Mark the whole range */ + char *guard = (char*)_PAllocaBase; + for (i = 0; i < _CbSize; i++) + { + guard[i] = 0xCC; + } + + /* Initialize the alloca base frame */ + _PAllocaBase->allocaSize = _CbSize; + + /* Insert this frame into the alloca list */ + _PAllocaBase->next = *_PAllocaInfoList; + *_PAllocaInfoList = _PAllocaBase; + } +} + Propchange: trunk/reactos/lib/sdk/RunTmChk/rtcapi.c ------------------------------------------------------------------------------ svn:eol-style = native

9 years, 11 months

[hbelusca] 64755: [NTVDM]: Arch, please do *not* reinitialize twice the keyboard and the video (first time before initializing the BDA, second time after), otherwise some programs won't display cor...

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Wed Oct 15 21:31:51 2014 New Revision: 64755 URL: http://svn.reactos.org/svn/reactos?rev=64755&view=rev Log: [NTVDM]: Arch, please do *not* reinitialize twice the keyboard and the video (first time before initializing the BDA, second time after), otherwise some programs won't display correct things!! Modified: trunk/reactos/subsystems/ntvdm/bios/bios32/bios32.c trunk/reactos/subsystems/ntvdm/dos/dem.c Modified: trunk/reactos/subsystems/ntvdm/bios/bios32/bios32.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/ntvdm/bios/bios… ============================================================================== --- trunk/reactos/subsystems/ntvdm/bios/bios32/bios32.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/ntvdm/bios/bios32/bios32.c [iso-8859-1] Wed Oct 15 21:31:51 2014 @@ -589,6 +589,10 @@ InitializeBiosData(); InitializeBiosInfo(); + /* + * Initialize IVT and hardware + */ + /* Register the BIOS 32-bit Interrupts */ InitializeBiosInt32(); @@ -605,35 +609,7 @@ return; } - ///////////// MUST BE DONE AFTER IVT INITIALIZATION !! ///////////////////// - - /* Load some ROMs */ - Success = LoadRom("boot.bin", (PVOID)0xE0000, NULL); - DPRINT1("Test ROM loading %s ; GetLastError() = %u\n", Success ? "succeeded" : "failed", GetLastError()); - - SearchAndInitRoms(&BiosContext); - - /* - * End of the 32-bit POST portion. We then fall back into 16-bit where - * the rest of the POST code is executed, typically calling INT 19h - * to boot up the OS. - */ -} - -static VOID WINAPI Bios32ResetBop(LPWORD Stack) -{ - DPRINT1("Bios32ResetBop\n"); - - /* Disable interrupts */ - setIF(0); - - // FIXME: Check the word at 0040h:0072h (Bda->SoftReset) and do one of the - // following actions: - // - if the word is 1234h, perform a warm reboot (aka. Ctrl-Alt-Del); - // - if the word is 0000h, perform a cold reboot (aka. Reset). - - /* Initialize IVT and hardware */ - +#if 0 /* Initialize the Keyboard and Video BIOS */ if (!KbdBiosInitialize() || !VidBiosInitialize()) { @@ -641,6 +617,34 @@ EmulatorTerminate(); return; } +#endif + + ///////////// MUST BE DONE AFTER IVT INITIALIZATION !! ///////////////////// + + /* Load some ROMs */ + Success = LoadRom("boot.bin", (PVOID)0xE0000, NULL); + DPRINT1("Test ROM loading %s ; GetLastError() = %u\n", Success ? "succeeded" : "failed", GetLastError()); + + SearchAndInitRoms(&BiosContext); + + /* + * End of the 32-bit POST portion. We then fall back into 16-bit where + * the rest of the POST code is executed, typically calling INT 19h + * to boot up the OS. + */ +} + +static VOID WINAPI Bios32ResetBop(LPWORD Stack) +{ + DPRINT1("Bios32ResetBop\n"); + + /* Disable interrupts */ + setIF(0); + + // FIXME: Check the word at 0040h:0072h (Bda->SoftReset) and do one of the + // following actions: + // - if the word is 1234h, perform a warm reboot (aka. Ctrl-Alt-Del); + // - if the word is 0000h, perform a cold reboot (aka. Reset). /* Do the POST */ Bios32Post(); Modified: trunk/reactos/subsystems/ntvdm/dos/dem.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/ntvdm/dos/dem.c… ============================================================================== --- trunk/reactos/subsystems/ntvdm/dos/dem.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/ntvdm/dos/dem.c [iso-8859-1] Wed Oct 15 21:31:51 2014 @@ -476,8 +476,6 @@ EmulatorTerminate(); } - - /* PUBLIC EXPORTED APIS *******************************************************/ // demLFNCleanup

9 years, 11 months

[pschweitzer] 64754: [NTFS] - Implement NtfsGetNameInformation() - Implement NtfsGetDirectoryInformation() - Implement NtfsGetFullDirectoryInformation() - Implement NtfsGetBothDirectoryInformation(...

by pschweitzer＠svn.reactos.org

Author: pschweitzer Date: Wed Oct 15 21:02:05 2014 New Revision: 64754 URL: http://svn.reactos.org/svn/reactos?rev=64754&view=rev Log: [NTFS] - Implement NtfsGetNameInformation() - Implement NtfsGetDirectoryInformation() - Implement NtfsGetFullDirectoryInformation() - Implement NtfsGetBothDirectoryInformation() - Implement NtfsQueryDirectory() which makes use of all the functions upper + all the previous fixes to make it able to look for a file using WC and file entry index This is supposed to bring directory enumeration in line on NTFS volumes. BUT, there's a bug at some point which makes it fail (or my test volume is corrupted :-P (which is unlikely (Scheme, get out of this commit message!))). Will look into it later on. Committing so far because it's quite major work anyway. More to follow~ Modified: trunk/reactos/drivers/filesystems/ntfs/dirctl.c Modified: trunk/reactos/drivers/filesystems/ntfs/dirctl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ntfs/d… ============================================================================== --- trunk/reactos/drivers/filesystems/ntfs/dirctl.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/ntfs/dirctl.c [iso-8859-1] Wed Oct 15 21:02:05 2014 @@ -120,400 +120,209 @@ return(STATUS_SUCCESS); } +#endif static NTSTATUS -CdfsFindFile(PDEVICE_EXTENSION DeviceExt, - PFCB Fcb, - PFCB Parent, - PWSTR FileToFind, - PULONG pDirIndex, - PULONG pDirIndex2) -/* - * FUNCTION: Find a file - */ -{ - WCHAR name[256]; - WCHAR TempStr[2]; - PVOID Block; - NTSTATUS Status; - ULONG len; - ULONG DirIndex; - ULONG Offset; - ULONG Read; - BOOLEAN IsRoot; - PVOID Context = NULL; - ULONG DirSize; - PUCHAR Ptr; - PDIR_RECORD Record; - LARGE_INTEGER StreamOffset; - - DPRINT("FindFile(Parent %x, FileToFind '%S', DirIndex: %d)\n", - Parent, FileToFind, pDirIndex ? *pDirIndex : 0); - DPRINT("FindFile: old Pathname %x, old Objectname %x)\n", - Fcb->PathName, Fcb->ObjectName); - - IsRoot = FALSE; - DirIndex = 0; - if (wcslen (FileToFind) == 0) - { - CHECKPOINT; - TempStr[0] = (WCHAR) '.'; - TempStr[1] = 0; - FileToFind = (PWSTR)&TempStr; - } - - if (Parent) - { - if (Parent->Entry.ExtentLocationL == DeviceExt->CdInfo.RootStart) - { - IsRoot = TRUE; - } - } - else - { - IsRoot = TRUE; - } - - if (IsRoot == TRUE) - { - StreamOffset.QuadPart = (LONGLONG)DeviceExt->CdInfo.RootStart * (LONGLONG)BLOCKSIZE; - DirSize = DeviceExt->CdInfo.RootSize; - - - if (FileToFind[0] == 0 || (FileToFind[0] == '\\' && FileToFind[1] == 0) - || (FileToFind[0] == '.' && FileToFind[1] == 0)) - { - /* it's root : complete essentials fields then return ok */ - RtlZeroMemory(Fcb, sizeof(FCB)); - - Fcb->PathName[0]='\\'; - Fcb->ObjectName = &Fcb->PathName[1]; - Fcb->Entry.ExtentLocationL = DeviceExt->CdInfo.RootStart; - Fcb->Entry.DataLengthL = DeviceExt->CdInfo.RootSize; - Fcb->Entry.FileFlags = 0x02; //FILE_ATTRIBUTE_DIRECTORY; - - if (pDirIndex) - *pDirIndex = 0; - if (pDirIndex2) - *pDirIndex2 = 0; - DPRINT("CdfsFindFile: new Pathname %S, new Objectname %S)\n",Fcb->PathName, Fcb->ObjectName); - return (STATUS_SUCCESS); - } - } - else - { - StreamOffset.QuadPart = (LONGLONG)Parent->Entry.ExtentLocationL * (LONGLONG)BLOCKSIZE; - DirSize = Parent->Entry.DataLengthL; - } - - DPRINT("StreamOffset %I64u DirSize %lu\n", StreamOffset.QuadPart, DirSize); - - if (pDirIndex && (*pDirIndex)) - DirIndex = *pDirIndex; - - if(!CcMapData(DeviceExt->StreamFileObject, &StreamOffset, - BLOCKSIZE, TRUE, &Context, &Block)) - { - DPRINT("CcMapData() failed\n"); - return(STATUS_UNSUCCESSFUL); - } - - Ptr = (PUCHAR)Block; - while(TRUE) - { - Record = (PDIR_RECORD)Ptr; - if (Record->RecordLength == 0) - { - DPRINT1("Stopped!\n"); - break; - } - - DPRINT("RecordLength %u ExtAttrRecordLength %u NameLength %u\n", - Record->RecordLength, Record->ExtAttrRecordLength, Record->FileIdLength); - - Status = CdfsGetEntryName(DeviceExt, &Context, &Block, &StreamOffset, - DirSize, (PVOID*)&Ptr, name, &DirIndex, pDirIndex2); - if (Status == STATUS_NO_MORE_ENTRIES) - { - break; - } - else if (Status == STATUS_UNSUCCESSFUL) - { - /* Note: the directory cache has already been unpinned */ - return(Status); - } - - DPRINT("Name '%S'\n", name); - - if (wstrcmpjoki(name, FileToFind)) /* || wstrcmpjoki (name2, FileToFind)) */ - { - if (Parent && Parent->PathName) - { - len = wcslen(Parent->PathName); - memcpy(Fcb->PathName, Parent->PathName, len*sizeof(WCHAR)); - Fcb->ObjectName=&Fcb->PathName[len]; - if (len != 1 || Fcb->PathName[0] != '\\') - { - Fcb->ObjectName[0] = '\\'; - Fcb->ObjectName = &Fcb->ObjectName[1]; - } - } - else - { - Fcb->ObjectName=Fcb->PathName; - Fcb->ObjectName[0]='\\'; - Fcb->ObjectName=&Fcb->ObjectName[1]; - } - - DPRINT("PathName '%S' ObjectName '%S'\n", Fcb->PathName, Fcb->ObjectName); - - memcpy(&Fcb->Entry, Ptr, sizeof(DIR_RECORD)); - wcsncpy(Fcb->ObjectName, name, MAX_PATH); - if (pDirIndex) - *pDirIndex = DirIndex; - - DPRINT("FindFile: new Pathname %S, new Objectname %S, DirIndex %d\n", - Fcb->PathName, Fcb->ObjectName, DirIndex); - - CcUnpinData(Context); - - return(STATUS_SUCCESS); - } - - - Ptr = Ptr + Record->RecordLength; - DirIndex++; - - if (((ULONG)Ptr - (ULONG)Block) >= DirSize) - { - DPRINT("Stopped!\n"); - break; - } - } - - CcUnpinData(Context); - - if (pDirIndex) - *pDirIndex = DirIndex; - - return(STATUS_UNSUCCESSFUL); +NtfsGetNameInformation(PDEVICE_EXTENSION DeviceExt, + PFILE_RECORD_HEADER FileRecord, + PNTFS_ATTR_CONTEXT DataContext, + PFILE_NAMES_INFORMATION Info, + ULONG BufferLength) +{ + ULONG Length; + PFILENAME_ATTRIBUTE FileName; + + DPRINT("NtfsGetNameInformation() called\n"); + + FileName = GetFileNameFromRecord(FileRecord); + ASSERT(FileName != NULL); + + Length = FileName->NameLength; + if ((sizeof(FILE_NAMES_INFORMATION) + Length) > BufferLength) + return(STATUS_BUFFER_OVERFLOW); + + Info->FileNameLength = Length; + Info->NextEntryOffset = + ROUND_UP(sizeof(FILE_NAMES_INFORMATION) + Length, sizeof(ULONG)); + RtlCopyMemory(Info->FileName, FileName->Name, Length); + + return(STATUS_SUCCESS); } static NTSTATUS -CdfsGetNameInformation(PFCB Fcb, - PDEVICE_EXTENSION DeviceExt, - PFILE_NAMES_INFORMATION Info, - ULONG BufferLength) -{ - ULONG Length; - - DPRINT("CdfsGetNameInformation() called\n"); - - Length = wcslen(Fcb->ObjectName) * sizeof(WCHAR); - if ((sizeof (FILE_BOTH_DIRECTORY_INFORMATION) + Length) > BufferLength) - return(STATUS_BUFFER_OVERFLOW); - - Info->FileNameLength = Length; - Info->NextEntryOffset = - ROUND_UP(sizeof(FILE_BOTH_DIRECTORY_INFORMATION) + Length, 4); - memcpy(Info->FileName, Fcb->ObjectName, Length); - - return(STATUS_SUCCESS); +NtfsGetDirectoryInformation(PDEVICE_EXTENSION DeviceExt, + PFILE_RECORD_HEADER FileRecord, + PNTFS_ATTR_CONTEXT DataContext, + PFILE_DIRECTORY_INFORMATION Info, + ULONG BufferLength) +{ + ULONG Length; + PFILENAME_ATTRIBUTE FileName; + + DPRINT("NtfsGetDirectoryInformation() called\n"); + + FileName = GetFileNameFromRecord(FileRecord); + ASSERT(FileName != NULL); + + Length = FileName->NameLength; + if ((sizeof(FILE_DIRECTORY_INFORMATION) + Length) > BufferLength) + return(STATUS_BUFFER_OVERFLOW); + + Info->FileNameLength = Length; + Info->NextEntryOffset = + ROUND_UP(sizeof(FILE_DIRECTORY_INFORMATION) + Length, sizeof(ULONG)); + RtlCopyMemory(Info->FileName, FileName->Name, Length); + + /* Convert file times */ + NtfsDateTimeToFileTime(FileName->CreationTime, &Info->CreationTime); + NtfsDateTimeToFileTime(FileName->LastAccessTime, &Info->LastAccessTime); + NtfsDateTimeToFileTime(FileName->LastWriteTime, &Info->LastWriteTime); + NtfsDateTimeToFileTime(FileName->ChangeTime, &Info->ChangeTime); + + /* Convert file flags */ + NtfsFileFlagsToAttributes(FileName->FileAttributes, &Info->FileAttributes); + + Info->EndOfFile.QuadPart = FileName->DataSize; + Info->AllocationSize.QuadPart = FileName->AllocatedSize; + +// Info->FileIndex=; + + return STATUS_SUCCESS; } static NTSTATUS -CdfsGetDirectoryInformation(PFCB Fcb, - PDEVICE_EXTENSION DeviceExt, - PFILE_DIRECTORY_INFORMATION Info, - ULONG BufferLength) -{ - ULONG Length; - - DPRINT("CdfsGetDirectoryInformation() called\n"); - - Length = wcslen(Fcb->ObjectName) * sizeof(WCHAR); - if ((sizeof (FILE_BOTH_DIRECTORY_INFORMATION) + Length) > BufferLength) - return(STATUS_BUFFER_OVERFLOW); - - Info->FileNameLength = Length; - Info->NextEntryOffset = - ROUND_UP(sizeof(FILE_BOTH_DIRECTORY_INFORMATION) + Length, 4); - memcpy(Info->FileName, Fcb->ObjectName, Length); - - /* Convert file times */ - CdfsDateTimeToFileTime(Fcb, - &Info->CreationTime); - CdfsDateTimeToFileTime(Fcb, - &Info->LastAccessTime); - CdfsDateTimeToFileTime(Fcb, - &Info->LastWriteTime); - CdfsDateTimeToFileTime(Fcb, - &Info->ChangeTime); - - /* Convert file flags */ - CdfsFileFlagsToAttributes(Fcb, - &Info->FileAttributes); - - Info->EndOfFile.QuadPart = Fcb->Entry.DataLengthL; - - /* Make AllocSize a rounded up multiple of the sector size */ - Info->AllocationSize.QuadPart = ROUND_UP(Fcb->Entry.DataLengthL, BLOCKSIZE); +NtfsGetFullDirectoryInformation(PDEVICE_EXTENSION DeviceExt, + PFILE_RECORD_HEADER FileRecord, + PNTFS_ATTR_CONTEXT DataContext, + PFILE_FULL_DIRECTORY_INFORMATION Info, + ULONG BufferLength) +{ + ULONG Length; + PFILENAME_ATTRIBUTE FileName; + + DPRINT("NtfsGetFullDirectoryInformation() called\n"); + + FileName = GetFileNameFromRecord(FileRecord); + ASSERT(FileName != NULL); + + Length = FileName->NameLength; + if ((sizeof(FILE_FULL_DIRECTORY_INFORMATION) + Length) > BufferLength) + return(STATUS_BUFFER_OVERFLOW); + + Info->FileNameLength = Length; + Info->NextEntryOffset = + ROUND_UP(sizeof(FILE_FULL_DIRECTORY_INFORMATION) + Length, sizeof(ULONG)); + RtlCopyMemory(Info->FileName, FileName->Name, Length); + + /* Convert file times */ + NtfsDateTimeToFileTime(FileName->CreationTime, &Info->CreationTime); + NtfsDateTimeToFileTime(FileName->LastAccessTime, &Info->LastAccessTime); + NtfsDateTimeToFileTime(FileName->LastWriteTime, &Info->LastWriteTime); + NtfsDateTimeToFileTime(FileName->ChangeTime, &Info->ChangeTime); + + /* Convert file flags */ + NtfsFileFlagsToAttributes(FileName->FileAttributes, &Info->FileAttributes); + + Info->EndOfFile.QuadPart = FileName->DataSize; + Info->AllocationSize.QuadPart = FileName->AllocatedSize; // Info->FileIndex=; - - return(STATUS_SUCCESS); + Info->EaSize = 0; + + return STATUS_SUCCESS; } static NTSTATUS -CdfsGetFullDirectoryInformation(PFCB Fcb, - PDEVICE_EXTENSION DeviceExt, - PFILE_FULL_DIRECTORY_INFORMATION Info, - ULONG BufferLength) -{ - ULONG Length; - - DPRINT("CdfsGetFullDirectoryInformation() called\n"); - - Length = wcslen(Fcb->ObjectName) * sizeof(WCHAR); - if ((sizeof (FILE_BOTH_DIRECTORY_INFORMATION) + Length) > BufferLength) - return(STATUS_BUFFER_OVERFLOW); - - Info->FileNameLength = Length; - Info->NextEntryOffset = - ROUND_UP(sizeof(FILE_BOTH_DIRECTORY_INFORMATION) + Length, 4); - memcpy(Info->FileName, Fcb->ObjectName, Length); - - /* Convert file times */ - CdfsDateTimeToFileTime(Fcb, - &Info->CreationTime); - CdfsDateTimeToFileTime(Fcb, - &Info->LastAccessTime); - CdfsDateTimeToFileTime(Fcb, - &Info->LastWriteTime); - CdfsDateTimeToFileTime(Fcb, - &Info->ChangeTime); - - /* Convert file flags */ - CdfsFileFlagsToAttributes(Fcb, - &Info->FileAttributes); - - Info->EndOfFile.QuadPart = Fcb->Entry.DataLengthL; - - /* Make AllocSize a rounded up multiple of the sector size */ - Info->AllocationSize.QuadPart = ROUND_UP(Fcb->Entry.DataLengthL, BLOCKSIZE); +NtfsGetBothDirectoryInformation(PDEVICE_EXTENSION DeviceExt, + PFILE_RECORD_HEADER FileRecord, + PNTFS_ATTR_CONTEXT DataContext, + PFILE_BOTH_DIR_INFORMATION Info, + ULONG BufferLength) +{ + ULONG Length; + PFILENAME_ATTRIBUTE FileName; + + DPRINT("NtfsGetBothDirectoryInformation() called\n"); + + FileName = GetFileNameFromRecord(FileRecord); + ASSERT(FileName != NULL); + + Length = FileName->NameLength; + if ((sizeof(FILE_BOTH_DIR_INFORMATION) + Length) > BufferLength) + return(STATUS_BUFFER_OVERFLOW); + + Info->FileNameLength = Length; + Info->NextEntryOffset = + ROUND_UP(sizeof(FILE_BOTH_DIR_INFORMATION) + Length, sizeof(ULONG)); + RtlCopyMemory(Info->FileName, FileName->Name, Length); + + /* Convert file times */ + NtfsDateTimeToFileTime(FileName->CreationTime, &Info->CreationTime); + NtfsDateTimeToFileTime(FileName->LastAccessTime, &Info->LastAccessTime); + NtfsDateTimeToFileTime(FileName->LastWriteTime, &Info->LastWriteTime); + NtfsDateTimeToFileTime(FileName->ChangeTime, &Info->ChangeTime); + + /* Convert file flags */ + NtfsFileFlagsToAttributes(FileName->FileAttributes, &Info->FileAttributes); + + Info->EndOfFile.QuadPart = FileName->DataSize; + Info->AllocationSize.QuadPart = FileName->AllocatedSize; // Info->FileIndex=; - Info->EaSize = 0; - - return(STATUS_SUCCESS); -} - - -static NTSTATUS -CdfsGetBothDirectoryInformation(PFCB Fcb, - PDEVICE_EXTENSION DeviceExt, - PFILE_BOTH_DIRECTORY_INFORMATION Info, - ULONG BufferLength) -{ - ULONG Length; - - DPRINT("CdfsGetBothDirectoryInformation() called\n"); - - Length = wcslen(Fcb->ObjectName) * sizeof(WCHAR); - if ((sizeof (FILE_BOTH_DIRECTORY_INFORMATION) + Length) > BufferLength) - return(STATUS_BUFFER_OVERFLOW); - - Info->FileNameLength = Length; - Info->NextEntryOffset = - ROUND_UP(sizeof(FILE_BOTH_DIRECTORY_INFORMATION) + Length, 4); - memcpy(Info->FileName, Fcb->ObjectName, Length); - - /* Convert file times */ - CdfsDateTimeToFileTime(Fcb, - &Info->CreationTime); - CdfsDateTimeToFileTime(Fcb, - &Info->LastAccessTime); - CdfsDateTimeToFileTime(Fcb, - &Info->LastWriteTime); - CdfsDateTimeToFileTime(Fcb, - &Info->ChangeTime); - - /* Convert file flags */ - CdfsFileFlagsToAttributes(Fcb, - &Info->FileAttributes); - - Info->EndOfFile.QuadPart = Fcb->Entry.DataLengthL; - - /* Make AllocSize a rounded up multiple of the sector size */ - Info->AllocationSize.QuadPart = ROUND_UP(Fcb->Entry.DataLengthL, BLOCKSIZE); - -// Info->FileIndex=; - Info->EaSize = 0; - - if (DeviceExt->CdInfo.JolietLevel == 0) - { - /* Standard ISO-9660 format */ - Info->ShortNameLength = Length; - memcpy(Info->ShortName, Fcb->ObjectName, Length); - } - else - { - /* Joliet extension */ - - /* FIXME: Copy or create a short file name */ - - Info->ShortName[0] = 0; - Info->ShortNameLength = 0; - } - - return(STATUS_SUCCESS); -} -#endif + Info->EaSize = 0; + + Info->ShortName[0] = 0; + Info->ShortNameLength = 0; + + return STATUS_SUCCESS; +} NTSTATUS NtfsQueryDirectory(PNTFS_IRP_CONTEXT IrpContext) { PIRP Irp; - //PDEVICE_OBJECT DeviceObject; - //PDEVICE_EXTENSION DeviceExtension; - //LONG BufferLength = 0; + PDEVICE_OBJECT DeviceObject; + PDEVICE_EXTENSION DeviceExtension; + LONG BufferLength = 0; PUNICODE_STRING SearchPattern = NULL; - //FILE_INFORMATION_CLASS FileInformationClass; + FILE_INFORMATION_CLASS FileInformationClass; ULONG FileIndex = 0; PUCHAR Buffer = NULL; PFILE_NAMES_INFORMATION Buffer0 = NULL; - //PNTFS_FCB Fcb; + PNTFS_FCB Fcb; PNTFS_CCB Ccb; -// FCB TempFcb; BOOLEAN First = FALSE; PIO_STACK_LOCATION Stack; PFILE_OBJECT FileObject; - //NTSTATUS Status = STATUS_SUCCESS; + NTSTATUS Status = STATUS_SUCCESS; + PFILE_RECORD_HEADER FileRecord; + PNTFS_ATTR_CONTEXT DataContext; + ULONGLONG MFTRecord; + UNICODE_STRING Pattern; DPRINT1("NtfsQueryDirectory() called\n"); ASSERT(IrpContext); Irp = IrpContext->Irp; -// DeviceObject = IrpContext->DeviceObject; - -// DeviceExtension = DeviceObject->DeviceExtension; + DeviceObject = IrpContext->DeviceObject; + + DeviceExtension = DeviceObject->DeviceExtension; Stack = IoGetCurrentIrpStackLocation(Irp); FileObject = Stack->FileObject; Ccb = (PNTFS_CCB)FileObject->FsContext2; -// Fcb = (PNTFS_FCB)FileObject->FsContext; + Fcb = (PNTFS_FCB)FileObject->FsContext; /* Obtain the callers parameters */ - //BufferLength = Stack->Parameters.QueryDirectory.Length; + BufferLength = Stack->Parameters.QueryDirectory.Length; SearchPattern = Stack->Parameters.QueryDirectory.FileName; - //FileInformationClass = Stack->Parameters.QueryDirectory.FileInformationClass; + FileInformationClass = Stack->Parameters.QueryDirectory.FileInformationClass; FileIndex = Stack->Parameters.QueryDirectory.FileIndex; - if (SearchPattern != NULL) { @@ -546,7 +355,10 @@ Ccb->DirectorySearchPattern[1] = 0; } - DPRINT("Search pattern '%S'\n", Ccb->DirectorySearchPattern); + RtlInitUnicodeString(&Pattern, Ccb->DirectorySearchPattern); + + DPRINT1("Search pattern '%S'\n", Ccb->DirectorySearchPattern); + DPRINT1("In: '%S'\n", Fcb->PathName); /* Determine directory index */ if (Stack->Flags & SL_INDEX_SPECIFIED) @@ -570,93 +382,96 @@ DPRINT("Buffer=%p tofind=%S\n", Buffer, Ccb->DirectorySearchPattern); -#if 0 - TempFcb.ObjectName = TempFcb.PathName; - while (Status == STATUS_SUCCESS && BufferLength > 0) - { - Status = CdfsFindFile(DeviceExtension, - &TempFcb, - Fcb, - Ccb->DirectorySearchPattern, - &Ccb->Entry, - NULL); - DPRINT("Found %S, Status=%x, entry %x\n", TempFcb.ObjectName, Status, Ccb->Entry); - - if (NT_SUCCESS(Status)) - { - switch (FileInformationClass) - { - case FileNameInformation: - Status = CdfsGetNameInformation(&TempFcb, - DeviceExtension, - (PFILE_NAMES_INFORMATION)Buffer, - BufferLength); - break; - - case FileDirectoryInformation: - Status = CdfsGetDirectoryInformation(&TempFcb, - DeviceExtension, - (PFILE_DIRECTORY_INFORMATION)Buffer, - BufferLength); - break; - - case FileFullDirectoryInformation: - Status = CdfsGetFullDirectoryInformation(&TempFcb, - DeviceExtension, - (PFILE_FULL_DIRECTORY_INFORMATION)Buffer, - BufferLength); - break; - - case FileBothDirectoryInformation: - Status = NtfsGetBothDirectoryInformation(&TempFcb, - DeviceExtension, - (PFILE_BOTH_DIRECTORY_INFORMATION)Buffer, - BufferLength); - break; - - default: - Status = STATUS_INVALID_INFO_CLASS; - } - - if (Status == STATUS_BUFFER_OVERFLOW) - { - if (Buffer0) - { - Buffer0->NextEntryOffset = 0; - } - break; - } - } - else - { - if (Buffer0) - { - Buffer0->NextEntryOffset = 0; - } - - if (First) - { - Status = STATUS_NO_SUCH_FILE; - } - else - { - Status = STATUS_NO_MORE_FILES; - } - break; - } - - Buffer0 = (PFILE_NAMES_INFORMATION)Buffer; - Buffer0->FileIndex = FileIndex++; - Ccb->Entry++; - - if (Stack->Flags & SL_RETURN_SINGLE_ENTRY) - { - break; - } - BufferLength -= Buffer0->NextEntryOffset; - Buffer += Buffer0->NextEntryOffset; - } -#endif + while (Status == STATUS_SUCCESS && BufferLength > 0) + { + Status = NtfsFindFileAt(DeviceExtension, + &Pattern, + &Ccb->Entry, + &FileRecord, + &DataContext, + &MFTRecord, + Fcb->MFTIndex); + //DPRINT("Found %S, Status=%x, entry %x\n", TempFcb.ObjectName, Status, Ccb->Entry); + + if (NT_SUCCESS(Status)) + { + switch (FileInformationClass) + { + case FileNameInformation: + Status = NtfsGetNameInformation(DeviceExtension, + FileRecord, + DataContext, + (PFILE_NAMES_INFORMATION)Buffer, + BufferLength); + break; + + case FileDirectoryInformation: + Status = NtfsGetDirectoryInformation(DeviceExtension, + FileRecord, + DataContext, + (PFILE_DIRECTORY_INFORMATION)Buffer, + BufferLength); + break; + + case FileFullDirectoryInformation: + Status = NtfsGetFullDirectoryInformation(DeviceExtension, + FileRecord, + DataContext, + (PFILE_FULL_DIRECTORY_INFORMATION)Buffer, + BufferLength); + break; + + case FileBothDirectoryInformation: + Status = NtfsGetBothDirectoryInformation(DeviceExtension, + FileRecord, + DataContext, + (PFILE_BOTH_DIR_INFORMATION)Buffer, + BufferLength); + break; + + default: + Status = STATUS_INVALID_INFO_CLASS; + } + + if (Status == STATUS_BUFFER_OVERFLOW) + { + if (Buffer0) + { + Buffer0->NextEntryOffset = 0; + } + break; + } + } + else + { + if (Buffer0) + { + Buffer0->NextEntryOffset = 0; + } + + if (First) + { + Status = STATUS_NO_SUCH_FILE; + } + else + { + Status = STATUS_NO_MORE_FILES; + } + break; + } + + Buffer0 = (PFILE_NAMES_INFORMATION)Buffer; + Buffer0->FileIndex = FileIndex++; + Ccb->Entry++; + + if (Stack->Flags & SL_RETURN_SINGLE_ENTRY) + { + break; + } + BufferLength -= Buffer0->NextEntryOffset; + Buffer += Buffer0->NextEntryOffset; + ExFreePoolWithTag(FileRecord, TAG_NTFS); + } if (Buffer0) { @@ -665,11 +480,10 @@ if (FileIndex > 0) { - //Status = STATUS_SUCCESS; - } - -// return Status; - return STATUS_NO_MORE_FILES; + Status = STATUS_SUCCESS; + } + + return Status; }

9 years, 11 months

[pschweitzer] 64753: [NTFS] Implement NtfsFileFlagsToAttributes() to fix some of the attributes of the MFT to make them usable by ReactOS. Would deserve a double-check

by pschweitzer＠svn.reactos.org

Author: pschweitzer Date: Wed Oct 15 20:36:30 2014 New Revision: 64753 URL: http://svn.reactos.org/svn/reactos?rev=64753&view=rev Log: [NTFS] Implement NtfsFileFlagsToAttributes() to fix some of the attributes of the MFT to make them usable by ReactOS. Would deserve a double-check Modified: trunk/reactos/drivers/filesystems/ntfs/misc.c trunk/reactos/drivers/filesystems/ntfs/ntfs.h Modified: trunk/reactos/drivers/filesystems/ntfs/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ntfs/m… ============================================================================== --- trunk/reactos/drivers/filesystems/ntfs/misc.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/ntfs/misc.c [iso-8859-1] Wed Oct 15 20:36:30 2014 @@ -109,4 +109,19 @@ SystemTime->QuadPart = NtfsTime + 116444736000000000; } +VOID +NtfsFileFlagsToAttributes(ULONG NtfsAttributes, + PULONG FileAttributes) +{ + *FileAttributes = NtfsAttributes; + if ((NtfsAttributes & NTFS_FILE_TYPE_DIRECTORY) == NTFS_FILE_TYPE_DIRECTORY) + { + *FileAttributes = NtfsAttributes & ~NTFS_FILE_TYPE_DIRECTORY; + *FileAttributes |= FILE_ATTRIBUTE_DIRECTORY; + } + + if (NtfsAttributes == 0) + *FileAttributes = FILE_ATTRIBUTE_NORMAL; +} + /* EOF */ Modified: trunk/reactos/drivers/filesystems/ntfs/ntfs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ntfs/n… ============================================================================== --- trunk/reactos/drivers/filesystems/ntfs/ntfs.h [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/ntfs/ntfs.h [iso-8859-1] Wed Oct 15 20:36:30 2014 @@ -686,11 +686,9 @@ NtfsDateTimeToFileTime(ULONGLONG NtfsTime, PLARGE_INTEGER SystemTime); -#if 0 -VOID -CdfsFileFlagsToAttributes(PFCB Fcb, - PULONG FileAttributes); -#endif +VOID +NtfsFileFlagsToAttributes(ULONG NtfsAttributes, + PULONG FileAttributes); /* rw.c */

9 years, 11 months

[pschweitzer] 64752: [NTFS] Implement NtfsDateTimeToFileTime() which convert epoch time (1970) to Windows time (1601)

by pschweitzer＠svn.reactos.org

Author: pschweitzer Date: Wed Oct 15 20:23:47 2014 New Revision: 64752 URL: http://svn.reactos.org/svn/reactos?rev=64752&view=rev Log: [NTFS] Implement NtfsDateTimeToFileTime() which convert epoch time (1970) to Windows time (1601) Modified: trunk/reactos/drivers/filesystems/ntfs/misc.c trunk/reactos/drivers/filesystems/ntfs/ntfs.h Modified: trunk/reactos/drivers/filesystems/ntfs/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ntfs/m… ============================================================================== --- trunk/reactos/drivers/filesystems/ntfs/misc.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/ntfs/misc.c [iso-8859-1] Wed Oct 15 20:23:47 2014 @@ -97,4 +97,16 @@ return IrpContext; } +/* See: + -> http://msdn.microsoft.com/en-us/library/ms724228 + -> http://bos.asmhackers.net/docs/filesystems/ntfs/standard.html#layout + */ +VOID +NtfsDateTimeToFileTime(ULONGLONG NtfsTime, + PLARGE_INTEGER SystemTime) +{ + + SystemTime->QuadPart = NtfsTime + 116444736000000000; +} + /* EOF */ Modified: trunk/reactos/drivers/filesystems/ntfs/ntfs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ntfs/n… ============================================================================== --- trunk/reactos/drivers/filesystems/ntfs/ntfs.h [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/ntfs/ntfs.h [iso-8859-1] Wed Oct 15 20:23:47 2014 @@ -680,11 +680,13 @@ CdfsSwapString(PWCHAR Out, PUCHAR In, ULONG Count); - -VOID -CdfsDateTimeToFileTime(PFCB Fcb, - TIME *FileTime); - +#endif + +VOID +NtfsDateTimeToFileTime(ULONGLONG NtfsTime, + PLARGE_INTEGER SystemTime); + +#if 0 VOID CdfsFileFlagsToAttributes(PFCB Fcb, PULONG FileAttributes);

9 years, 11 months

← Newer
1
...
38
39
40
41
42
43
44
...
73
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs October 2014