Ros-diffs

ros-diffs@reactos.org

81390 discussions

[fireball] 26661: - Create a place for kernel-mode regression testing drivers.
by fireball＠svn.reactos.org 09 May '07

09 May '07

Author: fireball Date: Wed May 9 15:13:20 2007 New Revision: 26661 URL: http://svn.reactos.org/svn/reactos?rev=26661&view=rev Log: - Create a place for kernel-mode regression testing drivers. Added: trunk/rostests/drivers/

1 0

[ion] 26660: - Fix line endings.
by ion＠svn.reactos.org 09 May '07

09 May '07

Author: ion Date: Wed May 9 08:55:24 2007 New Revision: 26660 URL: http://svn.reactos.org/svn/reactos?rev=26660&view=rev Log: - Fix line endings. Modified: trunk/reactos/include/reactos/win32k/ntgdityp.h Modified: trunk/reactos/include/reactos/win32k/ntgdityp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/win32k/ntg… ============================================================================== --- trunk/reactos/include/reactos/win32k/ntgdityp.h (original) +++ trunk/reactos/include/reactos/win32k/ntgdityp.h Wed May 9 08:55:24 2007 @@ -123,24 +123,24 @@ typedef struct _ENUMFONTDATAW ENUMFONTDATAW, *PENUMFONTDATAW; /* Number Representation */ -typedef struct _EFLOAT_S -{ - LONG lMant; - LONG lExp; +typedef struct _EFLOAT_S +{ + LONG lMant; + LONG lExp; } EFLOAT_S; /* XFORM Structures */ -typedef struct _MATRIX_S -{ - EFLOAT_S efM11; - EFLOAT_S efM12; - EFLOAT_S efM21; - EFLOAT_S efM22; - EFLOAT_S efDx; - EFLOAT_S efDy; - FIX fxDx; - FIX fxDy; - FLONG flAccel; +typedef struct _MATRIX_S +{ + EFLOAT_S efM11; + EFLOAT_S efM12; + EFLOAT_S efM21; + EFLOAT_S efM22; + EFLOAT_S efDx; + EFLOAT_S efDy; + FIX fxDx; + FIX fxDy; + FLONG flAccel; } MATRIX_S; #endif

1 0

[ion] 26659: - Added more improvements/fixes to the Executive Initialization code: - We now print out error messages at each SESSIONX_INITIALIZATION_FAILURE directly on the screen. - Build CmNtCSDVersion to include SP1 and our SVN Revision number. - Build CmNtSpBuildNumber with the actual SP1 build number. - Detect Headless Terminal usage. - Build and create the CmVersionString. - Display a startup banner similar to Windows based on the CmVersionString, also indicating the SVN revision. - Fix so
by ion＠svn.reactos.org 09 May '07

09 May '07

