Ros-diffs

ros-diffs@reactos.org

81390 discussions

[pschweitzer] 58847: [NTOSKRNL] Reimplement (yes, once more...) all the DOS wildcards in FsRtlIs*InExpression(). This time with a better understanding of MSDN (doc can be sometimes quite cryptic......
by pschweitzer＠svn.reactos.org 24 Apr '13

24 Apr '13

Author: pschweitzer Date: Wed Apr 24 20:36:33 2013 New Revision: 58847 URL: http://svn.reactos.org/svn/reactos?rev=58847&view=rev Log: [NTOSKRNL] Reimplement (yes, once more...) all the DOS wildcards in FsRtlIs*InExpression(). This time with a better understanding of MSDN (doc can be sometimes quite cryptic...). Which means that now the functions are passing all the tests and are even simpler. Modified: trunk/reactos/ntoskrnl/fsrtl/dbcsname.c trunk/reactos/ntoskrnl/fsrtl/name.c Modified: trunk/reactos/ntoskrnl/fsrtl/dbcsname.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/fsrtl/dbcsname.c?… ============================================================================== --- trunk/reactos/ntoskrnl/fsrtl/dbcsname.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/fsrtl/dbcsname.c [iso-8859-1] Wed Apr 24 20:36:33 2013 @@ -160,10 +160,9 @@ FsRtlIsDbcsInExpression(IN PANSI_STRING Expression, IN PANSI_STRING Name) { - SHORT StarFound = -1; - PUSHORT BackTracking = NULL; - USHORT ExpressionPosition = 0, NamePosition = 0, MatchingChars; - BOOLEAN BeyondName; + SHORT StarFound = -1, DosStarFound = -1; + PUSHORT BackTracking = NULL, DosBackTracking = NULL; + USHORT ExpressionPosition = 0, NamePosition = 0, MatchingChars, LastDot; PAGED_CODE(); ASSERT(Name->Length); @@ -222,129 +221,83 @@ /* Check DOS_STAR */ else if (Expression->Buffer[ExpressionPosition] == ANSI_DOS_STAR) { - /* We can only consume dot if that's not the last one - * Otherwise, we null match - */ - if (Name->Buffer[NamePosition] == '.') - { - MatchingChars = NamePosition + 1; - while (MatchingChars < Name->Length) - { - if (Name->Buffer[MatchingChars] == '.') - { - NamePosition++; - break; - } - MatchingChars++; - } - - /* In case we were already at last dot, simply accept it */ - if (MatchingChars == Name->Length) - { - NamePosition++; - } - } - else - { - /* XXX: Eat everything till the end */ - if (ExpressionPosition + 1 == Expression->Length) - { - NamePosition = Name->Length; - } - - /* Try to eat till the next matching char or . */ - MatchingChars = NamePosition; - while (MatchingChars < Name->Length) - { - if (ExpressionPosition + 1 < Expression->Length && - Name->Buffer[MatchingChars] == Expression->Buffer[ExpressionPosition + 1]) - { - NamePosition = MatchingChars; - break; - } - else if (Name->Buffer[MatchingChars] == '.') - { - NamePosition = MatchingChars + 1; - break; - } - MatchingChars++; - } - } - ExpressionPosition++; - } - /* Check DOS_DOT */ - else if (Expression->Buffer[ExpressionPosition] == DOS_DOT) - { - /* First try to find whether we are beyond last dot (beyond name) */ - BeyondName = TRUE; - MatchingChars = NamePosition + 1; + /* Skip contigous stars */ + while (ExpressionPosition + 1 < Expression->Length && Expression->Buffer[ExpressionPosition + 1] == ANSI_DOS_STAR) + { + ExpressionPosition++; + } + + /* Look for last dot */ + MatchingChars = 0; + LastDot = (USHORT)-1; while (MatchingChars < Name->Length) { if (Name->Buffer[MatchingChars] == '.') { - BeyondName = FALSE; - break; + LastDot = MatchingChars; + if (LastDot > NamePosition) + break; } + MatchingChars++; } - /* If we are beyond name, we null match */ - if (BeyondName) - { + /* If we don't have dots or we didn't find last yet + * start eating everything + */ + if (MatchingChars != Name->Length || LastDot == (USHORT)-1) + { + if (!DosBackTracking) DosBackTracking = ExAllocatePoolWithTag(PagedPool | POOL_RAISE_IF_ALLOCATION_FAILURE, + Expression->Length * sizeof(USHORT), 'nrSF'); + DosBackTracking[++DosStarFound] = ExpressionPosition++; + + /* Not the same char, start exploring */ + if (Expression->Buffer[ExpressionPosition] != Name->Buffer[NamePosition]) + NamePosition++; + } + else + { + /* Else, if we are at last dot, eat it - otherwise, null match */ if (Name->Buffer[NamePosition] == '.') - { NamePosition++; - } - ExpressionPosition++; - continue; - } - /* If not, we only match a dot */ - else if (Name->Buffer[NamePosition] == '.') + + ExpressionPosition++; + } + } + /* Check DOS_DOT */ + else if (Expression->Buffer[ExpressionPosition] == ANSI_DOS_DOT) + { + /* We only match dots */ + if (Name->Buffer[NamePosition] == '.') { NamePosition++; - ExpressionPosition++; - continue; - } - /* Otherwise, fail */ - else - { - break; - } + } + /* Try to explore later on for null matching */ + else if (ExpressionPosition + 1 < Expression->Length && + Name->Buffer[NamePosition] == Expression->Buffer[ExpressionPosition + 1]) + { + NamePosition++; + } + ExpressionPosition++; } /* Check DOS_QM */ else if (Expression->Buffer[ExpressionPosition] == ANSI_DOS_QM) { - /* Check whether we are upon a dot */ - MatchingChars = 0; - while (MatchingChars < NamePosition) - { - if (Name->Buffer[MatchingChars] == '.') - { - break; - } - MatchingChars++; - } - - /* If not, we match a single char */ - if (MatchingChars == NamePosition && Name->Buffer[NamePosition] != '.') + /* We match everything except dots */ + if (Name->Buffer[NamePosition] != '.') { NamePosition++; - ExpressionPosition++; - } - else - { - /* If we are, we just go through QMs */ - while (ExpressionPosition < Expression->Length && - Expression->Buffer[ExpressionPosition] == ANSI_DOS_QM) - { - ExpressionPosition++; - } - } + } + ExpressionPosition++; } /* If nothing match, try to backtrack */ else if (StarFound >= 0) { ExpressionPosition = BackTracking[StarFound--]; + } + else if (DosStarFound >= 0) + { + ExpressionPosition = DosBackTracking[DosStarFound--]; } /* Otherwise, fail */ else @@ -378,6 +331,10 @@ if (BackTracking) { ExFreePoolWithTag(BackTracking, 'nrSF'); + } + if (DosBackTracking) + { + ExFreePoolWithTag(DosBackTracking, 'nrSF'); } return (ExpressionPosition == Expression->Length && NamePosition == Name->Length); Modified: trunk/reactos/ntoskrnl/fsrtl/name.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/fsrtl/name.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/fsrtl/name.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/fsrtl/name.c [iso-8859-1] Wed Apr 24 20:36:33 2013 @@ -23,12 +23,11 @@ IN BOOLEAN IgnoreCase, IN PWCHAR UpcaseTable OPTIONAL) { - SHORT StarFound = -1; - PUSHORT BackTracking = NULL; + SHORT StarFound = -1, DosStarFound = -1; + PUSHORT BackTracking = NULL, DosBackTracking = NULL; UNICODE_STRING IntExpression; - USHORT ExpressionPosition = 0, NamePosition = 0, MatchingChars; + USHORT ExpressionPosition = 0, NamePosition = 0, MatchingChars, LastDot; WCHAR CompareChar; - BOOLEAN BeyondName; PAGED_CODE(); /* Check if we were given strings at all */ @@ -153,129 +152,85 @@ /* Check DOS_STAR */ else if (Expression->Buffer[ExpressionPosition] == DOS_STAR) { - /* We can only consume dot if that's not the last one - * Otherwise, we null match + /* Skip contigous stars */ + while ((ExpressionPosition + 1 < (USHORT)(Expression->Length / sizeof(WCHAR))) && + (Expression->Buffer[ExpressionPosition + 1] == DOS_STAR)) + { + ExpressionPosition++; + } + + /* Look for last dot */ + MatchingChars = 0; + LastDot = (USHORT)-1; + while (MatchingChars < Name->Length / sizeof(WCHAR)) + { + if (Name->Buffer[MatchingChars] == L'.') + { + LastDot = MatchingChars; + if (LastDot > NamePosition) + break; + } + + MatchingChars++; + } + + /* If we don't have dots or we didn't find last yet + * start eating everything */ - if (Name->Buffer[NamePosition] == L'.') - { - MatchingChars = NamePosition + 1; - while (MatchingChars < Name->Length / sizeof(WCHAR)) - { - if (Name->Buffer[MatchingChars] == L'.') - { - NamePosition++; - break; - } - MatchingChars++; - } - - /* In case we were already at last dot, simply accept it */ - if (MatchingChars == Name->Length / sizeof(WCHAR)) - { + if (MatchingChars != Name->Length || LastDot == (USHORT)-1) + { + if (!DosBackTracking) DosBackTracking = ExAllocatePoolWithTag(PagedPool | POOL_RAISE_IF_ALLOCATION_FAILURE, + (Expression->Length / sizeof(WCHAR)) * sizeof(USHORT), + 'nrSF'); + DosBackTracking[++DosStarFound] = ExpressionPosition++; + + /* Not the same char, start exploring */ + if (Expression->Buffer[ExpressionPosition] != Name->Buffer[NamePosition]) NamePosition++; - } } else { - /* XXX: Eat everything till the end */ - if (ExpressionPosition + 1 == Expression->Length / sizeof(WCHAR)) - { - NamePosition = Name->Length; - } - - /* Try to eat till the next matching char or . */ - MatchingChars = NamePosition; - while (MatchingChars < Name->Length / sizeof(WCHAR)) - { - if (ExpressionPosition + 1 < Expression->Length / sizeof(WCHAR) && - Name->Buffer[MatchingChars] == Expression->Buffer[ExpressionPosition + 1]) - { - NamePosition = MatchingChars; - break; - } - else if (Name->Buffer[MatchingChars] == L'.') - { - NamePosition = MatchingChars + 1; - break; - } - MatchingChars++; - } - } - ExpressionPosition++; + /* Else, if we are at last dot, eat it - otherwise, null match */ + if (Name->Buffer[NamePosition] == '.') + NamePosition++; + + ExpressionPosition++; + } } /* Check DOS_DOT */ else if (Expression->Buffer[ExpressionPosition] == DOS_DOT) { - /* First try to find whether we are beyond last dot (beyond name) */ - BeyondName = TRUE; - MatchingChars = NamePosition + 1; - while (MatchingChars < Name->Length / sizeof(WCHAR)) - { - if (Name->Buffer[MatchingChars] == L'.') - { - BeyondName = FALSE; - break; - } - MatchingChars++; - } - - /* If we are beyond name, we null match */ - if (BeyondName) - { - if (Name->Buffer[NamePosition] == L'.') - { - NamePosition++; - } - ExpressionPosition++; - continue; - } - /* If not, we only match a dot */ - else if (Name->Buffer[NamePosition] == L'.') + /* We only match dots */ + if (Name->Buffer[NamePosition] == L'.') { NamePosition++; - ExpressionPosition++; - continue; - } - /* Otherwise, fail */ - else - { - break; - } + } + /* Try to explore later on for null matching */ + else if ((ExpressionPosition + 1 < (USHORT)(Expression->Length / sizeof(WCHAR))) && + (Name->Buffer[NamePosition] == Expression->Buffer[ExpressionPosition + 1])) + { + NamePosition++; + } + ExpressionPosition++; } /* Check DOS_QM */ else if (Expression->Buffer[ExpressionPosition] == DOS_QM) { - /* Check whether we are upon a dot */ - MatchingChars = 0; - while (MatchingChars < NamePosition) - { - if (Name->Buffer[MatchingChars] == L'.') - { - break; - } - MatchingChars++; - } - - /* If not, we match a single char */ - if (MatchingChars == NamePosition && Name->Buffer[NamePosition] != L'.') + /* We match everything except dots */ + if (Name->Buffer[NamePosition] != L'.') { NamePosition++; - ExpressionPosition++; - } - else - { - /* If we are, we just go through QMs */ - while (ExpressionPosition < Expression->Length / sizeof(WCHAR) && - Expression->Buffer[ExpressionPosition] == DOS_QM) - { - ExpressionPosition++; - } - } + } + ExpressionPosition++; } /* If nothing match, try to backtrack */ else if (StarFound >= 0) { ExpressionPosition = BackTracking[StarFound--]; + } + else if (DosStarFound >= 0) + { + ExpressionPosition = DosBackTracking[DosStarFound--]; } /* Otherwise, fail */ else @@ -310,6 +265,10 @@ if (BackTracking) { ExFreePoolWithTag(BackTracking, 'nrSF'); + } + if (DosBackTracking) + { + ExFreePoolWithTag(DosBackTracking, 'nrSF'); } return (ExpressionPosition == Expression->Length / sizeof(WCHAR) && NamePosition == Name->Length / sizeof(WCHAR));

1 0

[tkreuzer] 58846: [NTOSKRNL/AMD64] - Add more required feature bits - Initialize the PAT MSR - Enable NX in EFER MSR
by tkreuzer＠svn.reactos.org 24 Apr '13

24 Apr '13

Author: tkreuzer Date: Wed Apr 24 20:28:45 2013 New Revision: 58846 URL: http://svn.reactos.org/svn/reactos?rev=58846&view=rev Log: [NTOSKRNL/AMD64] - Add more required feature bits - Initialize the PAT MSR - Enable NX in EFER MSR Modified: trunk/reactos/ntoskrnl/ke/amd64/kiinit.c Modified: trunk/reactos/ntoskrnl/ke/amd64/kiinit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/amd64/kiinit.c… ============================================================================== --- trunk/reactos/ntoskrnl/ke/amd64/kiinit.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/amd64/kiinit.c [iso-8859-1] Wed Apr 24 20:28:45 2013 @@ -14,7 +14,8 @@ #include <debug.h> #define REQUIRED_FEATURE_BITS (KF_RDTSC|KF_CR4|KF_CMPXCHG8B|KF_XMMI|KF_XMMI64| \ - KF_NX_BIT) + KF_LARGE_PAGE|KF_FAST_SYSCALL|KF_GLOBAL_PAGE| \ + KF_CMOV|KF_PAT|KF_MMX|KF_FXSR|KF_NX_BIT) /* GLOBALS *******************************************************************/ @@ -162,6 +163,7 @@ NTAPI KiInitializeCpu(PKIPCR Pcr) { + ULONG64 Pat; ULONG FeatureBits; /* Initialize gs */ @@ -215,14 +217,19 @@ __writemsr(MSR_LSTAR, (ULONG64)KiSystemCallEntry64); __writemsr(MSR_CSTAR, (ULONG64)KiSystemCallEntry32); - __writemsr(MSR_STAR, ((ULONG64)KGDT64_R0_CODE << 32) | - ((ULONG64)(KGDT64_R3_CMCODE|RPL_MASK) << 48)); + __writemsr(MSR_STAR, ((ULONG64)KGDT64_R0_CODE << 32) | + ((ULONG64)(KGDT64_R3_CMCODE|RPL_MASK) << 48)); /* Set the flags to be cleared when doing a syscall */ __writemsr(MSR_SYSCALL_MASK, EFLAGS_IF_MASK | EFLAGS_TF | EFLAGS_DF); - /* Enable syscall instruction */ - __writemsr(MSR_EFER, __readmsr(MSR_EFER) | MSR_SCE); + /* Enable syscall instruction and no-execute support */ + __writemsr(MSR_EFER, __readmsr(MSR_EFER) | MSR_SCE | MSR_NXE); + + /* Initialize the PAT */ + Pat = (PAT_WB << 0) | (PAT_WC << 8) | (PAT_UCM << 16) | (PAT_UC << 24) | + (PAT_WB << 32) | (PAT_WC << 40) | (PAT_UCM << 48) | (PAT_UC << 56); + __writemsr(MSR_PAT, Pat); } VOID

1 0

[gadamopoulos] 58845: [videoprt] - Improve some debug messages
by gadamopoulos＠svn.reactos.org 24 Apr '13

24 Apr '13

Author: gadamopoulos Date: Wed Apr 24 17:51:44 2013 New Revision: 58845 URL: http://svn.reactos.org/svn/reactos?rev=58845&view=rev Log: [videoprt] - Improve some debug messages Modified: trunk/reactos/win32ss/drivers/videoprt/timer.c trunk/reactos/win32ss/drivers/videoprt/videoprt.c trunk/reactos/win32ss/user/ntuser/display.c Modified: trunk/reactos/win32ss/drivers/videoprt/timer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/drivers/videoprt/t… ============================================================================== --- trunk/reactos/win32ss/drivers/videoprt/timer.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/drivers/videoprt/timer.c [iso-8859-1] Wed Apr 24 17:51:44 2013 @@ -57,7 +57,7 @@ if (!NT_SUCCESS(Status)) { - WARN_(VIDEOPRT, "IoInitializeTimer failed with status 0x%08x\n", Status); + ERR_(VIDEOPRT, "IoInitializeTimer failed with status 0x%08x\n", Status); return FALSE; } } Modified: trunk/reactos/win32ss/drivers/videoprt/videoprt.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/drivers/videoprt/v… ============================================================================== --- trunk/reactos/win32ss/drivers/videoprt/videoprt.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/drivers/videoprt/videoprt.c [iso-8859-1] Wed Apr 24 17:51:44 2013 @@ -442,7 +442,7 @@ } else { - WARN_(VIDEOPRT, "HwFindAdapter call failed with error 0x%X\n", Status); + ERR_(VIDEOPRT, "HwFindAdapter call failed with error 0x%X\n", Status); RtlFreeUnicodeString(&DeviceExtension->RegistryPath); if (DeviceExtension->NextDeviceObject) IoDetachDevice(DeviceExtension->NextDeviceObject); @@ -465,7 +465,7 @@ if (Status != NO_ERROR) { - WARN_(VIDEOPRT, "HwFindAdapter call failed with error 0x%X\n", Status); + ERR_(VIDEOPRT, "HwFindAdapter call failed with error 0x%X\n", Status); RtlFreeUnicodeString(&DeviceExtension->RegistryPath); if (DeviceExtension->NextDeviceObject) IoDetachDevice(DeviceExtension->NextDeviceObject); @@ -532,7 +532,7 @@ IoDetachDevice(DeviceExtension->NextDeviceObject); RtlFreeUnicodeString(&DeviceExtension->RegistryPath); IoDeleteDevice(DeviceObject); - WARN_(VIDEOPRT, "STATUS_INSUFFICIENT_RESOURCES\n"); + ERR_(VIDEOPRT, "IntVideoPortSetupTimer failed\n"); return STATUS_INSUFFICIENT_RESOURCES; } @@ -591,6 +591,7 @@ if (HwInitializationData->HwInitDataSize > sizeof(VIDEO_HW_INITIALIZATION_DATA)) { + ERR_(VIDEOPRT, "Invalid HwInitializationData\n"); return STATUS_REVISION_MISMATCH; } @@ -598,6 +599,7 @@ HwInitializationData->HwInitialize == NULL || HwInitializationData->HwStartIO == NULL) { + ERR_(VIDEOPRT, "Invalid HwInitializationData\n"); return STATUS_INVALID_PARAMETER; } @@ -621,7 +623,7 @@ break; default: - WARN_(VIDEOPRT, "Invalid HwInitializationData size.\n"); + ERR_(VIDEOPRT, "Invalid HwInitializationData size.\n"); return STATUS_UNSUCCESSFUL; } @@ -677,6 +679,7 @@ if (!NT_SUCCESS(Status)) { + ERR_(VIDEOPRT, "IoAllocateDriverObjectExtension failed 0x%x\n", Status); return Status; } @@ -744,13 +747,18 @@ } Status = IntVideoPortCreateAdapterDeviceObject(DriverObject, DriverExtension, NULL, &DeviceObject); - INFO_(VIDEOPRT, "IntVideoPortCreateAdapterDeviceObject returned 0x%x\n", Status); if (!NT_SUCCESS(Status)) + { + ERR_(VIDEOPRT, "IntVideoPortCreateAdapterDeviceObject returned 0x%x\n", Status); return Status; + } + Status = IntVideoPortFindAdapter(DriverObject, DriverExtension, DeviceObject); - INFO_(VIDEOPRT, "IntVideoPortFindAdapter returned 0x%x\n", Status); if (NT_SUCCESS(Status)) VideoPortDeviceNumber++; + else + ERR_(VIDEOPRT, "IntVideoPortFindAdapter returned 0x%x\n", Status); + return Status; } else Modified: trunk/reactos/win32ss/user/ntuser/display.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/displa… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/display.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/display.c [iso-8859-1] Wed Apr 24 17:51:44 2013 @@ -187,7 +187,7 @@ Status = RegOpenKey(KEY_VIDEO, &hkey); if (!NT_SUCCESS(Status)) { - ERR("Could not open device registry key!\n"); + ERR("Could not open HARDWARE\\DEVICEMAP\\VIDEO registry key:0x%lx\n", Status); return Status; }

1 0

[pschweitzer] 58844: [NTOSKRNL] Really implement support for DOS_QM in FsRtlIs*InExpression() Should fix some tests
by pschweitzer＠svn.reactos.org 24 Apr '13

24 Apr '13

Author: pschweitzer Date: Wed Apr 24 16:59:23 2013 New Revision: 58844 URL: http://svn.reactos.org/svn/reactos?rev=58844&view=rev Log: [NTOSKRNL] Really implement support for DOS_QM in FsRtlIs*InExpression() Should fix some tests Modified: trunk/reactos/ntoskrnl/fsrtl/dbcsname.c trunk/reactos/ntoskrnl/fsrtl/name.c Modified: trunk/reactos/ntoskrnl/fsrtl/dbcsname.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/fsrtl/dbcsname.c?… ============================================================================== --- trunk/reactos/ntoskrnl/fsrtl/dbcsname.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/fsrtl/dbcsname.c [iso-8859-1] Wed Apr 24 16:59:23 2013 @@ -184,7 +184,7 @@ ExpressionPosition++; } /* Check cases that eat one char */ - else if ((Expression->Buffer[ExpressionPosition] == '?') || (Expression->Buffer[ExpressionPosition] == ANSI_DOS_QM)) + else if (Expression->Buffer[ExpressionPosition] == '?') { NamePosition++; ExpressionPosition++; @@ -311,6 +311,36 @@ break; } } + /* Check DOS_QM */ + else if (Expression->Buffer[ExpressionPosition] == ANSI_DOS_QM) + { + /* Check whether we are upon a dot */ + MatchingChars = 0; + while (MatchingChars < NamePosition) + { + if (Name->Buffer[MatchingChars] == '.') + { + break; + } + MatchingChars++; + } + + /* If not, we match a single char */ + if (MatchingChars == NamePosition && Name->Buffer[NamePosition] != '.') + { + NamePosition++; + ExpressionPosition++; + } + else + { + /* If we are, we just go through QMs */ + while (ExpressionPosition < Expression->Length && + Expression->Buffer[ExpressionPosition] == ANSI_DOS_QM) + { + ExpressionPosition++; + } + } + } /* If nothing match, try to backtrack */ else if (StarFound >= 0) { Modified: trunk/reactos/ntoskrnl/fsrtl/name.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/fsrtl/name.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/fsrtl/name.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/fsrtl/name.c [iso-8859-1] Wed Apr 24 16:59:23 2013 @@ -113,7 +113,7 @@ ExpressionPosition++; } /* Check cases that eat one char */ - else if (Expression->Buffer[ExpressionPosition] == L'?' || (Expression->Buffer[ExpressionPosition] == DOS_QM)) + else if (Expression->Buffer[ExpressionPosition] == L'?') { NamePosition++; ExpressionPosition++; @@ -240,6 +240,36 @@ else { break; + } + } + /* Check DOS_QM */ + else if (Expression->Buffer[ExpressionPosition] == DOS_QM) + { + /* Check whether we are upon a dot */ + MatchingChars = 0; + while (MatchingChars < NamePosition) + { + if (Name->Buffer[MatchingChars] == L'.') + { + break; + } + MatchingChars++; + } + + /* If not, we match a single char */ + if (MatchingChars == NamePosition && Name->Buffer[NamePosition] != L'.') + { + NamePosition++; + ExpressionPosition++; + } + else + { + /* If we are, we just go through QMs */ + while (ExpressionPosition < Expression->Length / sizeof(WCHAR) && + Expression->Buffer[ExpressionPosition] == DOS_QM) + { + ExpressionPosition++; + } } } /* If nothing match, try to backtrack */

1 0

[spetreolle] 58843: [SYSSETUP] Register ieframe during 2nd stage.
by spetreolle＠svn.reactos.org 24 Apr '13

24 Apr '13

Author: spetreolle Date: Wed Apr 24 16:46:52 2013 New Revision: 58843 URL: http://svn.reactos.org/svn/reactos?rev=58843&view=rev Log: [SYSSETUP] Register ieframe during 2nd stage. Modified: trunk/reactos/media/inf/syssetup.inf (contents, props changed) Modified: trunk/reactos/media/inf/syssetup.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/syssetup.inf?rev… ============================================================================== --- trunk/reactos/media/inf/syssetup.inf [iso-8859-1] (original) +++ trunk/reactos/media/inf/syssetup.inf [iso-8859-1] Wed Apr 24 16:46:52 2013 @@ -96,6 +96,7 @@ 11,,wininet.dll,2 11,,wintrust.dll,1 11,,wuapi.dll,1 +11,,ieframe.dll,1 [Strings] MciExtStr="Software\Microsoft\Windows NT\CurrentVersion\MCI Extensions"

1 0

[pschweitzer] 58842: [NTOSKRNL] Properly handle when we are at last dot in FsRtlIs*InExpression with DOS_STAR
by pschweitzer＠svn.reactos.org 24 Apr '13

24 Apr '13

Author: pschweitzer Date: Wed Apr 24 15:25:19 2013 New Revision: 58842 URL: http://svn.reactos.org/svn/reactos?rev=58842&view=rev Log: [NTOSKRNL] Properly handle when we are at last dot in FsRtlIs*InExpression with DOS_STAR Modified: trunk/reactos/ntoskrnl/fsrtl/dbcsname.c trunk/reactos/ntoskrnl/fsrtl/name.c Modified: trunk/reactos/ntoskrnl/fsrtl/dbcsname.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/fsrtl/dbcsname.c?… ============================================================================== --- trunk/reactos/ntoskrnl/fsrtl/dbcsname.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/fsrtl/dbcsname.c [iso-8859-1] Wed Apr 24 15:25:19 2013 @@ -236,6 +236,12 @@ break; } MatchingChars++; + } + + /* In case we were already at last dot, simply accept it */ + if (MatchingChars == Name->Length) + { + NamePosition++; } } else Modified: trunk/reactos/ntoskrnl/fsrtl/name.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/fsrtl/name.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/fsrtl/name.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/fsrtl/name.c [iso-8859-1] Wed Apr 24 15:25:19 2013 @@ -168,6 +168,12 @@ } MatchingChars++; } + + /* In case we were already at last dot, simply accept it */ + if (MatchingChars == Name->Length / sizeof(WCHAR)) + { + NamePosition++; + } } else {

1 0

[pschweitzer] 58841: [NTOSKRNL] Fix a few tests with FsRtlIs*InExpression()
by pschweitzer＠svn.reactos.org 24 Apr '13

24 Apr '13

Author: pschweitzer Date: Wed Apr 24 14:21:26 2013 New Revision: 58841 URL: http://svn.reactos.org/svn/reactos?rev=58841&view=rev Log: [NTOSKRNL] Fix a few tests with FsRtlIs*InExpression() Modified: trunk/reactos/ntoskrnl/fsrtl/dbcsname.c trunk/reactos/ntoskrnl/fsrtl/name.c Modified: trunk/reactos/ntoskrnl/fsrtl/dbcsname.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/fsrtl/dbcsname.c?… ============================================================================== --- trunk/reactos/ntoskrnl/fsrtl/dbcsname.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/fsrtl/dbcsname.c [iso-8859-1] Wed Apr 24 14:21:26 2013 @@ -285,6 +285,10 @@ /* If we are beyond name, we null match */ if (BeyondName) { + if (Name->Buffer[NamePosition] == '.') + { + NamePosition++; + } ExpressionPosition++; continue; } Modified: trunk/reactos/ntoskrnl/fsrtl/name.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/fsrtl/name.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/fsrtl/name.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/fsrtl/name.c [iso-8859-1] Wed Apr 24 14:21:26 2013 @@ -216,6 +216,10 @@ /* If we are beyond name, we null match */ if (BeyondName) { + if (Name->Buffer[NamePosition] == L'.') + { + NamePosition++; + } ExpressionPosition++; continue; }

1 0

[pschweitzer] 58840: [NTOSKRNL] Fix null matching for empty string in FsRtlIsDbcsInExpression()
by pschweitzer＠svn.reactos.org 24 Apr '13

24 Apr '13

Author: pschweitzer Date: Wed Apr 24 12:18:28 2013 New Revision: 58840 URL: http://svn.reactos.org/svn/reactos?rev=58840&view=rev Log: [NTOSKRNL] Fix null matching for empty string in FsRtlIsDbcsInExpression() Modified: trunk/reactos/ntoskrnl/fsrtl/dbcsname.c Modified: trunk/reactos/ntoskrnl/fsrtl/dbcsname.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/fsrtl/dbcsname.c?… ============================================================================== --- trunk/reactos/ntoskrnl/fsrtl/dbcsname.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/fsrtl/dbcsname.c [iso-8859-1] Wed Apr 24 12:18:28 2013 @@ -169,6 +169,11 @@ ASSERT(Name->Length); ASSERT(Expression->Length); ASSERT(!FsRtlDoesDbcsContainWildCards(Name)); + + if (Name->Length == 0) + { + return (Expression->Length == 0); + } while (NamePosition < Name->Length && ExpressionPosition < Expression->Length) {

1 0

[akhaldi] 58839: [JSCRIPT] * Add the typelib related registration data. * Set the correct dependencies for the resource file.
by akhaldi＠svn.reactos.org 24 Apr '13

24 Apr '13

Author: akhaldi Date: Wed Apr 24 11:18:29 2013 New Revision: 58839 URL: http://svn.reactos.org/svn/reactos?rev=58839&view=rev Log: [JSCRIPT] * Add the typelib related registration data. * Set the correct dependencies for the resource file. Modified: trunk/reactos/dll/win32/jscript/CMakeLists.txt trunk/reactos/dll/win32/jscript/jscript_classes.rgs Modified: trunk/reactos/dll/win32/jscript/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/jscript/CMakeLis… ============================================================================== --- trunk/reactos/dll/win32/jscript/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/jscript/CMakeLists.txt [iso-8859-1] Wed Apr 24 11:18:29 2013 @@ -1,5 +1,3 @@ - -add_typelib(jsglobal.idl) remove_definitions(-D_WIN32_WINNT=0x502) add_definitions(-D_WIN32_WINNT=0x600) @@ -42,6 +40,19 @@ add_library(jscript SHARED ${SOURCE} rsrc.rc) add_idl_headers(jscript_idlheader jscript_classes.idl) +add_typelib(jsglobal.idl) + +list(APPEND jscript_rc_deps + ${CMAKE_CURRENT_SOURCE_DIR}/jscript.rgs + ${CMAKE_CURRENT_SOURCE_DIR}/jscript_classes.rgs + ${CMAKE_CURRENT_BINARY_DIR}/jsglobal.tlb) + +set_source_files_properties(rsrc.rc PROPERTIES OBJECT_DEPENDS "${jscript_rc_deps}") + +# jsglobal.tlb needs stdole2.tlb +add_dependencies(jscript jscript_idlheader stdole2) + + if(NOT MSVC) # FIXME: http://www.cmake.org/Bug/view.php?id=12998 #allow_warnings(jscript) @@ -52,7 +63,4 @@ target_link_libraries(jscript wine) add_importlibs(jscript user32 ole32 oleaut32 advapi32 msvcrt kernel32 ntdll) add_pch(jscript jscript.h) -# jsglobal.tlb needs stdole2.tlb -add_dependencies(jscript jscript_idlheader stdole2) add_cd_file(TARGET jscript DESTINATION reactos/system32 FOR all) -set_source_files_properties(rsrc.rc PROPERTIES OBJECT_DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/jsglobal.tlb) Modified: trunk/reactos/dll/win32/jscript/jscript_classes.rgs URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/jscript/jscript_… ============================================================================== --- trunk/reactos/dll/win32/jscript/jscript_classes.rgs [iso-8859-1] (original) +++ trunk/reactos/dll/win32/jscript/jscript_classes.rgs [iso-8859-1] Wed Apr 24 11:18:29 2013 @@ -33,4 +33,147 @@ { CLSID = s '{F414C262-6AC0-11CF-B6D1-00AA00BBBB58}' } + NoRemove Typelib + { + NoRemove '{3EEF9759-35FC-11D1-8CE4-00C04FC2B085}' + { + '1.0' = s 'JSGlobal' + { + '0' { win32 = s '%MODULE%' } + FLAGS = s '0' + } + } + } + NoRemove Interface + { + '{3EEF9758-35FC-11D1-8CE4-00C04FC2B086}' = s 'GlobalObj' + { + ProxyStubClsid = s '{00020424-0000-0000-C000-000000000046}' + ProxyStubClsid32 = s '{00020424-0000-0000-C000-000000000046}' + TypeLib = s '{3EEF9759-35FC-11D1-8CE4-00C04FC2B085}' { val Version = s '1.0' } + } + '{3EEF9758-35FC-11D1-8CE4-00C04FC2B087}' = s 'DateObj' + { + ProxyStubClsid = s '{00020424-0000-0000-C000-000000000046}' + ProxyStubClsid32 = s '{00020424-0000-0000-C000-000000000046}' + TypeLib = s '{3EEF9759-35FC-11D1-8CE4-00C04FC2B085}' { val Version = s '1.0' } + } + '{3EEF9758-35FC-11D1-8CE4-00C04FC2B088}' = s 'MathObj' + { + ProxyStubClsid = s '{00020424-0000-0000-C000-000000000046}' + ProxyStubClsid32 = s '{00020424-0000-0000-C000-000000000046}' + TypeLib = s '{3EEF9759-35FC-11D1-8CE4-00C04FC2B085}' { val Version = s '1.0' } + } + '{3EEF9758-35FC-11D1-8CE4-00C04FC2B089}' = s 'NumberObj' + { + ProxyStubClsid = s '{00020424-0000-0000-C000-000000000046}' + ProxyStubClsid32 = s '{00020424-0000-0000-C000-000000000046}' + TypeLib = s '{3EEF9759-35FC-11D1-8CE4-00C04FC2B085}' { val Version = s '1.0' } + } + '{3EEF9758-35FC-11D1-8CE4-00C04FC2B090}' = s 'RegExpObj' + { + ProxyStubClsid = s '{00020424-0000-0000-C000-000000000046}' + ProxyStubClsid32 = s '{00020424-0000-0000-C000-000000000046}' + TypeLib = s '{3EEF9759-35FC-11D1-8CE4-00C04FC2B085}' { val Version = s '1.0' } + } + '{3EEF9758-35FC-11D1-8CE4-00C04FC2B091}' = s 'StringObj' + { + ProxyStubClsid = s '{00020424-0000-0000-C000-000000000046}' + ProxyStubClsid32 = s '{00020424-0000-0000-C000-000000000046}' + TypeLib = s '{3EEF9759-35FC-11D1-8CE4-00C04FC2B085}' { val Version = s '1.0' } + } + '{3EEF9758-35FC-11D1-8CE4-00C04FC2B092}' = s 'ArrayInstance' + { + ProxyStubClsid = s '{00020424-0000-0000-C000-000000000046}' + ProxyStubClsid32 = s '{00020424-0000-0000-C000-000000000046}' + TypeLib = s '{3EEF9759-35FC-11D1-8CE4-00C04FC2B085}' { val Version = s '1.0' } + } + '{3EEF9758-35FC-11D1-8CE4-00C04FC2B093}' = s 'FunctionInstance' + { + ProxyStubClsid = s '{00020424-0000-0000-C000-000000000046}' + ProxyStubClsid32 = s '{00020424-0000-0000-C000-000000000046}' + TypeLib = s '{3EEF9759-35FC-11D1-8CE4-00C04FC2B085}' { val Version = s '1.0' } + } + '{3EEF9758-35FC-11D1-8CE4-00C04FC2B094}' = s 'StringInstance' + { + ProxyStubClsid = s '{00020424-0000-0000-C000-000000000046}' + ProxyStubClsid32 = s '{00020424-0000-0000-C000-000000000046}' + TypeLib = s '{3EEF9759-35FC-11D1-8CE4-00C04FC2B085}' { val Version = s '1.0' } + } + '{3EEF9758-35FC-11D1-8CE4-00C04FC2B095}' = s 'BoolInstance' + { + ProxyStubClsid = s '{00020424-0000-0000-C000-000000000046}' + ProxyStubClsid32 = s '{00020424-0000-0000-C000-000000000046}' + TypeLib = s '{3EEF9759-35FC-11D1-8CE4-00C04FC2B085}' { val Version = s '1.0' } + } + '{3EEF9758-35FC-11D1-8CE4-00C04FC2B096}' = s 'NumberInstance' + { + ProxyStubClsid = s '{00020424-0000-0000-C000-000000000046}' + ProxyStubClsid32 = s '{00020424-0000-0000-C000-000000000046}' + TypeLib = s '{3EEF9759-35FC-11D1-8CE4-00C04FC2B085}' { val Version = s '1.0' } + } + '{3EEF9758-35FC-11D1-8CE4-00C04FC2B097}' = s 'ObjectInstance' + { + ProxyStubClsid = s '{00020424-0000-0000-C000-000000000046}' + ProxyStubClsid32 = s '{00020424-0000-0000-C000-000000000046}' + TypeLib = s '{3EEF9759-35FC-11D1-8CE4-00C04FC2B085}' { val Version = s '1.0' } + } + '{3EEF9758-35FC-11D1-8CE4-00C04FC2B098}' = s 'DateInstance' + { + ProxyStubClsid = s '{00020424-0000-0000-C000-000000000046}' + ProxyStubClsid32 = s '{00020424-0000-0000-C000-000000000046}' + TypeLib = s '{3EEF9759-35FC-11D1-8CE4-00C04FC2B085}' { val Version = s '1.0' } + } + '{3EEF9758-35FC-11D1-8CE4-00C04FC2B099}' = s 'RegExpInstance' + { + ProxyStubClsid = s '{00020424-0000-0000-C000-000000000046}' + ProxyStubClsid32 = s '{00020424-0000-0000-C000-000000000046}' + TypeLib = s '{3EEF9759-35FC-11D1-8CE4-00C04FC2B085}' { val Version = s '1.0' } + } + '{3EEF9758-35FC-11D1-8CE4-00C04FC2B09A}' = s 'ErrorInstance' + { + ProxyStubClsid = s '{00020424-0000-0000-C000-000000000046}' + ProxyStubClsid32 = s '{00020424-0000-0000-C000-000000000046}' + TypeLib = s '{3EEF9759-35FC-11D1-8CE4-00C04FC2B085}' { val Version = s '1.0' } + } + '{3EEF9758-35FC-11D1-8CE4-00C04FC2B09B}' = s 'EvalErrorInstance' + { + ProxyStubClsid = s '{00020424-0000-0000-C000-000000000046}' + ProxyStubClsid32 = s '{00020424-0000-0000-C000-000000000046}' + TypeLib = s '{3EEF9759-35FC-11D1-8CE4-00C04FC2B085}' { val Version = s '1.0' } + } + '{3EEF9758-35FC-11D1-8CE4-00C04FC2B09C}' = s 'RangeErrorInstance' + { + ProxyStubClsid = s '{00020424-0000-0000-C000-000000000046}' + ProxyStubClsid32 = s '{00020424-0000-0000-C000-000000000046}' + TypeLib = s '{3EEF9759-35FC-11D1-8CE4-00C04FC2B085}' { val Version = s '1.0' } + } + '{3EEF9758-35FC-11D1-8CE4-00C04FC2B09D}' = s 'ReferenceErrorInstance' + { + ProxyStubClsid = s '{00020424-0000-0000-C000-000000000046}' + ProxyStubClsid32 = s '{00020424-0000-0000-C000-000000000046}' + TypeLib = s '{3EEF9759-35FC-11D1-8CE4-00C04FC2B085}' { val Version = s '1.0' } + } + '{3EEF9758-35FC-11D1-8CE4-00C04FC2B09E}' = s 'SyntaxErrorInstance' + { + ProxyStubClsid = s '{00020424-0000-0000-C000-000000000046}' + ProxyStubClsid32 = s '{00020424-0000-0000-C000-000000000046}' + TypeLib = s '{3EEF9759-35FC-11D1-8CE4-00C04FC2B085}' { val Version = s '1.0' } + } + '{3EEF9758-35FC-11D1-8CE4-00C04FC2B09F}' = s 'TypeErrorInstance' + { + ProxyStubClsid = s '{00020424-0000-0000-C000-000000000046}' + ProxyStubClsid32 = s '{00020424-0000-0000-C000-000000000046}' + TypeLib = s '{3EEF9759-35FC-11D1-8CE4-00C04FC2B085}' { val Version = s '1.0' } + } + '{3EEF9758-35FC-11D1-8CE4-00C04FC2B0A0}' = s 'URIErrorInstance' + { + ProxyStubClsid = s '{00020424-0000-0000-C000-000000000046}' + ProxyStubClsid32 = s '{00020424-0000-0000-C000-000000000046}' + TypeLib = s '{3EEF9759-35FC-11D1-8CE4-00C04FC2B085}' { val Version = s '1.0' } + } + } + NoRemove CLSID + { + } }

1 0

[pschweitzer] 58838: [KMTESTS:FSRTL] Add tests for testing Large MCBs on Aleksey's request. Currently, they fail (and even crash) on ReactOS. Aleksey promised a bugfix!
by pschweitzer＠svn.reactos.org 23 Apr '13

23 Apr '13

Author: pschweitzer Date: Tue Apr 23 21:34:59 2013 New Revision: 58838 URL: http://svn.reactos.org/svn/reactos?rev=58838&view=rev Log: [KMTESTS:FSRTL] Add tests for testing Large MCBs on Aleksey's request. Currently, they fail (and even crash) on ReactOS. Aleksey promised a bugfix! Added: trunk/rostests/kmtests/ntos_fsrtl/FsRtlMcb.c (with props) Modified: trunk/rostests/kmtests/CMakeLists.txt trunk/rostests/kmtests/kmtest_drv/testlist.c Modified: trunk/rostests/kmtests/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/kmtests/CMakeLists.txt?re… ============================================================================== --- trunk/rostests/kmtests/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/kmtests/CMakeLists.txt [iso-8859-1] Tue Apr 23 21:34:59 2013 @@ -36,6 +36,7 @@ ntos_ex/ExSingleList.c ntos_ex/ExTimer.c ntos_fsrtl/FsRtlExpression.c + ntos_fsrtl/FsRtlMcb.c ntos_io/IoDeviceInterface.c ntos_io/IoEvent.c ntos_io/IoInterrupt.c Modified: trunk/rostests/kmtests/kmtest_drv/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/kmtests/kmtest_drv/testli… ============================================================================== --- trunk/rostests/kmtests/kmtest_drv/testlist.c [iso-8859-1] (original) +++ trunk/rostests/kmtests/kmtest_drv/testlist.c [iso-8859-1] Tue Apr 23 21:34:59 2013 @@ -20,6 +20,7 @@ KMT_TESTFUNC Test_ExSingleList; KMT_TESTFUNC Test_ExTimer; KMT_TESTFUNC Test_FsRtlExpression; +KMT_TESTFUNC Test_FsRtlMcb; KMT_TESTFUNC Test_IoDeviceInterface; KMT_TESTFUNC Test_IoEvent; KMT_TESTFUNC Test_IoInterrupt; @@ -61,6 +62,7 @@ { "-ExTimer", Test_ExTimer }, { "Example", Test_Example }, { "FsRtlExpression", Test_FsRtlExpression }, + { "FsRtlMcb", Test_FsRtlMcb }, { "IoDeviceInterface", Test_IoDeviceInterface }, { "IoEvent", Test_IoEvent }, { "IoInterrupt", Test_IoInterrupt }, Added: trunk/rostests/kmtests/ntos_fsrtl/FsRtlMcb.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/kmtests/ntos_fsrtl/FsRtlM… ============================================================================== --- trunk/rostests/kmtests/ntos_fsrtl/FsRtlMcb.c (added) +++ trunk/rostests/kmtests/ntos_fsrtl/FsRtlMcb.c [iso-8859-1] Tue Apr 23 21:34:59 2013 @@ -1,0 +1,150 @@ +/* + * PROJECT: ReactOS kernel-mode tests + * LICENSE: LGPLv2+ - See COPYING.LIB in the top level directory + * PURPOSE: Kernel-Mode Test Suite FsRtl Test + * PROGRAMMER: Pierre Schweitzer <pierre.schweitzer(a)reactos.org> + */ + +#include <kmt_test.h> + +#define NDEBUG +#include <debug.h> + +static VOID FsRtlMcbTest() +{ +} + +static VOID FsRtlLargeMcbTest() +{ + LARGE_MCB LargeMcb; + ULONG NbRuns, Index; + LONGLONG Vbn, Lbn, SectorCount, StartingLbn, CountFromStartingLbn; + + FsRtlInitializeLargeMcb(&LargeMcb, PagedPool); + + ok(FsRtlLookupLastLargeMcbEntry(&LargeMcb, &Vbn, &Lbn) == FALSE, "expected FALSE, got TRUE\n"); + ok(FsRtlLookupLastLargeMcbEntryAndIndex(&LargeMcb, &Vbn, &Lbn, &Index) == FALSE, "expected FALSE, got TRUE\n"); + + ok(FsRtlAddLargeMcbEntry(&LargeMcb, 1, 1, 1024) == TRUE, "expected TRUE, got FALSE\n"); + NbRuns = FsRtlNumberOfRunsInLargeMcb(&LargeMcb); + ok(NbRuns == 2, "Expected 2 runs, got: %lu\n", NbRuns); + ok(FsRtlLookupLastLargeMcbEntry(&LargeMcb, &Vbn, &Lbn) == TRUE, "expected FALSE, got TRUE\n"); + ok(Vbn == 1024, "Expected Vbn 1024, got: %I64d\n", Vbn); + ok(Lbn == 1024, "Expected Lbn 1024, got: %I64d\n", Lbn); + ok(FsRtlLookupLastLargeMcbEntryAndIndex(&LargeMcb, &Vbn, &Lbn, &Index) == TRUE, "expected FALSE, got TRUE\n"); + ok(Vbn == 1024, "Expected Vbn 1024, got: %I64d\n", Vbn); + ok(Lbn == 1024, "Expected Lbn 1024, got: %I64d\n", Lbn); + ok(Index == 1, "Expected Index 1, got: %lu\n", Index); + + ok(FsRtlAddLargeMcbEntry(&LargeMcb, 2048, 2, 1024) == TRUE, "expected TRUE, got FALSE\n"); + NbRuns = FsRtlNumberOfRunsInLargeMcb(&LargeMcb); + ok(NbRuns == 4, "Expected 4 runs, got: %lu\n", NbRuns); + ok(FsRtlLookupLastLargeMcbEntry(&LargeMcb, &Vbn, &Lbn) == TRUE, "expected FALSE, got TRUE\n"); + ok(Vbn == 3071, "Expected Vbn 3071, got: %I64d\n", Vbn); + ok(Lbn == 1025, "Expected Lbn 1025, got: %I64d\n", Lbn); + ok(FsRtlLookupLastLargeMcbEntryAndIndex(&LargeMcb, &Vbn, &Lbn, &Index) == TRUE, "expected FALSE, got TRUE\n"); + ok(Vbn == 3071, "Expected Vbn 3071, got: %I64d\n", Vbn); + ok(Lbn == 1025, "Expected Lbn 1025, got: %I64d\n", Lbn); + ok(Index == 3, "Expected Index 3, got: %lu\n", Index); + + ok(FsRtlGetNextLargeMcbEntry(&LargeMcb, 0, &Vbn, &Lbn, &SectorCount) == TRUE, "expected TRUE, got FALSE\n"); + ok(Vbn == 0, "Expected Vbn 0, got: %I64d\n", Vbn); + ok(Lbn == -1, "Expected Lbn -1, got: %I64d\n", Lbn); + ok(SectorCount == 1, "Expected SectorCount 1, got: %I64d\n", SectorCount); + + ok(FsRtlGetNextLargeMcbEntry(&LargeMcb, 1, &Vbn, &Lbn, &SectorCount) == TRUE, "expected TRUE, got FALSE\n"); + ok(Vbn == 1, "Expected Vbn 1, got: %I64d\n", Vbn); + ok(Lbn == 1, "Expected Lbn 1, got: %I64d\n", Lbn); + ok(SectorCount == 1024, "Expected SectorCount 1024, got: %I64d\n", SectorCount); + + ok(FsRtlGetNextLargeMcbEntry(&LargeMcb, 2, &Vbn, &Lbn, &SectorCount) == TRUE, "expected TRUE, got FALSE\n"); + ok(Vbn == 1025, "Expected Vbn 1025, got: %I64d\n", Vbn); + ok(Lbn == -1, "Expected Lbn -1, got: %I64d\n", Lbn); + ok(SectorCount == 1023, "Expected SectorCount 1023, got: %I64d\n", SectorCount); + + ok(FsRtlGetNextLargeMcbEntry(&LargeMcb, 3, &Vbn, &Lbn, &SectorCount) == TRUE, "expected TRUE, got FALSE\n"); + ok(Vbn == 2048, "Expected Vbn 2048, got: %I64d\n", Vbn); + ok(Lbn == 2, "Expected Lbn 2, got: %I64d\n", Lbn); + ok(SectorCount == 1024, "Expected SectorCount 1024, got: %I64d\n", SectorCount); + + ok(FsRtlGetNextLargeMcbEntry(&LargeMcb, 4, &Vbn, &Lbn, &SectorCount) == FALSE, "expected FALSE, got TRUE\n"); + + ok(FsRtlLookupLargeMcbEntry(&LargeMcb, 1, &Lbn, &SectorCount, &StartingLbn, &CountFromStartingLbn, &Index) == TRUE, "expected TRUE, got FALSE\n"); + ok(Lbn == 1, "Expected Lbn 1, got: %I64d\n", Lbn); + ok(SectorCount == 1024, "Expected SectorCount 1024, got: %I64d\n", SectorCount); + ok(StartingLbn == 1, "Expected StartingLbn 1, got: %I64d\n", StartingLbn); + ok(CountFromStartingLbn == 1024, "Expected CountFromStartingLbn 1024, got: %I64d\n", CountFromStartingLbn); + ok(Index == 1, "Expected Index 1, got: %lu\n", Index); + + ok(FsRtlLookupLargeMcbEntry(&LargeMcb, 2048, &Lbn, &SectorCount, &StartingLbn, &CountFromStartingLbn, &Index) == TRUE, "expected TRUE, got FALSE\n"); + ok(Lbn == 2, "Expected Lbn 2, got: %I64d\n", Lbn); + ok(SectorCount == 1024, "Expected SectorCount 1024, got: %I64d\n", SectorCount); + ok(StartingLbn == 2, "Expected StartingLbn 2, got: %I64d\n", StartingLbn); + ok(CountFromStartingLbn == 1024, "Expected CountFromStartingLbn 1024, got: %I64d\n", CountFromStartingLbn); + ok(Index == 3, "Expected Index 3, got: %lu\n", Index); + + ok(FsRtlLookupLargeMcbEntry(&LargeMcb, 3073, &Lbn, &SectorCount, &StartingLbn, &CountFromStartingLbn, &Index) == FALSE, "expected FALSE, got TRUE\n"); + + FsRtlRemoveLargeMcbEntry(&LargeMcb, 1, 1024); + NbRuns = FsRtlNumberOfRunsInLargeMcb(&LargeMcb); + ok(NbRuns == 2, "Expected 2 runs, got: %lu\n", NbRuns); + ok(FsRtlLookupLargeMcbEntry(&LargeMcb, 512, &Lbn, &SectorCount, &StartingLbn, &CountFromStartingLbn, &Index) == TRUE, "expected TRUE, got FALSE\n"); + ok(Lbn == -1, "Expected Lbn -1, got: %I64d\n", Lbn); + ok(SectorCount == 1536, "Expected SectorCount 1536, got: %I64d\n", SectorCount); + ok(StartingLbn == -1, "Expected StartingLbn -1, got: %I64d\n", StartingLbn); + ok(CountFromStartingLbn == 2048, "Expected CountFromStartingLbn 2048, got: %I64d\n", CountFromStartingLbn); + ok(Index == 0, "Expected Index 0, got: %lu\n", Index); + ok(FsRtlLookupLastLargeMcbEntryAndIndex(&LargeMcb, &Vbn, &Lbn, &Index) == TRUE, "expected FALSE, got TRUE\n"); + ok(Vbn == 3071, "Expected Vbn 3071, got: %I64d\n", Vbn); + ok(Lbn == 1025, "Expected Lbn 1025, got: %I64d\n", Lbn); + ok(Index == 1, "Expected Index 1, got: %lu\n", Index); + + ok(FsRtlSplitLargeMcb(&LargeMcb, 2048, 1024) == TRUE, "expected FALSE, got TRUE\n"); + NbRuns = FsRtlNumberOfRunsInLargeMcb(&LargeMcb); + ok(NbRuns == 2, "Expected 2 runs, got: %lu\n", NbRuns); + ok(FsRtlLookupLastLargeMcbEntryAndIndex(&LargeMcb, &Vbn, &Lbn, &Index) == TRUE, "expected FALSE, got TRUE\n"); + ok(Vbn == 4095, "Expected Vbn 4095, got: %I64d\n", Vbn); + ok(Lbn == 1025, "Expected Lbn 1025, got: %I64d\n", Lbn); + ok(Index == 1, "Expected Index 1, got: %lu\n", Index); + ok(FsRtlLookupLargeMcbEntry(&LargeMcb, 2048, &Lbn, &SectorCount, &StartingLbn, &CountFromStartingLbn, &Index) == TRUE, "expected FALSE, got TRUE\n"); + ok(Lbn == -1, "Expected Lbn -1, got: %I64d\n", Lbn); + ok(SectorCount == 1024, "Expected SectorCount 1024, got: %I64d\n", SectorCount); + ok(StartingLbn == -1, "Expected StartingLbn -1, got: %I64d\n", StartingLbn); + ok(CountFromStartingLbn == 3072, "Expected CountFromStartingLbn 3072, got: %I64d\n", CountFromStartingLbn); + ok(Index == 0, "Expected Index 0, got: %lu\n", Index); + ok(FsRtlLookupLargeMcbEntry(&LargeMcb, 3072, &Lbn, &SectorCount, &StartingLbn, &CountFromStartingLbn, &Index) == TRUE, "expected TRUE, got FALSE\n"); + ok(Lbn == 2, "Expected Lbn 2, got: %I64d\n", Lbn); + ok(SectorCount == 1024, "Expected SectorCount 1024, got: %I64d\n", SectorCount); + ok(StartingLbn == 2, "Expected StartingLbn 2, got: %I64d\n", StartingLbn); + ok(CountFromStartingLbn == 1024, "Expected CountFromStartingLbn 1024, got: %I64d\n", CountFromStartingLbn); + ok(Index == 1, "Expected Index 1, got: %lu\n", Index); + + ok(FsRtlAddLargeMcbEntry(&LargeMcb, 3584, 3, 1024) == FALSE, "expected FALSE, got TRUE\n"); + + ok(FsRtlAddLargeMcbEntry(&LargeMcb, 4095, 1025, 1024) == TRUE, "expected TRUE, got FALSE\n"); + NbRuns = FsRtlNumberOfRunsInLargeMcb(&LargeMcb); + ok(NbRuns == 2, "Expected 2 runs, got: %lu\n", NbRuns); + ok(FsRtlLookupLastLargeMcbEntry(&LargeMcb, &Vbn, &Lbn) == TRUE, "expected FALSE, got TRUE\n"); + ok(Vbn == 5118, "Expected Vbn 5118, got: %I64d\n", Vbn); + ok(Lbn == 2048, "Expected Lbn 2048, got: %I64d\n", Lbn); + ok(FsRtlLookupLastLargeMcbEntryAndIndex(&LargeMcb, &Vbn, &Lbn, &Index) == TRUE, "expected FALSE, got TRUE\n"); + ok(Vbn == 5118, "Expected Vbn 5118, got: %I64d\n", Vbn); + ok(Lbn == 2048, "Expected Lbn 2048, got: %I64d\n", Lbn); + ok(Index == 1, "Expected Index 1, got: %lu\n", Index); + + FsRtlTruncateLargeMcb(&LargeMcb, 4607); + ok(FsRtlLookupLargeMcbEntry(&LargeMcb, 4095, &Lbn, &SectorCount, &StartingLbn, &CountFromStartingLbn, &Index) == TRUE, "expected TRUE, got FALSE\n"); + ok(Lbn == 1025, "Expected Lbn 1025, got: %I64d\n", Lbn); + ok(SectorCount == 512, "Expected SectorCount 512, got: %I64d\n", SectorCount); + ok(StartingLbn == 2, "Expected StartingLbn 2, got: %I64d\n", StartingLbn); + ok(CountFromStartingLbn == 1535, "Expected CountFromStartingLbn 1535, got: %I64d\n", CountFromStartingLbn); + ok(Index == 1, "Expected Index 1, got: %lu\n", Index); + + FsRtlUninitializeLargeMcb(&LargeMcb); +} + +START_TEST(FsRtlMcb) +{ + FsRtlMcbTest(); + FsRtlLargeMcbTest(); +} Propchange: trunk/rostests/kmtests/ntos_fsrtl/FsRtlMcb.c ------------------------------------------------------------------------------ svn:eol-style = native

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs