Ros-diffs

ros-diffs@reactos.org

81390 discussions

[ion] 55343: [SMSS2]: Implement SmpCreateDynamicEnvironmentVariables such that all the SMSS-generated variables are created. Compared to SMSS it has some bug fixes and also handles the safe-mode op...
by ion＠svn.reactos.org 31 Jan '12

31 Jan '12

Author: ion Date: Tue Jan 31 01:19:14 2012 New Revision: 55343 URL: http://svn.reactos.org/svn/reactos?rev=55343&view=rev Log: [SMSS2]: Implement SmpCreateDynamicEnvironmentVariables such that all the SMSS-generated variables are created. Compared to SMSS it has some bug fixes and also handles the safe-mode options key. Next step is to handle boot/setup/execute keys and get autochk running from SMSS2. [SMSS]: No longer initialize the registry, let SMSS2 do that now. Modified: trunk/reactos/base/system/autochk/autochk.c trunk/reactos/base/system/smss/init.c trunk/reactos/base/system/smss2/sminit.c Modified: trunk/reactos/base/system/autochk/autochk.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/autochk/autoch… ============================================================================== --- trunk/reactos/base/system/autochk/autochk.c [iso-8859-1] (original) +++ trunk/reactos/base/system/autochk/autochk.c [iso-8859-1] Tue Jan 31 01:19:14 2012 @@ -326,6 +326,7 @@ NtDrivePath[wcslen(NtDrivePath)-1] = 0; RtlInitUnicodeString(&DrivePathU, NtDrivePath); + DPRINT1("AUTOCHK: Checking %wZ\n", &DrivePathU); Status = ChkdskFunc(&DrivePathU, TRUE, // FixErrors TRUE, // Verbose Modified: trunk/reactos/base/system/smss/init.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/smss/init.c?re… ============================================================================== --- trunk/reactos/base/system/smss/init.c [iso-8859-1] (original) +++ trunk/reactos/base/system/smss/init.c [iso-8859-1] Tue Jan 31 01:19:14 2012 @@ -33,7 +33,7 @@ {FALSE, SmUpdateEnvironment, "update environment variables"}, {FALSE, SmLoadKnownDlls, "preload system DLLs"}, {TRUE, SmCreatePagingFiles, "create paging files"}, - {TRUE, SmInitializeRegistry, "initialize the registry"}, +// {TRUE, SmInitializeRegistry, "initialize the registry"}, {TRUE, SmInitializeClientManagement, "initialize client management"}, {TRUE, SmLoadSubsystems, "load subsystems"} }; Modified: trunk/reactos/base/system/smss2/sminit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/smss2/sminit.c… ============================================================================== --- trunk/reactos/base/system/smss2/sminit.c [iso-8859-1] (original) +++ trunk/reactos/base/system/smss2/sminit.c [iso-8859-1] Tue Jan 31 01:19:14 2012 @@ -1507,6 +1507,322 @@ NTAPI SmpCreateDynamicEnvironmentVariables(VOID) { + NTSTATUS Status; + SYSTEM_BASIC_INFORMATION BasicInfo; + SYSTEM_PROCESSOR_INFORMATION ProcessorInfo; + OBJECT_ATTRIBUTES ObjectAttributes; + UNICODE_STRING ValueName, DestinationString; + HANDLE KeyHandle, KeyHandle2; + ULONG ResultLength; + PWCHAR ArchName; + WCHAR ValueBuffer[512], ValueBuffer2[512]; + PKEY_VALUE_PARTIAL_INFORMATION PartialInfo = (PVOID)ValueBuffer; + PKEY_VALUE_PARTIAL_INFORMATION PartialInfo2 = (PVOID)ValueBuffer2; + + /* Get system basic information -- we'll need the CPU count */ + Status = NtQuerySystemInformation(SystemBasicInformation, + &BasicInfo, + sizeof(BasicInfo), + NULL); + if (!NT_SUCCESS(Status)) + { + /* Bail out on failure */ + DPRINT1("SMSS: Unable to query system basic information - %x\n", Status); + return Status; + } + + /* Get the processor information, we'll query a bunch of revision info */ + Status = NtQuerySystemInformation(SystemProcessorInformation, + &ProcessorInfo, + sizeof(ProcessorInfo), + NULL); + if (!NT_SUCCESS(Status)) + { + /* Bail out on failure */ + DPRINT1("SMSS: Unable to query system processor information - %x\n", Status); + return Status; + } + + /* We'll be writing all these environment variables over here */ + RtlInitUnicodeString(&DestinationString, + L"\\Registry\\Machine\\System\\CurrentControlSet\\" + "Control\\Session Manager\\Environment"); + InitializeObjectAttributes(&ObjectAttributes, + &DestinationString, + OBJ_CASE_INSENSITIVE, + NULL, + NULL); + Status = NtOpenKey(&KeyHandle, GENERIC_WRITE, &ObjectAttributes); + if (!NT_SUCCESS(Status)) + { + /* Bail out on failure */ + DPRINT1("SMSS: Unable to open %wZ - %x\n", &DestinationString, Status); + return Status; + } + + /* First let's write the OS variable */ + RtlInitUnicodeString(&ValueName, L"OS"); + DPRINT1("Setting %wZ to %S\n", &ValueName, L"Windows_NT"); + Status = NtSetValueKey(KeyHandle, + &ValueName, + 0, + REG_SZ, + L"Windows_NT", + wcslen(L"Windows_NT") * sizeof(WCHAR) + sizeof(UNICODE_NULL)); + if (!NT_SUCCESS(Status)) + { + DPRINT1("SMSS: Failed writing %wZ environment variable - %x\n", + &ValueName, Status); + NtClose(KeyHandle); + return Status; + } + + /* Next, let's write the CPU architecture variable */ + RtlInitUnicodeString(&ValueName, L"PROCESSOR_ARCHITECTURE"); + switch (ProcessorInfo.ProcessorArchitecture) + { + /* Pick the correct string that matches the architecture */ + case PROCESSOR_ARCHITECTURE_INTEL: + ArchName = L"x86"; + break; + + case PROCESSOR_ARCHITECTURE_AMD64: + ArchName = L"AMD64"; + break; + + case PROCESSOR_ARCHITECTURE_IA64: + ArchName = L"IA64"; + break; + + default: + ArchName = L"Unknown"; + break; + } + + /* Set it */ + DPRINT1("Setting %wZ to %S\n", &ValueName, ArchName); + Status = NtSetValueKey(KeyHandle, + &ValueName, + 0, + REG_SZ, + ArchName, + wcslen(ArchName) * sizeof(WCHAR) + sizeof(UNICODE_NULL)); + if (!NT_SUCCESS(Status)) + { + DPRINT1("SMSS: Failed writing %wZ environment variable - %x\n", + &ValueName, Status); + NtClose(KeyHandle); + return Status; + } + + /* And now let's write the processor level */ + RtlInitUnicodeString(&ValueName, L"PROCESSOR_LEVEL"); + swprintf(ValueBuffer, L"%u", ProcessorInfo.ProcessorLevel); + DPRINT1("Setting %wZ to %S\n", &ValueName, ValueBuffer); + Status = NtSetValueKey(KeyHandle, + &ValueName, + 0, + REG_SZ, + ValueBuffer, + wcslen(ValueBuffer) * sizeof(WCHAR) + sizeof(UNICODE_NULL)); + if (!NT_SUCCESS(Status)) + { + DPRINT1("SMSS: Failed writing %wZ environment variable - %x\n", + &ValueName, Status); + NtClose(KeyHandle); + return Status; + } + + /* Now open the hardware CPU key */ + RtlInitUnicodeString(&DestinationString, + L"\\Registry\\Machine\\Hardware\\Description\\System\\" + "CentralProcessor\\0"); + InitializeObjectAttributes(&ObjectAttributes, + &DestinationString, + OBJ_CASE_INSENSITIVE, + NULL, + NULL); + Status = NtOpenKey(&KeyHandle2, KEY_READ, &ObjectAttributes); + if (!NT_SUCCESS(Status)) + { + DPRINT1("SMSS: Unable to open %wZ - %x\n", &DestinationString, Status); + NtClose(KeyHandle); + return Status; + } + + /* So that we can read the identifier out of it... */ + RtlInitUnicodeString(&ValueName, L"Identifier"); + Status = NtQueryValueKey(KeyHandle2, + &ValueName, + KeyValuePartialInformation, + PartialInfo, + sizeof(ValueBuffer), + &ResultLength); + if (!NT_SUCCESS(Status)) + { + NtClose(KeyHandle2); + NtClose(KeyHandle); + DPRINT1("SMSS: Unable to read %wZ\\%wZ - %x\n", + &DestinationString, &ValueName, Status); + return Status; + } + + /* As well as the vendor... */ + RtlInitUnicodeString(&ValueName, L"VendorIdentifier"); + Status = NtQueryValueKey(KeyHandle2, + &ValueName, + KeyValuePartialInformation, + PartialInfo2, + sizeof(ValueBuffer2), + &ResultLength); + NtClose(KeyHandle2); + if (NT_SUCCESS(Status)) + { + /* To combine it into a single string */ + swprintf((PWCHAR)PartialInfo->Data + wcslen((PWCHAR)PartialInfo->Data), + L", %ws", + PartialInfo2->Data); + } + + /* So that we can set this as the PROCESSOR_IDENTIFIER variable */ + RtlInitUnicodeString(&ValueName, L"PROCESSOR_IDENTIFIER"); + DPRINT1("Setting %wZ to %S\n", &ValueName, PartialInfo->Data); + Status = NtSetValueKey(KeyHandle, + &ValueName, + 0, + REG_SZ, + PartialInfo->Data, + wcslen((PWCHAR)PartialInfo->Data) * sizeof(WCHAR) + sizeof(UNICODE_NULL)); + if (!NT_SUCCESS(Status)) + { + DPRINT1("SMSS: Failed writing %wZ environment variable - %x\n", + &ValueName, Status); + NtClose(KeyHandle); + return Status; + } + + /* Now let's get the processor architecture */ + RtlInitUnicodeString(&ValueName, L"PROCESSOR_REVISION"); + switch (ProcessorInfo.ProcessorArchitecture) + { + /* Check if this is an older Intel CPU */ + case PROCESSOR_ARCHITECTURE_INTEL: + if ((ProcessorInfo.ProcessorRevision >> 8) == 0xFF) + { + /* These guys used a revision + stepping, so get the rev only */ + swprintf(ValueBuffer, L"%02x", ProcessorInfo.ProcessorRevision & 0xFF); + _wcsupr(ValueBuffer); + break; + } + + /* Modern Intel, as well as 64-bit CPUs use a revision without stepping */ + case PROCESSOR_ARCHITECTURE_IA64: + case PROCESSOR_ARCHITECTURE_AMD64: + swprintf(ValueBuffer, L"%04x", ProcessorInfo.ProcessorRevision); + break; + + /* And anything else we'll just read the whole revision identifier */ + default: + swprintf(ValueBuffer, L"%u", ProcessorInfo.ProcessorRevision); + break; + } + + /* Write the revision to the registry */ + DPRINT1("Setting %wZ to %S\n", &ValueName, ValueBuffer); + Status = NtSetValueKey(KeyHandle, + &ValueName, + 0, + REG_SZ, + ValueBuffer, + wcslen(ValueBuffer) * sizeof(WCHAR) + sizeof(UNICODE_NULL)); + if (!NT_SUCCESS(Status)) + { + DPRINT1("SMSS: Failed writing %wZ environment variable - %x\n", + &ValueName, Status); + NtClose(KeyHandle); + return Status; + } + + /* And finally, write the number of CPUs */ + RtlInitUnicodeString(&ValueName, L"NUMBER_OF_PROCESSORS"); + swprintf(ValueBuffer, L"%u", BasicInfo.NumberOfProcessors); + DPRINT1("Setting %wZ to %S\n", &ValueName, ValueBuffer); + Status = NtSetValueKey(KeyHandle, + &ValueName, + 0, + REG_SZ, + ValueBuffer, + wcslen(ValueBuffer) * sizeof(WCHAR) + sizeof(UNICODE_NULL)); + if (!NT_SUCCESS(Status)) + { + DPRINT1("SMSS: Failed writing %wZ environment variable - %x\n", + &ValueName, Status); + NtClose(KeyHandle); + return Status; + } + + /* Now we need to write the safeboot option key in a different format */ + RtlInitUnicodeString(&DestinationString, + L"\\Registry\\Machine\\System\\CurrentControlSet\\" + "Control\\Safeboot\\Option"); + InitializeObjectAttributes(&ObjectAttributes, + &DestinationString, + OBJ_CASE_INSENSITIVE, + NULL, + NULL); + Status = NtOpenKey(&KeyHandle2, KEY_ALL_ACCESS, &ObjectAttributes); + if (NT_SUCCESS(Status)) + { + /* This was indeed a safeboot, so check what kind of safeboot it was */ + RtlInitUnicodeString(&ValueName, L"OptionValue"); + Status = NtQueryValueKey(KeyHandle2, + &ValueName, + KeyValuePartialInformation, + PartialInfo, + sizeof(ValueBuffer), + &ResultLength); + NtClose(KeyHandle2); + if (NT_SUCCESS(Status)) + { + /* Convert from the integer value to the correct specifier */ + RtlInitUnicodeString(&ValueName, L"SAFEBOOT_OPTION"); + switch (*(PULONG)PartialInfo->Data) + { + case 1: + wcscpy(ValueBuffer, L"MINIMAL"); + break; + case 2: + wcscpy(ValueBuffer, L"NETWORK"); + break; + case 3: + wcscpy(ValueBuffer, L"DSREPAIR"); + break; + } + + /* And write it in the environment! */ + DPRINT1("Setting %wZ to %S\n", &ValueName, ValueBuffer); + Status = NtSetValueKey(KeyHandle, + &ValueName, + 0, + REG_SZ, + ValueBuffer, + wcslen(ValueBuffer) * sizeof(WCHAR) + sizeof(UNICODE_NULL)); + if (!NT_SUCCESS(Status)) + { + DPRINT1("SMSS: Failed writing %wZ environment variable - %x\n", + &ValueName, Status); + NtClose(KeyHandle); + return Status; + } + } + else + { + DPRINT1("SMSS: Failed querying safeboot option = %x\n", Status); + } + } + + /* We are all done now */ + NtClose(KeyHandle); return STATUS_SUCCESS; } @@ -1698,7 +2014,7 @@ SmpCreatePagingFiles(); /* Tell Cm it's now safe to fully enable write access to the registry */ - // NtInitializeRegistry(FALSE); Later... + NtInitializeRegistry(CM_BOOT_FLAG_SMSS); /* Create all the system-based environment variables for later inheriting */ Status = SmpCreateDynamicEnvironmentVariables();