Author: ion Date: Wed May 9 04:44:45 2007 New Revision: 26659 URL: http://svn.reactos.org/svn/reactos?rev=26659&view=rev Log: - Added more improvements/fixes to the Executive Initialization code: - We now print out error messages at each SESSIONX_INITIALIZATION_FAILURE directly on the screen. - Build CmNtCSDVersion to include SP1 and our SVN Revision number. - Build CmNtSpBuildNumber with the actual SP1 build number. - Detect Headless Terminal usage. - Build and create the CmVersionString. - Display a startup banner similar to Windows based on the CmVersionString, also indicating the SVN revision. - Fix some bugs in the timezone code. - Display a second startup banner like Windows's, displaying memory and CPU counts. - Add calls to initialize RANGE_LISTs, the Prefetecher, XIP Support and Phase 2 Executive Initialization. - Parse the command line to detect /SAFEBOOT: switch and which type of safe mode boot this is. - Display an optional third startup banner showing which safemode boot type this is. - Detect /BOOTLOG switch and display a fourth startup banner if it's enabled, but don't initialize boot logging yet. - Don't allow driver loading to push the progress bar beyond 75%. - Write safe-boot type to registry, detect AlternateShell mode and validate that one is configured. - Write MININT key to registry if booting in WinPE (LiveCD) mode. - Don't leak smss environment and parameters anymore. - Cleanup and reformat some code, use VER_ constants instead of magic numbers. Modified: trunk/reactos/ntoskrnl/ex/init.c trunk/reactos/ntoskrnl/include/internal/rtl.h trunk/reactos/ntoskrnl/rtl/libsupp.c Modified: trunk/reactos/ntoskrnl/ex/init.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/init.c?rev=266… ============================================================================== --- trunk/reactos/ntoskrnl/ex/init.c (original) +++ trunk/reactos/ntoskrnl/ex/init.c Wed May 9 04:44:45 2007 @@ -14,7 +14,18 @@ #include <debug.h> //#include <ntoskrnl/cm/newcm.h> #include "ntoskrnl/cm/cm.h" -#include <ntverp.h> +#include "ntverp.h" +#include "ntstrsafe.h" + +typedef struct _INIT_BUFFER +{ + WCHAR DebugBuffer[256]; + CHAR VersionBuffer[256]; + CHAR BootlogHeader[256]; + CHAR VersionNumber[24]; + RTL_USER_PROCESS_INFORMATION ProcessInfo; + WCHAR RegistryBuffer[256]; +} INIT_BUFFER, *PINIT_BUFFER; /* DATA **********************************************************************/ @@ -65,6 +76,7 @@ /* CMOS Timer Sanity */ BOOLEAN ExCmosClockIsSane = TRUE; +BOOLEAN ExpRealTimeIsUniversal; /* FUNCTIONS ****************************************************************/ @@ -347,38 +359,52 @@ ExpNlsTableBase = SectionBase; } -NTSTATUS +VOID NTAPI -ExpLoadInitialProcess(IN OUT PRTL_USER_PROCESS_INFORMATION ProcessInformation) +ExpLoadInitialProcess(IN PINIT_BUFFER InitBuffer, + OUT PRTL_USER_PROCESS_PARAMETERS *ProcessParameters, + OUT PCHAR *ProcessEnvironment) { - PRTL_USER_PROCESS_PARAMETERS ProcessParameters = NULL; NTSTATUS Status; ULONG Size; PWSTR p; UNICODE_STRING NullString = RTL_CONSTANT_STRING(L""); - UNICODE_STRING SmssName, Environment, SystemDriveString; + UNICODE_STRING SmssName, Environment, SystemDriveString, DebugString; PVOID EnvironmentPtr = NULL; + PRTL_USER_PROCESS_INFORMATION ProcessInformation; + PRTL_USER_PROCESS_PARAMETERS ProcessParams = NULL; + + /* Use the initial buffer, after the strings */ + ProcessInformation = &InitBuffer->ProcessInfo; /* Allocate memory for the process parameters */ - Size = sizeof(RTL_USER_PROCESS_PARAMETERS) + - ((MAX_PATH * 6) * sizeof(WCHAR)); + Size = sizeof(*ProcessParams) + ((MAX_PATH * 6) * sizeof(WCHAR)); Status = ZwAllocateVirtualMemory(NtCurrentProcess(), - (PVOID)&ProcessParameters, + (PVOID*)&ProcessParams, 0, &Size, MEM_COMMIT, PAGE_READWRITE); if (!NT_SUCCESS(Status)) { - /* Failed */ + /* Failed, display error */ + p = InitBuffer->DebugBuffer; + _snwprintf(p, + 256 * sizeof(WCHAR), + L"INIT: Unable to allocate Process Parameters. 0x%lx", + Status); + RtlInitUnicodeString(&DebugString, p); + ZwDisplayString(&DebugString); + + /* Bugcheck the system */ KeBugCheckEx(SESSION1_INITIALIZATION_FAILED, Status, 0, 0, 0); } /* Setup the basic header, and give the process the low 1MB to itself */ - ProcessParameters->Length = Size; - ProcessParameters->MaximumLength = Size; - ProcessParameters->Flags = RTL_USER_PROCESS_PARAMETERS_NORMALIZED | - RTL_USER_PROCESS_PARAMETERS_RESERVE_1MB; + ProcessParams->Length = Size; + ProcessParams->MaximumLength = Size; + ProcessParams->Flags = RTL_USER_PROCESS_PARAMETERS_NORMALIZED | + RTL_USER_PROCESS_PARAMETERS_RESERVE_1MB; /* Allocate a page for the environment */ Size = PAGE_SIZE; @@ -390,39 +416,48 @@ PAGE_READWRITE); if (!NT_SUCCESS(Status)) { - /* Failed */ + /* Failed, display error */ + p = InitBuffer->DebugBuffer; + _snwprintf(p, + 256 * sizeof(WCHAR), + L"INIT: Unable to allocate Process Environment. 0x%lx", + Status); + RtlInitUnicodeString(&DebugString, p); + ZwDisplayString(&DebugString); + + /* Bugcheck the system */ KeBugCheckEx(SESSION2_INITIALIZATION_FAILED, Status, 0, 0, 0); } /* Write the pointer */ - ProcessParameters->Environment = EnvironmentPtr; + ProcessParams->Environment = EnvironmentPtr; /* Make a buffer for the DOS path */ - p = (PWSTR)(ProcessParameters + 1); - ProcessParameters->CurrentDirectory.DosPath.Buffer = p; - ProcessParameters-> - CurrentDirectory.DosPath.MaximumLength = MAX_PATH * sizeof(WCHAR); + p = (PWSTR)(ProcessParams + 1); + ProcessParams->CurrentDirectory.DosPath.Buffer = p; + ProcessParams->CurrentDirectory.DosPath.MaximumLength = MAX_PATH * + sizeof(WCHAR); /* Copy the DOS path */ - RtlCopyUnicodeString(&ProcessParameters->CurrentDirectory.DosPath, + RtlCopyUnicodeString(&ProcessParams->CurrentDirectory.DosPath, &NtSystemRoot); /* Make a buffer for the DLL Path */ - p = (PWSTR)((PCHAR)ProcessParameters->CurrentDirectory.DosPath.Buffer + - ProcessParameters->CurrentDirectory.DosPath.MaximumLength); - ProcessParameters->DllPath.Buffer = p; - ProcessParameters->DllPath.MaximumLength = MAX_PATH * sizeof(WCHAR); + p = (PWSTR)((PCHAR)ProcessParams->CurrentDirectory.DosPath.Buffer + + ProcessParams->CurrentDirectory.DosPath.MaximumLength); + ProcessParams->DllPath.Buffer = p; + ProcessParams->DllPath.MaximumLength = MAX_PATH * sizeof(WCHAR); /* Copy the DLL path and append the system32 directory */ - RtlCopyUnicodeString(&ProcessParameters->DllPath, - &ProcessParameters->CurrentDirectory.DosPath); - RtlAppendUnicodeToString(&ProcessParameters->DllPath, L"\\System32"); + RtlCopyUnicodeString(&ProcessParams->DllPath, + &ProcessParams->CurrentDirectory.DosPath); + RtlAppendUnicodeToString(&ProcessParams->DllPath, L"\\System32"); /* Make a buffer for the image name */ - p = (PWSTR)((PCHAR)ProcessParameters->DllPath.Buffer + - ProcessParameters->DllPath.MaximumLength); - ProcessParameters->ImagePathName.Buffer = p; - ProcessParameters->ImagePathName.MaximumLength = MAX_PATH * sizeof(WCHAR); + p = (PWSTR)((PCHAR)ProcessParams->DllPath.Buffer + + ProcessParams->DllPath.MaximumLength); + ProcessParams->ImagePathName.Buffer = p; + ProcessParams->ImagePathName.MaximumLength = MAX_PATH * sizeof(WCHAR); /* Make sure the buffer is a valid string which within the given length */ if ((NtInitialUserProcessBufferType != REG_SZ) || @@ -433,7 +468,7 @@ { /* Invalid initial process string, bugcheck */ KeBugCheckEx(SESSION2_INITIALIZATION_FAILED, - (ULONG_PTR)STATUS_INVALID_PARAMETER, + STATUS_INVALID_PARAMETER, NtInitialUserProcessBufferType, NtInitialUserProcessBufferLength, sizeof(NtInitialUserProcessBuffer)); @@ -441,41 +476,40 @@ /* Cut out anything after a space */ p = NtInitialUserProcessBuffer; - while (*p && *p != L' ') p++; + while ((*p) && (*p != L' ')) p++; /* Set the image path length */ - ProcessParameters->ImagePathName.Length = + ProcessParams->ImagePathName.Length = (USHORT)((PCHAR)p - (PCHAR)NtInitialUserProcessBuffer); /* Copy the actual buffer */ - RtlCopyMemory(ProcessParameters->ImagePathName.Buffer, + RtlCopyMemory(ProcessParams->ImagePathName.Buffer, NtInitialUserProcessBuffer, - ProcessParameters->ImagePathName.Length); + ProcessParams->ImagePathName.Length); /* Null-terminate it */ - ProcessParameters-> - ImagePathName.Buffer[ProcessParameters->ImagePathName.Length / - sizeof(WCHAR)] = UNICODE_NULL; + ProcessParams->ImagePathName.Buffer[ProcessParams->ImagePathName.Length / + sizeof(WCHAR)] = UNICODE_NULL; /* Make a buffer for the command line */ - p = (PWSTR)((PCHAR)ProcessParameters->ImagePathName.Buffer + - ProcessParameters->ImagePathName.MaximumLength); - ProcessParameters->CommandLine.Buffer = p; - ProcessParameters->CommandLine.MaximumLength = MAX_PATH * sizeof(WCHAR); + p = (PWSTR)((PCHAR)ProcessParams->ImagePathName.Buffer + + ProcessParams->ImagePathName.MaximumLength); + ProcessParams->CommandLine.Buffer = p; + ProcessParams->CommandLine.MaximumLength = MAX_PATH * sizeof(WCHAR); /* Add the image name to the command line */ - RtlAppendUnicodeToString(&ProcessParameters->CommandLine, + RtlAppendUnicodeToString(&ProcessParams->CommandLine, NtInitialUserProcessBuffer); /* Create the environment string */ RtlInitEmptyUnicodeString(&Environment, - ProcessParameters->Environment, + ProcessParams->Environment, (USHORT)Size); /* Append the DLL path to it */ RtlAppendUnicodeToString(&Environment, L"Path=" ); - RtlAppendUnicodeStringToString(&Environment, &ProcessParameters->DllPath); - RtlAppendUnicodeStringToString(&Environment, &NullString ); + RtlAppendUnicodeStringToString(&Environment, &ProcessParams->DllPath); + RtlAppendUnicodeStringToString(&Environment, &NullString); /* Create the system drive string */ SystemDriveString = NtSystemRoot; @@ -491,12 +525,14 @@ RtlAppendUnicodeStringToString(&Environment, &NtSystemRoot); RtlAppendUnicodeStringToString(&Environment, &NullString); + /* Prepare the prefetcher */ + //CcPfBeginBootPhase(150); + /* Create SMSS process */ - SmssName = ProcessParameters->ImagePathName; + SmssName = ProcessParams->ImagePathName; Status = RtlCreateUserProcess(&SmssName, OBJ_CASE_INSENSITIVE, - RtlDeNormalizeProcessParams( - ProcessParameters), + RtlDeNormalizeProcessParams(ProcessParams), NULL, NULL, NULL, @@ -506,7 +542,16 @@ ProcessInformation); if (!NT_SUCCESS(Status)) { - /* Failed */ + /* Failed, display error */ + p = InitBuffer->DebugBuffer; + _snwprintf(p, + 256 * sizeof(WCHAR), + L"INIT: Unable to create Session Manager. 0x%lx", + Status); + RtlInitUnicodeString(&DebugString, p); + ZwDisplayString(&DebugString); + + /* Bugcheck the system */ KeBugCheckEx(SESSION3_INITIALIZATION_FAILED, Status, 0, 0, 0); } @@ -514,12 +559,22 @@ Status = ZwResumeThread(ProcessInformation->ThreadHandle, NULL); if (!NT_SUCCESS(Status)) { - /* Failed */ + /* Failed, display error */ + p = InitBuffer->DebugBuffer; + _snwprintf(p, + 256 * sizeof(WCHAR), + L"INIT: Unable to resume Session Manager. 0x%lx", + Status); + RtlInitUnicodeString(&DebugString, p); + ZwDisplayString(&DebugString); + + /* Bugcheck the system */ KeBugCheckEx(SESSION4_INITIALIZATION_FAILED, Status, 0, 0, 0); } /* Return success */ - return STATUS_SUCCESS; + *ProcessParameters = ProcessParams; + *ProcessEnvironment = EnvironmentPtr; } ULONG @@ -651,13 +706,13 @@ if (Extension->Size < sizeof(LOADER_PARAMETER_EXTENSION)) return FALSE; /* Don't validate upper versions */ - if (Extension->MajorVersion > 5) return TRUE; + if (Extension->MajorVersion > VER_PRODUCTMAJORVERSION) return TRUE; /* Fail if this is NT 4 */ - if (Extension->MajorVersion < 5) return FALSE; + if (Extension->MajorVersion < VER_PRODUCTMAJORVERSION) return FALSE; /* Fail if this is XP */ - if (Extension->MinorVersion < 2) return FALSE; + if (Extension->MinorVersion < VER_PRODUCTMINORVERSION) return FALSE; /* This is 2003 or newer, approve it */ return TRUE; @@ -766,6 +821,12 @@ NTSTATUS Status; PCHAR CommandLine, PerfMem; ULONG PerfMemUsed; + PLDR_DATA_TABLE_ENTRY NtosEntry; + PRTL_MESSAGE_RESOURCE_ENTRY MsgEntry; + ANSI_STRING CsdString; + ULONG Remaining = 0; + PCHAR RcEnd = NULL; + CHAR VersionBuffer [65]; /* Validate Loader */ if (!ExpIsLoaderValid(LoaderBlock)) @@ -905,7 +966,7 @@ sprintf(Buffer, "C:%s", LoaderBlock->NtBootPathName); /* Convert to ANSI_STRING and null-terminate it */ - RtlInitString(&AnsiPath, Buffer ); + RtlInitString(&AnsiPath, Buffer); Buffer[--AnsiPath.Length] = ANSI_NULL; /* Get the string from KUSER_SHARED_DATA's buffer */ @@ -923,17 +984,36 @@ /* Setup initial system settings (FIXME: Needs Cm Rewrite) */ CmGetSystemControlValues(LoaderBlock->RegistryBase, CmControlVector); + /* Load static defaults for Service Pack 1 and add our SVN revision */ + CmNtCSDVersion = 0x100 | (KERNEL_VERSION_BUILD_HEX << 16); + CmNtCSDReleaseType = 0; + + /* Set Service Pack data for Service Pack 1 */ + CmNtSpBuildNumber = 1830; + if (!(CmNtCSDVersion & 0xFFFF0000)) + { + /* Check the release type */ + if (CmNtCSDReleaseType == 1) CmNtSpBuildNumber |= 1830 << 16; + } + /* Initialize the executive at phase 0 */ if (!ExInitSystem()) KEBUGCHECK(PHASE0_INITIALIZATION_FAILED); /* Initialize the memory manager at phase 0 */ - if (!MmInitSystem(0, LoaderBlock)) KeBugCheck(MEMORY1_INITIALIZATION_FAILED); + if (!MmInitSystem(0, LoaderBlock)) KeBugCheck(PHASE0_INITIALIZATION_FAILED); /* Load boot symbols */ ExpLoadBootSymbols(LoaderBlock); /* Check if we should break after symbol load */ if (KdBreakAfterSymbolLoad) DbgBreakPointWithStatus(DBG_STATUS_CONTROL_C); + + /* Check if this loader is compatible with NT 5.2 */ + if (LoaderBlock->Extension->Size >= sizeof(LOADER_PARAMETER_EXTENSION)) + { + /* Setup headless terminal settings */ + HeadlessInit(LoaderBlock); + } /* Set system ranges */ SharedUserData->Reserved1 = (ULONG_PTR)MmHighestUserAddress; @@ -941,6 +1021,133 @@ /* Make a copy of the NLS Tables */ ExpInitNls(LoaderBlock); + + /* Get the kernel's load entry */ + NtosEntry = CONTAINING_RECORD(LoaderBlock->LoadOrderListHead.Flink, + LDR_DATA_TABLE_ENTRY, + InLoadOrderLinks); + + /* Check if this is a service pack */ + if (CmNtCSDVersion & 0xFFFF) + { + /* Get the service pack string */ + Status = RtlFindMessage(NtosEntry->DllBase, + 11, + 0, + WINDOWS_NT_CSD_STRING, + &MsgEntry); + if (NT_SUCCESS(Status)) + { + /* Setup the string */ + RtlInitAnsiString(&CsdString, MsgEntry->Text); + CsdString.Length -= sizeof(UNICODE_NULL); + Status = RtlStringCbPrintfA(Buffer, + sizeof(Buffer), + "%Z %u%c", + &CsdString, + (CmNtCSDVersion & 0xFF00) >> 8, + (CmNtCSDVersion & 0xFF) ? + 'A' + (CmNtCSDVersion & 0xFF) - 1 : + ANSI_NULL); + } + else + { + /* Build default string */ + Status = RtlStringCbPrintfA(Buffer, + sizeof(Buffer), + "CSD %04x", + CmNtCSDVersion); + } + + /* Check for success */ + if (!NT_SUCCESS(Status)) + { + /* Fail */ + KeBugCheckEx(PHASE0_INITIALIZATION_FAILED, Status, 0, 0, 0); + } + } + else + { + /* Then this is a beta */ + Status = RtlStringCbCopyExA(Buffer, + sizeof(Buffer), + VER_PRODUCTBETA_STR, + NULL, + &Remaining, + 0); + if (!NT_SUCCESS(Status)) + { + /* Fail */ + KeBugCheckEx(PHASE0_INITIALIZATION_FAILED, Status, 0, 0, 0); + } + + /* Update length */ + CmCSDVersionString.MaximumLength = sizeof(Buffer) - Remaining; + } + + /* Check if we have an RC number */ + if (CmNtCSDVersion & 0xFFFF0000) + { + /* Check if we have no version data yet */ + if (!(*Buffer)) + { + /* Set defaults */ + Remaining = sizeof(Buffer); + RcEnd = Buffer; + } + else + { + /* Add comma and space */ + Status = RtlStringCbCatExA(Buffer, + sizeof(Buffer), + ", ", + &RcEnd, + &Remaining, + 0); + if (!NT_SUCCESS(Status)) + { + /* Fail */ + KeBugCheckEx(PHASE0_INITIALIZATION_FAILED, Status, 0, 0, 0); + } + } + + /* Add the version format string */ + Status = RtlStringCbPrintfA(RcEnd, + Remaining, + "v. %u", + (CmNtCSDVersion & 0xFFFF0000) >> 16); + if (!NT_SUCCESS(Status)) + { + /* Fail */ + KeBugCheckEx(PHASE0_INITIALIZATION_FAILED, Status, 0, 0, 0); + } + } + + /* Now setup the final string */ + RtlInitAnsiString(&CsdString, Buffer); + Status = RtlAnsiStringToUnicodeString(&CmCSDVersionString, + &CsdString, + TRUE); + if (!NT_SUCCESS(Status)) + { + /* Fail */ + KeBugCheckEx(PHASE0_INITIALIZATION_FAILED, Status, 0, 0, 0); + } + + /* Add our version */ + Status = RtlStringCbPrintfA(VersionBuffer, + sizeof(VersionBuffer), + "%u.%u", + VER_PRODUCTMAJORVERSION, + VER_PRODUCTMINORVERSION); + if (!NT_SUCCESS(Status)) + { + /* Fail */ + KeBugCheckEx(PHASE0_INITIALIZATION_FAILED, Status, 0, 0, 0); + } + + /* Build the final version string */ + RtlCreateUnicodeStringFromAsciiz(&CmVersionString, VersionBuffer); /* Check if the user wants a kernel stack trace database */ if (NtGlobalFlag & FLG_KERNEL_STACK_TRACE_DB) @@ -1020,23 +1227,32 @@ VOID NTAPI -Phase1InitializationDiscard(PVOID Context) +Phase1InitializationDiscard(IN PVOID Context) { PLOADER_PARAMETER_BLOCK LoaderBlock = Context; - PCHAR CommandLine, Y2KHackRequired; - LARGE_INTEGER Timeout; - NTSTATUS Status; + NTSTATUS Status, MsgStatus; TIME_FIELDS TimeFields; - LARGE_INTEGER SystemBootTime, UniversalBootTime, OldTime; + LARGE_INTEGER SystemBootTime, UniversalBootTime, OldTime, Timeout; + BOOLEAN SosEnabled, NoGuiBoot, ResetBias = FALSE, AlternateShell = FALSE; + PLDR_DATA_TABLE_ENTRY NtosEntry; + PRTL_MESSAGE_RESOURCE_ENTRY MsgEntry; + PCHAR CommandLine, Y2KHackRequired, SafeBoot, Environment; + PCHAR StringBuffer, EndBuffer, BeginBuffer, MpString = ""; + PINIT_BUFFER InitBuffer; + ANSI_STRING TempString; + ULONG LastTzBias, Size, Length, YearHack = 0, Disposition, MessageCode = 0; PRTL_USER_PROCESS_INFORMATION ProcessInfo; - BOOLEAN SosEnabled, NoGuiBoot; - ULONG YearHack = 0; - - /* Allocate initial process information */ - ProcessInfo = ExAllocatePoolWithTag(NonPagedPool, - sizeof(RTL_USER_PROCESS_INFORMATION), - TAG('I', 'n', 'i', 't')); - if (!ProcessInfo) + KEY_VALUE_PARTIAL_INFORMATION KeyPartialInfo; + UNICODE_STRING KeyName, DebugString; + OBJECT_ATTRIBUTES ObjectAttributes; + HANDLE KeyHandle, OptionHandle; + PRTL_USER_PROCESS_PARAMETERS ProcessParameters = NULL; + + /* Allocate the initialization buffer */ + InitBuffer = ExAllocatePoolWithTag(NonPagedPool, + sizeof(INIT_BUFFER), + TAG('I', 'n', 'i', 't')); + if (!InitBuffer) { /* Bugcheck */ KeBugCheckEx(PHASE1_INITIALIZATION_FAILED, STATUS_NO_MEMORY, 8, 0, 0); @@ -1088,7 +1304,90 @@ InitWinPEModeType |= (strstr(CommandLine, "INRAM")) ? 0x80000000 : 1; } - /* FIXME: Print product name, version, and build */ + /* Get the kernel's load entry */ + NtosEntry = CONTAINING_RECORD(LoaderBlock->LoadOrderListHead.Flink, + LDR_DATA_TABLE_ENTRY, + InLoadOrderLinks); + + /* Find the banner message */ + MsgStatus = RtlFindMessage(NtosEntry->DllBase, + 11, + 0, + WINDOWS_NT_BANNER, + &MsgEntry); + + /* Setup defaults and check if we have a version string */ + StringBuffer = InitBuffer->VersionBuffer; + BeginBuffer = StringBuffer; + EndBuffer = StringBuffer; + Length = 256; + if (CmCSDVersionString.Length) + { + /* Print the version string */ + Status = RtlStringCbPrintfExA(StringBuffer, + 255, + &EndBuffer, + &Length, + 0, + ": %wZ", + &CmCSDVersionString); + if (!NT_SUCCESS(Status)) + { + /* Bugcheck */ + KeBugCheckEx(PHASE1_INITIALIZATION_FAILED, Status, 7, 0, 0); + } + } + else + { + /* No version */ + Length = 255; + } + + /* Null-terminate the string */ + *EndBuffer++ = ANSI_NULL; + + /* Build the version number */ + StringBuffer = InitBuffer->VersionNumber; + Status = RtlStringCbPrintfA(StringBuffer, + 24, + "%u.%u", + VER_PRODUCTMAJORVERSION, + VER_PRODUCTMINORVERSION); + if (!NT_SUCCESS(Status)) + { + /* Bugcheck */ + KeBugCheckEx(PHASE1_INITIALIZATION_FAILED, Status, 7, 0, 0); + } + + /* Check if we had found a banner message */ + if (NT_SUCCESS(MsgStatus)) + { + /* Create the banner message */ + Status = RtlStringCbPrintfA(EndBuffer, + Length, + MsgEntry->Text, + StringBuffer, + NtBuildNumber & 0xFFFF, + BeginBuffer); + if (!NT_SUCCESS(Status)) + { + /* Bugcheck */ + KeBugCheckEx(PHASE1_INITIALIZATION_FAILED, Status, 7, 0, 0); + } + } + else + { + /* Use hard-coded banner message */ + Status = RtlStringCbCopyA(EndBuffer, Length, "REACTOS (R)\n"); + if (!NT_SUCCESS(Status)) + { + /* Bugcheck */ + KeBugCheckEx(PHASE1_INITIALIZATION_FAILED, Status, 7, 0, 0); + } + } + + /* Display the version string on-screen */ + InbvDisplayString(EndBuffer); /* Initialize Power Subsystem in Phase 0 */ if (!PoInitSystem(0, AcpiTableDetected)) KeBugCheck(INTERNAL_POWER_ERROR); @@ -1108,23 +1407,36 @@ RtlTimeFieldsToTime(&TimeFields, &SystemBootTime); UniversalBootTime = SystemBootTime; -#if 0 // FIXME: Won't work until we can read registry data here - /* FIXME: This assumes that the RTC is not already in GMT */ - ExpTimeZoneBias.QuadPart = Int32x32To64(ExpLastTimeZoneBias * 60, - 10000000); - - /* Set the boot time-zone bias */ - SharedUserData->TimeZoneBias.High2Time = ExpTimeZoneBias.HighPart; - SharedUserData->TimeZoneBias.LowPart = ExpTimeZoneBias.LowPart; - SharedUserData->TimeZoneBias.High1Time = ExpTimeZoneBias.HighPart; - - /* Convert the boot time to local time, and set it */ - UniversalBootTime.QuadPart = SystemBootTime.QuadPart + - ExpTimeZoneBias.QuadPart; -#endif + /* Check if real time is GMT */ + if (!ExpRealTimeIsUniversal) + { + /* Check if we don't have a valid bias */ + if (ExpLastTimeZoneBias == -1) + { + /* Reset */ + ResetBias = TRUE; + ExpLastTimeZoneBias = ExpAltTimeZoneBias; + } + + /* Calculate the bias in seconds */ + ExpTimeZoneBias.QuadPart = Int32x32To64(ExpLastTimeZoneBias * 60, + 10000000); + + /* Set the boot time-zone bias */ + SharedUserData->TimeZoneBias.High2Time = ExpTimeZoneBias.HighPart; + SharedUserData->TimeZoneBias.LowPart = ExpTimeZoneBias.LowPart; + SharedUserData->TimeZoneBias.High1Time = ExpTimeZoneBias.HighPart; + + /* Convert the boot time to local time, and set it */ + UniversalBootTime.QuadPart = SystemBootTime.QuadPart + + ExpTimeZoneBias.QuadPart; + } /* Update the system time */ KeSetSystemTime(&UniversalBootTime, &OldTime, FALSE, NULL); + + /* Do system callback */ + PoNotifySystemTimeSet(); /* Remember this as the boot time */ KeBootTime = UniversalBootTime; @@ -1134,7 +1446,47 @@ /* Initialize all processors */ if (!HalAllProcessorsStarted()) KeBugCheck(HAL1_INITIALIZATION_FAILED); - /* FIXME: Print CPU and Memory */ +#ifdef CONFIG_SMP + /* HACK: We should use RtlFindMessage and not only fallback to this */ + MpString = "MultiProcessor Kernel\r\n"; +#endif + + /* Setup the "MP" String */ + RtlInitAnsiString(&TempString, MpString); + + /* Make sure to remove the \r\n if we actually have a string */ + if (TempString.Length >= 2) TempString.Length -= sizeof(UNICODE_NULL); + + /* Get the information string from our resource file */ + MsgStatus = RtlFindMessage(NtosEntry->DllBase, + 11, + 0, + KeNumberProcessors > 1 ? + WINDOWS_NT_INFO_STRING_PLURAL : + WINDOWS_NT_INFO_STRING, + &MsgEntry); + + /* Get total RAM size */ + Size = MmStats.NrTotalPages * PAGE_SIZE / 1024 / 1024; + + /* Create the string */ + StringBuffer = InitBuffer->VersionBuffer; + Status = RtlStringCbPrintfA(StringBuffer, + 256, + NT_SUCCESS(MsgStatus) ? + MsgEntry->Text : + "%u System Processor [%u MB Memory] %Z\n", + KeNumberProcessors, + Size, + &TempString); + if (!NT_SUCCESS(Status)) + { + /* Bugcheck */ + KeBugCheckEx(PHASE1_INITIALIZATION_FAILED, Status, 4, 0, 0); + } + + /* Display RAM and CPU count */ + InbvDisplayString(StringBuffer); /* Update the progress bar */ InbvUpdateProgressBar(5); @@ -1181,19 +1533,43 @@ /* Initialize the Registry */ if (!CmInitSystem1()) KeBugCheck(CONFIG_INITIALIZATION_FAILED); + /* Initialize Prefetcher */ + CcPfInitializePrefetcher(); + /* Update progress bar */ InbvUpdateProgressBar(15); /* Update timezone information */ + LastTzBias = ExpLastTimeZoneBias; ExRefreshTimeZoneInformation(&SystemBootTime); + + /* Check if we're resetting timezone data */ + if (ResetBias) + { + /* Convert the local time to system time */ + ExLocalTimeToSystemTime(&SystemBootTime, &UniversalBootTime); + KeBootTime = UniversalBootTime; + KeBootTimeBias = 0; + + /* Set the new time */ + KeSetSystemTime(&UniversalBootTime, &OldTime, FALSE, NULL); + } + else + { + /* Check if the timezone switched and update the time */ + if (LastTzBias != ExpLastTimeZoneBias) ZwSetSystemTime(NULL, NULL); + } /* Initialize the File System Runtime Library */ if (!FsRtlInitSystem()) KeBugCheck(FILE_INITIALIZATION_FAILED); + /* Initialize range lists */ + RtlInitializeRangeListPackage(); + /* Report all resources used by HAL */ HalReportResourceUsage(); - /* Call the debugger DLL once we have KD64 6.0 support */ + /* Call the debugger DLL */ KdDebuggerInitialize1(LoaderBlock); /* Setup PnP Manager in phase 1 */ @@ -1205,8 +1581,234 @@ /* Initialize LPC */ if (!LpcInitSystem()) KeBugCheck(LPC_INITIALIZATION_FAILED); + /* Make sure we have a command line */ + if (CommandLine) + { + /* Check if this is a safe mode boot */ + SafeBoot = strstr(CommandLine, "SAFEBOOT:"); + if (SafeBoot) + { + /* Check what kind of boot this is */ + SafeBoot += 9; + if (!strncmp(SafeBoot, "MINIMAL", 7)) + { + /* Minimal mode */ + InitSafeBootMode = 1; + SafeBoot += 7; + MessageCode = BOOTING_IN_SAFEMODE_MINIMAL; + } + else if (!strncmp(SafeBoot, "NETWORK", 7)) + { + /* With Networking */ + InitSafeBootMode = 1; + SafeBoot += 7; + MessageCode = BOOTING_IN_SAFEMODE_NETWORK; + } + else if (!strncmp(SafeBoot, "DSREPAIR", 8)) + { + /* Domain Server Repair */ + InitSafeBootMode = 3; + SafeBoot += 8; + MessageCode = BOOTING_IN_SAFEMODE_DSREPAIR; + + } + else + { + /* Invalid */ + InitSafeBootMode = 0; + } + + /* Check if there's any settings left */ + if (*SafeBoot) + { + /* Check if an alternate shell was requested */ + if (!strncmp(SafeBoot, "(ALTERNATESHELL)", 16)) + { + /* Remember this for later */ + AlternateShell = TRUE; + } + } + + /* Find the message to print out */ + Status = RtlFindMessage(NtosEntry->DllBase, + 11, + 0, + MessageCode, + &MsgEntry); + if (NT_SUCCESS(Status)) + { + /* Display it */ + InbvDisplayString(MsgEntry->Text); + } + } + } + + /* Make sure we have a command line */ + if (CommandLine) + { + /* Check if bootlogging is enabled */ + if (strstr(CommandLine, "BOOTLOG")) + { + /* Find the message to print out */ + Status = RtlFindMessage(NtosEntry->DllBase, + 11, + 0, + BOOTLOG_ENABLED, + &MsgEntry); + if (NT_SUCCESS(Status)) + { + /* Display it */ + InbvDisplayString(MsgEntry->Text); + } + + /* Setup boot logging */ + //IopInitializeBootLogging(LoaderBlock, InitBuffer->BootlogHeader); + } + } + + /* Setup the Executive in Phase 2 */ + //ExInitSystemPhase2(); + + /* Update progress bar */ + InbvUpdateProgressBar(25); + +#ifdef _WINKD_ + /* No KD Time Slip is pending */ + KdpTimeSlipPending = 0; +#endif + + /* Initialize in-place execution support */ + XIPInit(LoaderBlock); + + /* Set maximum update to 75% */ + InbvSetProgressBarSubset(25, 75); + /* Initialize the I/O Subsystem */ - if (!IoInitSystem(KeLoaderBlock)) KeBugCheck(IO1_INITIALIZATION_FAILED); + if (!IoInitSystem(LoaderBlock)) KeBugCheck(IO1_INITIALIZATION_FAILED); + + /* Set maximum update to 100% */ + InbvSetProgressBarSubset(0, 100); + + /* Are we in safe mode? */ + if (InitSafeBootMode) + { + /* Open the safe boot key */ + RtlInitUnicodeString(&KeyName, + L"\\REGISTRY\\MACHINE\\SYSTEM\\CURRENTCONTROLSET" + L"\\CONTROL\\SAFEBOOT"); + InitializeObjectAttributes(&ObjectAttributes, + &KeyName, + OBJ_CASE_INSENSITIVE, + NULL, + NULL); + Status = ZwOpenKey(&KeyHandle, KEY_ALL_ACCESS, &ObjectAttributes); + if (NT_SUCCESS(Status)) + { + /* First check if we have an alternate shell */ + if (AlternateShell) + { + /* Make sure that the registry has one setup */ + RtlInitUnicodeString(&KeyName, L"AlternateShell"); + Status = NtQueryValueKey(KeyHandle, + &KeyName, + KeyValuePartialInformation, + &KeyPartialInfo, + sizeof(KeyPartialInfo), + &Length); + if (!NT_SUCCESS(Status)) AlternateShell = FALSE; + } + + /* Create the option key */ + RtlInitUnicodeString(&KeyName, L"Option"); + InitializeObjectAttributes(&ObjectAttributes, + &KeyName, + OBJ_CASE_INSENSITIVE, + KeyHandle, + NULL); + Status = ZwCreateKey(&OptionHandle, + KEY_ALL_ACCESS, + &ObjectAttributes, + 0, + NULL, + REG_OPTION_VOLATILE, + &Disposition); + NtClose(KeyHandle); + + /* Check if the key create worked */ + if (NT_SUCCESS(Status)) + { + /* Write the safe boot type */ + RtlInitUnicodeString(&KeyName, L"OptionValue"); + NtSetValueKey(OptionHandle, + &KeyName, + 0, + REG_DWORD, + &InitSafeBootMode, + sizeof(InitSafeBootMode)); + + /* Check if we have to use an alternate shell */ + if (AlternateShell) + { + /* Remember this for later */ + Disposition = TRUE; + RtlInitUnicodeString(&KeyName, L"UseAlternateShell"); + NtSetValueKey(OptionHandle, + &KeyName, + 0, + REG_DWORD, + &Disposition, + sizeof(Disposition)); + } + + /* Close the options key handle */ + NtClose(OptionHandle); + } + } + } + + /* Are we in Win PE mode? */ + if (InitIsWinPEMode) + { + /* Open the safe control key */ + RtlInitUnicodeString(&KeyName, + L"\\REGISTRY\\MACHINE\\SYSTEM\\CURRENTCONTROLSET" + L"\\CONTROL"); + InitializeObjectAttributes(&ObjectAttributes, + &KeyName, + OBJ_CASE_INSENSITIVE, + NULL, + NULL); + Status = ZwOpenKey(&KeyHandle, KEY_ALL_ACCESS, &ObjectAttributes); + if (!NT_SUCCESS(Status)) + { + /* Bugcheck */ + KeBugCheckEx(PHASE1_INITIALIZATION_FAILED, Status, 6, 0, 0); + } + + /* Create the MiniNT key */ + RtlInitUnicodeString(&KeyName, L"MiniNT"); + InitializeObjectAttributes(&ObjectAttributes, + &KeyName, + OBJ_CASE_INSENSITIVE, + KeyHandle, + NULL); + Status = ZwCreateKey(&OptionHandle, + KEY_ALL_ACCESS, + &ObjectAttributes, + 0, + NULL, + REG_OPTION_VOLATILE, + &Disposition); + if (!NT_SUCCESS(Status)) + { + /* Bugcheck */ + KeBugCheckEx(PHASE1_INITIALIZATION_FAILED, Status, 6, 0, 0); + } + + /* Close the handles */ + NtClose(KeyHandle); + NtClose(OptionHandle); + } /* Unmap Low memory, and initialize the MPW and Balancer Thread */ MmInitSystem(2, LoaderBlock); @@ -1234,7 +1836,8 @@ InbvUpdateProgressBar(90); /* Launch initial process */ - Status = ExpLoadInitialProcess(ProcessInfo); + ProcessInfo = &InitBuffer->ProcessInfo; + ExpLoadInitialProcess(InitBuffer, &ProcessParameters, &Environment); /* Update progress bar */ InbvUpdateProgressBar(100); @@ -1246,9 +1849,12 @@ Timeout.QuadPart = Int32x32To64(5, -10000000); Status = ZwWaitForSingleObject(ProcessInfo->ProcessHandle, FALSE, &Timeout); if (InbvBootDriverInstalled) FinalizeBootLogo(); - if (Status == STATUS_SUCCESS) { + /* Failed, display error */ + RtlInitUnicodeString(&DebugString, L"INIT: Session Manager terminated."); + ZwDisplayString(&DebugString); + /* Bugcheck the system if SMSS couldn't initialize */ KeBugCheck(SESSION5_INITIALIZATION_FAILED); } @@ -1257,13 +1863,25 @@ ZwClose(ProcessInfo->ThreadHandle); ZwClose(ProcessInfo->ProcessHandle); - /* FIXME: We should free the initial process' memory!*/ + /* Free the initial process environment */ + Size = 0; + ZwFreeVirtualMemory(NtCurrentProcess(), + (PVOID*)&Environment, + &Size, + MEM_RELEASE); + + /* Free the initial process parameters */ + Size = 0; + ZwFreeVirtualMemory(NtCurrentProcess(), + (PVOID*)&ProcessParameters, + &Size, + MEM_RELEASE); /* Increase init phase */ - ExpInitializationPhase += 1; - - /* Free the process information */ - ExFreePool(ProcessInfo); + ExpInitializationPhase++; + + /* Free the boot buffer */ + ExFreePool(InitBuffer); } VOID @@ -1276,6 +1894,3 @@ /* Jump into zero page thread */ MmZeroPageThreadMain(NULL); } - - - Modified: trunk/reactos/ntoskrnl/include/internal/rtl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/rtl.h (original) +++ trunk/reactos/ntoskrnl/include/internal/rtl.h Wed May 9 04:44:45 2007 @@ -10,6 +10,12 @@ OUT RTL_ATOM *AtomList ); +VOID +NTAPI +RtlInitializeRangeListPackage( + VOID +); + #endif /* __NTOSKRNL_INCLUDE_INTERNAL_NLS_H */ /* EOF */ Modified: trunk/reactos/ntoskrnl/rtl/libsupp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/rtl/libsupp.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/rtl/libsupp.c (original) +++ trunk/reactos/ntoskrnl/rtl/libsupp.c Wed May 9 04:44:45 2007 @@ -15,7 +15,29 @@ extern ULONG NtGlobalFlag; +typedef struct _RTL_RANGE_ENTRY +{ + LIST_ENTRY Entry; + RTL_RANGE Range; +} RTL_RANGE_ENTRY, *PRTL_RANGE_ENTRY; + +PAGED_LOOKASIDE_LIST RtlpRangeListEntryLookasideList; + /* FUNCTIONS *****************************************************************/ + +VOID +NTAPI +RtlInitializeRangeListPackage(VOID) +{ + /* Setup the lookaside list for allocations (not used yet) */ + ExInitializePagedLookasideList(&RtlpRangeListEntryLookasideList, + NULL, + NULL, + POOL_COLD_ALLOCATION, + sizeof(RTL_RANGE_ENTRY), + TAG('R', 'R', 'l', 'e'), + 16); +} BOOLEAN NTAPI

1 0

[ion] 26658: - Add CcPf (Cache Manager PreFetcher) structures and add a stub function to initailize the global settings for the pre-fetcher (only a lock and list for now). - Add hdlsterm.c for Headless Terminal Support and a stub function to detect if anyone is trying to do this. - Add xipdisp.c for eXecute-In-Place Support and add a stub function to detect if anyone is trying this, as well as get various supported command line settings. - Try to find XIP Memory Descriptor if one was given. - Ge
by ion＠svn.reactos.org 09 May '07

09 May '07

Author: ion Date: Wed May 9 04:29:38 2007 New Revision: 26658 URL: http://svn.reactos.org/svn/reactos?rev=26658&view=rev Log: - Add CcPf (Cache Manager PreFetcher) structures and add a stub function to initailize the global settings for the pre-fetcher (only a lock and list for now). - Add hdlsterm.c for Headless Terminal Support and a stub function to detect if anyone is trying to do this. - Add xipdisp.c for eXecute-In-Place Support and add a stub function to detect if anyone is trying this, as well as get various supported command line settings. - Try to find XIP Memory Descriptor if one was given. - Get Power Event callback from Win32k in PsEstablishWin32Callouts. - Notifiy System Time Change callback with PoNotifySystemTimeSet. - Add safemode and bootlog Message IDs. Added: trunk/reactos/ntoskrnl/ex/hdlsterm.c trunk/reactos/ntoskrnl/ex/xipdisp.c Modified: trunk/reactos/ntoskrnl/cc/cacheman.c trunk/reactos/ntoskrnl/ex/time.c trunk/reactos/ntoskrnl/include/internal/cc.h trunk/reactos/ntoskrnl/include/internal/po.h trunk/reactos/ntoskrnl/ntoskrnl.mc trunk/reactos/ntoskrnl/ntoskrnl.rbuild trunk/reactos/ntoskrnl/po/events.c trunk/reactos/ntoskrnl/ps/win32.c Modified: trunk/reactos/ntoskrnl/cc/cacheman.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cc/cacheman.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/cc/cacheman.c (original) +++ trunk/reactos/ntoskrnl/cc/cacheman.c Wed May 9 04:29:38 2007 @@ -14,7 +14,26 @@ #define NDEBUG #include <internal/debug.h> +PFSN_PREFETCHER_GLOBALS CcPfGlobals; + /* FUNCTIONS *****************************************************************/ + +VOID +NTAPI +CcPfInitializePrefetcher(VOID) +{ + /* Notify debugger */ + DbgPrintEx(DPFLTR_PREFETCHER_ID, + DPFLTR_TRACE_LEVEL, + "CCPF: InitializePrefetecher()\n"); + + /* Setup the Prefetcher Data */ + InitializeListHead(&CcPfGlobals.ActiveTraces); + InitializeListHead(&CcPfGlobals.CompletedTraces); + ExInitializeFastMutex(&CcPfGlobals.CompletedTracesLock); + + /* FIXME: Setup the rest of the prefetecher */ +} BOOLEAN NTAPI Added: trunk/reactos/ntoskrnl/ex/hdlsterm.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/hdlsterm.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/ex/hdlsterm.c (added) +++ trunk/reactos/ntoskrnl/ex/hdlsterm.c Wed May 9 04:29:38 2007 @@ -1,0 +1,32 @@ +/* + * PROJECT: ReactOS Kernel + * LICENSE: GPL - See COPYING in the top level directory + * FILE: ntoskrnl/ex/hdlsterm.c + * PURPOSE: Headless Terminal Support + * PROGRAMMERS: Alex Ionescu (alex.ionescu(a)reactos.org) + */ + +/* INCLUDES ******************************************************************/ + +#include <ntoskrnl.h> +#include <debug.h> + +/* GLOBALS *******************************************************************/ + +/* FUNCTIONS *****************************************************************/ + +VOID +NTAPI +HeadlessInit(IN PLOADER_PARAMETER_BLOCK LoaderBlock) +{ + PHEADLESS_LOADER_BLOCK HeadlessBlock; + + /* Get the headless loader block */ + HeadlessBlock = LoaderBlock->Extension->HeadlessLoaderBlock; + if (HeadlessBlock) + { + DPRINT1("ReactOS does not currently have Headless Terminal support!\n"); + } +} + +/* EOF */ Modified: trunk/reactos/ntoskrnl/ex/time.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/time.c?rev=266… ============================================================================== --- trunk/reactos/ntoskrnl/ex/time.c (original) +++ trunk/reactos/ntoskrnl/ex/time.c Wed May 9 04:29:38 2007 @@ -21,6 +21,7 @@ TIME_ZONE_INFORMATION ExpTimeZoneInfo; ULONG ExpLastTimeZoneBias = -1; LARGE_INTEGER ExpTimeZoneBias; +ULONG ExpAltTimeZoneBias; ULONG ExpTimeZoneId; ULONG ExpTickCountMultiplier; ERESOURCE ExpTimeRefreshLock; Added: trunk/reactos/ntoskrnl/ex/xipdisp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/xipdisp.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/ex/xipdisp.c (added) +++ trunk/reactos/ntoskrnl/ex/xipdisp.c Wed May 9 04:29:38 2007 @@ -1,0 +1,77 @@ +/* + * PROJECT: ReactOS Kernel + * LICENSE: GPL - See COPYING in the top level directory + * FILE: ntoskrnl/ex/xipdisp.c + * PURPOSE: eXecute In Place (XIP) Support. + * PROGRAMMERS: Alex Ionescu (alex.ionescu(a)reactos.org) + */ + +/* INCLUDES ******************************************************************/ + +#include <ntoskrnl.h> +#include <debug.h> + +/* GLOBALS *******************************************************************/ + +/* FUNCTIONS *****************************************************************/ + +PMEMORY_ALLOCATION_DESCRIPTOR +NTAPI +XIPpFindMemoryDescriptor(IN PLOADER_PARAMETER_BLOCK LoaderBlock) +{ + PLIST_ENTRY NextEntry; + PMEMORY_ALLOCATION_DESCRIPTOR Descriptor = NULL; + + /* Loop the memory descriptors */ + for (NextEntry = LoaderBlock->MemoryDescriptorListHead.Flink; + NextEntry != &LoaderBlock->MemoryDescriptorListHead; + NextEntry = NextEntry->Flink) + { + /* Get the current descriptor and check if it's the XIP ROM */ + Descriptor = CONTAINING_RECORD(NextEntry, + MEMORY_ALLOCATION_DESCRIPTOR, + ListEntry); + if (Descriptor->MemoryType == LoaderXIPRom) return Descriptor; + } + + /* Nothing found if we got here */ + return NULL; +} + +VOID +NTAPI +XIPInit(IN PLOADER_PARAMETER_BLOCK LoaderBlock) +{ + PCHAR CommandLine, XipBoot, XipRom, XipMegs, XipVerbose; + PMEMORY_ALLOCATION_DESCRIPTOR XipDescriptor; + + /* Get the command line */ + CommandLine = LoaderBlock->LoadOptions; + if (!CommandLine) return; + + /* Get XIP settings */ + XipBoot = strstr(CommandLine, "XIPBOOT"); + XipRom = strstr(CommandLine, "XIPROM="); + XipMegs = strstr(CommandLine, "XIPMEGS="); + XipVerbose = strstr(CommandLine, "XIPVERBOSE"); + + /* Check if this is a verbose boot */ + if (XipVerbose) + { + /* Print out our header */ + DbgPrint("\n\nXIP: debug timestamp at line %d in %s: <<<%s %s>>>\n\n", + __LINE__, + __FILE__, + __DATE__, + __TIME__); + } + + /* Find the XIP memory descriptor */ + XipDescriptor = XIPpFindMemoryDescriptor(LoaderBlock); + if (!XipDescriptor) return; + + /* FIXME: TODO */ + DPRINT1("ReactOS does not yet support eXecute In Place boot technology\n"); +} + +/* EOF */ Modified: trunk/reactos/ntoskrnl/include/internal/cc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/cc.h (original) +++ trunk/reactos/ntoskrnl/include/internal/cc.h Wed May 9 04:29:38 2007 @@ -1,5 +1,106 @@ #ifndef __INCLUDE_INTERNAL_CC_H #define __INCLUDE_INTERNAL_CC_H + +typedef struct _PF_SCENARIO_ID +{ + WCHAR ScenName[30]; + ULONG HashId; +} PF_SCENARIO_ID, *PPF_SCENARIO_ID; + +typedef struct _PF_LOG_ENTRY +{ + ULONG FileOffset:30; + ULONG Type:2; + union + { + ULONG FileKey; + ULONG FileSequenceNumber; + }; +} PF_LOG_ENTRY, *PPF_LOG_ENTRY; + +typedef struct _PFSN_LOG_ENTRIES +{ + LIST_ENTRY TraceBuffersLink; + LONG NumEntries; + LONG MaxEntries; + PF_LOG_ENTRY Entries[ANYSIZE_ARRAY]; +} PFSN_LOG_ENTRIES, *PPFSN_LOG_ENTRIES; + +typedef struct _PF_SECTION_INFO +{ + ULONG FileKey; + ULONG FileSequenceNumber; + ULONG FileIdLow; + ULONG FileIdHigh; +} PF_SECTION_INFO, *PPF_SECTION_INFO; + +typedef struct _PF_TRACE_HEADER +{ + ULONG Version; + ULONG MagicNumber; + ULONG Size; + PF_SCENARIO_ID ScenarioId; + ULONG ScenarioType; // PF_SCENARIO_TYPE + ULONG EventEntryIdxs[8]; + ULONG NumEventEntryIdxs; + ULONG TraceBufferOffset; + ULONG NumEntries; + ULONG SectionInfoOffset; + ULONG NumSections; + ULONG FaultsPerPeriod[10]; + LARGE_INTEGER LaunchTime; + ULONGLONG Reserved[5]; +} PF_TRACE_HEADER, *PPF_TRACE_HEADER; + +typedef struct _PFSN_TRACE_DUMP +{ + LIST_ENTRY CompletedTracesLink; + PF_TRACE_HEADER Trace; +} PFSN_TRACE_DUMP, *PPFSN_TRACE_DUMP; + +typedef struct _PFSN_TRACE_HEADER +{ + ULONG Magic; + LIST_ENTRY ActiveTracesLink; + PF_SCENARIO_ID ScenarioId; + ULONG ScenarioType; // PF_SCENARIO_TYPE + ULONG EventEntryIdxs[8]; + ULONG NumEventEntryIdxs; + PPFSN_LOG_ENTRIES CurrentTraceBuffer; + LIST_ENTRY TraceBuffersList; + ULONG NumTraceBuffers; + KSPIN_LOCK TraceBufferSpinLock; + KTIMER TraceTimer; + LARGE_INTEGER TraceTimerPeriod; + KDPC TraceTimerDpc; + KSPIN_LOCK TraceTimerSpinLock; + ULONG FaultsPerPeriod[10]; + LONG LastNumFaults; + LONG CurPeriod; + LONG NumFaults; + LONG MaxFaults; + PEPROCESS Process; + EX_RUNDOWN_REF RefCount; + WORK_QUEUE_ITEM EndTraceWorkItem; + LONG EndTraceCalled; + PPFSN_TRACE_DUMP TraceDump; + NTSTATUS TraceDumpStatus; + LARGE_INTEGER LaunchTime; + PPF_SECTION_INFO SectionInfo; + ULONG SectionInfoCount; +} PFSN_TRACE_HEADER, *PPFSN_TRACE_HEADER; + +typedef struct _PFSN_PREFETCHER_GLOBALS +{ + LIST_ENTRY ActiveTraces; + KSPIN_LOCK ActiveTracesLock; + PPFSN_TRACE_HEADER SystemWideTrace; + LIST_ENTRY CompletedTraces; + FAST_MUTEX CompletedTracesLock; + LONG NumCompletedTraces; + PKEVENT CompletedTracesEvent; + LONG ActivePrefetches; +} PFSN_PREFETCHER_GLOBALS, *PPFSN_PREFETCHER_GLOBALS; typedef struct _BCB { @@ -63,6 +164,12 @@ VOID NTAPI +CcPfInitializePrefetcher( + VOID +); + +VOID +NTAPI CcMdlReadComplete2( IN PMDL MemoryDescriptorList, IN PFILE_OBJECT FileObject Modified: trunk/reactos/ntoskrnl/include/internal/po.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/po.h (original) +++ trunk/reactos/ntoskrnl/include/internal/po.h Wed May 9 04:29:38 2007 @@ -71,6 +71,15 @@ ); // +// Notifications +// +VOID +NTAPI +PoNotifySystemTimeSet( + VOID +); + +// // Global data inside the Power Manager // extern PDEVICE_NODE PopSystemPowerDeviceNode; Modified: trunk/reactos/ntoskrnl/ntoskrnl.mc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ntoskrnl.mc?rev=2… ============================================================================== --- trunk/reactos/ntoskrnl/ntoskrnl.mc (original) +++ trunk/reactos/ntoskrnl/ntoskrnl.mc Wed May 9 04:29:38 2007 @@ -1130,6 +1130,38 @@ system vendor for an updated BIOS. . +MessageId=0xA8 +Severity=Informational +Facility=System +SymbolicName=BOOTING_IN_SAFEMODE_MINIMAL +Language=English +The system is booting in safemode - Minimal Services +. + +MessageId=0xA9 +Severity=Informational +Facility=System +SymbolicName=BOOTING_IN_SAFEMODE_NETWORK +Language=English +The system is booting in safemode - Minimal Services with Network +. + +MessageId=0xAA +Severity=Informational +Facility=System +SymbolicName=BOOTING_IN_SAFEMODE_DSREPAIR +Language=English +The system is booting in safemode - Directory Services Repair +. + +MessageId=0xB7 +Severity=Informational +Facility=System +SymbolicName=BOOTLOG_ENABLED +Language=English +Boot Logging Enabled +. + MessageId=0xBE Severity=Success Facility=System @@ -1337,7 +1369,7 @@ Facility=System SymbolicName=WINDOWS_NT_MP_STRING Language=English -MulitProcessor Kernel +MultiProcessor Kernel . MessageId=0x9D Modified: trunk/reactos/ntoskrnl/ntoskrnl.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ntoskrnl.rbuild?r… ============================================================================== --- trunk/reactos/ntoskrnl/ntoskrnl.rbuild (original) +++ trunk/reactos/ntoskrnl/ntoskrnl.rbuild Wed May 9 04:29:38 2007 @@ -124,6 +124,7 @@ <file>fmutex.c</file> <file>handle.c</file> <file>harderr.c</file> + <file>hdlsterm.c</file> <file>init.c</file> <file>keyedevt.c</file> <file>locale.c</file> @@ -141,6 +142,7 @@ <file>uuid.c</file> <file>win32k.c</file> <file>work.c</file> + <file>xipdisp.c</file> <file>zone.c</file> </directory> <directory name="fsrtl"> Modified: trunk/reactos/ntoskrnl/po/events.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/po/events.c?rev=2… ============================================================================== --- trunk/reactos/ntoskrnl/po/events.c (original) +++ trunk/reactos/ntoskrnl/po/events.c Wed May 9 04:29:38 2007 @@ -10,6 +10,29 @@ #include <ntoskrnl.h> //#define NDEBUG #include <internal/debug.h> + +PKWIN32_POWEREVENT_CALLOUT PopEventCallout; +extern PCALLBACK_OBJECT SetSystemTimeCallback; + +VOID +NTAPI +PoNotifySystemTimeSet(VOID) +{ + KIRQL OldIrql; + + /* Check if Win32k registered a notification callback */ + if (PopEventCallout) + { + /* Raise to dispatch */ + KeRaiseIrql(DISPATCH_LEVEL, &OldIrql); + + /* Notify the callback */ + ExNotifyCallback(SetSystemTimeCallback, NULL, NULL); + + /* Lower IRQL back */ + KeLowerIrql(OldIrql); + } +} NTSTATUS NTAPI Modified: trunk/reactos/ntoskrnl/ps/win32.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ps/win32.c?rev=26… ============================================================================== --- trunk/reactos/ntoskrnl/ps/win32.c (original) +++ trunk/reactos/ntoskrnl/ps/win32.c Wed May 9 04:29:38 2007 @@ -20,6 +20,7 @@ extern PKWIN32_PARSEMETHOD_CALLOUT ExpWindowStationObjectParse; extern PKWIN32_DELETEMETHOD_CALLOUT ExpWindowStationObjectDelete; extern PKWIN32_DELETEMETHOD_CALLOUT ExpDesktopObjectDelete; +extern PKWIN32_POWEREVENT_CALLOUT PopEventCallout; /* PRIVATE FUNCTIONS *********************************************************/ @@ -112,6 +113,7 @@ ExpWindowStationObjectParse = CalloutData->WindowStationParseProcedure; ExpWindowStationObjectDelete = CalloutData->WindowStationDeleteProcedure; ExpDesktopObjectDelete = CalloutData->DesktopDeleteProcedure; + PopEventCallout = CalloutData->PowerEventCallout; } NTSTATUS