1 0

[ion] 55342: [NDK]: D'oh.
by ion＠svn.reactos.org 30 Jan '12

30 Jan '12

Author: ion Date: Mon Jan 30 22:55:24 2012 New Revision: 55342 URL: http://svn.reactos.org/svn/reactos?rev=55342&view=rev Log: [NDK]: D'oh. Modified: trunk/reactos/include/ndk/iotypes.h Modified: trunk/reactos/include/ndk/iotypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/iotypes.h?rev=… ============================================================================== --- trunk/reactos/include/ndk/iotypes.h [iso-8859-1] (original) +++ trunk/reactos/include/ndk/iotypes.h [iso-8859-1] Mon Jan 30 22:55:24 2012 @@ -122,7 +122,14 @@ // Device Charactertics // #define FILE_REMOVABLE_MEDIA 0x00000001 +#define FILE_READ_ONLY_DEVICE 0x00000002 +#define FILE_FLOPPY_DISKETTE 0x00000004 +#define FILE_WRITE_ONCE_MEDIA 0x00000008 #define FILE_REMOTE_DEVICE 0x00000010 +#define FILE_DEVICE_IS_MOUNTED 0x00000020 +#define FILE_VIRTUAL_VOLUME 0x00000040 +#define FILE_AUTOGENERATED_DEVICE_NAME 0x00000080 +#define FILE_DEVICE_SECURE_OPEN 0x00000100 // // File Object Flags

1 0

[cgutman] 55341: [USBEHCI] - Remove debug spam
by cgutman＠svn.reactos.org 30 Jan '12

30 Jan '12

Author: cgutman Date: Mon Jan 30 22:54:40 2012 New Revision: 55341 URL: http://svn.reactos.org/svn/reactos?rev=55341&view=rev Log: [USBEHCI] - Remove debug spam Modified: branches/usb-bringup-trunk/drivers/usb/usbehci_new/hardware.cpp Modified: branches/usb-bringup-trunk/drivers/usb/usbehci_new/hardware.cpp URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/usb/u… ============================================================================== --- branches/usb-bringup-trunk/drivers/usb/usbehci_new/hardware.cpp [iso-8859-1] (original) +++ branches/usb-bringup-trunk/drivers/usb/usbehci_new/hardware.cpp [iso-8859-1] Mon Jan 30 22:54:40 2012 @@ -1090,7 +1090,7 @@ This = (CUSBHardwareDevice*) SystemArgument1; CStatus = (ULONG) SystemArgument2; - DPRINT1("CStatus %x\n", CStatus); + DPRINT("CStatus %x\n", CStatus); // // check for completion of async schedule