1 0

[ion] 26657: - Stripped down ntstrafe.h routines required for a future patch, and for basic functionality. Do not support any flags yet (and will ASSERT if attempt is made): RtlStringCbCopyA, RtlStringCbCatExA, RtlStringCbCopyExA, RtlStringCbPrintfExA, RtlStringCbPrintfA.
by ion＠svn.reactos.org 09 May '07

09 May '07

Author: ion Date: Wed May 9 04:06:18 2007 New Revision: 26657 URL: http://svn.reactos.org/svn/reactos?rev=26657&view=rev Log: - Stripped down ntstrafe.h routines required for a future patch, and for basic functionality. Do not support any flags yet (and will ASSERT if attempt is made): RtlStringCbCopyA, RtlStringCbCatExA, RtlStringCbCopyExA, RtlStringCbPrintfExA, RtlStringCbPrintfA. Added: trunk/reactos/include/ddk/ntstrsafe.h Modified: trunk/reactos/include/ddk/winddk.h Added: trunk/reactos/include/ddk/ntstrsafe.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/ntstrsafe.h?re… ============================================================================== --- trunk/reactos/include/ddk/ntstrsafe.h (added) +++ trunk/reactos/include/ddk/ntstrsafe.h Wed May 9 04:06:18 2007 @@ -1,0 +1,494 @@ +/* + * PROJECT: ReactOS Kernel + * LICENSE: GPL - See COPYING in the top level directory + * FILE: include/ddk/ntstrsafe.h + * PURPOSE: Safe String Library for NT Code (Native/Kernel) + * PROGRAMMERS: Alex Ionescu (alex.ionescu(a)reactos.org) + */ + +/* INCLUDES ******************************************************************/ + +#ifndef _NTSTRSAFE_H_INCLUDED_ +#define _NTSTRSAFE_H_INCLUDED_ + +// +// Dependencies +// +#include <stdio.h> +#include <string.h> +#include <stdarg.h> + +// +// Maximum limits: allow overriding the maximum +// +#ifndef NTSTRSAFE_MAX_CCH +#define NTSTRSAFE_MAX_CCH 2147483647 +#endif +#define NTSTRSAFE_MAX_LENGTH (NTSTRSAFE_MAX_CCH - 1) + +/* PRIVATE FUNCTIONS *********************************************************/ + +FORCEINLINE +NTSTATUS +NTAPI +RtlStringLengthWorkerA(IN PCHAR String, + IN SIZE_T MaxLength, + OUT PSIZE_T ReturnLength OPTIONAL) +{ + NTSTATUS Status = STATUS_SUCCESS; + SIZE_T LocalMax = MaxLength; + + while (MaxLength && (*String != ANSI_NULL)) + { + String++; + MaxLength--; + } + + if (!MaxLength) Status = STATUS_INVALID_PARAMETER; + + if (ReturnLength) + { + if (NT_SUCCESS(Status)) + { + *ReturnLength = LocalMax - MaxLength; + } + else + { + *ReturnLength = 0; + } + } + + return Status; +} + +FORCEINLINE +NTSTATUS +NTAPI +RtlStringValidateDestA(IN PCHAR Destination, + IN SIZE_T Length, + OUT PSIZE_T ReturnLength OPTIONAL, + IN SIZE_T MaxLength) +{ + NTSTATUS Status = STATUS_SUCCESS; + + if (!(Length) || (Length > MaxLength)) Status = STATUS_INVALID_PARAMETER; + + if (ReturnLength) + { + if (NT_SUCCESS(Status)) + { + Status = RtlStringLengthWorkerA(Destination, + Length, + ReturnLength); + } + else + { + *ReturnLength = 0; + } + } + + return Status; +} + +FORCEINLINE +NTSTATUS +NTAPI +RtlStringExValidateDestA(IN OUT PCHAR *Destination, + IN OUT PSIZE_T DestinationLength, + OUT PSIZE_T ReturnLength OPTIONAL, + IN SIZE_T MaxLength, + IN DWORD Flags) +{ + ASSERTMSG("We don't support Extended Flags yet!\n", Flags == 0); + return RtlStringValidateDestA(*Destination, + *DestinationLength, + ReturnLength, + MaxLength); +} + +FORCEINLINE +NTSTATUS +NTAPI +RtlStringExValidateSrcA(IN OUT PCCHAR *Source OPTIONAL, + IN OUT PSIZE_T ReturnLength OPTIONAL, + IN SIZE_T MaxLength, + IN DWORD Flags) +{ + NTSTATUS Status = STATUS_SUCCESS; + ASSERTMSG("We don't support Extended Flags yet!\n", Flags == 0); + + if ((ReturnLength) && (*ReturnLength >= MaxLength)) + { + Status = STATUS_INVALID_PARAMETER; + } + + return Status; +} + +FORCEINLINE +NTSTATUS +NTAPI +RtlStringVPrintfWorkerA(OUT PCHAR Destination, + IN SIZE_T Length, + OUT PSIZE_T NewLength OPTIONAL, + IN PCCHAR Format, + IN va_list argList) +{ + NTSTATUS Status = STATUS_SUCCESS; + ULONG Return; + SIZE_T MaxLength, LocalNewLength = 0; + + MaxLength = Length - 1; + + Return = _vsnprintf(Destination, MaxLength, Format, argList); + if ((Return < 0) || (Return > MaxLength)) + { + Destination += MaxLength; + *Destination = ANSI_NULL; + + LocalNewLength = MaxLength; + + Status = STATUS_BUFFER_OVERFLOW; + } + else if (Return == MaxLength) + { + Destination += MaxLength; + *Destination = ANSI_NULL; + + LocalNewLength = MaxLength; + } + else + { + LocalNewLength = Return; + } + + if (NewLength) *NewLength = LocalNewLength; + return Status; +} + +FORCEINLINE +NTSTATUS +NTAPI +RtlStringCopyWorkerA(OUT PCHAR Destination, + IN SIZE_T Length, + OUT PSIZE_T NewLength OPTIONAL, + IN PCCHAR Source, + IN SIZE_T CopyLength) +{ + NTSTATUS Status = STATUS_SUCCESS; + SIZE_T LocalNewLength = 0; + + while ((Length) && (CopyLength) && (*Source != ANSI_NULL)) + { + *Destination++ = *Source++; + Length--; + CopyLength--; + + LocalNewLength++; + } + + if (!Length) + { + Destination--; + LocalNewLength--; + + Status = STATUS_BUFFER_OVERFLOW; + } + + *Destination = ANSI_NULL; + + if (NewLength) *NewLength = LocalNewLength; + return Status; +} + +/* PUBLIC FUNCTIONS **********************************************************/ + +FORCEINLINE +NTSTATUS +NTAPI +RtlStringCbPrintfA(OUT PCHAR Destination, + IN SIZE_T Length, + IN PCHAR Format, + ...) +{ + NTSTATUS Status; + SIZE_T CharLength = Length / sizeof(CHAR); + va_list argList; + + Status = RtlStringValidateDestA(Destination, + CharLength, + NULL, + NTSTRSAFE_MAX_CCH); + if (NT_SUCCESS(Status)) + { + va_start(argList, Format); + Status = RtlStringVPrintfWorkerA(Destination, + CharLength, + NULL, + Format, + argList); + va_end(argList); + } + + return Status; +} + +FORCEINLINE +NTSTATUS +NTAPI +RtlStringCbPrintfExA(OUT PCHAR Destination, + IN SIZE_T Length, + OUT PCHAR *DestinationEnd OPTIONAL, + OUT PSIZE_T RemainingSize OPTIONAL, + IN DWORD Flags, + IN PCCHAR Format, + ...) +{ + NTSTATUS Status; + SIZE_T CharLength = Length / sizeof(CHAR), Remaining, LocalNewLength = 0; + PCHAR LocalDestinationEnd; + va_list argList; + ASSERTMSG("We don't support Extended Flags yet!\n", Flags == 0); + + Status = RtlStringExValidateDestA(&Destination, + &CharLength, + NULL, + NTSTRSAFE_MAX_CCH, + Flags); + if (NT_SUCCESS(Status)) + { + LocalDestinationEnd = Destination; + Remaining = CharLength; + + Status = RtlStringExValidateSrcA(&Format, + NULL, + NTSTRSAFE_MAX_CCH, + Flags); + if (NT_SUCCESS(Status)) + { + if (!Length) + { + if (*Format != ANSI_NULL) + { + if (!Destination) + { + Status = STATUS_INVALID_PARAMETER; + } + else + { + Status = STATUS_BUFFER_OVERFLOW; + } + } + } + else + { + va_start(argList, Format); + Status = RtlStringVPrintfWorkerA(Destination, + CharLength, + &LocalNewLength, + Format, + argList); + va_end(argList); + + LocalDestinationEnd = Destination + LocalNewLength; + Remaining = CharLength - LocalNewLength; + } + } + else + { + if (Length) *Destination = ANSI_NULL; + } + + if ((NT_SUCCESS(Status)) || (Status == STATUS_BUFFER_OVERFLOW)) + { + if (DestinationEnd) *DestinationEnd = LocalDestinationEnd; + + if (RemainingSize) + { + *RemainingSize = (Remaining * sizeof(CHAR)) + + (Length % sizeof(CHAR)); + } + } + } + + return Status; +} + +FORCEINLINE +NTSTATUS +NTAPI +RtlStringCbCopyExA(OUT PCHAR Destination, + IN SIZE_T Length, + IN PCCHAR Source, + OUT PCHAR *DestinationEnd OPTIONAL, + OUT PSIZE_T RemainingSize OPTIONAL, + IN DWORD Flags) +{ + NTSTATUS Status; + SIZE_T CharLength = Length / sizeof(CHAR), Copied = 0, Remaining; + PCHAR LocalDestinationEnd; + ASSERTMSG("We don't support Extended Flags yet!\n", Flags == 0); + + Status = RtlStringExValidateDestA(&Destination, + &Length, + NULL, + NTSTRSAFE_MAX_CCH, + Flags); + if (NT_SUCCESS(Status)) + { + LocalDestinationEnd = Destination; + Remaining = CharLength; + + Status = RtlStringExValidateSrcA(&Source, + NULL, + NTSTRSAFE_MAX_CCH, + Flags); + if (NT_SUCCESS(Status)) + { + if (!CharLength) + { + if (*Source != ANSI_NULL) + { + if (!Destination) + { + Status = STATUS_INVALID_PARAMETER; + } + else + { + Status = STATUS_BUFFER_OVERFLOW; + } + } + } + else + { + Status = RtlStringCopyWorkerA(Destination, + CharLength, + &Copied, + Source, + NTSTRSAFE_MAX_LENGTH); + + LocalDestinationEnd = Destination + Copied; + Remaining = CharLength - Copied; + } + } + else + { + if (CharLength) *Destination = ANSI_NULL; + } + + if ((NT_SUCCESS(Status)) || (Status == STATUS_BUFFER_OVERFLOW)) + { + if (DestinationEnd) *DestinationEnd = LocalDestinationEnd; + + if (RemainingSize) + { + *RemainingSize = (Remaining * sizeof(CHAR)) + + (Length % sizeof(CHAR)); + } + } + } + + return Status; +} + +FORCEINLINE +NTSTATUS +NTAPI +RtlStringCbCatExA(IN OUT PCHAR Destination, + IN SIZE_T Length, + IN PCCHAR Source, + OUT PCHAR *DestinationEnd OPTIONAL, + OUT PSIZE_T RemainingSize OPTIONAL, + IN DWORD Flags) +{ + NTSTATUS Status; + SIZE_T CharLength = Length / sizeof(CHAR); + SIZE_T DestinationLength, Remaining, Copied = 0; + PCHAR LocalDestinationEnd; + ASSERTMSG("We don't support Extended Flags yet!\n", Flags == 0); + + Status = RtlStringExValidateDestA(&Destination, + &CharLength, + &DestinationLength, + NTSTRSAFE_MAX_CCH, + Flags); + if (NT_SUCCESS(Status)) + { + LocalDestinationEnd = Destination + DestinationLength; + Remaining = CharLength - DestinationLength; + + Status = RtlStringExValidateSrcA(&Source, + NULL, + NTSTRSAFE_MAX_CCH, + Flags); + if (NT_SUCCESS(Status)) + { + if (Remaining <= 1) + { + if (*Source != ANSI_NULL) + { + if (!Destination) + { + Status = STATUS_INVALID_PARAMETER; + } + else + { + Status = STATUS_BUFFER_OVERFLOW; + } + } + } + else + { + Status = RtlStringCopyWorkerA(LocalDestinationEnd, + Remaining, + &Copied, + Source, + NTSTRSAFE_MAX_LENGTH); + + LocalDestinationEnd = LocalDestinationEnd + Copied; + Remaining = Remaining - Copied; + } + } + + if ((NT_SUCCESS(Status)) || (Status == STATUS_BUFFER_OVERFLOW)) + { + if (DestinationEnd) *DestinationEnd = LocalDestinationEnd; + + if (RemainingSize) + { + *RemainingSize = (Remaining * sizeof(CHAR)) + + (Length % sizeof(CHAR)); + } + } + } + + return Status; +} + +FORCEINLINE +NTSTATUS +NTAPI +RtlStringCbCopyA(OUT PCHAR Destination, + IN SIZE_T Length, + IN PCCHAR Source) +{ + NTSTATUS Status; + SIZE_T CharLength = Length / sizeof(CHAR); + + Status = RtlStringValidateDestA(Destination, + CharLength, + NULL, + NTSTRSAFE_MAX_CCH); + if (NT_SUCCESS(Status)) + { + Status = RtlStringCopyWorkerA(Destination, + CharLength, + NULL, + Source, + NTSTRSAFE_MAX_LENGTH); + } + + return Status; +} + +#endif Modified: trunk/reactos/include/ddk/winddk.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/winddk.h?rev=2… ============================================================================== --- trunk/reactos/include/ddk/winddk.h (original) +++ trunk/reactos/include/ddk/winddk.h Wed May 9 04:06:18 2007 @@ -227,6 +227,8 @@ #define DPFLTR_TRACE_LEVEL 2 #define DPFLTR_INFO_LEVEL 3 #define DPFLTR_MASK 0x80000000 + +#define DPFLTR_PREFETCHER_ID 63 #define MAXIMUM_PROCESSORS 32

1 0

[ion] 26656: - Buildno now generates a KERNEL_VERSION_BUILD_HEX ULONG containing the SVN revision.
by ion＠svn.reactos.org 08 May '07

08 May '07