1 0

[ion] 55340: [SMSS2]: Create and define the volume descriptor structure, and go ahead and build some volume descriptors!
by ion＠svn.reactos.org 30 Jan '12

30 Jan '12

Author: ion Date: Mon Jan 30 22:50:37 2012 New Revision: 55340 URL: http://svn.reactos.org/svn/reactos?rev=55340&view=rev Log: [SMSS2]: Create and define the volume descriptor structure, and go ahead and build some volume descriptors! Modified: trunk/reactos/base/system/smss2/pagefile.c Modified: trunk/reactos/base/system/smss2/pagefile.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/smss2/pagefile… ============================================================================== --- trunk/reactos/base/system/smss2/pagefile.c [iso-8859-1] (original) +++ trunk/reactos/base/system/smss2/pagefile.c [iso-8859-1] Mon Jan 30 22:50:37 2012 @@ -20,6 +20,9 @@ #define STANDARD_PAGING_FILE_NAME L"\\??\\?:\\pagefile.sys" #define STANDARD_DRIVE_LETTER_OFFSET 4 +// +// Structure and flags describing each pagefile +// #define SMP_PAGEFILE_CREATED 0x01 #define SMP_PAGEFILE_DEFAULT 0x02 #define SMP_PAGEFILE_SYSTEM_MANAGED 0x04 @@ -38,6 +41,20 @@ LARGE_INTEGER ActualMaxSize; ULONG Flags; } SMP_PAGEFILE_DESCRIPTOR, *PSMP_PAGEFILE_DESCRIPTOR; + +// +// Structure and flags describing each volume +// +#define SMP_VOLUME_INSERTED 0x01 +#define SMP_VOLUME_IS_BOOT 0x08 +typedef struct _SMP_VOLUME_DESCRIPTOR +{ + LIST_ENTRY Entry; + ULONG Flags; + WCHAR DriveLetter; + LARGE_INTEGER FreeSpace; + FILE_FS_DEVICE_INFORMATION DeviceInfo; +} SMP_VOLUME_DESCRIPTOR, *PSMP_VOLUME_DESCRIPTOR; LIST_ENTRY SmpPagingFileDescriptorList, SmpVolumeDescriptorList; BOOLEAN SmpRegistrySpecifierPresent; @@ -411,7 +428,184 @@ NTAPI SmpCreateVolumeDescriptors(VOID) { - return STATUS_SUCCESS; + NTSTATUS Status; + UNICODE_STRING VolumePath; + ULONG Length; + BOOLEAN BootVolumeFound = FALSE; + WCHAR StartChar, Drive, DriveDiff; + HANDLE VolumeHandle; + OBJECT_ATTRIBUTES ObjectAttributes; + IO_STATUS_BLOCK IoStatusBlock; + PROCESS_DEVICEMAP_INFORMATION ProcessInformation; + FILE_FS_DEVICE_INFORMATION DeviceInfo; + FILE_FS_SIZE_INFORMATION SizeInfo; + PSMP_VOLUME_DESCRIPTOR Volume; + LARGE_INTEGER FreeSpace, FinalFreeSpace; + WCHAR Buffer[32]; + + /* We should be starting with an empty list */ + ASSERT(IsListEmpty(&SmpVolumeDescriptorList)); + + /* Query the device map so we can get the drive letters */ + Status = NtQueryInformationProcess(NtCurrentProcess(), + ProcessDeviceMap, + &ProcessInformation, + sizeof(ProcessInformation), + NULL); + if (!NT_SUCCESS(Status)) + { + DPRINT1("SMSS:PFILE: Query(ProcessDeviceMap) failed with status %X \n", + Status); + return Status; + } + + /* Build the volume string, starting with A: (we'll edit this in place) */ + wcscpy(Buffer, L"\\??\\A:\\"); + Length = wcslen(Buffer); + VolumePath.Buffer = Buffer; + VolumePath.Length = Length * sizeof(WCHAR); + VolumePath.MaximumLength = Length * sizeof(WCHAR) + sizeof(UNICODE_NULL); + + /* Start with the C drive except on weird Japanese NECs... */ + StartChar = SharedUserData->AlternativeArchitecture ? L'A' : L'C'; + for (Drive = StartChar, DriveDiff = StartChar - 'A'; Drive <= L'Z'; Drive++, DriveDiff++) + { + /* Skip the disk if it's not in the drive map */ + if (!((1 << DriveDiff) & ProcessInformation.Query.DriveMap)) continue; + + /* Write the drive letter and try to open the volume */ + VolumePath.Buffer[STANDARD_DRIVE_LETTER_OFFSET] = Drive; + InitializeObjectAttributes(&ObjectAttributes, + &VolumePath, + OBJ_CASE_INSENSITIVE, + NULL, + NULL); + Status = NtOpenFile(&VolumeHandle, + FILE_READ_ATTRIBUTES | FILE_WRITE_ATTRIBUTES | SYNCHRONIZE, + &ObjectAttributes, + &IoStatusBlock, + FILE_SHARE_READ | FILE_SHARE_WRITE, + FILE_SYNCHRONOUS_IO_NONALERT | FILE_DIRECTORY_FILE); + if (!NT_SUCCESS(Status)) + { + /* Skip the volume if we failed */ + DPRINT1("SMSS:PFILE: Open volume `%wZ' failed with status %X \n", + &VolumePath, Status); + continue; + } + + /* Now query device information on the volume */ + Status = NtQueryVolumeInformationFile(VolumeHandle, + &IoStatusBlock, + &DeviceInfo, + sizeof(DeviceInfo), + FileFsDeviceInformation); + if (!NT_SUCCESS(Status)) + { + /* Move to the next volume if we failed */ + DPRINT1("SMSS:PFILE: Query volume `%wZ' (handle %p) for device info" + " failed with status %X \n", + &VolumePath, + VolumeHandle, + Status); + NtClose(VolumeHandle); + continue; + } + + /* Check if this is a fixed disk */ + if (DeviceInfo.Characteristics & (FILE_FLOPPY_DISKETTE | + FILE_READ_ONLY_DEVICE | + FILE_REMOTE_DEVICE | + FILE_REMOVABLE_MEDIA)) + { + /* It isn't, so skip it */ + DPRINT1("SMSS:PFILE: Volume `%wZ' (%X) cannot store a paging file \n", + &VolumePath, + DeviceInfo.Characteristics); + NtClose(VolumeHandle); + continue; + } + + /* We found a fixed volume, allocate a descriptor for it */ + Volume = RtlAllocateHeap(RtlGetProcessHeap(), + HEAP_ZERO_MEMORY, + sizeof(SMP_VOLUME_DESCRIPTOR)); + if (!Volume) + { + /* Failed to allocate memory, try the next disk */ + DPRINT1("SMSS:PFILE: Failed to allocate a volume descriptor (%u bytes) \n", + sizeof(SMP_VOLUME_DESCRIPTOR)); + NtClose(VolumeHandle); + continue; + } + + /* Save the drive letter and device information */ + Volume->DriveLetter = Drive; + Volume->DeviceInfo = DeviceInfo; + + /* Check if this is the boot volume */ + if (RtlUpcaseUnicodeChar(Drive) == + RtlUpcaseUnicodeChar(SharedUserData->NtSystemRoot[0])) + { + /* Save it */ + ASSERT(BootVolumeFound == FALSE); + Volume->Flags |= SMP_VOLUME_IS_BOOT; + BootVolumeFound = TRUE; + } + + /* Now get size information on the volume */ + Status = NtQueryVolumeInformationFile(VolumeHandle, + &IoStatusBlock, + &SizeInfo, + sizeof(SizeInfo), + FileFsSizeInformation); + if (!NT_SUCCESS(Status)) + { + /* We failed -- keep going */ + DPRINT1("SMSS:PFILE: Query volume `%wZ' (handle %p) for size failed" + " with status %X \n", + &VolumePath, + VolumeHandle, + Status); + RtlFreeHeap(RtlGetProcessHeap(), 0, Volume); + NtClose(VolumeHandle); + continue; + } + + /* Done querying volume information, close the handle */ + NtClose(VolumeHandle); + + /* Compute how much free space we have */ + FreeSpace.QuadPart = SizeInfo.AvailableAllocationUnits.QuadPart * + SizeInfo.SectorsPerAllocationUnit; + FinalFreeSpace.QuadPart = FreeSpace.QuadPart * SizeInfo.BytesPerSector; + Volume->FreeSpace = FinalFreeSpace; + + /* Check if there's less than 32MB free so we don't starve the disk */ + if (FinalFreeSpace.QuadPart <= 0x2000000) + { + /* In this case, act as if there's no free space */ + Volume->FreeSpace.QuadPart = 0; + } + else + { + /* Trim off 32MB to give the disk a bit of breathing room */ + Volume->FreeSpace.QuadPart = FinalFreeSpace.QuadPart - 0x2000000; + } + + /* All done, add this volume to our descriptor list */ + InsertTailList(&SmpVolumeDescriptorList, &Volume->Entry); + Volume->Flags |= SMP_VOLUME_INSERTED; + DPRINT1("SMSS:PFILE: Created volume descriptor for`%wZ' \n", &VolumePath); + } + + /* We must've found at least the boot volume */ + ASSERT(BootVolumeFound == TRUE); + ASSERT(!IsListEmpty(&SmpVolumeDescriptorList)); + if (!IsListEmpty(&SmpVolumeDescriptorList)) return STATUS_SUCCESS; + + /* Something is really messed up if we found no disks at all */ + return STATUS_UNEXPECTED_IO_ERROR; } NTSTATUS

1 0

[cgutman] 55339: [USBHUB] - Missed a fix from last commit - Wait for the device status change work item to complete - The USB stack is now properly constructed for USB booting
by cgutman＠svn.reactos.org 30 Jan '12

30 Jan '12

Author: cgutman Date: Mon Jan 30 22:45:16 2012 New Revision: 55339 URL: http://svn.reactos.org/svn/reactos?rev=55339&view=rev Log: [USBHUB] - Missed a fix from last commit - Wait for the device status change work item to complete - The USB stack is now properly constructed for USB booting Modified: branches/usb-bringup-trunk/drivers/usb/usbhub_new/fdo.c branches/usb-bringup-trunk/drivers/usb/usbhub_new/usbhub.h Modified: branches/usb-bringup-trunk/drivers/usb/usbhub_new/fdo.c URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/usb/u… ============================================================================== --- branches/usb-bringup-trunk/drivers/usb/usbhub_new/fdo.c [iso-8859-1] (original) +++ branches/usb-bringup-trunk/drivers/usb/usbhub_new/fdo.c [iso-8859-1] Mon Jan 30 22:45:16 2012 @@ -260,8 +260,6 @@ PORT_STATUS_CHANGE PortStatus; LONG PortId; - static LONG failsafe = 0; - DPRINT1("Entered DeviceStatusChangeThread, Context %x\n", Context); WorkItemData = (PWORK_ITEM_DATA)Context; @@ -408,20 +406,7 @@ } } - // - // FIXME: Still in testing - // - failsafe++; - if (failsafe > 100) - { - DPRINT1("SCE completed over 100 times but no action has been taken to clear the Change of any ports.\n"); - // - // Return and dont send any more SCE Requests - // - return; - } - - ExFreePool(WorkItemData); + KeSetEvent(&WorkItemData->Event, IO_NO_INCREMENT, FALSE); // // Send another SCE Request @@ -460,6 +445,7 @@ return STATUS_INSUFFICIENT_RESOURCES; } WorkItemData->Context = RealDeviceObject; + KeInitializeEvent(&WorkItemData->Event, NotificationEvent, FALSE); DPRINT1("Initialize work item\n"); ExInitializeWorkItem(&WorkItemData->WorkItem, DeviceStatusChangeThread, (PVOID)WorkItemData); @@ -467,6 +453,16 @@ // Queue the work item to handle initializing the device // ExQueueWorkItem(&WorkItemData->WorkItem, DelayedWorkQueue); + + // + // Wait for the work item + // + KeWaitForSingleObject(&WorkItemData->Event, + Executive, + KernelMode, + FALSE, + NULL); + ExFreePool(WorkItemData); // // Return more processing required so the IO Manger doesnât try to mess with IRP just freed @@ -1823,6 +1819,11 @@ } else { + // + // Send the first SCE Request + // + QueryStatusChangeEndpoint(DeviceObject); + // // reset ports // @@ -1848,11 +1849,6 @@ } } } - - // - // Send the first SCE Request - // - QueryStatusChangeEndpoint(DeviceObject); } ExFreePool(Urb); Modified: branches/usb-bringup-trunk/drivers/usb/usbhub_new/usbhub.h URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/usb/u… ============================================================================== --- branches/usb-bringup-trunk/drivers/usb/usbhub_new/usbhub.h [iso-8859-1] (original) +++ branches/usb-bringup-trunk/drivers/usb/usbhub_new/usbhub.h [iso-8859-1] Mon Jan 30 22:45:16 2012 @@ -44,6 +44,7 @@ typedef struct _WORK_ITEM_DATA { WORK_QUEUE_ITEM WorkItem; + KEVENT Event; PVOID Context; } WORK_ITEM_DATA, *PWORK_ITEM_DATA;

1 0

[cgutman] 55338: [USBHUB] - Send the SCE IRP before resetting the port so we can wait on it for device enumeration
by cgutman＠svn.reactos.org 30 Jan '12

30 Jan '12

Author: cgutman Date: Mon Jan 30 22:19:47 2012 New Revision: 55338 URL: http://svn.reactos.org/svn/reactos?rev=55338&view=rev Log: [USBHUB] - Send the SCE IRP before resetting the port so we can wait on it for device enumeration Modified: branches/usb-bringup-trunk/drivers/usb/usbhub_new/fdo.c Modified: branches/usb-bringup-trunk/drivers/usb/usbhub_new/fdo.c URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/usb/u… ============================================================================== --- branches/usb-bringup-trunk/drivers/usb/usbhub_new/fdo.c [iso-8859-1] (original) +++ branches/usb-bringup-trunk/drivers/usb/usbhub_new/fdo.c [iso-8859-1] Mon Jan 30 22:19:47 2012 @@ -1446,6 +1446,11 @@ DPRINT1("RootHubInitCallbackFunction Sending the initial SCE Request %x\n", DeviceObject); + // + // Send the first SCE Request + // + QueryStatusChangeEndpoint(DeviceObject); + for (PortId = 1; PortId <= HubDeviceExtension->HubDescriptor.bNumberOfPorts; PortId++) { // @@ -1468,11 +1473,6 @@ } } } - - // - // Send the first SCE Request - // - QueryStatusChangeEndpoint(DeviceObject); } NTSTATUS

1 0

[cgutman] 55337: [HAL] - Remove differences between legacy and ACPI HAL initialization
by cgutman＠svn.reactos.org 30 Jan '12

30 Jan '12

Author: cgutman Date: Mon Jan 30 21:47:30 2012 New Revision: 55337 URL: http://svn.reactos.org/svn/reactos?rev=55337&view=rev Log: [HAL] - Remove differences between legacy and ACPI HAL initialization Modified: branches/usb-bringup-trunk/hal/halx86/legacy/halpnpdd.c Modified: branches/usb-bringup-trunk/hal/halx86/legacy/halpnpdd.c URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/hal/halx86/le… ============================================================================== --- branches/usb-bringup-trunk/hal/halx86/legacy/halpnpdd.c [iso-8859-1] (original) +++ branches/usb-bringup-trunk/hal/halx86/legacy/halpnpdd.c [iso-8859-1] Mon Jan 30 21:47:30 2012 @@ -50,6 +50,50 @@ /* PRIVATE FUNCTIONS **********************************************************/ +VOID +NTAPI +HalpReportDetectedDevices(IN PDRIVER_OBJECT DriverObject, + IN PVOID Context, + IN ULONG Count) +{ + PFDO_EXTENSION FdoExtension = Context; + PPDO_EXTENSION PdoExtension; + PDEVICE_OBJECT PdoDeviceObject; + NTSTATUS Status; + + /* Create the PDO */ + Status = IoCreateDevice(DriverObject, + sizeof(PDO_EXTENSION), + NULL, + FILE_DEVICE_BUS_EXTENDER, + FILE_AUTOGENERATED_DEVICE_NAME, + FALSE, + &PdoDeviceObject); + if (!NT_SUCCESS(Status)) + { + /* Fail */ + DPRINT1("HAL: Could not create ACPI device object status=0x%08x\n", Status); + return; + } + + /* Setup the PDO device extension */ + PdoExtension = PdoDeviceObject->DeviceExtension; + PdoExtension->ExtensionType = PdoExtensionType; + PdoExtension->PhysicalDeviceObject = PdoDeviceObject; + PdoExtension->ParentFdoExtension = FdoExtension; + PdoExtension->PdoType = AcpiPdo; + + /* Add the PDO to the head of the list */ + PdoExtension->Next = FdoExtension->ChildPdoList; + FdoExtension->ChildPdoList = PdoExtension; + + /* Initialization is finished */ + PdoDeviceObject->Flags &= ~DO_DEVICE_INITIALIZING; + + /* Invalidate device relations since we added a new device */ + IoSynchronousInvalidateDeviceRelations(FdoExtension->PhysicalDeviceObject, BusRelations); +} + NTSTATUS NTAPI HalpAddDevice(IN PDRIVER_OBJECT DriverObject, @@ -57,9 +101,9 @@ { NTSTATUS Status; PFDO_EXTENSION FdoExtension; - PPDO_EXTENSION PdoExtension; - PDEVICE_OBJECT DeviceObject, PdoDeviceObject, AttachedDevice; + PDEVICE_OBJECT DeviceObject, AttachedDevice; // PDESCRIPTION_HEADER Wdrt; + DPRINT("HAL: PnP Driver ADD!\n"); /* Create the FDO */ @@ -99,47 +143,10 @@ /* Save the attachment */ FdoExtension->AttachedDeviceObject = AttachedDevice; - /* Create the PDO */ - Status = IoCreateDevice(DriverObject, - sizeof(PDO_EXTENSION), - NULL, - FILE_DEVICE_BUS_EXTENDER, - FILE_AUTOGENERATED_DEVICE_NAME, - FALSE, - &PdoDeviceObject); - if (!NT_SUCCESS(Status)) - { - /* Fail */ - DPRINT1("HAL: Could not create ACPI device object status=0x%08x\n", Status); - return Status; - } - - /* Setup the PDO device extension */ - PdoExtension = PdoDeviceObject->DeviceExtension; - PdoExtension->ExtensionType = PdoExtensionType; - PdoExtension->PhysicalDeviceObject = PdoDeviceObject; - PdoExtension->ParentFdoExtension = FdoExtension; - PdoExtension->PdoType = AcpiPdo; - - /* Add the PDO to the head of the list */ - PdoExtension->Next = FdoExtension->ChildPdoList; - FdoExtension->ChildPdoList = PdoExtension; - - /* Initialization is finished */ - PdoDeviceObject->Flags &= ~DO_DEVICE_INITIALIZING; - -#if 0 - /* Find the ACPI watchdog table */ - Wdrt = HalAcpiGetTable(0, 'TRDW'); - if (Wdrt) - { - /* FIXME: TODO */ - DPRINT1("You have an ACPI Watchdog. That's great! You should be proud ;-)\n"); - } -#endif - - /* Invalidate device relations since we added a new device */ - IoSynchronousInvalidateDeviceRelations(TargetDevice, BusRelations); + /* Register for reinitialization to report devices later */ + IoRegisterBootDriverReinitialization(DriverObject, + HalpReportDetectedDevices, + FdoExtension); /* Return status */ DPRINT("Device added %lx\n", Status);