Author: ion Date: Wed May 9 03:00:35 2007 New Revision: 26656 URL: http://svn.reactos.org/svn/reactos?rev=26656&view=rev Log: - Buildno now generates a KERNEL_VERSION_BUILD_HEX ULONG containing the SVN revision. Modified: trunk/reactos/tools/buildno/buildno.cpp Modified: trunk/reactos/tools/buildno/buildno.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/buildno/buildno.cpp?… ============================================================================== --- trunk/reactos/tools/buildno/buildno.cpp (original) +++ trunk/reactos/tools/buildno/buildno.cpp Wed May 9 03:00:35 2007 @@ -63,124 +63,6 @@ for( i = 0; str[i]; i++ ); return i; -} - -void -write_h (int build, char *buildstr) -{ - FILE *h = NULL; - char* s; - char* s1; - unsigned int length; - int dllversion = KERNEL_VERSION_MAJOR + 42; - - s1 = s = (char *) malloc(256 * 1024); - - s = s + sprintf (s, "/* Do not edit - Machine generated */\n"); - - s = s + sprintf (s, "#ifndef _INC_REACTOS_BUILDNO\n" ); - s = s + sprintf (s, "#define _INC_REACTOS_BUILDNO\n" ); - - s = s + sprintf (s, "#define KERNEL_VERSION_BUILD\t%d\n", build); - s = s + sprintf (s, "#define KERNEL_VERSION_BUILD_STR\t\"%s\"\n", buildstr); - s = s + sprintf (s, "#define KERNEL_VERSION_BUILD_RC\t\"%s\\0\"\n", buildstr); - s = s + sprintf (s, "#define KERNEL_RELEASE_RC\t\"%d.%d", - KERNEL_VERSION_MAJOR, KERNEL_VERSION_MINOR); - if (0 != KERNEL_VERSION_PATCH_LEVEL) - { - s = s + sprintf (s, ".%d", KERNEL_VERSION_PATCH_LEVEL); - } - s = s + sprintf (s, "-%s\\0\"\n", kernel_version_build_type); - s = s + sprintf (s, "#define KERNEL_RELEASE_STR\t\"%d.%d", - KERNEL_VERSION_MAJOR, - KERNEL_VERSION_MINOR); - if (0 != KERNEL_VERSION_PATCH_LEVEL) - { - s = s + sprintf (s, ".%d", KERNEL_VERSION_PATCH_LEVEL); - } - s = s + sprintf (s, "-%s\"\n", kernel_version_build_type); - s = s + sprintf (s, "#define KERNEL_VERSION_RC\t\"%d.%d", - KERNEL_VERSION_MAJOR, - KERNEL_VERSION_MINOR); - if (0 != KERNEL_VERSION_PATCH_LEVEL) - { - s = s + sprintf (s, ".%d", KERNEL_VERSION_PATCH_LEVEL); - } - s = s + sprintf (s, "-%s\\0\"\n", kernel_version_build_type); - s = s + sprintf (s, "#define KERNEL_VERSION_STR\t\"%d.%d", - KERNEL_VERSION_MAJOR, - KERNEL_VERSION_MINOR); - if (0 != KERNEL_VERSION_PATCH_LEVEL) - { - s = s + sprintf (s, ".%d", KERNEL_VERSION_PATCH_LEVEL); - } - s = s + sprintf (s, "-%s\"\n", kernel_version_build_type); - s = s + sprintf (s, "#define REACTOS_DLL_VERSION_MAJOR\t%d\n", dllversion); - s = s + sprintf (s, "#define REACTOS_DLL_RELEASE_RC\t\"%d.%d", - dllversion, KERNEL_VERSION_MINOR); - if (0 != KERNEL_VERSION_PATCH_LEVEL) - { - s = s + sprintf (s, ".%d", KERNEL_VERSION_PATCH_LEVEL); - } - s = s + sprintf (s, "-%s\\0\"\n", kernel_version_build_type); - s = s + sprintf (s, "#define REACTOS_DLL_RELEASE_STR\t\"%d.%d", - dllversion, - KERNEL_VERSION_MINOR); - if (0 != KERNEL_VERSION_PATCH_LEVEL) - { - s = s + sprintf (s, ".%d", KERNEL_VERSION_PATCH_LEVEL); - } - s = s + sprintf (s, "-%s\"\n", kernel_version_build_type); - s = s + sprintf (s, "#define REACTOS_DLL_VERSION_RC\t\"%d.%d", - dllversion, - KERNEL_VERSION_MINOR); - if (0 != KERNEL_VERSION_PATCH_LEVEL) - { - s = s + sprintf (s, ".%d", KERNEL_VERSION_PATCH_LEVEL); - } - s = s + sprintf (s, "-%s\\0\"\n", kernel_version_build_type); - s = s + sprintf (s, "#define REACTOS_DLL_VERSION_STR\t\"%d.%d", - dllversion, - KERNEL_VERSION_MINOR); - if (0 != KERNEL_VERSION_PATCH_LEVEL) - { - s = s + sprintf (s, ".%d", KERNEL_VERSION_PATCH_LEVEL); - } - s = s + sprintf (s, "-%s\"\n", kernel_version_build_type); - s = s + sprintf (s, "#endif\n/* EOF */\n"); - - h = fopen (filename, "wb"); - if (h != NULL) - { - fseek(h, 0, SEEK_END); - length = ftell(h); - if (length == strlen(s1)) - { - char* orig; - - orig = (char *) malloc(length); - fseek(h, 0, SEEK_SET); - fread(orig, 1, length, h); - if (memcmp(s1, orig, length) == 0) - { - fclose(h); - return; - } - } - fclose(h); - } - - h = fopen (filename, "wb"); - if (!h) - { - fprintf (stderr, - "%s: can not create file \"%s\"!\n", - argv0, - filename); - return; - } - fwrite(s1, 1, strlen(s1), h); - fclose (h); } char * @@ -278,6 +160,124 @@ return Unknown; } +void +write_h (int build, char *buildstr) +{ + FILE *h = NULL; + char* s; + char* s1; + unsigned int length; + int dllversion = KERNEL_VERSION_MAJOR + 42; + + s1 = s = (char *) malloc(256 * 1024); + + s = s + sprintf (s, "/* Do not edit - Machine generated */\n"); + + s = s + sprintf (s, "#ifndef _INC_REACTOS_BUILDNO\n" ); + s = s + sprintf (s, "#define _INC_REACTOS_BUILDNO\n" ); + + s = s + sprintf (s, "#define KERNEL_VERSION_BUILD\t%d\n", build); + s = s + sprintf (s, "#define KERNEL_VERSION_BUILD_HEX\t0x%x\n", atoi(GetRev())); + s = s + sprintf (s, "#define KERNEL_VERSION_BUILD_STR\t\"%s\"\n", buildstr); + s = s + sprintf (s, "#define KERNEL_VERSION_BUILD_RC\t\"%s\\0\"\n", buildstr); + s = s + sprintf (s, "#define KERNEL_RELEASE_RC\t\"%d.%d", + KERNEL_VERSION_MAJOR, KERNEL_VERSION_MINOR); + if (0 != KERNEL_VERSION_PATCH_LEVEL) + { + s = s + sprintf (s, ".%d", KERNEL_VERSION_PATCH_LEVEL); + } + s = s + sprintf (s, "-%s\\0\"\n", kernel_version_build_type); + s = s + sprintf (s, "#define KERNEL_RELEASE_STR\t\"%d.%d", + KERNEL_VERSION_MAJOR, + KERNEL_VERSION_MINOR); + if (0 != KERNEL_VERSION_PATCH_LEVEL) + { + s = s + sprintf (s, ".%d", KERNEL_VERSION_PATCH_LEVEL); + } + s = s + sprintf (s, "-%s\"\n", kernel_version_build_type); + s = s + sprintf (s, "#define KERNEL_VERSION_RC\t\"%d.%d", + KERNEL_VERSION_MAJOR, + KERNEL_VERSION_MINOR); + if (0 != KERNEL_VERSION_PATCH_LEVEL) + { + s = s + sprintf (s, ".%d", KERNEL_VERSION_PATCH_LEVEL); + } + s = s + sprintf (s, "-%s\\0\"\n", kernel_version_build_type); + s = s + sprintf (s, "#define KERNEL_VERSION_STR\t\"%d.%d", + KERNEL_VERSION_MAJOR, + KERNEL_VERSION_MINOR); + if (0 != KERNEL_VERSION_PATCH_LEVEL) + { + s = s + sprintf (s, ".%d", KERNEL_VERSION_PATCH_LEVEL); + } + s = s + sprintf (s, "-%s\"\n", kernel_version_build_type); + s = s + sprintf (s, "#define REACTOS_DLL_VERSION_MAJOR\t%d\n", dllversion); + s = s + sprintf (s, "#define REACTOS_DLL_RELEASE_RC\t\"%d.%d", + dllversion, KERNEL_VERSION_MINOR); + if (0 != KERNEL_VERSION_PATCH_LEVEL) + { + s = s + sprintf (s, ".%d", KERNEL_VERSION_PATCH_LEVEL); + } + s = s + sprintf (s, "-%s\\0\"\n", kernel_version_build_type); + s = s + sprintf (s, "#define REACTOS_DLL_RELEASE_STR\t\"%d.%d", + dllversion, + KERNEL_VERSION_MINOR); + if (0 != KERNEL_VERSION_PATCH_LEVEL) + { + s = s + sprintf (s, ".%d", KERNEL_VERSION_PATCH_LEVEL); + } + s = s + sprintf (s, "-%s\"\n", kernel_version_build_type); + s = s + sprintf (s, "#define REACTOS_DLL_VERSION_RC\t\"%d.%d", + dllversion, + KERNEL_VERSION_MINOR); + if (0 != KERNEL_VERSION_PATCH_LEVEL) + { + s = s + sprintf (s, ".%d", KERNEL_VERSION_PATCH_LEVEL); + } + s = s + sprintf (s, "-%s\\0\"\n", kernel_version_build_type); + s = s + sprintf (s, "#define REACTOS_DLL_VERSION_STR\t\"%d.%d", + dllversion, + KERNEL_VERSION_MINOR); + if (0 != KERNEL_VERSION_PATCH_LEVEL) + { + s = s + sprintf (s, ".%d", KERNEL_VERSION_PATCH_LEVEL); + } + s = s + sprintf (s, "-%s\"\n", kernel_version_build_type); + s = s + sprintf (s, "#endif\n/* EOF */\n"); + + h = fopen (filename, "wb"); + if (h != NULL) + { + fseek(h, 0, SEEK_END); + length = ftell(h); + if (length == strlen(s1)) + { + char* orig; + + orig = (char *) malloc(length); + fseek(h, 0, SEEK_SET); + fread(orig, 1, length, h); + if (memcmp(s1, orig, length) == 0) + { + fclose(h); + return; + } + } + fclose(h); + } + + h = fopen (filename, "wb"); + if (!h) + { + fprintf (stderr, + "%s: can not create file \"%s\"!\n", + argv0, + filename); + return; + } + fwrite(s1, 1, strlen(s1), h); + fclose (h); +} void usage (void)

1 0

[ekohl] 26655: Save user cursor schemes using the environment variables SystemRoot, USERPROFILE or ProgramFiles in the cursor paths instead of absolute paths.
by ekohl＠svn.reactos.org 08 May '07

08 May '07

Author: ekohl Date: Wed May 9 02:13:18 2007 New Revision: 26655 URL: http://svn.reactos.org/svn/reactos?rev=26655&view=rev Log: Save user cursor schemes using the environment variables SystemRoot, USERPROFILE or ProgramFiles in the cursor paths instead of absolute paths. Modified: trunk/reactos/dll/cpl/main/mouse.c Modified: trunk/reactos/dll/cpl/main/mouse.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/main/mouse.c?rev=2… ============================================================================== --- trunk/reactos/dll/cpl/main/mouse.c (original) +++ trunk/reactos/dll/cpl/main/mouse.c Wed May 9 02:13:18 2007 @@ -424,6 +424,42 @@ } +static VOID +CompressPath(LPTSTR lpShortPath, LPTSTR lpPath) +{ + TCHAR szUserProfile[MAX_PATH]; + TCHAR szSystemRoot[MAX_PATH]; + TCHAR szProgramFiles[MAX_PATH]; + DWORD dwUserProfile; + DWORD dwSystemRoot; + DWORD dwProgramFiles; + + dwUserProfile = GetEnvironmentVariable(_T("USERPROFILE"), szUserProfile, MAX_PATH); + dwSystemRoot = GetEnvironmentVariable(_T("SystemRoot"), szSystemRoot, MAX_PATH); + dwProgramFiles = GetEnvironmentVariable(_T("ProgramFiles"), szProgramFiles, MAX_PATH); + + if (dwUserProfile > 0 && _tcsncmp(lpPath, szUserProfile, dwUserProfile) == 0) + { + _tcscpy(lpShortPath, _T("%USERPROFILE%")); + _tcscat(lpShortPath, &lpPath[dwUserProfile]); + } + else if (dwSystemRoot > 0 && _tcsncmp(lpPath, szSystemRoot, dwSystemRoot) == 0) + { + _tcscpy(lpShortPath, _T("%SystemRoot%")); + _tcscat(lpShortPath, &lpPath[dwSystemRoot]); + } + else if (dwProgramFiles > 0 && _tcsncmp(lpPath, szProgramFiles, dwProgramFiles) == 0) + { + _tcscpy(lpShortPath, _T("%ProgramFiles%")); + _tcscat(lpShortPath, &lpPath[dwProgramFiles]); + } + else + { + _tcscpy(lpShortPath, lpPath); + } +} + + static BOOL EnumerateCursorSchemes(HWND hwndDlg) { @@ -433,6 +469,7 @@ DWORD dwValueName; TCHAR szSystemScheme[MAX_PATH]; TCHAR szValueData[2000]; + TCHAR szTempData[2000]; DWORD dwValueData; LONG lError; HWND hDlgCtrl; @@ -446,6 +483,50 @@ 0, KEY_READ | KEY_QUERY_VALUE , &hCursorKey); if (lError == ERROR_SUCCESS) { + for (dwIndex = 0;; dwIndex++) + { + dwValueName = sizeof(szValueName) / sizeof(TCHAR); + dwValueData = sizeof(szValueData) / sizeof(TCHAR); + lError = RegEnumValue(hCursorKey, dwIndex, szValueName, &dwValueName, + NULL, NULL, (LPBYTE)szValueData, &dwValueData); + if (lError == ERROR_NO_MORE_ITEMS) + break; + + ExpandEnvironmentStrings(szValueData, szTempData, 2000); + + if (_tcslen(szTempData) > 0) + { + LPTSTR lpCopy, lpStart; + + /* Remove quotation marks */ + if (szTempData[0] == _T('"')) + { + lpStart = szValueData + 1; + szTempData[_tcslen(szTempData) - 1] = 0; + } + else + { + lpStart = szTempData; + } + + lpCopy = _tcsdup(lpStart); + + lResult = SendMessage(hDlgCtrl, CB_ADDSTRING, (WPARAM)0, (LPARAM)szValueName); + SendMessage(hDlgCtrl, CB_SETITEMDATA, (WPARAM)lResult, (LPARAM)lpCopy); + } + } + + RegCloseKey(hCursorKey); + } + + /* Read the system cursor schemes */ + lError = RegOpenKeyEx(HKEY_LOCAL_MACHINE, + _T("SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Control Panel\\Cursors\\Schemes"), + 0, KEY_READ | KEY_QUERY_VALUE , &hCursorKey); + if (lError == ERROR_SUCCESS) + { + LoadString(hApplet, IDS_SYSTEM_SCHEME, szSystemScheme, MAX_PATH); + for (dwIndex = 0;; dwIndex++) { dwValueName = sizeof(szValueName) / sizeof(TCHAR); @@ -472,48 +553,6 @@ lpCopy = _tcsdup(lpStart); - lResult = SendMessage(hDlgCtrl, CB_ADDSTRING, (WPARAM)0, (LPARAM)szValueName); - SendMessage(hDlgCtrl, CB_SETITEMDATA, (WPARAM)lResult, (LPARAM)lpCopy); - } - } - - RegCloseKey(hCursorKey); - } - - /* Read the system cursor schemes */ - lError = RegOpenKeyEx(HKEY_LOCAL_MACHINE, - _T("SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Control Panel\\Cursors\\Schemes"), - 0, KEY_READ | KEY_QUERY_VALUE , &hCursorKey); - if (lError == ERROR_SUCCESS) - { - LoadString(hApplet, IDS_SYSTEM_SCHEME, szSystemScheme, MAX_PATH); - - for (dwIndex = 0;; dwIndex++) - { - dwValueName = sizeof(szValueName) / sizeof(TCHAR); - dwValueData = sizeof(szValueData) / sizeof(TCHAR); - lError = RegEnumValue(hCursorKey, dwIndex, szValueName, &dwValueName, - NULL, NULL, (LPBYTE)szValueData, &dwValueData); - if (lError == ERROR_NO_MORE_ITEMS) - break; - - if (_tcslen(szValueData) > 0) - { - LPTSTR lpCopy, lpStart; - - /* Remove quotation marks */ - if (szValueData[0] == _T('"')) - { - lpStart = szValueData + 1; - szValueData[_tcslen(szValueData) - 1] = 0; - } - else - { - lpStart = szValueData; - } - - lpCopy = _tcsdup(lpStart); - _tcscat(szValueName, TEXT(" ")); _tcscat(szValueName, szSystemScheme); @@ -661,6 +700,7 @@ TCHAR szSystemScheme[MAX_PATH]; TCHAR szSchemeName[MAX_PATH]; TCHAR szNewSchemeName[MAX_PATH]; + TCHAR szTempPath[MAX_PATH]; TCHAR szTitle[128]; TCHAR szText[256]; INT nSel; @@ -739,9 +779,10 @@ for (index = IDS_ARROW, i = 0; index <= IDS_HAND; index++, i++) { + CompressPath(szTempPath, g_CursorData[i].szCursorPath); if (i > 0) _tcscat(lpSchemeData, _T(",")); - _tcscat(lpSchemeData, g_CursorData[i].szCursorPath); + _tcscat(lpSchemeData, szTempPath); } if (RegOpenCurrentUser(KEY_READ | KEY_SET_VALUE, &hCuKey) != ERROR_SUCCESS) @@ -753,8 +794,9 @@ return FALSE; } - lError = RegSetValueEx(hCuCursorKey, szNewSchemeName, 0, REG_EXPAND_SZ, - (LPBYTE)lpSchemeData, nLength * sizeof(TCHAR)); + lError = RegSetValueEx(hCuCursorKey, szNewSchemeName, 0, + REG_EXPAND_SZ, (LPBYTE)lpSchemeData, + (_tcslen(lpSchemeData) + 1) * sizeof(TCHAR)); RegCloseKey(hCuCursorKey); RegCloseKey(hCuKey); @@ -1080,6 +1122,7 @@ { TCHAR szSchemeName[MAX_PATH]; TCHAR szSystemScheme[MAX_PATH]; + TCHAR szTempPath[MAX_PATH]; LPTSTR lpSchemeData; DWORD dwNameLength; DWORD dwSchemeSource; @@ -1131,9 +1174,10 @@ for (index = IDS_ARROW, i = 0; index <= IDS_HAND; index++, i++) { + CompressPath(szTempPath, g_CursorData[i].szCursorPath); RegSetValueEx(hCursorKey, g_CursorData[i].lpValueName, 0, - REG_EXPAND_SZ, (LPBYTE)g_CursorData[i].szCursorPath, - (_tcslen(g_CursorData[i].szCursorPath) + 1) * sizeof(TCHAR)); + REG_EXPAND_SZ, (LPBYTE)szTempPath, + (_tcslen(szTempPath) + 1) * sizeof(TCHAR)); } RegCloseKey(hCursorKey);

1 0