1 0

[cgutman] 55336: [HIVESYS] - Fix the service entries [HAL] - Synchronously invalidate device relations [NTOSKRNL] - Remove hacks
by cgutman＠svn.reactos.org 30 Jan '12

30 Jan '12

Author: cgutman Date: Mon Jan 30 21:36:51 2012 New Revision: 55336 URL: http://svn.reactos.org/svn/reactos?rev=55336&view=rev Log: [HIVESYS] - Fix the service entries [HAL] - Synchronously invalidate device relations [NTOSKRNL] - Remove hacks Modified: branches/usb-bringup-trunk/boot/bootdata/hivesys_i386.inf branches/usb-bringup-trunk/hal/halx86/acpi/halpnpdd.c branches/usb-bringup-trunk/hal/halx86/legacy/halpnpdd.c branches/usb-bringup-trunk/ntoskrnl/io/pnpmgr/pnpmgr.c Modified: branches/usb-bringup-trunk/boot/bootdata/hivesys_i386.inf URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/boot/bootdata… ============================================================================== --- branches/usb-bringup-trunk/boot/bootdata/hivesys_i386.inf [iso-8859-1] (original) +++ branches/usb-bringup-trunk/boot/bootdata/hivesys_i386.inf [iso-8859-1] Mon Jan 30 21:36:51 2012 @@ -1453,31 +1453,35 @@ ; USB hub driver HKLM,"SYSTEM\CurrentControlSet\Services\usbhub","ErrorControl",0x00010001,0x00000001 -HKLM,"SYSTEM\CurrentControlSet\Services\usbhub","Group",0x00000000,"Boot Bus" +HKLM,"SYSTEM\CurrentControlSet\Services\usbhub","Group",0x00000000,"Boot Bus Extender" HKLM,"SYSTEM\CurrentControlSet\Services\usbhub","Tag",0x00010001,0x00000002 HKLM,"SYSTEM\CurrentControlSet\Services\usbhub","ImagePath",0x00020000,"system32\drivers\usbhub.sys" HKLM,"SYSTEM\CurrentControlSet\Services\usbhub","Start",0x00010001,0x00000000 +HKLM,"SYSTEM\CurrentControlSet\Services\usbhub","Type",0x00010001,0x00000002 ; EHCI controller driver HKLM,"SYSTEM\CurrentControlSet\Services\usbehci","ErrorControl",0x00010001,0x00000001 -HKLM,"SYSTEM\CurrentControlSet\Services\usbehci","Group",0x00000000,"Boot Bus" +HKLM,"SYSTEM\CurrentControlSet\Services\usbehci","Group",0x00000000,"Boot Bus Extender" HKLM,"SYSTEM\CurrentControlSet\Services\usbehci","Tag",0x00010001,0x00000002 HKLM,"SYSTEM\CurrentControlSet\Services\usbehci","ImagePath",0x00020000,"system32\drivers\usbehci.sys" HKLM,"SYSTEM\CurrentControlSet\Services\usbehci","Start",0x00010001,0x00000000 +HKLM,"SYSTEM\CurrentControlSet\Services\usbehci","Type",0x00010001,0x00000002 ; OHCI controller driver HKLM,"SYSTEM\CurrentControlSet\Services\usbohci","ErrorControl",0x00010001,0x00000001 -HKLM,"SYSTEM\CurrentControlSet\Services\usbohci","Group",0x00000000,"Boot Bus" +HKLM,"SYSTEM\CurrentControlSet\Services\usbohci","Group",0x00000000,"Boot Bus Extender" HKLM,"SYSTEM\CurrentControlSet\Services\usbohci","Tag",0x00010001,0x00000002 HKLM,"SYSTEM\CurrentControlSet\Services\usbohci","ImagePath",0x00020000,"system32\drivers\usbohci.sys" HKLM,"SYSTEM\CurrentControlSet\Services\usbohci","Start",0x00010001,0x00000000 +HKLM,"SYSTEM\CurrentControlSet\Services\usbohci","Type",0x00010001,0x00000001 ; UHCI controller driver -HKLM,"SYSTEM\CurrentControlSet\Services\usbuhci","ErrorControl",0x00010001,0x00000001 -HKLM,"SYSTEM\CurrentControlSet\Services\usbuhci","Group",0x00000000,"Boot Bus" -HKLM,"SYSTEM\CurrentControlSet\Services\usbuhci","Tag",0x00010001,0x00000002 -HKLM,"SYSTEM\CurrentControlSet\Services\usbuhci","ImagePath",0x00020000,"system32\drivers\usbuhci.sys" -HKLM,"SYSTEM\CurrentControlSet\Services\usbuhci","Start",0x00010001,0x00000000 +;HKLM,"SYSTEM\CurrentControlSet\Services\usbuhci","ErrorControl",0x00010001,0x00000001 +;HKLM,"SYSTEM\CurrentControlSet\Services\usbuhci","Group",0x00000000,"Boot Bus Extender" +;HKLM,"SYSTEM\CurrentControlSet\Services\usbuhci","Tag",0x00010001,0x00000002 +;HKLM,"SYSTEM\CurrentControlSet\Services\usbuhci","ImagePath",0x00020000,"system32\drivers\usbuhci.sys" +;HKLM,"SYSTEM\CurrentControlSet\Services\usbuhci","Start",0x00010001,0x00000000 +;HKLM,"SYSTEM\CurrentControlSet\Services\usbuhci","Type",0x00010001,0x00000001 ; USB storage driver HKLM,"SYSTEM\CurrentControlSet\Services\usbstor","ErrorControl",0x00010001,0x00000001 @@ -1485,27 +1489,31 @@ HKLM,"SYSTEM\CurrentControlSet\Services\usbstor","Tag",0x00010001,0x00000002 HKLM,"SYSTEM\CurrentControlSet\Services\usbstor","ImagePath",0x00020000,"system32\drivers\usbstor.sys" HKLM,"SYSTEM\CurrentControlSet\Services\usbstor","Start",0x00010001,0x00000000 +HKLM,"SYSTEM\CurrentControlSet\Services\usbstor","Type",0x00010001,0x00000001 ; USB composite generic parent HKLM,"SYSTEM\CurrentControlSet\Services\usbccgp","ErrorControl",0x00010001,0x00000001 -HKLM,"SYSTEM\CurrentControlSet\Services\usbccgp","Group",0x00000000,"Boot Bus" +HKLM,"SYSTEM\CurrentControlSet\Services\usbccgp","Group",0x00000000,"Boot Bus Extender" HKLM,"SYSTEM\CurrentControlSet\Services\usbccgp","Tag",0x00010001,0x00000002 HKLM,"SYSTEM\CurrentControlSet\Services\usbccgp","ImagePath",0x00020000,"system32\drivers\usbccgp.sys" HKLM,"SYSTEM\CurrentControlSet\Services\usbccgp","Start",0x00010001,0x00000000 +HKLM,"SYSTEM\CurrentControlSet\Services\usbccgp","Type",0x00010001,0x00000001 ; ACPI driver HKLM,"SYSTEM\CurrentControlSet\Services\acpi","ErrorControl",0x00010001,0x00000001 -HKLM,"SYSTEM\CurrentControlSet\Services\acpi","Group",0x00000000,"Boot Bus" +HKLM,"SYSTEM\CurrentControlSet\Services\acpi","Group",0x00000000,"Boot Bus Extender" HKLM,"SYSTEM\CurrentControlSet\Services\acpi","Tag",0x00010001,0x00000002 HKLM,"SYSTEM\CurrentControlSet\Services\acpi","ImagePath",0x00020000,"system32\drivers\acpi.sys" HKLM,"SYSTEM\CurrentControlSet\Services\acpi","Start",0x00010001,0x00000000 +HKLM,"SYSTEM\CurrentControlSet\Services\acpi","Type",0x00010001,0x00000001 ; PCI Bus driver HKLM,"SYSTEM\CurrentControlSet\Services\Pci","ErrorControl",0x00010001,0x00000001 -HKLM,"SYSTEM\CurrentControlSet\Services\Pci","Group",0x00000000,"Boot Bus" +HKLM,"SYSTEM\CurrentControlSet\Services\Pci","Group",0x00000000,"Boot Bus Extender" HKLM,"SYSTEM\CurrentControlSet\Services\Pci","Tag",0x00010001,0x00000002 HKLM,"SYSTEM\CurrentControlSet\Services\Pci","ImagePath",0x00020000,"system32\drivers\pci.sys" HKLM,"SYSTEM\CurrentControlSet\Services\Pci","Start",0x00010001,0x00000000 +HKLM,"SYSTEM\CurrentControlSet\Services\Pci","Type",0x00010001,0x00000001 HKLM,"SYSTEM\CurrentControlSet\Services\Pci\Parameters","1045C621",0x00030003,04,00,00,00,00,00,00,00 HKLM,"SYSTEM\CurrentControlSet\Services\Pci\Parameters","10950640",0x00030003,04,00,00,00,00,00,00,00 HKLM,"SYSTEM\CurrentControlSet\Services\Pci\Parameters","80861230",0x00030003,04,00,00,00,00,00,00,00 Modified: branches/usb-bringup-trunk/hal/halx86/acpi/halpnpdd.c URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/hal/halx86/ac… ============================================================================== --- branches/usb-bringup-trunk/hal/halx86/acpi/halpnpdd.c [iso-8859-1] (original) +++ branches/usb-bringup-trunk/hal/halx86/acpi/halpnpdd.c [iso-8859-1] Mon Jan 30 21:36:51 2012 @@ -57,9 +57,50 @@ IN ULONG Count) { PFDO_EXTENSION FdoExtension = Context; - - /* Invalidate device relations since we added a new device */ - IoInvalidateDeviceRelations(FdoExtension->PhysicalDeviceObject, BusRelations); + PPDO_EXTENSION PdoExtension; + PDEVICE_OBJECT PdoDeviceObject; + PDESCRIPTION_HEADER Wdrt; + NTSTATUS Status; + + /* Create the PDO */ + Status = IoCreateDevice(DriverObject, + sizeof(PDO_EXTENSION), + NULL, + FILE_DEVICE_BUS_EXTENDER, + FILE_AUTOGENERATED_DEVICE_NAME, + FALSE, + &PdoDeviceObject); + if (!NT_SUCCESS(Status)) + { + /* Fail */ + DPRINT1("HAL: Could not create ACPI device object status=0x%08x\n", Status); + return; + } + + /* Setup the PDO device extension */ + PdoExtension = PdoDeviceObject->DeviceExtension; + PdoExtension->ExtensionType = PdoExtensionType; + PdoExtension->PhysicalDeviceObject = PdoDeviceObject; + PdoExtension->ParentFdoExtension = FdoExtension; + PdoExtension->PdoType = AcpiPdo; + + /* Add the PDO to the head of the list */ + PdoExtension->Next = FdoExtension->ChildPdoList; + FdoExtension->ChildPdoList = PdoExtension; + + /* Initialization is finished */ + PdoDeviceObject->Flags &= ~DO_DEVICE_INITIALIZING; + + /* Find the ACPI watchdog table */ + Wdrt = HalAcpiGetTable(0, 'TRDW'); + if (Wdrt) + { + /* FIXME: TODO */ + DPRINT1("You have an ACPI Watchdog. That's great! You should be proud ;-)\n"); + } + + /* This will synchronously load the ACPI driver (needed because we're critical for boot) */ + IoSynchronousInvalidateDeviceRelations(FdoExtension->PhysicalDeviceObject, BusRelations); } NTSTATUS @@ -69,10 +110,7 @@ { NTSTATUS Status; PFDO_EXTENSION FdoExtension; - PPDO_EXTENSION PdoExtension; PDEVICE_OBJECT DeviceObject, AttachedDevice; - PDEVICE_OBJECT PdoDeviceObject; - PDESCRIPTION_HEADER Wdrt; DPRINT("HAL: PnP Driver ADD!\n"); @@ -112,43 +150,6 @@ /* Save the attachment */ FdoExtension->AttachedDeviceObject = AttachedDevice; - - /* Create the PDO */ - Status = IoCreateDevice(DriverObject, - sizeof(PDO_EXTENSION), - NULL, - FILE_DEVICE_BUS_EXTENDER, - FILE_AUTOGENERATED_DEVICE_NAME, - FALSE, - &PdoDeviceObject); - if (!NT_SUCCESS(Status)) - { - /* Fail */ - DPRINT1("HAL: Could not create ACPI device object status=0x%08x\n", Status); - return Status; - } - - /* Setup the PDO device extension */ - PdoExtension = PdoDeviceObject->DeviceExtension; - PdoExtension->ExtensionType = PdoExtensionType; - PdoExtension->PhysicalDeviceObject = PdoDeviceObject; - PdoExtension->ParentFdoExtension = FdoExtension; - PdoExtension->PdoType = AcpiPdo; - - /* Add the PDO to the head of the list */ - PdoExtension->Next = FdoExtension->ChildPdoList; - FdoExtension->ChildPdoList = PdoExtension; - - /* Initialization is finished */ - PdoDeviceObject->Flags &= ~DO_DEVICE_INITIALIZING; - - /* Find the ACPI watchdog table */ - Wdrt = HalAcpiGetTable(0, 'TRDW'); - if (Wdrt) - { - /* FIXME: TODO */ - DPRINT1("You have an ACPI Watchdog. That's great! You should be proud ;-)\n"); - } /* Register for reinitialization to report devices later */ IoRegisterBootDriverReinitialization(DriverObject, Modified: branches/usb-bringup-trunk/hal/halx86/legacy/halpnpdd.c URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/hal/halx86/le… ============================================================================== --- branches/usb-bringup-trunk/hal/halx86/legacy/halpnpdd.c [iso-8859-1] (original) +++ branches/usb-bringup-trunk/hal/halx86/legacy/halpnpdd.c [iso-8859-1] Mon Jan 30 21:36:51 2012 @@ -139,7 +139,7 @@ #endif /* Invalidate device relations since we added a new device */ - IoInvalidateDeviceRelations(TargetDevice, BusRelations); + IoSynchronousInvalidateDeviceRelations(TargetDevice, BusRelations); /* Return status */ DPRINT("Device added %lx\n", Status); Modified: branches/usb-bringup-trunk/ntoskrnl/io/pnpmgr/pnpmgr.c URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/ntoskrnl/io/p… ============================================================================== --- branches/usb-bringup-trunk/ntoskrnl/io/pnpmgr/pnpmgr.c [iso-8859-1] (original) +++ branches/usb-bringup-trunk/ntoskrnl/io/pnpmgr/pnpmgr.c [iso-8859-1] Mon Jan 30 21:36:51 2012 @@ -389,9 +389,6 @@ DPRINT1("Installed NULL service for critical device '%wZ'\n", &ChildIdNameU); } - /* We need to enumerate children */ - DeviceNode->Flags |= DNF_NEED_TO_ENUM; - ExFreePool(OriginalIdBuffer); ExFreePool(PartialInfo); ExFreePool(BasicInfo); @@ -2174,6 +2171,9 @@ ULONG i; BOOLEAN Found; + if (DeviceNode == IopRootDeviceNode) + return; + while (Child != NULL) { NextChild = Child->Sibling; @@ -2420,7 +2420,7 @@ UNICODE_STRING RegKey; /* Install the service for this if it's in the CDDB */ - //IopInstallCriticalDevice(DeviceNode); + IopInstallCriticalDevice(DeviceNode); RegKey.Length = 0; RegKey.MaximumLength = sizeof(RegKeyBuffer); @@ -2553,25 +2553,7 @@ if (IopDeviceNodeHasFlag(DeviceNode, DNF_STARTED) || IopDeviceNodeHasFlag(DeviceNode, DNF_ADDED) || IopDeviceNodeHasFlag(DeviceNode, DNF_DISABLED)) - { - if (DeviceNode->Flags & DNF_NEED_TO_ENUM) - { - Status = IopInitializeDevice(DeviceNode, NULL); - if (NT_SUCCESS(Status)) - { - /* HACK */ - DeviceNode->Flags &= ~DNF_STARTED; - Status = IopStartDevice(DeviceNode); - if (!NT_SUCCESS(Status)) - { - DPRINT1("IopStartDevice(%wZ) failed with status 0x%08x\n", - &DeviceNode->InstancePath, Status); - } - } - DeviceNode->Flags &= ~DNF_NEED_TO_ENUM; - } return STATUS_SUCCESS; - } if (DeviceNode->ServiceName.Buffer == NULL) {