[ion] 26654: - Fix broken definition of IsBoostAllowed which would cause ERESOURCE boosts to be applied backwards. - Use cleaner, inlined definitions for ExAcquire/ReleaseResourceLock. - Convert ERESOURCE code to use a Queued In-Stack Spinlock instead of a regular spinlock. - Force usage of the spinlock instead of cli/sti for DBG builds, and enable strict sanity checks. - Fix incorrect check in ExpCheckForApcsDisabled. - Properly handle memory starvation in the contended path. - Make sure to all
by ion＠svn.reactos.org 08 May '07

08 May '07

Author: ion Date: Wed May 9 01:35:10 2007 New Revision: 26654 URL: http://svn.reactos.org/svn/reactos?rev=26654&view=rev Log: - Fix broken definition of IsBoostAllowed which would cause ERESOURCE boosts to be applied backwards. - Use cleaner, inlined definitions for ExAcquire/ReleaseResourceLock. - Convert ERESOURCE code to use a Queued In-Stack Spinlock instead of a regular spinlock. - Force usage of the spinlock instead of cli/sti for DBG builds, and enable strict sanity checks. - Fix incorrect check in ExpCheckForApcsDisabled. - Properly handle memory starvation in the contended path. - Make sure to allocate a semaphore if needed during ExAcquireSharedStarveExclusive. - Fix multiple bugs in ExIsResourceAcquiredSharedLite. - ExReleaseResourceForThreadLite didn't always properly set the ResourceOwnedExclusive flag, and didn't validate ownership. - ExSetResourceOwnerPointer wouldn't set the owner if there wasn't one already. Modified: trunk/reactos/ntoskrnl/ex/resource.c trunk/reactos/ntoskrnl/include/internal/ex.h Modified: trunk/reactos/ntoskrnl/ex/resource.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/resource.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/ex/resource.c (original) +++ trunk/reactos/ntoskrnl/ex/resource.c Wed May 9 01:35:10 2007 @@ -1,19 +1,17 @@ /* - * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS Kernel + * LICENSE: GPL - See COPYING in the top level directory * FILE: ntoskrnl/ex/resource.c - * PURPOSE: ERESOURCE Implementation - * PROGRAMMERS: Alex Ionescu (alex(a)relsoft.net) + * PURPOSE: Executive Resource Implementation + * PROGRAMMERS: Alex Ionescu (alex.ionescu(a)reactos.org) */ -/* WARNING: +/* + * WARNING: * This implementation is the Windows NT 5.x one. - * NT 6.0 beta has optimized the OwnerThread entry array - * and the internals of ExpFindEntryForThread and ExpFindFreeEntry - * need to be modified accordingly in order to support the WDK. - * These changes will not be made here until NT 6.0 reaches RTM status since - * there is a possibility that they will be removed; as such, do NOT - * update ERESOURCE/relevant code to the WDK definition. + * Vista has optimized the OwnerThread entry array and the internals of + * ExpFindEntryForThread and ExpFindFreeEntry probably need to be modified + * accordingly in order to support the WDK. */ /* INCLUDES *****************************************************************/ @@ -26,15 +24,65 @@ #define IsExclusiveWaiting(r) (r->NumberOfExclusiveWaiters) #define IsSharedWaiting(r) (r->NumberOfSharedWaiters) #define IsOwnedExclusive(r) (r->Flag & ResourceOwnedExclusive) -#define IsBoostAllowed(r) (r->Flag & ResourceHasDisabledPriorityBoost) +#define IsBoostAllowed(r) (!(r->Flag & ResourceHasDisabledPriorityBoost)) + +#if (!(defined(CONFIG_SMP)) && !(defined(DBG))) + +VOID +FORCEINLINE +ExAcquireResourceLock(IN PERESOURCE_XP Resource, + IN PKLOCK_QUEUE_HANDLE LockHandle) +{ + UNREFERENCED_PARAMETER(Resource); + UNREFERENCED_PARAMETER(LockHandle); + + /* Simply disable interrupts */ + _disable(); +} + +VOID +FORCEINLINE +ExReleaseResourceLock(IN PERESOURCE_XP Resource, + IN PKLOCK_QUEUE_HANDLE LockHandle) +{ + UNREFERENCED_PARAMETER(Resource); + UNREFERENCED_PARAMETER(LockHandle); + + /* Simply enable interrupts */ + _disable(); +} + +#else + +VOID +FORCEINLINE +ExAcquireResourceLock(IN PERESOURCE_XP Resource, + IN PKLOCK_QUEUE_HANDLE LockHandle) +{ + /* Acquire the lock */ + KeAcquireInStackQueuedSpinLock(&Resource->SpinLock, LockHandle); +} + +VOID +FORCEINLINE +ExReleaseResourceLock(IN PERESOURCE_XP Resource, + IN PKLOCK_QUEUE_HANDLE LockHandle) +{ + UNREFERENCED_PARAMETER(Resource); + + /* Release the lock */ + KeReleaseInStackQueuedSpinLock(LockHandle); +} +#endif /* DATA***********************************************************************/ +LARGE_INTEGER ExShortTime = {{-100000, -1}}; LARGE_INTEGER ExpTimeout; ULONG ExpResourceTimeoutCount = 90 * 3600 / 2; KSPIN_LOCK ExpResourceSpinLock; LIST_ENTRY ExpSystemResourcesList; -BOOLEAN ExResourceStrict = FALSE; /* FIXME */ +BOOLEAN ExResourceStrict = TRUE; /* PRIVATE FUNCTIONS *********************************************************/ @@ -74,8 +122,8 @@ * The ExpCheckForApcsDisabled routine checks if Kernel APCs are still * enabled when they should be disabled, and optionally breakpoints. * - * @param BreakIfTrue - * Specifies if we should break if an invalid APC State is detected. + * @param Irql + * Specifies the IRQL during the acquire attempt. * * @param Resource * Pointer to the resource being checked. @@ -90,15 +138,15 @@ *--*/ VOID NTAPI -ExpCheckForApcsDisabled(IN BOOLEAN BreakIfTrue, +ExpCheckForApcsDisabled(IN KIRQL Irql, IN PERESOURCE_XP Resource, - IN PETHREAD Thread) + IN PKTHREAD Thread) { /* Check if we should care and check if we should break */ if ((ExResourceStrict) && - (BreakIfTrue) && - !(Thread->SystemThread) && - !(Thread->Tcb.CombinedApcDisable)) + (Irql >= APC_LEVEL) && + !(((PETHREAD)Thread)->SystemThread) && + !(Thread->CombinedApcDisable)) { /* Bad! */ DPRINT1("EX: resource: APCs still enabled before resource %p acquire " @@ -143,8 +191,8 @@ * @param Resource * Pointer to the resource. * - * @param OldIrql - * Pointer to current IRQL. TBC: Pointer to in-stack queued spinlock. + * @param LockHandle + * Pointer to in-stack queued spinlock. * * @return None. * @@ -154,33 +202,44 @@ VOID NTAPI ExpAllocateExclusiveWaiterEvent(IN PERESOURCE_XP Resource, - IN PKIRQL OldIrql) + IN PKLOCK_QUEUE_HANDLE LockHandle) { PKEVENT Event; /* Release the lock */ - ExReleaseResourceLock(&Resource->SpinLock, *OldIrql); - - /* Allocate the event */ - Event = ExAllocatePoolWithTag(NonPagedPool, - sizeof(KEVENT), - TAG_RESOURCE_EVENT); - - /* Initialize it */ - KeInitializeEvent(Event, SynchronizationEvent, FALSE); - - /* Set it */ - if (InterlockedCompareExchangePointer(&Resource->ExclusiveWaiters, - Event, - NULL)) - { - /* Someone already set it, free our event */ - DPRINT1("WARNING: Handling race condition\n"); - ExFreePool(Event); - } + ExReleaseResourceLock(Resource, LockHandle); + + /* Loop as long as we keep running out of memory */ + do + { + /* Allocate the event */ + Event = ExAllocatePoolWithTag(NonPagedPool, + sizeof(KEVENT), + TAG_RESOURCE_EVENT); + if (Event) + { + /* Initialize it */ + KeInitializeEvent(Event, SynchronizationEvent, FALSE); + + /* Set it */ + if (InterlockedCompareExchangePointer(&Resource->ExclusiveWaiters, + Event, + NULL)) + { + /* Someone already set it, free our event */ + DPRINT1("WARNING: Handling race condition\n"); + ExFreePool(Event); + } + + break; + } + + /* Wait a bit before trying again */ + KeDelayExecutionThread(KernelMode, FALSE, &ExShortTime); + } while (TRUE); /* Re-acquire the lock */ - ExAcquireResourceLock(&Resource->SpinLock, OldIrql); + ExAcquireResourceLock(Resource, LockHandle); } /*++ @@ -192,8 +251,8 @@ * @param Resource * Pointer to the resource. * - * @param OldIrql - * Pointer to current IRQL. TBC: Pointer to in-stack queued spinlock. + * @param LockHandle + * Pointer to in-stack queued spinlock. * * @return None. * @@ -203,33 +262,44 @@ VOID NTAPI ExpAllocateSharedWaiterSemaphore(IN PERESOURCE_XP Resource, - IN PKIRQL OldIrql) + IN PKLOCK_QUEUE_HANDLE LockHandle) { PKSEMAPHORE Semaphore; /* Release the lock */ - ExReleaseResourceLock(&Resource->SpinLock, *OldIrql); - - /* Allocate the semaphore */ - Semaphore = ExAllocatePoolWithTag(NonPagedPool, - sizeof(KSEMAPHORE), - TAG_RESOURCE_SEMAPHORE); - - /* Initialize it */ - KeInitializeSemaphore(Semaphore, 0, MAXLONG); - - /* Set it */ - if (InterlockedCompareExchangePointer(&Resource->SharedWaiters, - Semaphore, - NULL)) - { - /* Someone already set it, free our semaphore */ - DPRINT1("WARNING: Handling race condition\n"); - ExFreePool(Semaphore); - } + ExReleaseResourceLock(Resource, LockHandle); + + /* Loop as long as we keep running out of memory */ + do + { + /* Allocate the semaphore */ + Semaphore = ExAllocatePoolWithTag(NonPagedPool, + sizeof(KSEMAPHORE), + TAG_RESOURCE_SEMAPHORE); + if (Semaphore) + { + /* Initialize it */ + KeInitializeSemaphore(Semaphore, 0, MAXLONG); + + /* Set it */ + if (InterlockedCompareExchangePointer(&Resource->SharedWaiters, + Semaphore, + NULL)) + { + /* Someone already set it, free our semaphore */ + DPRINT1("WARNING: Handling race condition\n"); + ExFreePool(Semaphore); + } + + break; + } + + /* Wait a bit before trying again */ + KeDelayExecutionThread(KernelMode, FALSE, &ExShortTime); + } while (TRUE); /* Re-acquire the lock */ - ExAcquireResourceLock(&Resource->SpinLock, OldIrql); + ExAcquireResourceLock(Resource, LockHandle); } /*++ @@ -241,8 +311,8 @@ * @param Resource * Pointer to the resource. * - * @param OldIrql - * Pointer to current IRQL. TBC: Pointer to in-stack queued spinlock. + * @param LockHandle + * Pointer to in-stack queued spinlock. * * @return None. * @@ -252,12 +322,11 @@ VOID NTAPI ExpExpandResourceOwnerTable(IN PERESOURCE_XP Resource, - IN PKIRQL OldIrql) + IN PKLOCK_QUEUE_HANDLE LockHandle) { POWNER_ENTRY Owner, Table; - KIRQL OldIrql2; + KIRQL OldIrql; ULONG NewSize, OldSize; - DPRINT("ExpExpandResourceOwnerTable: %p\n", Resource); /* Get the owner table */ Owner = Resource->OwnerTable; @@ -275,7 +344,7 @@ } /* Release the lock */ - ExReleaseResourceLock(&Resource->SpinLock, *OldIrql); + ExReleaseResourceLock(Resource, LockHandle); /* Allocate memory for the table */ Table = ExAllocatePoolWithTag(NonPagedPool, @@ -287,38 +356,36 @@ (NewSize - OldSize) * sizeof(OWNER_ENTRY)); /* Lock the resource */ - ExAcquireResourceLock(&Resource->SpinLock, OldIrql); + ExAcquireResourceLock(Resource, LockHandle); /* Make sure nothing has changed */ if ((Owner != Resource->OwnerTable) || - ((Owner) && (OldSize != Resource->OwnerTable->TableSize))) + ((Owner) && (OldSize != Owner->TableSize))) { /* Resource changed while we weren't holding the lock; bail out */ - ExReleaseResourceLock(&Resource->SpinLock, *OldIrql); + ExReleaseResourceLock(Resource, LockHandle); ExFreePool(Table); } else { /* Copy the table */ - RtlCopyMemory(Table, - Owner, - OldSize * sizeof(OWNER_ENTRY)); + RtlCopyMemory(Table, Owner, OldSize * sizeof(OWNER_ENTRY)); /* Acquire dispatcher lock to prevent thread boosting */ - OldIrql2 = KiAcquireDispatcherLock(); + OldIrql = KiAcquireDispatcherLock(); /* Set the new table data */ Table->TableSize = NewSize; Resource->OwnerTable = Table; /* Release dispatcher lock */ - KiReleaseDispatcherLock(OldIrql2); + KiReleaseDispatcherLock(OldIrql); /* Sanity check */ ExpVerifyResource(Resource); /* Release lock */ - ExReleaseResourceLock(&Resource->SpinLock, *OldIrql); + ExReleaseResourceLock(Resource, LockHandle); /* Free the old table */ if (Owner) ExFreePool(Owner); @@ -331,7 +398,7 @@ KeGetCurrentThread()->ResourceIndex = (UCHAR)OldSize; /* Lock the resource again */ - ExAcquireResourceLock(&Resource->SpinLock, OldIrql); + ExAcquireResourceLock(Resource, LockHandle); } /*++ @@ -344,8 +411,8 @@ * @param Resource * Pointer to the resource. * - * @param OldIrql - * Pointer to current IRQL. TBC: Pointer to in-stack queued spinlock. + * @param LockHandle + * Pointer to in-stack queued spinlock. * * @return Pointer to an empty OWNER_ENTRY structure. * @@ -355,13 +422,13 @@ POWNER_ENTRY FASTCALL ExpFindFreeEntry(IN PERESOURCE_XP Resource, - IN PKIRQL OldIrql) + IN PKLOCK_QUEUE_HANDLE LockHandle) { POWNER_ENTRY Owner, Limit; POWNER_ENTRY FreeEntry = NULL; /* Sanity check */ - ASSERT(OldIrql != 0); + ASSERT(LockHandle != 0); ASSERT(Resource->OwnerThreads[0].OwnerThread != 0); /* Check if the next built-in entry is free */ @@ -385,9 +452,8 @@ if (!Owner->OwnerThread) { /* Update the resource entry and return it */ - KeGetCurrentThread()->ResourceIndex = (UCHAR)(Owner - - Resource-> - OwnerTable); + KeGetCurrentThread()->ResourceIndex = + (UCHAR)(Owner - Resource->OwnerTable); return Owner; } @@ -397,8 +463,7 @@ } /* No free entry, expand the table */ - ExpExpandResourceOwnerTable(Resource, OldIrql); - FreeEntry = NULL; + ExpExpandResourceOwnerTable(Resource, LockHandle); } /* Return the entry found */ @@ -418,8 +483,8 @@ * @param Thread * Pointer to the thread to find. * - * @param OldIrql - * Pointer to current IRQL. TBC: Pointer to in-stack queued spinlock. + * @param LockHandle + * Pointer to in-stack queued spinlock. * * @return Pointer to an empty OWNER_ENTRY structure. * @@ -430,7 +495,7 @@ FASTCALL ExpFindEntryForThread(IN PERESOURCE_XP Resource, IN ERESOURCE_THREAD Thread, - IN PKIRQL OldIrql) + IN PKLOCK_QUEUE_HANDLE LockHandle) { POWNER_ENTRY FreeEntry, Owner, Limit; @@ -456,9 +521,8 @@ if (Owner->OwnerThread == Thread) { /* We did, update the index and return it */ - KeGetCurrentThread()->ResourceIndex = (UCHAR)(Owner - - Resource-> - OwnerTable); + KeGetCurrentThread()->ResourceIndex = + (UCHAR)(Owner - Resource->OwnerTable); return Owner; } @@ -469,19 +533,19 @@ } /* Check if it's OK to do an expansion */ - if (!OldIrql) return NULL; + if (!LockHandle) return NULL; /* If we found a free entry by now, return it */ if (FreeEntry) { /* Set the resource index */ - KeGetCurrentThread()->ResourceIndex = (UCHAR)(FreeEntry - - Resource->OwnerTable); + KeGetCurrentThread()->ResourceIndex = + (UCHAR)(FreeEntry - Resource->OwnerTable); return FreeEntry; } /* No free entry, expand the table */ - ExpExpandResourceOwnerTable(Resource, OldIrql); + ExpExpandResourceOwnerTable(Resource, LockHandle); return NULL; } @@ -561,7 +625,7 @@ LARGE_INTEGER Timeout; PKTHREAD Thread, OwnerThread; #if DBG - KIRQL OldIrql; + KLOCK_QUEUE_HANDLE LockHandle; #endif /* Increase contention count and use a 5 second timeout */ @@ -588,7 +652,7 @@ WaitCount = 0; #if DBG /* Lock the resource */ - ExAcquireResourceLock(&Resource->SpinLock, &OldIrql); + ExAcquireResourceLock(Resource, &LockHandle); /* Dump debug information */ DPRINT1("Resource @ %lx\n", Resource); @@ -625,7 +689,7 @@ /* Break */ DbgBreakPoint(); DPRINT1("EX - Rewaiting\n"); - ExReleaseResourceLock(&Resource->SpinLock, OldIrql); + ExReleaseResourceLock(Resource, &LockHandle); #endif } @@ -709,10 +773,10 @@ *--*/ BOOLEAN NTAPI -ExAcquireResourceExclusiveLite(PERESOURCE resource, - BOOLEAN Wait) -{ - KIRQL OldIrql = PASSIVE_LEVEL; +ExAcquireResourceExclusiveLite(IN PERESOURCE resource, + IN BOOLEAN Wait) +{ + KLOCK_QUEUE_HANDLE LockHandle; ERESOURCE_THREAD Thread; BOOLEAN Success; PERESOURCE_XP Resource = (PERESOURCE_XP)resource; @@ -728,8 +792,8 @@ ExpVerifyResource(Resource); /* Acquire the lock */ - ExAcquireResourceLock(&Resource->SpinLock, &OldIrql); - ExpCheckForApcsDisabled(TRUE, Resource, (PETHREAD)Thread); + ExAcquireResourceLock(Resource, &LockHandle); + ExpCheckForApcsDisabled(LockHandle.OldIrql, Resource, (PKTHREAD)Thread); /* Check if there is a shared owner or exclusive owner */ TryAcquire: @@ -760,20 +824,19 @@ if (!Resource->ExclusiveWaiters) { /* It doesn't, allocate the event and try acquiring again */ - ExpAllocateExclusiveWaiterEvent(Resource, &OldIrql); + ExpAllocateExclusiveWaiterEvent(Resource, &LockHandle); goto TryAcquire; } - else - { - /* Has exclusive waiters, wait on it */ - Resource->NumberOfExclusiveWaiters++; - ExReleaseResourceLock(&Resource->SpinLock, OldIrql); - ExpWaitForResource(Resource, Resource->ExclusiveWaiters); - - /* Set owner and return success */ - Resource->OwnerThreads[0].OwnerThread = ExGetCurrentResourceThread(); - return TRUE; - } + + /* Has exclusive waiters, wait on it */ + Resource->NumberOfExclusiveWaiters++; + ExReleaseResourceLock(Resource, &LockHandle); + ExpWaitForResource(Resource, Resource->ExclusiveWaiters); + + /* Set owner and return success */ + Resource->OwnerThreads[0].OwnerThread = + ExGetCurrentResourceThread(); + return TRUE; } } } @@ -788,7 +851,7 @@ } /* Release the lock and return */ - ExReleaseResourceLock(&Resource->SpinLock, OldIrql); + ExReleaseResourceLock(Resource, &LockHandle); return Success; } @@ -824,10 +887,10 @@ *--*/ BOOLEAN NTAPI -ExAcquireResourceSharedLite(PERESOURCE resource, - BOOLEAN Wait) -{ - KIRQL OldIrql; +ExAcquireResourceSharedLite(IN PERESOURCE resource, + IN BOOLEAN Wait) +{ + KLOCK_QUEUE_HANDLE LockHandle; ERESOURCE_THREAD Thread; POWNER_ENTRY Owner; PERESOURCE_XP Resource = (PERESOURCE_XP)resource; @@ -840,8 +903,8 @@ ExpVerifyResource(Resource); /* Acquire the lock */ - ExAcquireResourceLock(&Resource->SpinLock, &OldIrql); - ExpCheckForApcsDisabled(TRUE, Resource, (PETHREAD)Thread); + ExAcquireResourceLock(Resource, &LockHandle); + ExpCheckForApcsDisabled(LockHandle.OldIrql, Resource, (PKTHREAD)Thread); /* See if nobody owns us */ TryAcquire: @@ -854,7 +917,7 @@ Resource->ActiveCount = 1; /* Release the lock and return */ - ExReleaseResourceLock(&Resource->SpinLock, OldIrql); + ExReleaseResourceLock(Resource, &LockHandle); return TRUE; } @@ -868,18 +931,18 @@ Resource->OwnerThreads[0].OwnerCount++; /* Release the lock and return */ - ExReleaseResourceLock(&Resource->SpinLock, OldIrql); + ExReleaseResourceLock(Resource, &LockHandle); return TRUE; } /* Find a free entry */ - Owner = ExpFindFreeEntry(Resource, &OldIrql); + Owner = ExpFindFreeEntry(Resource, &LockHandle); if (!Owner) goto TryAcquire; } else { /* Resource is shared, find who owns it */ - Owner = ExpFindEntryForThread(Resource, Thread, &OldIrql); + Owner = ExpFindEntryForThread(Resource, Thread, &LockHandle); if (!Owner) goto TryAcquire; /* Is it us? */ @@ -890,7 +953,7 @@ ASSERT(Owner->OwnerCount != 0); /* Release the lock and return */ - ExReleaseResourceLock(&Resource->SpinLock, OldIrql); + ExReleaseResourceLock(Resource, &LockHandle); return TRUE; } @@ -903,7 +966,7 @@ Resource->ActiveCount++; /* Release the lock and return */ - ExReleaseResourceLock(&Resource->SpinLock, OldIrql); + ExReleaseResourceLock(Resource, &LockHandle); return TRUE; } } @@ -912,7 +975,7 @@ if (!Wait) { /* Release the lock and return */ - ExReleaseResourceLock(&Resource->SpinLock, OldIrql); + ExReleaseResourceLock(Resource, &LockHandle); return FALSE; } @@ -920,7 +983,7 @@ if (!Resource->SharedWaiters) { /* Allocate it and try another acquire */ - ExpAllocateSharedWaiterSemaphore(Resource, &OldIrql); + ExpAllocateSharedWaiterSemaphore(Resource, &LockHandle); goto TryAcquire; } @@ -930,7 +993,7 @@ Resource->NumberOfSharedWaiters++; /* Release the lock and return */ - ExReleaseResourceLock(&Resource->SpinLock, OldIrql); + ExReleaseResourceLock(Resource, &LockHandle); ExpWaitForResource(Resource, Resource->SharedWaiters); return TRUE; } @@ -975,10 +1038,10 @@ *--*/ BOOLEAN NTAPI -ExAcquireSharedStarveExclusive(PERESOURCE resource, - BOOLEAN Wait) -{ - KIRQL OldIrql; +ExAcquireSharedStarveExclusive(IN PERESOURCE resource, + IN BOOLEAN Wait) +{ + KLOCK_QUEUE_HANDLE LockHandle; ERESOURCE_THREAD Thread; POWNER_ENTRY Owner; PERESOURCE_XP Resource = (PERESOURCE_XP)resource; @@ -991,7 +1054,7 @@ ExpVerifyResource(Resource); /* Acquire the lock */ - ExAcquireResourceLock(&Resource->SpinLock, &OldIrql); + ExAcquireResourceLock(Resource, &LockHandle); /* See if nobody owns us */ TryAcquire: @@ -1003,7 +1066,7 @@ Resource->OwnerThreads[1].OwnerCount = 1; /* Release the lock and return */ - ExReleaseResourceLock(&Resource->SpinLock, OldIrql); + ExReleaseResourceLock(Resource, &LockHandle); return TRUE; } @@ -1017,18 +1080,18 @@ Resource->OwnerThreads[0].OwnerCount++; /* Release the lock and return */ - ExReleaseResourceLock(&Resource->SpinLock, OldIrql); + ExReleaseResourceLock(Resource, &LockHandle); return TRUE; } /* Find a free entry */ - Owner = ExpFindFreeEntry(Resource, &OldIrql); + Owner = ExpFindFreeEntry(Resource, &LockHandle); if (!Owner) goto TryAcquire; } else { /* Resource is shared, find who owns it */ - Owner = ExpFindEntryForThread(Resource, Thread, &OldIrql); + Owner = ExpFindEntryForThread(Resource, Thread, &LockHandle); if (!Owner) goto TryAcquire; /* Is it us? */ @@ -1039,7 +1102,7 @@ ASSERT(Owner->OwnerCount != 0); /* Release the lock and return */ - ExReleaseResourceLock(&Resource->SpinLock, OldIrql); + ExReleaseResourceLock(Resource, &LockHandle); return TRUE; } @@ -1049,7 +1112,7 @@ Resource->ActiveCount++; /* Release the lock and return */ - ExReleaseResourceLock(&Resource->SpinLock, OldIrql); + ExReleaseResourceLock(Resource, &LockHandle); return TRUE; } @@ -1057,8 +1120,16 @@ if (!Wait) { /* Release the lock and return */ - ExReleaseResourceLock(&Resource->SpinLock, OldIrql); + ExReleaseResourceLock(Resource, &LockHandle); return TRUE; + } + + /* Check if we have a shared waiters semaphore */ + if (!Resource->SharedWaiters) + { + /* Allocate it and try another acquire */ + ExpAllocateSharedWaiterSemaphore(Resource, &LockHandle); + goto TryAcquire; } /* Now wait for the resource */ @@ -1067,7 +1138,7 @@ Resource->NumberOfSharedWaiters++; /* Release the lock and return */ - ExReleaseResourceLock(&Resource->SpinLock, OldIrql); + ExReleaseResourceLock(Resource, &LockHandle); ExpWaitForResource(Resource, Resource->SharedWaiters); return TRUE; } @@ -1108,7 +1179,7 @@ ExAcquireSharedWaitForExclusive(IN PERESOURCE resource, IN BOOLEAN Wait) { - KIRQL OldIrql; + KLOCK_QUEUE_HANDLE LockHandle; ERESOURCE_THREAD Thread; POWNER_ENTRY Owner; PERESOURCE_XP Resource = (PERESOURCE_XP)resource; @@ -1121,7 +1192,7 @@ ExpVerifyResource(Resource); /* Acquire the lock */ - ExAcquireResourceLock(&Resource->SpinLock, &OldIrql); + ExAcquireResourceLock(Resource, &LockHandle); /* See if nobody owns us */ TryAcquire: @@ -1133,7 +1204,7 @@ Resource->OwnerThreads[1].OwnerCount = 1; /* Release the lock and return */ - ExReleaseResourceLock(&Resource->SpinLock, OldIrql); + ExReleaseResourceLock(Resource, &LockHandle); return TRUE; } @@ -1147,12 +1218,12 @@ Resource->OwnerThreads[0].OwnerCount++; /* Release the lock and return */ - ExReleaseResourceLock(&Resource->SpinLock, OldIrql); + ExReleaseResourceLock(Resource, &LockHandle); return TRUE; } /* Find a free entry */ - Owner = ExpFindFreeEntry(Resource, &OldIrql); + Owner = ExpFindFreeEntry(Resource, &LockHandle); if (!Owner) goto TryAcquire; } else @@ -1164,7 +1235,7 @@ if (!Wait) { /* So bail out if we're not allowed */ - ExReleaseResourceLock(&Resource->SpinLock, OldIrql); + ExReleaseResourceLock(Resource, &LockHandle); return TRUE; } @@ -1172,20 +1243,20 @@ if (!Resource->SharedWaiters) { /* Allocate one and try again */ - ExpAllocateSharedWaiterSemaphore(Resource, &OldIrql); + ExpAllocateSharedWaiterSemaphore(Resource, &LockHandle); goto TryAcquire; } /* Now wait for the resource */ Resource->NumberOfSharedWaiters++; - ExReleaseResourceLock(&Resource->SpinLock, OldIrql); + ExReleaseResourceLock(Resource, &LockHandle); ExpWaitForResource(Resource, Resource->SharedWaiters); /* Get the lock back */ - ExAcquireResourceLock(&Resource->SpinLock, &OldIrql); + ExAcquireResourceLock(Resource, &LockHandle); /* Find who owns it now */ - while (!(Owner = ExpFindEntryForThread(Resource, Thread, &OldIrql))); + while (!(Owner = ExpFindEntryForThread(Resource, Thread, &LockHandle))); /* Sanity checks */ ASSERT(IsOwnedExclusive(Resource) == FALSE); @@ -1197,13 +1268,13 @@ Owner->OwnerCount = 1; /* Release the lock and return */ - ExReleaseResourceLock(&Resource->SpinLock, OldIrql); + ExReleaseResourceLock(Resource, &LockHandle); return TRUE; } else { /* Resource is shared, find who owns it */ - Owner = ExpFindEntryForThread(Resource, Thread, &OldIrql); + Owner = ExpFindEntryForThread(Resource, Thread, &LockHandle); if (!Owner) goto TryAcquire; /* Is it us? */ @@ -1214,7 +1285,7 @@ ASSERT(Owner->OwnerCount != 0); /* Release the lock and return */ - ExReleaseResourceLock(&Resource->SpinLock, OldIrql); + ExReleaseResourceLock(Resource, &LockHandle); return TRUE; } @@ -1224,7 +1295,7 @@ Resource->ActiveCount++; /* Release the lock and return */ - ExReleaseResourceLock(&Resource->SpinLock, OldIrql); + ExReleaseResourceLock(Resource, &LockHandle); return TRUE; } } @@ -1233,7 +1304,7 @@ if (!Wait) { /* So bail out if we're not allowed */ - ExReleaseResourceLock(&Resource->SpinLock, OldIrql); + ExReleaseResourceLock(Resource, &LockHandle); return TRUE; } @@ -1241,7 +1312,7 @@ if (!Resource->SharedWaiters) { /* Allocate one and try again */ - ExpAllocateSharedWaiterSemaphore(Resource, &OldIrql); + ExpAllocateSharedWaiterSemaphore(Resource,&LockHandle); goto TryAcquire; } @@ -1251,7 +1322,7 @@ Resource->NumberOfSharedWaiters++; /* Release the lock and return */ - ExReleaseResourceLock(&Resource->SpinLock, OldIrql); + ExReleaseResourceLock(Resource, &LockHandle); ExpWaitForResource(Resource, Resource->SharedWaiters); return TRUE; } @@ -1274,10 +1345,10 @@ *--*/ VOID NTAPI -ExConvertExclusiveToSharedLite(PERESOURCE resource) +ExConvertExclusiveToSharedLite(IN PERESOURCE resource) { ULONG OldWaiters; - KIRQL OldIrql; + KLOCK_QUEUE_HANDLE LockHandle; PERESOURCE_XP Resource = (PERESOURCE_XP)resource; /* Sanity checks */ @@ -1287,7 +1358,7 @@ ASSERT(Resource->OwnerThreads[0].OwnerThread == (ERESOURCE_THREAD)PsGetCurrentThread()); /* Lock the resource */ - ExAcquireResourceLock(&Resource->SpinLock, &OldIrql); + ExAcquireResourceLock(Resource, &LockHandle); /* Erase the exclusive flag */ Resource->Flag &= ~ResourceOwnedExclusive; @@ -1301,13 +1372,13 @@ Resource->NumberOfSharedWaiters = 0; /* Release lock and wake the waiters */ - ExReleaseResourceLock(&Resource->SpinLock, OldIrql); + ExReleaseResourceLock(Resource, &LockHandle); KeReleaseSemaphore(Resource->SharedWaiters, 0, OldWaiters, FALSE); } else { /* Release lock */ - ExReleaseResourceLock(&Resource->SpinLock, OldIrql); + ExReleaseResourceLock(Resource, &LockHandle); } } @@ -1329,9 +1400,9 @@ *--*/ NTSTATUS NTAPI -ExDeleteResourceLite(PERESOURCE resource) -{ - KIRQL OldIrql; +ExDeleteResourceLite(IN PERESOURCE resource) +{ + KLOCK_QUEUE_HANDLE LockHandle; PERESOURCE_XP Resource = (PERESOURCE_XP)resource; /* Sanity checks */ @@ -1341,13 +1412,13 @@ ExpVerifyResource(Resource); /* Lock the resource */ - KeAcquireSpinLock(&ExpResourceSpinLock, &OldIrql); + KeAcquireInStackQueuedSpinLock(&ExpResourceSpinLock, &LockHandle); /* Remove the resource */ RemoveEntryList(&Resource->SystemResourcesList); /* Release the lock */ - KeReleaseSpinLock(&ExpResourceSpinLock, OldIrql); + KeReleaseInStackQueuedSpinLock(&LockHandle); /* Free every structure */ if (Resource->OwnerTable) ExFreePool(Resource->OwnerTable); @@ -1375,22 +1446,22 @@ *--*/ VOID NTAPI -ExDisableResourceBoostLite(PERESOURCE resource) -{ - KIRQL OldIrql; +ExDisableResourceBoostLite(IN PERESOURCE resource) +{ + KLOCK_QUEUE_HANDLE LockHandle; PERESOURCE_XP Resource = (PERESOURCE_XP)resource; /* Sanity check */ ExpVerifyResource(Resource); /* Lock the resource */ - ExAcquireResourceLock(&Resource->SpinLock, &OldIrql); + ExAcquireResourceLock(Resource, &LockHandle); /* Remove the flag */ Resource->Flag |= ResourceHasDisabledPriorityBoost; /* Release the lock */ - ExReleaseResourceLock(&Resource->SpinLock, OldIrql); + ExReleaseResourceLock(Resource, &LockHandle); } /*++ @@ -1410,7 +1481,7 @@ *--*/ ULONG NTAPI -ExGetExclusiveWaiterCount(PERESOURCE resource) +ExGetExclusiveWaiterCount(IN PERESOURCE resource) { PERESOURCE_XP Resource = (PERESOURCE_XP)resource; @@ -1435,7 +1506,7 @@ *--*/ ULONG NTAPI -ExGetSharedWaiterCount(PERESOURCE resource) +ExGetSharedWaiterCount(IN PERESOURCE resource) { PERESOURCE_XP Resource = (PERESOURCE_XP)resource; @@ -1461,9 +1532,10 @@ *--*/ NTSTATUS NTAPI -ExInitializeResourceLite(PERESOURCE resource) +ExInitializeResourceLite(IN PERESOURCE resource) { PERESOURCE_XP Resource = (PERESOURCE_XP)resource; + KLOCK_QUEUE_HANDLE LockHandle; /* Clear the structure */ RtlZeroMemory(Resource, sizeof(ERESOURCE_XP)); @@ -1472,9 +1544,9 @@ KeInitializeSpinLock(&Resource->SpinLock); /* Add it into the system list */ - ExInterlockedInsertTailList(&ExpSystemResourcesList, - &Resource->SystemResourcesList, - &ExpResourceSpinLock); + KeAcquireInStackQueuedSpinLock(&ExpResourceSpinLock, &LockHandle); + InsertTailList(&ExpSystemResourcesList, &Resource->SystemResourcesList); + KeReleaseInStackQueuedSpinLock(&LockHandle); /* Return success */ return STATUS_SUCCESS; @@ -1498,7 +1570,7 @@ *--*/ BOOLEAN NTAPI -ExIsResourceAcquiredExclusiveLite(PERESOURCE resource) +ExIsResourceAcquiredExclusiveLite(IN PERESOURCE resource) { ERESOURCE_THREAD Thread = ExGetCurrentResourceThread(); BOOLEAN IsAcquired = FALSE; @@ -1544,13 +1616,16 @@ ERESOURCE_THREAD Thread; ULONG i, Size; ULONG Count = 0; - KIRQL OldIrql; + KLOCK_QUEUE_HANDLE LockHandle; POWNER_ENTRY Owner; PERESOURCE_XP Resource = (PERESOURCE_XP)resource; /* Sanity check */ ExpVerifyResource(Resource); + /* Check if nobody owns us */ + if (!Resource->ActiveCount) return 0; + /* Get the thread */ Thread = ExGetCurrentResourceThread(); @@ -1560,50 +1635,57 @@ /* Found it, return count */ Count = Resource->OwnerThreads[0].OwnerCount; } - else if (Resource->OwnerThreads[1].OwnerThread == Thread) - { - /* Found it on the second list, return count */ - Count = Resource->OwnerThreads[1].OwnerCount; - } else { - /* Not in the list, do a full table look up */ - Owner = Resource->OwnerTable; - if (Owner) + /* We can't own an exclusive resource at this point */ + if (IsOwnedExclusive(Resource)) return 0; + + /* Check if we are in the other thread list */ + if (Resource->OwnerThreads[1].OwnerThread == Thread) + { + /* Found it on the second list, return count */ + Count = Resource->OwnerThreads[1].OwnerCount; + } + else { /* Lock the resource */ - ExAcquireResourceLock(&Resource->SpinLock, &OldIrql); - - /* Get the resource index */ - i = ((PKTHREAD)Thread)->ResourceIndex; - Size = Owner->TableSize; - - /* Check if the index is valid and check if we don't match */ - if ((i >= Size) || (Owner[i].OwnerThread != Thread)) + ExAcquireResourceLock(Resource, &LockHandle); + + /* Not in the list, do a full table look up */ + Owner = Resource->OwnerTable; + if (Owner) { - /* Sh*t! We need to do a full search */ - for (i = 1; i < Size; i++) + /* Get the resource index */ + i = ((PKTHREAD)Thread)->ResourceIndex; + Size = Owner->TableSize; + + /* Check if the index is valid and check if we don't match */ + if ((i >= Size) || (Owner[i].OwnerThread != Thread)) { - /* Move to next owner */ - Owner++; - - /* Try to find a match */ - if (Owner->OwnerThread == Thread) + /* Sh*t! We need to do a full search */ + for (i = 1; i < Size; i++) { - /* Finally! */ - Count = Owner->OwnerCount; - break; + /* Move to next owner */ + Owner++; + + /* Try to find a match */ + if (Owner->OwnerThread == Thread) + { + /* Finally! */ + Count = Owner->OwnerCount; + break; + } } } + else + { + /* We found the match directlry */ + Count = Owner[i].OwnerCount; + } } - else - { - /* We found the match directlry */ - Count = Owner[i].OwnerCount; - } /* Release the lock */ - ExReleaseResourceLock(&Resource->SpinLock, OldIrql); + ExReleaseResourceLock(Resource, &LockHandle); } } @@ -1637,7 +1719,7 @@ *--*/ NTSTATUS NTAPI -ExReinitializeResourceLite(PERESOURCE resource) +ExReinitializeResourceLite(IN PERESOURCE resource) { PKEVENT Event; PKSEMAPHORE Semaphore; @@ -1679,9 +1761,6 @@ Resource->ContentionCount = 0; Resource->NumberOfSharedWaiters = 0; Resource->NumberOfExclusiveWaiters = 0; - - /* Reset the spinlock */ - KeInitializeSpinLock(&Resource->SpinLock); return STATUS_SUCCESS; } @@ -1703,11 +1782,11 @@ *--*/ VOID FASTCALL -ExReleaseResourceLite(PERESOURCE resource) +ExReleaseResourceLite(IN PERESOURCE resource) { ERESOURCE_THREAD Thread; ULONG Count, i; - KIRQL OldIrql; + KLOCK_QUEUE_HANDLE LockHandle; POWNER_ENTRY Owner, Limit; PERESOURCE_XP Resource = (PERESOURCE_XP)resource; @@ -1716,19 +1795,18 @@ /* Get the thread and lock the resource */ Thread = ExGetCurrentResourceThread(); - ExAcquireResourceLock(&Resource->SpinLock, &OldIrql); - ExpCheckForApcsDisabled(TRUE, Resource, (PETHREAD)Thread); + ExAcquireResourceLock(Resource, &LockHandle); + ExpCheckForApcsDisabled(LockHandle.OldIrql, Resource, (PKTHREAD)Thread); /* Check if it's exclusively owned */ if (IsOwnedExclusive(Resource)) { /* Decrement owner count and check if we're done */ ASSERT(Resource->OwnerThreads[0].OwnerCount > 0); - ASSERT(Resource->ActiveCount == 1); if (--Resource->OwnerThreads[0].OwnerCount) { /* Done, release lock! */ - ExReleaseResourceLock(&Resource->SpinLock, OldIrql); + ExReleaseResourceLock(Resource, &LockHandle); return; } @@ -1745,13 +1823,13 @@ /* Remove the exclusive flag */ Resource->Flag &= ~ResourceOwnedExclusive; - /* Give ownage to another thread */ + /* Give ownership to another thread */ Count = Resource->NumberOfSharedWaiters; Resource->ActiveCount = (SHORT)Count; Resource->NumberOfSharedWaiters = 0; /* Release lock and let someone else have it */ - ExReleaseResourceLock(&Resource->SpinLock, OldIrql); + ExReleaseResourceLock(Resource, &LockHandle); KeReleaseSemaphore(Resource->SharedWaiters, 0, Count, FALSE); return; } @@ -1764,7 +1842,7 @@ Resource->NumberOfExclusiveWaiters--; /* Release the lock and give it away */ - ExReleaseResourceLock(&Resource->SpinLock, OldIrql); + ExReleaseResourceLock(Resource, &LockHandle); KeSetEventBoostPriority(Resource->ExclusiveWaiters, (PKTHREAD*) &Resource->OwnerThreads[0].OwnerThread); @@ -1843,7 +1921,7 @@ if (--Owner->OwnerCount) { /* Release lock */ - ExReleaseResourceLock(&Resource->SpinLock, OldIrql); + ExReleaseResourceLock(Resource, &LockHandle); return; } @@ -1865,7 +1943,7 @@ Resource->NumberOfExclusiveWaiters--; /* Release the lock and give it away */ - ExReleaseResourceLock(&Resource->SpinLock, OldIrql); + ExReleaseResourceLock(Resource, &LockHandle); KeSetEventBoostPriority(Resource->ExclusiveWaiters, (PKTHREAD*) &Resource->OwnerThreads[0].OwnerThread); @@ -1875,7 +1953,7 @@ } /* Release lock */ - ExReleaseResourceLock(&Resource->SpinLock, OldIrql); + ExReleaseResourceLock(Resource, &LockHandle); } /*++ @@ -1899,32 +1977,32 @@ *--*/ VOID NTAPI -ExReleaseResourceForThreadLite(PERESOURCE resource, - ERESOURCE_THREAD Thread) +ExReleaseResourceForThreadLite(IN PERESOURCE resource, + IN ERESOURCE_THREAD Thread) { ULONG i; ULONG Count; - KIRQL OldIrql; - POWNER_ENTRY Owner; + KLOCK_QUEUE_HANDLE LockHandle; + POWNER_ENTRY Owner, Limit; PERESOURCE_XP Resource = (PERESOURCE_XP)resource; ASSERT(Thread != 0); /* Get the thread and lock the resource */ - ExAcquireResourceLock(&Resource->SpinLock, &OldIrql); - - /* Sanity check */ + ExAcquireResourceLock(Resource, &LockHandle); + + /* Sanity checks */ ExpVerifyResource(Resource); + ExpCheckForApcsDisabled(LockHandle.OldIrql, Resource, (PKTHREAD)Thread); /* Check if it's exclusively owned */ if (IsOwnedExclusive(Resource)) { /* Decrement owner count and check if we're done */ ASSERT(Resource->OwnerThreads[0].OwnerThread == Thread); - ASSERT(Resource->OwnerThreads[0].OwnerCount > 0); if (--Resource->OwnerThreads[0].OwnerCount) { /* Done, release lock! */ - ExReleaseResourceLock(&Resource->SpinLock, OldIrql); + ExReleaseResourceLock(Resource, &LockHandle); return; } @@ -1947,7 +2025,7 @@ Resource->NumberOfSharedWaiters = 0; /* Release lock and let someone else have it */ - ExReleaseResourceLock(&Resource->SpinLock, OldIrql); + ExReleaseResourceLock(Resource, &LockHandle); KeReleaseSemaphore(Resource->SharedWaiters, 0, Count, FALSE); return; } @@ -1960,7 +2038,7 @@ Resource->NumberOfExclusiveWaiters--; /* Release the lock and give it away */ - ExReleaseResourceLock(&Resource->SpinLock, OldIrql); + ExReleaseResourceLock(Resource, &LockHandle); KeSetEventBoostPriority(Resource->ExclusiveWaiters, (PKTHREAD*) &Resource->OwnerThreads[0].OwnerThread); @@ -2000,10 +2078,22 @@ if ((i >= Owner->TableSize) || (Owner[i].OwnerThread != Thread)) { /* Get the last entry */ + Limit = &Owner[Owner->TableSize]; for (;;) { /* Move to the next entry */ Owner++; + + /* Make sure we're not out of bounds */ + if (Owner >= Limit) + { + /* Bugcheck, nobody owns us */ + KeBugCheckEx(RESOURCE_NOT_OWNED, + (ULONG_PTR)Resource, + (ULONG_PTR)Thread, + (ULONG_PTR)Resource->OwnerTable, + (ULONG_PTR)3); + } /* Check for a match */ if (Owner->OwnerThread == Thread) break; @@ -2024,7 +2114,7 @@ if (!(--Owner->OwnerCount)) { /* Release lock */ - ExReleaseResourceLock(&Resource->SpinLock, OldIrql); + ExReleaseResourceLock(Resource, &LockHandle); return; } @@ -2039,13 +2129,14 @@ if (IsExclusiveWaiting(Resource)) { /* Give exclusive access */ + Resource->Flag |= ResourceOwnedExclusive; Resource->OwnerThreads[0].OwnerThread = 1; Resource->OwnerThreads[0].OwnerCount = 1; Resource->ActiveCount = 1; Resource->NumberOfExclusiveWaiters--; /* Release the lock and give it away */ - ExReleaseResourceLock(&Resource->SpinLock, OldIrql); + ExReleaseResourceLock(Resource, &LockHandle); KeSetEventBoostPriority(Resource->ExclusiveWaiters, (PKTHREAD*) &Resource->OwnerThreads[0].OwnerThread); @@ -2055,7 +2146,7 @@ } /* Release lock */ - ExReleaseResourceLock(&Resource->SpinLock, OldIrql); + ExReleaseResourceLock(Resource, &LockHandle); } /*++ @@ -2093,7 +2184,7 @@ IN PVOID OwnerPointer) { ERESOURCE_THREAD Thread; - KIRQL OldIrql; + KLOCK_QUEUE_HANDLE LockHandle; POWNER_ENTRY Owner, ThisOwner; PERESOURCE_XP Resource = (PERESOURCE_XP)resource; @@ -2107,7 +2198,7 @@ ExpVerifyResource(Resource); /* Lock the resource */ - ExAcquireResourceLock(&Resource->SpinLock, &OldIrql); + ExAcquireResourceLock(Resource, &LockHandle); /* Check if it's exclusive */ if (IsOwnedExclusive(Resource)) @@ -2121,8 +2212,8 @@ { /* Set the thread in both entries */ ThisOwner = ExpFindEntryForThread(Resource, - (ERESOURCE_THREAD)OwnerPointer, - 0); + (ERESOURCE_THREAD)OwnerPointer, + 0); Owner = ExpFindEntryForThread(Resource, Thread, 0); if (!Owner) { @@ -2144,10 +2235,15 @@ ASSERT(Resource->ActiveCount >= 2); Resource->ActiveCount--; } + else + { + /* Update the owner entry instead */ + Owner->OwnerThread = (ERESOURCE_THREAD)OwnerPointer; + } } /* Release the resource */ - ExReleaseResourceLock(&Resource->SpinLock, OldIrql); + ExReleaseResourceLock(Resource, &LockHandle); } /*++ @@ -2168,10 +2264,10 @@ *--*/ BOOLEAN NTAPI -ExTryToAcquireResourceExclusiveLite(PERESOURCE resource) +ExTryToAcquireResourceExclusiveLite(IN PERESOURCE resource) { ERESOURCE_THREAD Thread; - KIRQL OldIrql; + KLOCK_QUEUE_HANDLE LockHandle; BOOLEAN Acquired = FALSE; PERESOURCE_XP Resource = (PERESOURCE_XP)resource; @@ -2186,7 +2282,7 @@ ExpVerifyResource(Resource); /* Acquire the lock */ - ExAcquireResourceLock(&Resource->SpinLock, &OldIrql); + ExAcquireResourceLock(Resource, &LockHandle); /* Check if there is an owner */ if (!Resource->ActiveCount) @@ -2207,7 +2303,7 @@ } /* Release the resource */ - ExReleaseResourceLock(&Resource->SpinLock, OldIrql); + ExReleaseResourceLock(Resource, &LockHandle); return Acquired; } @@ -2228,7 +2324,7 @@ *--*/ PVOID NTAPI -ExEnterCriticalRegionAndAcquireResourceExclusive(PERESOURCE Resource) +ExEnterCriticalRegionAndAcquireResourceExclusive(IN PERESOURCE Resource) { /* Enter critical region */ KeEnterCriticalRegion(); @@ -2257,7 +2353,7 @@ *--*/ VOID FASTCALL -ExReleaseResourceAndLeaveCriticalRegion(PERESOURCE Resource) +ExReleaseResourceAndLeaveCriticalRegion(IN PERESOURCE Resource) { /* Release the resource */ ExReleaseResourceLite(Resource); Modified: trunk/reactos/ntoskrnl/include/internal/ex.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/ex.h (original) +++ trunk/reactos/ntoskrnl/include/internal/ex.h Wed May 9 01:35:10 2007 @@ -25,6 +25,7 @@ extern ULONG CmNtCSDVersion; extern ULONG NtGlobalFlag; extern ULONG ExpInitializationPhase; +extern ULONG ExpAltTimeZoneBias; typedef struct _EXHANDLE { @@ -61,18 +62,6 @@ #define MAX_FAST_REFS 7 -/* Note: we only use a spinlock on SMP. On UP, we cli/sti intead */ -#ifndef CONFIG_SMP -#define ExAcquireResourceLock(l, i) { \ - (void)i; \ - _disable(); \ -} -#define ExReleaseResourceLock(l, i) _enable(); -#else -#define ExAcquireResourceLock(l, i) KeAcquireSpinLock(l, i); -#define ExReleaseResourceLock(l, i) KeReleaseSpinLock(l, i); -#endif - #define ExAcquireRundownProtection _ExAcquireRundownProtection #define ExReleaseRundownProtection _ExReleaseRundownProtection #define ExInitializeRundownProtection _ExInitializeRundownProtection @@ -1012,6 +1001,18 @@ NTAPI ExTimerRundown(VOID); +VOID +NTAPI +HeadlessInit( + IN PLOADER_PARAMETER_BLOCK LoaderBlock +); + +VOID +NTAPI +XIPInit( + IN PLOADER_PARAMETER_BLOCK LoaderBlock +); + #define InterlockedDecrementUL(Addend) \ (ULONG)InterlockedDecrement((PLONG)(Addend))