1 0

[ion] 55335: [SMSS2]: Implement all the processing required for being able to create emergency, system, and manual-sized page files, on both fixed drives any "any" drives. Missing the code to build...
by ion＠svn.reactos.org 30 Jan '12

30 Jan '12

Author: ion Date: Mon Jan 30 21:28:48 2012 New Revision: 55335 URL: http://svn.reactos.org/svn/reactos?rev=55335&view=rev Log: [SMSS2]: Implement all the processing required for being able to create emergency, system, and manual-sized page files, on both fixed drives any "any" drives. Missing the code to build volume descriptors and to actually ask the kernel to create the file (right now, just prints what should be done and sizes). Modified: trunk/reactos/base/system/smss2/pagefile.c Modified: trunk/reactos/base/system/smss2/pagefile.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/smss2/pagefile… ============================================================================== --- trunk/reactos/base/system/smss2/pagefile.c [iso-8859-1] (original) +++ trunk/reactos/base/system/smss2/pagefile.c [iso-8859-1] Mon Jan 30 21:28:48 2012 @@ -14,7 +14,11 @@ /* GLOBALS ********************************************************************/ -#define STANDARD_DRIVE_LETTER_OFFSET 4 +// +// Taken from ASSERTs +// +#define STANDARD_PAGING_FILE_NAME L"\\??\\?:\\pagefile.sys" +#define STANDARD_DRIVE_LETTER_OFFSET 4 #define SMP_PAGEFILE_CREATED 0x01 #define SMP_PAGEFILE_DEFAULT 0x02 @@ -209,7 +213,308 @@ NTSTATUS NTAPI +SmpCreatePagingFileOnFixedDrive(IN PSMP_PAGEFILE_DESCRIPTOR Descriptor, + IN PLARGE_INTEGER FuzzFactor, + IN PLARGE_INTEGER MinimumSize) +{ + DPRINT1("Should create fixed pagefile of sizes: %I64d %I64d\n", + FuzzFactor->QuadPart, MinimumSize->QuadPart); + return STATUS_SUCCESS; +} + +NTSTATUS +NTAPI +SmpCreatePagingFileOnAnyDrive(IN PSMP_PAGEFILE_DESCRIPTOR Descriptor, + IN PLARGE_INTEGER FuzzFactor, + IN PLARGE_INTEGER MinimumSize) +{ + DPRINT1("Should create 'any' pagefile of sizes: %I64d %I64d\n", + FuzzFactor->QuadPart, MinimumSize->QuadPart); + return STATUS_SUCCESS; +} + +VOID +NTAPI +SmpMakeDefaultPagingFileDescriptor(IN PSMP_PAGEFILE_DESCRIPTOR Descriptor) +{ + /* The default descriptor uses 128MB as a pagefile size */ + Descriptor->Flags |= SMP_PAGEFILE_DEFAULT; + Descriptor->MinSize.QuadPart = 0x8000000; + Descriptor->MaxSize.QuadPart = 0x8000000; +} + +VOID +NTAPI +SmpMakeSystemManagedPagingFileDescriptor(IN PSMP_PAGEFILE_DESCRIPTOR Descriptor) +{ + NTSTATUS Status; + LONGLONG MinimumSize, MaximumSize, Ram; + SYSTEM_BASIC_INFORMATION BasicInfo; + + /* Query the page size of the system, and the amount of RAM */ + Status = NtQuerySystemInformation(SystemBasicInformation, + &BasicInfo, + sizeof(BasicInfo), + NULL); + if (!NT_SUCCESS(Status)) + { + /* If we failed, use defaults since we have no idea otherwise */ + DPRINT1("SMSS:PFILE: NtQuerySystemInformation failed with %x \n", Status); + SmpMakeDefaultPagingFileDescriptor(Descriptor); + return; + } + + /* Chekc how much RAM we have and set three times this amount as maximum */ + Ram = BasicInfo.NumberOfPhysicalPages * BasicInfo.PageSize; + MaximumSize = 3 * Ram; + + /* If we have more than 1GB, use that as minimum, otherwise, use 1.5X RAM */ + MinimumSize = (Ram >= 0x40000000) ? Ram : MaximumSize / 2; + + /* Write the new sizes in the descriptor and mark it as system managed */ + Descriptor->MinSize.QuadPart = MinimumSize; + Descriptor->MaxSize.QuadPart = MaximumSize; + Descriptor->Flags |= SMP_PAGEFILE_SYSTEM_MANAGED; +} + +NTSTATUS +NTAPI +SmpValidatePagingFileSizes(IN PSMP_PAGEFILE_DESCRIPTOR Descriptor) +{ + NTSTATUS Status = STATUS_SUCCESS; + ULONGLONG MinSize, MaxSize; + BOOLEAN WasTooBig = FALSE; + + /* Capture the min and max */ + MinSize = Descriptor->MinSize.QuadPart; + MaxSize = Descriptor->MaxSize.QuadPart; + DPRINT1("SMSS:PFILE: Validating sizes for `%wZ' %I64X %I64X\n", + &Descriptor->Name, MinSize, MaxSize); + + /* Don't let minimum be bigger than maximum */ + if (MinSize > MaxSize) MaxSize = MinSize; + + /* On PAE we can have bigger pagefiles... */ + if (SharedUserData->ProcessorFeatures[PF_PAE_ENABLED]) + { + /* But we don't support that yet */ + DPRINT1("ReactOS does not support PAE yet... assuming sizes OK\n"); + } + else + { + /* Check if the minimum is more then 4095 MB */ + if (MinSize > 0xFFF00000) + { + /* Trim it, this isn't allowed */ + WasTooBig = TRUE; + MinSize = 0xFFF00000; + } + + /* Check if the maximum is more then 4095 MB */ + if (MaxSize > 0xFFF00000) + { + /* Trim it, this isn't allowed */ + WasTooBig = TRUE; + MaxSize = 0xFFF00000; + } + } + + /* Did we trim? */ + if (WasTooBig) + { + /* Notify debugger output and write a flag in the descriptor */ + DPRINT1("SMSS:PFILE: Trimmed size of `%wZ' to maximum allowed \n", + &Descriptor->Name); + Descriptor->Flags |= SMP_PAGEFILE_WAS_TOO_BIG; + } + + /* Now write the (possibly trimmed) sizes back */ + Descriptor->MinSize.QuadPart = MinSize; + Descriptor->MaxSize.QuadPart = MaxSize; + return Status; +} + +NTSTATUS +NTAPI +SmpCreateSystemManagedPagingFile(IN PSMP_PAGEFILE_DESCRIPTOR Descriptor, + IN BOOLEAN DecreaseSize) +{ + LARGE_INTEGER FuzzFactor, Size; + + /* Make sure there's at least 1 paging file and that we are system-managed */ + ASSERT(SmpNumberOfPagingFiles >= 1); + ASSERT(!IsListEmpty(&SmpPagingFileDescriptorList)); + ASSERT(Descriptor->Flags & SMP_PAGEFILE_SYSTEM_MANAGED); // Descriptor->SystemManaged == 1 in ASSERT. + + /* Keep decreasing the pagefile by this amount if we run out of space */ + FuzzFactor.QuadPart = 0x1000000; + + /* Create the descriptor for it (mainly the right sizes) and validate */ + SmpMakeSystemManagedPagingFileDescriptor(Descriptor); + SmpValidatePagingFileSizes(Descriptor); + + /* Use either the minimum size in the descriptor, or 16MB in minimal mode */ + Size.QuadPart = DecreaseSize ? 0x1000000 : Descriptor->MinSize.QuadPart; + + /* Check if this should be a fixed pagefile or an any pagefile*/ + if (Descriptor->Name.Buffer[STANDARD_DRIVE_LETTER_OFFSET] == '?') + { + /* Find a disk for it */ + return SmpCreatePagingFileOnAnyDrive(Descriptor, &FuzzFactor, &Size); + } + + /* Use the disk that was given */ + return SmpCreatePagingFileOnFixedDrive(Descriptor, &FuzzFactor, &Size); +} + +NTSTATUS +NTAPI +SmpCreateEmergencyPagingFile(VOID) +{ + PSMP_PAGEFILE_DESCRIPTOR Descriptor; + ULONG Length; + WCHAR Buffer[32]; + + /* Allocate a descriptor */ + Descriptor = RtlAllocateHeap(RtlGetProcessHeap(), + HEAP_ZERO_MEMORY, + sizeof(SMP_PAGEFILE_DESCRIPTOR)); + if (!Descriptor) return STATUS_NO_MEMORY; + + /* Initialize it */ + RtlInitUnicodeString(&Descriptor->Name, NULL); + RtlInitUnicodeString(&Descriptor->Token, NULL); + + /* Copy the default pagefile name */ + wcscpy(Buffer, STANDARD_PAGING_FILE_NAME); + Length = wcslen(Buffer) * sizeof(WCHAR); + ASSERT(sizeof(Buffer) > Length); + + /* Fill the rest of the descriptor out */ + Descriptor->Name.Buffer = Buffer; + Descriptor->Name.Length = Length; + Descriptor->Name.MaximumLength = Length + sizeof(UNICODE_NULL); + Descriptor->Name.Buffer[STANDARD_DRIVE_LETTER_OFFSET] = '?'; + Descriptor->Flags |= SMP_PAGEFILE_SYSTEM_MANAGED | + SMP_PAGEFILE_EMERGENCY | + SMP_PAGEFILE_ON_ANY_DRIVE; + + /* Insert it into the descriptor list */ + InsertHeadList(&SmpPagingFileDescriptorList, &Descriptor->Entry); + SmpNumberOfPagingFiles++; + + /* Go ahead and create it now, with the minimal size possible */ + return SmpCreateSystemManagedPagingFile(Descriptor, TRUE); +} + +NTSTATUS +NTAPI +SmpCreateVolumeDescriptors(VOID) +{ + return STATUS_SUCCESS; +} + +NTSTATUS +NTAPI SmpCreatePagingFiles(VOID) { - return STATUS_SUCCESS; -} + NTSTATUS Status; + PSMP_PAGEFILE_DESCRIPTOR Descriptor; + LARGE_INTEGER Size, FuzzFactor; + BOOLEAN Created = FALSE; + PLIST_ENTRY NextEntry; + + /* Check if no paging files were requested */ + if (!(SmpNumberOfPagingFiles) && !(SmpRegistrySpecifierPresent)) + { + /* The list should be empty -- nothign to do */ + ASSERT(IsListEmpty(&SmpPagingFileDescriptorList)); + DPRINT1("SMSS:PFILE: No paging file was requested \n"); + return STATUS_SUCCESS; + } + + /* Initialize the volume descriptors so we can know what's available */ + Status = SmpCreateVolumeDescriptors(); + if (!NT_SUCCESS(Status)) + { + /* We can't make decisions without this, so fail */ + DPRINT1("SMSS:PFILE: Failed to create volume descriptors (status %X)\n", + Status); + return Status; + } + + /* If we fail creating pagefiles, try to reduce by this much each time */ + FuzzFactor.QuadPart = 0x1000000; + + /* Loop the descriptor list */ + NextEntry = SmpPagingFileDescriptorList.Flink; + while (NextEntry != &SmpPagingFileDescriptorList) + { + /* Check what kind of descriptor this is */ + Descriptor = CONTAINING_RECORD(NextEntry, SMP_PAGEFILE_DESCRIPTOR, Entry); + if (Descriptor->Flags & SMP_PAGEFILE_SYSTEM_MANAGED) + { + /* This is a system-managed descriptor. Create the correct file */ + DPRINT1("SMSS:PFILE: Creating a system managed paging file (`%wZ')\n", + &Descriptor->Name); + Status = SmpCreateSystemManagedPagingFile(Descriptor, FALSE); + if (!NT_SUCCESS(Status)) + { + /* We failed -- try again, with size minimization this time */ + DPRINT1("SMSS:PFILE: Trying lower sizes for (`%wZ') \n", + &Descriptor->Name); + Status = SmpCreateSystemManagedPagingFile(Descriptor, TRUE); + } + } + else + { + /* This is a manually entered descriptor. Validate its size first */ + SmpValidatePagingFileSizes(Descriptor); + + /* Check if this is an ANY pagefile or a FIXED pagefile */ + DPRINT1("SMSS:PFILE: Creating a normal paging file (`%wZ') \n", + &Descriptor->Name); + if (Descriptor->Name.Buffer[STANDARD_DRIVE_LETTER_OFFSET] == L'?') + { + /* It's an any pagefile, try to create it wherever possible */ + Size = Descriptor->MinSize; + Status = SmpCreatePagingFileOnAnyDrive(Descriptor, + &FuzzFactor, + &Size); + if (!NT_SUCCESS(Status)) + { + /* We failed to create it. Try again with a smaller size */ + DPRINT1("SMSS:PFILE: Trying lower sizes for (`%wZ') \n", + &Descriptor->Name); + Size.QuadPart = 0x1000000; + Status = SmpCreatePagingFileOnAnyDrive(Descriptor, + &FuzzFactor, + &Size); + } + } + else + { + /* It's a fixed pagefile: override the minimum and use ours */ + Size.QuadPart = 0x1000000; + Status = SmpCreatePagingFileOnFixedDrive(Descriptor, + &FuzzFactor, + &Size); + } + } + + /* Go to the next descriptor */ + if (NT_SUCCESS(Status)) Created = TRUE; + NextEntry = NextEntry->Flink; + } + + /* Check if none of the code in our loops above was able to create it */ + if (!Created) + { + /* Build an emergency pagefile ourselves */ + DPRINT1("SMSS:PFILE: Creating emergency paging file. \n"); + Status = SmpCreateEmergencyPagingFile(); + } + + /* All done */ + return Status; +}

1 0

[tfaber] 55334: [COMCTL32] - Fix the fix for MSVC build (r55306). This is the version accepted by Wine.
by tfaber＠svn.reactos.org 30 Jan '12

30 Jan '12

Author: tfaber Date: Mon Jan 30 20:29:12 2012 New Revision: 55334 URL: http://svn.reactos.org/svn/reactos?rev=55334&view=rev Log: [COMCTL32] - Fix the fix for MSVC build (r55306). This is the version accepted by Wine. Modified: trunk/reactos/dll/win32/comctl32/imagelist.c Modified: trunk/reactos/dll/win32/comctl32/imagelist.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/imageli… ============================================================================== --- trunk/reactos/dll/win32/comctl32/imagelist.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comctl32/imagelist.c [iso-8859-1] Mon Jan 30 20:29:12 2012 @@ -3094,13 +3094,13 @@ if ((ilc >= ILC_COLOR4 && ilc <= ILC_COLOR32) || ilc == ILC_COLOR) { - BITMAPINFO *bmi = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, FIELD_OFFSET( BITMAPINFO, bmiColors[256] )); - if (bmi == NULL) - return NULL; + char buffer[sizeof(BITMAPINFO) + (256 - 1) * sizeof(RGBQUAD)]; + BITMAPINFO *bmi = (BITMAPINFO *)buffer; TRACE("Creating DIBSection %d x %d, %d Bits per Pixel\n", sz.cx, sz.cy, himl->uBitsPixel); + memset( buffer, 0, sizeof(buffer) ); bmi->bmiHeader.biSize = sizeof(BITMAPINFOHEADER); bmi->bmiHeader.biWidth = sz.cx; bmi->bmiHeader.biHeight = sz.cy; @@ -3116,7 +3116,6 @@ DeleteObject( tmp ); } hbmNewBitmap = CreateDIBSection(hdc, bmi, DIB_RGB_COLORS, NULL, 0, 0); - HeapFree( GetProcessHeap(), 0, bmi ); } else /*if (ilc == ILC_COLORDDB)*/ {

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