1 0

[fireball] 26653: - Fix unshielded "return"s inside PSEH blocks, in the kernel. - Fix formatting of a couple of lines.
by fireball＠svn.reactos.org 08 May '07

08 May '07

Author: fireball Date: Tue May 8 14:32:16 2007 New Revision: 26653 URL: http://svn.reactos.org/svn/reactos?rev=26653&view=rev Log: - Fix unshielded "return"s inside PSEH blocks, in the kernel. - Fix formatting of a couple of lines. Modified: trunk/reactos/ntoskrnl/ex/sysinfo.c trunk/reactos/ntoskrnl/io/iomgr/iofunc.c trunk/reactos/ntoskrnl/ob/oblife.c Modified: trunk/reactos/ntoskrnl/ex/sysinfo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/sysinfo.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/ex/sysinfo.c (original) +++ trunk/reactos/ntoskrnl/ex/sysinfo.c Tue May 8 14:32:16 2007 @@ -720,7 +720,7 @@ if (Size < sizeof(SYSTEM_PROCESS_INFORMATION)) { - return (STATUS_INFO_LENGTH_MISMATCH); // in case buffer size is too small + _SEH_YIELD(return STATUS_INFO_LENGTH_MISMATCH); // in case buffer size is too small } syspr = PsGetNextProcess(NULL); @@ -735,7 +735,7 @@ int inLen=32; // image name len in bytes PLIST_ENTRY current_entry; PETHREAD current; - PSYSTEM_THREAD_INFORMATION ThreadInfo; + PSYSTEM_THREAD_INFORMATION ThreadInfo; SpiCur = (PSYSTEM_PROCESS_INFORMATION)pCur; @@ -756,7 +756,7 @@ *ReqSize = ovlSize; ObDereferenceObject(pr); - return (STATUS_INFO_LENGTH_MISMATCH); // in case buffer size is too small + _SEH_YIELD(return STATUS_INFO_LENGTH_MISMATCH); // in case buffer size is too small } // fill system information @@ -777,7 +777,7 @@ } else { - RtlInitUnicodeString(&SpiCur->ImageName, NULL); + RtlInitUnicodeString(&SpiCur->ImageName, NULL); } SpiCur->BasePriority = pr->Pcb.BasePriority; @@ -796,15 +796,14 @@ SpiCur->PagefileUsage = pr->QuotaUsage[2]; SpiCur->PeakPagefileUsage = pr->QuotaPeak[2]; SpiCur->PrivatePageCount = pr->CommitCharge; - ThreadInfo = (PSYSTEM_THREAD_INFORMATION)(SpiCur + 1); - - current_entry = pr->ThreadListHead.Flink; - while (current_entry != &pr->ThreadListHead) + ThreadInfo = (PSYSTEM_THREAD_INFORMATION)(SpiCur + 1); + + current_entry = pr->ThreadListHead.Flink; + while (current_entry != &pr->ThreadListHead) { current = CONTAINING_RECORD(current_entry, ETHREAD, ThreadListEntry); - ThreadInfo->KernelTime.QuadPart = current->Tcb.KernelTime * 100000LL; ThreadInfo->UserTime.QuadPart = current->Tcb.UserTime * 100000LL; // SpiCur->TH[i].CreateTime = current->CreateTime; @@ -1828,7 +1827,7 @@ */ if (SystemInformationClass >= MaxSystemInfoClass) { - return (STATUS_INVALID_INFO_CLASS); + _SEH_YIELD(return STATUS_INVALID_INFO_CLASS); } if (NULL != CallQS [SystemInformationClass].Query) Modified: trunk/reactos/ntoskrnl/io/iomgr/iofunc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/iofunc.c… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/iofunc.c (original) +++ trunk/reactos/ntoskrnl/io/iomgr/iofunc.c Tue May 8 14:32:16 2007 @@ -2800,7 +2800,7 @@ { /* We failed */ ObDereferenceObject(FileObject); - return STATUS_ACCESS_DENIED; + _SEH_YIELD(return STATUS_ACCESS_DENIED); } /* Probe the status block */ Modified: trunk/reactos/ntoskrnl/ob/oblife.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ob/oblife.c?rev=2… ============================================================================== --- trunk/reactos/ntoskrnl/ob/oblife.c (original) +++ trunk/reactos/ntoskrnl/ob/oblife.c Tue May 8 14:32:16 2007 @@ -839,7 +839,10 @@ ALIGN_UP(ObjectType->Name.MaximumLength, ULONG); /* Check if thats too much though. */ - if (Length < *ReturnLength) return STATUS_INFO_LENGTH_MISMATCH; + if (Length < *ReturnLength) + { + _SEH_YIELD(return STATUS_INFO_LENGTH_MISMATCH); + } /* Build the data */ ObjectTypeInfo->TotalNumberOfHandles =

1 0

[fireball] 26652: - Fix an unshielded "return" inside a PSEH block.
by fireball＠svn.reactos.org 08 May '07

08 May '07

Author: fireball Date: Tue May 8 13:01:39 2007 New Revision: 26652 URL: http://svn.reactos.org/svn/reactos?rev=26652&view=rev Log: - Fix an unshielded "return" inside a PSEH block. Modified: trunk/reactos/drivers/network/afd/afd/info.c Modified: trunk/reactos/drivers/network/afd/afd/info.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/afd/afd/in… ============================================================================== --- trunk/reactos/drivers/network/afd/afd/info.c (original) +++ trunk/reactos/drivers/network/afd/afd/info.c Tue May 8 13:01:39 2007 @@ -25,7 +25,10 @@ InfoReq ? InfoReq->InformationClass : 0)); _SEH_TRY { - if( !SocketAcquireStateLock( FCB ) ) return LostSocket( Irp, TRUE ); + if( !SocketAcquireStateLock( FCB ) ) { + Status = LostSocket( Irp, TRUE ); + _SEH_YIELD(return Status); + } switch( InfoReq->InformationClass ) { case AFD_INFO_RECEIVE_WINDOW_SIZE:

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