Ros-diffs January 2012

ros-diffs@reactos.org

19 participants
559 discussions

[cgutman] 55328: [HALACPI] - Create PDO earlier so ACPI can be loaded earlier in boot [HIVESYS] - Create critical device database with required devices for USB boot [NTOSKRNL] - Read the CDDB and i...

by cgutman＠svn.reactos.org

Author: cgutman Date: Mon Jan 30 16:23:44 2012 New Revision: 55328 URL: http://svn.reactos.org/svn/reactos?rev=55328&view=rev Log: [HALACPI] - Create PDO earlier so ACPI can be loaded earlier in boot [HIVESYS] - Create critical device database with required devices for USB boot [NTOSKRNL] - Read the CDDB and install devices that are critical for boot - This implementation won't be 100% correct until a PnP manager rewrite but it should work well enough for our needs - Not complete and disabled atm Modified: branches/usb-bringup-trunk/boot/bootdata/hivesys_i386.inf branches/usb-bringup-trunk/hal/halx86/acpi/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 16:23:44 2012 @@ -7,6 +7,44 @@ HKLM,"SYSTEM\CurrentControlSet\Control","WaitToKillServiceTimeout",2,"20000" HKLM,"SYSTEM\CurrentControlSet\Control\Biosinfo","InfName",2,"biosinfo.inf" HKLM,"SYSTEM\CurrentControlSet\Control\PnP",,0x00000012 + +; Critical Device Database + +HKLM,"SYSTEM\CurrentControlSet\Control\CriticalDeviceDatabase\acpipic_up","ClassGUID",0x00000000,"{4D36E966-E325-11CE-BFC1-08002BE10318}" + +HKLM,"SYSTEM\CurrentControlSet\Control\CriticalDeviceDatabase\*PNP0A03","Service",0x00000000,"pci" +HKLM,"SYSTEM\CurrentControlSet\Control\CriticalDeviceDatabase\*PNP0A03","ClassGUID",0x00000000,"{4D36E97D-E325-11CE-BFC1-08002BE10318}" + +HKLM,"SYSTEM\CurrentControlSet\Control\CriticalDeviceDatabase\*PNP0C08","Service",0x00000000,"acpi" +HKLM,"SYSTEM\CurrentControlSet\Control\CriticalDeviceDatabase\*PNP0C08","ClassGUID",0x00000000,"{4D36E97D-E325-11CE-BFC1-08002BE10318}" + +;HKLM,"SYSTEM\CurrentControlSet\Control\CriticalDeviceDatabase\PCI#CC_0C0300","Service",0x00000000,"usbuhci" +;HKLM,"SYSTEM\CurrentControlSet\Control\CriticalDeviceDatabase\PCI#CC_0C0300","ClassGUID",0x00000000,"{36FC9E60-C465-11CF-8056-444553540000}" + +HKLM,"SYSTEM\CurrentControlSet\Control\CriticalDeviceDatabase\PCI#CC_0C0310","Service",0x00000000,"usbohci" +HKLM,"SYSTEM\CurrentControlSet\Control\CriticalDeviceDatabase\PCI#CC_0C0310","ClassGUID",0x00000000,"{36FC9E60-C465-11CF-8056-444553540000}" + +HKLM,"SYSTEM\CurrentControlSet\Control\CriticalDeviceDatabase\PCI#CC_0C0320","Service",0x00000000,"usbehci" +HKLM,"SYSTEM\CurrentControlSet\Control\CriticalDeviceDatabase\PCI#CC_0C0320","ClassGUID",0x00000000,"{36FC9E60-C465-11CF-8056-444553540000}" + +HKLM,"SYSTEM\CurrentControlSet\Control\CriticalDeviceDatabase\USB#Class_08&SubClass_06&Prot_50","Service",0x00000000,"usbstor" +HKLM,"SYSTEM\CurrentControlSet\Control\CriticalDeviceDatabase\USB#Class_08&SubClass_06&Prot_50","ClassGUID",0x00000000,"{36FC9E60-C465-11CF-8056-444553540000}" + +HKLM,"SYSTEM\CurrentControlSet\Control\CriticalDeviceDatabase\USB#COMPOSITE","Service",0x00000000,"usbccgp" +HKLM,"SYSTEM\CurrentControlSet\Control\CriticalDeviceDatabase\USB#COMPOSITE","ClassGUID",0x00000000,"{36FC9E60-C465-11CF-8056-444553540000}" + +HKLM,"SYSTEM\CurrentControlSet\Control\CriticalDeviceDatabase\USB#CLASS_09","Service",0x00000000,"usbhub" +HKLM,"SYSTEM\CurrentControlSet\Control\CriticalDeviceDatabase\USB#CLASS_09","ClassGUID",0x00000000,"{36FC9E60-C465-11CF-8056-444553540000}" + +HKLM,"SYSTEM\CurrentControlSet\Control\CriticalDeviceDatabase\USB#ROOT_HUB","Service",0x00000000,"usbhub" +HKLM,"SYSTEM\CurrentControlSet\Control\CriticalDeviceDatabase\USB#ROOT_HUB","ClassGUID",0x00000000,"{36FC9E60-C465-11CF-8056-444553540000}" + +HKLM,"SYSTEM\CurrentControlSet\Control\CriticalDeviceDatabase\USB#ROOT_HUB20","Service",0x00000000,"usbhub" +HKLM,"SYSTEM\CurrentControlSet\Control\CriticalDeviceDatabase\USB#ROOT_HUB20","ClassGUID",0x00000000,"{36FC9E60-C465-11CF-8056-444553540000}" + +HKLM,"SYSTEM\CurrentControlSet\Control\CriticalDeviceDatabase\GenDisk","Service",0x00000000,"disk" +HKLM,"SYSTEM\CurrentControlSet\Control\CriticalDeviceDatabase\GenDisk","ClassGUID",0x00000000,"{4D36E967-E325-11CE-BFC1-08002BE10318}" + HKLM,"SYSTEM\CurrentControlSet\Control\SafeBoot","AlternateShell",2,"cmd.exe" @@ -1413,10 +1451,61 @@ HKLM,"SYSTEM\CurrentControlSet\Services\Packet","Start",0x00010001,0x00000004 HKLM,"SYSTEM\CurrentControlSet\Services\Packet","Type",0x00010001,0x00000001 +; 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","Tag",0x00010001,0x00000002 +HKLM,"SYSTEM\CurrentControlSet\Services\usbhub","ImagePath",0x00020000,"system32\drivers\usbhub.sys" +HKLM,"SYSTEM\CurrentControlSet\Services\usbhub","Start",0x00010001,0x00000000 + +; 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","Tag",0x00010001,0x00000002 +HKLM,"SYSTEM\CurrentControlSet\Services\usbehci","ImagePath",0x00020000,"system32\drivers\usbehci.sys" +HKLM,"SYSTEM\CurrentControlSet\Services\usbehci","Start",0x00010001,0x00000000 + +; 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","Tag",0x00010001,0x00000002 +HKLM,"SYSTEM\CurrentControlSet\Services\usbohci","ImagePath",0x00020000,"system32\drivers\usbohci.sys" +HKLM,"SYSTEM\CurrentControlSet\Services\usbohci","Start",0x00010001,0x00000000 + +; 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 + +; USB storage driver +HKLM,"SYSTEM\CurrentControlSet\Services\usbstor","ErrorControl",0x00010001,0x00000001 +HKLM,"SYSTEM\CurrentControlSet\Services\usbstor","Group",0x00000000,"Primary Disk" +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 + +; 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","Tag",0x00010001,0x00000002 +HKLM,"SYSTEM\CurrentControlSet\Services\usbccgp","ImagePath",0x00020000,"system32\drivers\usbccgp.sys" +HKLM,"SYSTEM\CurrentControlSet\Services\usbccgp","Start",0x00010001,0x00000000 + +; ACPI driver +HKLM,"SYSTEM\CurrentControlSet\Services\acpi","ErrorControl",0x00010001,0x00000001 +HKLM,"SYSTEM\CurrentControlSet\Services\acpi","Group",0x00000000,"Boot Bus" +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 + ; 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" 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\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 16:23:44 2012 @@ -57,10 +57,61 @@ IN ULONG Count) { PFDO_EXTENSION FdoExtension = Context; + + /* Invalidate device relations since we added a new device */ + IoInvalidateDeviceRelations(FdoExtension->PhysicalDeviceObject, BusRelations); +} + +NTSTATUS +NTAPI +HalpAddDevice(IN PDRIVER_OBJECT DriverObject, + IN PDEVICE_OBJECT TargetDevice) +{ + NTSTATUS Status; + PFDO_EXTENSION FdoExtension; PPDO_EXTENSION PdoExtension; + PDEVICE_OBJECT DeviceObject, AttachedDevice; PDEVICE_OBJECT PdoDeviceObject; - NTSTATUS Status; PDESCRIPTION_HEADER Wdrt; + + DPRINT("HAL: PnP Driver ADD!\n"); + + /* Create the FDO */ + Status = IoCreateDevice(DriverObject, + sizeof(FDO_EXTENSION), + NULL, + FILE_DEVICE_BUS_EXTENDER, + 0, + FALSE, + &DeviceObject); + if (!NT_SUCCESS(Status)) + { + /* Should not happen */ + DbgBreakPoint(); + return Status; + } + + /* Setup the FDO extension */ + FdoExtension = DeviceObject->DeviceExtension; + FdoExtension->ExtensionType = FdoExtensionType; + FdoExtension->PhysicalDeviceObject = TargetDevice; + FdoExtension->FunctionalDeviceObject = DeviceObject; + FdoExtension->ChildPdoList = NULL; + + /* FDO is done initializing */ + DeviceObject->Flags &= ~DO_DEVICE_INITIALIZING; + + /* Attach to the physical device object (the bus) */ + AttachedDevice = IoAttachDeviceToDeviceStack(DeviceObject, TargetDevice); + if (!AttachedDevice) + { + /* Failed, undo everything */ + IoDeleteDevice(DeviceObject); + return STATUS_NO_SUCH_DEVICE; + } + + /* Save the attachment */ + FdoExtension->AttachedDeviceObject = AttachedDevice; /* Create the PDO */ Status = IoCreateDevice(DriverObject, @@ -74,7 +125,7 @@ { /* Fail */ DPRINT1("HAL: Could not create ACPI device object status=0x%08x\n", Status); - return; + return Status; } /* Setup the PDO device extension */ @@ -87,7 +138,7 @@ /* Add the PDO to the head of the list */ PdoExtension->Next = FdoExtension->ChildPdoList; FdoExtension->ChildPdoList = PdoExtension; - + /* Initialization is finished */ PdoDeviceObject->Flags &= ~DO_DEVICE_INITIALIZING; @@ -99,61 +150,10 @@ DPRINT1("You have an ACPI Watchdog. That's great! You should be proud ;-)\n"); } - /* Invalidate device relations since we added a new device */ - IoInvalidateDeviceRelations(FdoExtension->PhysicalDeviceObject, BusRelations); -} - -NTSTATUS -NTAPI -HalpAddDevice(IN PDRIVER_OBJECT DriverObject, - IN PDEVICE_OBJECT TargetDevice) -{ - NTSTATUS Status; - PFDO_EXTENSION FdoExtension; - PDEVICE_OBJECT DeviceObject, AttachedDevice; - DPRINT("HAL: PnP Driver ADD!\n"); - - /* Create the FDO */ - Status = IoCreateDevice(DriverObject, - sizeof(FDO_EXTENSION), - NULL, - FILE_DEVICE_BUS_EXTENDER, - 0, - FALSE, - &DeviceObject); - if (!NT_SUCCESS(Status)) - { - /* Should not happen */ - DbgBreakPoint(); - return Status; - } - - /* Setup the FDO extension */ - FdoExtension = DeviceObject->DeviceExtension; - FdoExtension->ExtensionType = FdoExtensionType; - FdoExtension->PhysicalDeviceObject = TargetDevice; - FdoExtension->FunctionalDeviceObject = DeviceObject; - FdoExtension->ChildPdoList = NULL; - - /* FDO is done initializing */ - DeviceObject->Flags &= ~DO_DEVICE_INITIALIZING; - - /* Attach to the physical device object (the bus) */ - AttachedDevice = IoAttachDeviceToDeviceStack(DeviceObject, TargetDevice); - if (!AttachedDevice) - { - /* Failed, undo everything */ - IoDeleteDevice(DeviceObject); - return STATUS_NO_SUCH_DEVICE; - } - - /* Save the attachment */ - FdoExtension->AttachedDeviceObject = AttachedDevice; - /* Register for reinitialization to report devices later */ - IoRegisterDriverReinitialization(DriverObject, - HalpReportDetectedDevices, - FdoExtension); + IoRegisterBootDriverReinitialization(DriverObject, + HalpReportDetectedDevices, + FdoExtension); /* 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 16:23:44 2012 @@ -55,6 +55,370 @@ IopGetDeviceNode(PDEVICE_OBJECT DeviceObject) { return ((PEXTENDED_DEVOBJ_EXTENSION)DeviceObject->DeviceObjectExtension)->DeviceNode; +} + +VOID +IopFixupDeviceId(PWCHAR String) +{ + ULONG Length = wcslen(String), i; + + for (i = 0; i < Length; i++) + { + if (String[i] == L'\\') + String[i] = L'#'; + } +} + +VOID +NTAPI +IopInstallCriticalDevice(PDEVICE_NODE DeviceNode) +{ + NTSTATUS Status; + HANDLE CriticalDeviceKey, InstanceKey; + OBJECT_ATTRIBUTES ObjectAttributes; + UNICODE_STRING CriticalDeviceKeyU = RTL_CONSTANT_STRING(L"\\Registry\\Machine\\System\\CurrentControlSet\\Control\\CriticalDeviceDatabase"); + UNICODE_STRING CompatibleIdU = RTL_CONSTANT_STRING(L"CompatibleIDs"); + UNICODE_STRING HardwareIdU = RTL_CONSTANT_STRING(L"HardwareID"); + UNICODE_STRING ServiceU = RTL_CONSTANT_STRING(L"Service"); + UNICODE_STRING ClassGuidU = RTL_CONSTANT_STRING(L"ClassGUID"); + PKEY_VALUE_PARTIAL_INFORMATION PartialInfo; + ULONG HidLength = 0, CidLength = 0, BufferLength; + PWCHAR IdBuffer, OriginalIdBuffer; + + /* Open the device instance key */ + Status = IopCreateDeviceKeyPath(&DeviceNode->InstancePath, 0, &InstanceKey); + if (Status != STATUS_SUCCESS) + return; + + Status = ZwQueryValueKey(InstanceKey, + &HardwareIdU, + KeyValuePartialInformation, + NULL, + 0, + &HidLength); + if (Status != STATUS_BUFFER_OVERFLOW && Status != STATUS_BUFFER_TOO_SMALL) + { + ZwClose(InstanceKey); + return; + } + + Status = ZwQueryValueKey(InstanceKey, + &CompatibleIdU, + KeyValuePartialInformation, + NULL, + 0, + &CidLength); + if (Status != STATUS_BUFFER_OVERFLOW && Status != STATUS_BUFFER_TOO_SMALL) + { + CidLength = 0; + } + + BufferLength = HidLength + CidLength; + BufferLength -= (((CidLength != 0) ? 2 : 1) * FIELD_OFFSET(KEY_VALUE_PARTIAL_INFORMATION, Data)); + + /* Allocate a buffer to hold data from both */ + OriginalIdBuffer = IdBuffer = ExAllocatePool(PagedPool, BufferLength); + if (!IdBuffer) + { + ZwClose(InstanceKey); + return; + } + + /* Compute the buffer size */ + if (HidLength > CidLength) + BufferLength = HidLength; + else + BufferLength = CidLength; + + PartialInfo = ExAllocatePool(PagedPool, BufferLength); + if (!PartialInfo) + { + ZwClose(InstanceKey); + ExFreePool(OriginalIdBuffer); + return; + } + + Status = ZwQueryValueKey(InstanceKey, + &HardwareIdU, + KeyValuePartialInformation, + PartialInfo, + HidLength, + &HidLength); + if (Status != STATUS_SUCCESS) + { + ExFreePool(PartialInfo); + ExFreePool(OriginalIdBuffer); + ZwClose(InstanceKey); + return; + } + + /* Copy in HID info first (without 2nd terminating NULL if CID is present) */ + HidLength = PartialInfo->DataLength - ((CidLength != 0) ? sizeof(WCHAR) : 0); + RtlCopyMemory(IdBuffer, PartialInfo->Data, HidLength); + + if (CidLength != 0) + { + Status = ZwQueryValueKey(InstanceKey, + &CompatibleIdU, + KeyValuePartialInformation, + PartialInfo, + CidLength, + &CidLength); + if (Status != STATUS_SUCCESS) + { + ExFreePool(PartialInfo); + ExFreePool(OriginalIdBuffer); + ZwClose(InstanceKey); + return; + } + + /* Copy CID next */ + CidLength = PartialInfo->DataLength; + RtlCopyMemory(((PUCHAR)IdBuffer) + HidLength, PartialInfo->Data, CidLength); + } + + /* Free our temp buffer */ + ExFreePool(PartialInfo); + + InitializeObjectAttributes(&ObjectAttributes, + &CriticalDeviceKeyU, + OBJ_KERNEL_HANDLE | OBJ_CASE_INSENSITIVE, + NULL, + NULL); + Status = ZwOpenKey(&CriticalDeviceKey, + KEY_ENUMERATE_SUB_KEYS, + &ObjectAttributes); + if (!NT_SUCCESS(Status)) + { + /* The critical device database doesn't exist because + * we're probably in 1st stage setup, but it's ok */ + ExFreePool(OriginalIdBuffer); + ZwClose(InstanceKey); + return; + } + + while (*IdBuffer) + { + ULONG StringLength = (ULONG)wcslen(IdBuffer) + 1, Index; + + IopFixupDeviceId(IdBuffer); + + /* Look through all subkeys for a match */ + for (Index = 0; TRUE; Index++) + { + ULONG NeededLength; + PKEY_BASIC_INFORMATION BasicInfo; + + Status = ZwEnumerateKey(CriticalDeviceKey, + Index, + KeyBasicInformation, + NULL, + 0, + &NeededLength); + if (Status == STATUS_NO_MORE_ENTRIES) + break; + else if (Status == STATUS_BUFFER_OVERFLOW || Status == STATUS_BUFFER_TOO_SMALL) + { + UNICODE_STRING ChildIdNameU, RegKeyNameU; + + BasicInfo = ExAllocatePool(PagedPool, NeededLength); + if (!BasicInfo) + { + /* No memory */ + ExFreePool(OriginalIdBuffer); + ZwClose(CriticalDeviceKey); + ZwClose(InstanceKey); + return; + } + + Status = ZwEnumerateKey(CriticalDeviceKey, + Index, + KeyBasicInformation, + BasicInfo, + NeededLength, + &NeededLength); + if (Status != STATUS_SUCCESS) + { + /* This shouldn't happen */ + ExFreePool(BasicInfo); + continue; + } + + ChildIdNameU.Buffer = IdBuffer; + ChildIdNameU.MaximumLength = ChildIdNameU.Length = (StringLength - 1) * sizeof(WCHAR); + RegKeyNameU.Buffer = BasicInfo->Name; + RegKeyNameU.MaximumLength = RegKeyNameU.Length = BasicInfo->NameLength; + + if (RtlEqualUnicodeString(&ChildIdNameU, &RegKeyNameU, TRUE)) + { + HANDLE ChildKeyHandle; + + InitializeObjectAttributes(&ObjectAttributes, + &ChildIdNameU, + OBJ_KERNEL_HANDLE | OBJ_CASE_INSENSITIVE, + CriticalDeviceKey, + NULL); + + Status = ZwOpenKey(&ChildKeyHandle, + KEY_QUERY_VALUE, + &ObjectAttributes); + if (Status != STATUS_SUCCESS) + { + ExFreePool(BasicInfo); + continue; + } + + /* Check if there's already a driver installed */ + Status = ZwQueryValueKey(InstanceKey, + &ClassGuidU, + KeyValuePartialInformation, + NULL, + 0, + &NeededLength); + if (Status == STATUS_BUFFER_OVERFLOW || Status == STATUS_BUFFER_TOO_SMALL) + { + ExFreePool(BasicInfo); + continue; + } + + Status = ZwQueryValueKey(ChildKeyHandle, + &ClassGuidU, + KeyValuePartialInformation, + NULL, + 0, + &NeededLength); + if (Status != STATUS_BUFFER_OVERFLOW && Status != STATUS_BUFFER_TOO_SMALL) + { + ExFreePool(BasicInfo); + continue; + } + + PartialInfo = ExAllocatePool(PagedPool, NeededLength); + if (!PartialInfo) + { + ExFreePool(OriginalIdBuffer); + ExFreePool(BasicInfo); + ZwClose(InstanceKey); + ZwClose(ChildKeyHandle); + ZwClose(CriticalDeviceKey); + return; + } + + /* Read ClassGUID entry in the CDDB */ + Status = ZwQueryValueKey(ChildKeyHandle, + &ClassGuidU, + KeyValuePartialInformation, + PartialInfo, + NeededLength, + &NeededLength); + if (Status != STATUS_SUCCESS) + { + ExFreePool(BasicInfo); + continue; + } + + /* Write it to the ENUM key */ + Status = ZwSetValueKey(InstanceKey, + &ClassGuidU, + 0, + REG_SZ, + PartialInfo->Data, + PartialInfo->DataLength); + if (Status != STATUS_SUCCESS) + { + ExFreePool(BasicInfo); + ExFreePool(PartialInfo); + ZwClose(ChildKeyHandle); + continue; + } + + Status = ZwQueryValueKey(ChildKeyHandle, + &ServiceU, + KeyValuePartialInformation, + NULL, + 0, + &NeededLength); + if (Status == STATUS_BUFFER_OVERFLOW || Status == STATUS_BUFFER_TOO_SMALL) + { + ExFreePool(PartialInfo); + PartialInfo = ExAllocatePool(PagedPool, NeededLength); + if (!PartialInfo) + { + ExFreePool(OriginalIdBuffer); + ExFreePool(BasicInfo); + ZwClose(InstanceKey); + ZwClose(ChildKeyHandle); + ZwClose(CriticalDeviceKey); + return; + } + + /* Read the service entry from the CDDB */ + Status = ZwQueryValueKey(ChildKeyHandle, + &ServiceU, + KeyValuePartialInformation, + PartialInfo, + NeededLength, + &NeededLength); + if (Status != STATUS_SUCCESS) + { + ExFreePool(BasicInfo); + ExFreePool(PartialInfo); + ZwClose(ChildKeyHandle); + continue; + } + + /* Write it to the ENUM key */ + Status = ZwSetValueKey(InstanceKey, + &ServiceU, + 0, + REG_SZ, + PartialInfo->Data, + PartialInfo->DataLength); + if (Status != STATUS_SUCCESS) + { + ExFreePool(BasicInfo); + ExFreePool(PartialInfo); + ZwClose(ChildKeyHandle); + continue; + } + + DPRINT1("Installed service '%S' for critical device '%wZ'\n", PartialInfo->Data, &ChildIdNameU); + } + else + { + 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); + ZwClose(InstanceKey); + ZwClose(ChildKeyHandle); + ZwClose(CriticalDeviceKey); + + /* That's it */ + return; + } + + ExFreePool(BasicInfo); + } + else + { + /* Umm, not sure what happened here */ + continue; + } + } + + /* Advance to the next ID */ + IdBuffer += StringLength; + } + + ExFreePool(OriginalIdBuffer); + ZwClose(InstanceKey); + ZwClose(CriticalDeviceKey); } NTSTATUS @@ -1869,6 +2233,8 @@ &DeviceNode->InstancePath); } + DeviceNode->Flags &= ~DNF_NEED_TO_ENUM; + DPRINT("Sending IRP_MN_QUERY_DEVICE_RELATIONS to device stack\n"); Stack.Parameters.QueryDeviceRelations.Type = BusRelations; @@ -2052,6 +2418,9 @@ { WCHAR RegKeyBuffer[MAX_PATH]; UNICODE_STRING RegKey; + + /* Install the service for this if it's in the CDDB */ + //IopInstallCriticalDevice(DeviceNode); RegKey.Length = 0; RegKey.MaximumLength = sizeof(RegKeyBuffer); @@ -2184,7 +2553,25 @@ 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) {

12 years, 11 months

[janderwald] 55327: [KBDHID] - Fix typo [USBCCGP] - Remove unused variable

by janderwald＠svn.reactos.org

Author: janderwald Date: Mon Jan 30 13:31:05 2012 New Revision: 55327 URL: http://svn.reactos.org/svn/reactos?rev=55327&view=rev Log: [KBDHID] - Fix typo [USBCCGP] - Remove unused variable Modified: branches/usb-bringup-trunk/drivers/hid/kbdhid/kbdhid.c branches/usb-bringup-trunk/drivers/usb/usbccgp/pdo.c Modified: branches/usb-bringup-trunk/drivers/hid/kbdhid/kbdhid.c URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/hid/k… ============================================================================== --- branches/usb-bringup-trunk/drivers/hid/kbdhid/kbdhid.c [iso-8859-1] (original) +++ branches/usb-bringup-trunk/drivers/hid/kbdhid/kbdhid.c [iso-8859-1] Mon Jan 30 13:31:05 2012 @@ -575,7 +575,7 @@ MmBuildMdlForNonPagedPool(DeviceExtension->ReportMDL); /* get max number of buttons */ - Buttons = HidP_MaxUsageListLength(HidP_Input, HID_USAGE_PAGE_BUTTON, PreparsedData); + Buttons = HidP_MaxUsageListLength(HidP_Input, HID_USAGE_PAGE_KEYBOARD, PreparsedData); DPRINT1("[KBDHID] Buttons %lu\n", Buttons); ASSERT(Buttons > 0); Modified: branches/usb-bringup-trunk/drivers/usb/usbccgp/pdo.c URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/usb/u… ============================================================================== --- branches/usb-bringup-trunk/drivers/usb/usbccgp/pdo.c [iso-8859-1] (original) +++ branches/usb-bringup-trunk/drivers/usb/usbccgp/pdo.c [iso-8859-1] Mon Jan 30 13:31:05 2012 @@ -188,7 +188,6 @@ { PIO_STACK_LOCATION IoStack; PUNICODE_STRING DeviceString = NULL; - UNICODE_STRING TempString; PPDO_DEVICE_EXTENSION PDODeviceExtension; NTSTATUS Status; LPWSTR Buffer; @@ -855,12 +854,10 @@ return Status; } } - else if (Urb->UrbHeader.Function == URB_FUNCTION_GET_DESCRIPTOR_FROM_INTERFACE) - { - DPRINT1("URB_FUNCTION_GET_DESCRIPTOR_FROM_INTERFACE\n"); + else + { IoSkipCurrentIrpStackLocation(Irp); Status = IoCallDriver(PDODeviceExtension->NextDeviceObject, Irp); - DPRINT1("URB_FUNCTION_GET_DESCRIPTOR_FROM_INTERFACE Status %x\n", Status); return Status; } }

12 years, 11 months

[janderwald] 55326: [USBCCGP] - Add function to append interface number - Append function number to BusQueryDeviceId / BusQueryInstanceId - USBCCGP is now properly enumerated and its child device s...

by janderwald＠svn.reactos.org

Author: janderwald Date: Mon Jan 30 12:42:05 2012 New Revision: 55326 URL: http://svn.reactos.org/svn/reactos?rev=55326&view=rev Log: [USBCCGP] - Add function to append interface number - Append function number to BusQueryDeviceId / BusQueryInstanceId - USBCCGP is now properly enumerated and its child device start to get installed Modified: branches/usb-bringup-trunk/drivers/usb/usbccgp/pdo.c Modified: branches/usb-bringup-trunk/drivers/usb/usbccgp/pdo.c URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/usb/u… ============================================================================== --- branches/usb-bringup-trunk/drivers/usb/usbccgp/pdo.c [iso-8859-1] (original) +++ branches/usb-bringup-trunk/drivers/usb/usbccgp/pdo.c [iso-8859-1] Mon Jan 30 12:42:05 2012 @@ -122,6 +122,64 @@ // return STATUS_SUCCESS; } + +NTSTATUS +USBCCGP_PdoAppendInterfaceNumber( + IN LPWSTR DeviceId, + IN ULONG InterfaceNumber, + OUT LPWSTR *OutString) +{ + ULONG Length = 0, StringLength; + LPWSTR String; + + // + // count length of string + // + String = DeviceId; + while(*String) + { + StringLength = wcslen(String) + 1; + Length += StringLength; + Length += 6; //&MI_XX + String += StringLength; + } + + // + // now allocate the buffer + // + String = AllocateItem(NonPagedPool, (Length + 2) * sizeof(WCHAR)); + if (!String) + { + // + // no memory + // + return STATUS_INSUFFICIENT_RESOURCES; + } + + // + // store result + // + *OutString = String; + + while(*DeviceId) + { + StringLength = swprintf(String, L"%s&MI_%02x", DeviceId) + 1; + Length = wcslen(DeviceId) + 1; + DPRINT1("String %p\n", String); + + // + // next string + // + String += StringLength; + DeviceId += Length; + } + + // + // success + // + return STATUS_SUCCESS; +} + NTSTATUS USBCCGP_PdoHandleQueryId( @@ -152,11 +210,32 @@ // handle query device id // Status = USBCCGP_SyncForwardIrp(PDODeviceExtension->NextDeviceObject, Irp); - - // - // FIXME append interface id - // - UNIMPLEMENTED + if (NT_SUCCESS(Status)) + { + // + // allocate buffer + // + Buffer = AllocateItem(NonPagedPool, (wcslen((LPWSTR)Irp->IoStatus.Information) + 7) * sizeof(WCHAR)); + if (Buffer) + { + // + // append interface number + // + ASSERT(Irp->IoStatus.Information); + swprintf(Buffer, L"%s&MI_%02x", (LPWSTR)Irp->IoStatus.Information, PDODeviceExtension->FunctionDescriptor->FunctionNumber); + DPRINT1("BusQueryDeviceID %S\n", Buffer); + + ExFreePool((PVOID)Irp->IoStatus.Information); + Irp->IoStatus .Information = (ULONG_PTR)Buffer; + } + else + { + // + // no memory + // + Status = STATUS_INSUFFICIENT_RESOURCES; + } + } return Status; } else if (IoStack->Parameters.QueryId.IdType == BusQueryHardwareIDs) @@ -171,8 +250,21 @@ // // handle instance id // - RtlInitUnicodeString(&TempString, L"0000"); - DeviceString = &TempString; + Buffer = AllocateItem(NonPagedPool, 5 * sizeof(WCHAR)); + if (!Buffer) + { + // + // no memory + // + return STATUS_INSUFFICIENT_RESOURCES; + } + + // + // use function number + // + swprintf(Buffer, L"%04x", PDODeviceExtension->FunctionDescriptor->FunctionNumber); + Irp->IoStatus.Information = (ULONG_PTR)Buffer; + return STATUS_SUCCESS; } else if (IoStack->Parameters.QueryId.IdType == BusQueryCompatibleIDs) { @@ -202,8 +294,9 @@ // // copy buffer // + RtlCopyMemory(Buffer, DeviceString->Buffer, DeviceString->Length); Irp->IoStatus.Information = (ULONG_PTR)Buffer; - RtlCopyMemory(Buffer, DeviceString->Buffer, DeviceString->Length); + return STATUS_SUCCESS; }

12 years, 11 months

[janderwald] 55325: [USBCCGP] - Fix bug while scanning configuration descriptor - Store interface list in the PDO device extension - Display interface numbers when dumping function descriptor - Fix...

by janderwald＠svn.reactos.org

Author: janderwald Date: Mon Jan 30 10:41:52 2012 New Revision: 55325 URL: http://svn.reactos.org/svn/reactos?rev=55325&view=rev Log: [USBCCGP] - Fix bug while scanning configuration descriptor - Store interface list in the PDO device extension - Display interface numbers when dumping function descriptor - Fix a few bugs while selecting the configuration for the PDO Modified: branches/usb-bringup-trunk/drivers/usb/usbccgp/descriptor.c branches/usb-bringup-trunk/drivers/usb/usbccgp/fdo.c branches/usb-bringup-trunk/drivers/usb/usbccgp/function.c branches/usb-bringup-trunk/drivers/usb/usbccgp/misc.c branches/usb-bringup-trunk/drivers/usb/usbccgp/pdo.c branches/usb-bringup-trunk/drivers/usb/usbccgp/usbccgp.c Modified: branches/usb-bringup-trunk/drivers/usb/usbccgp/descriptor.c URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/usb/u… ============================================================================== --- branches/usb-bringup-trunk/drivers/usb/usbccgp/descriptor.c [iso-8859-1] (original) +++ branches/usb-bringup-trunk/drivers/usb/usbccgp/descriptor.c [iso-8859-1] Mon Jan 30 10:41:52 2012 @@ -301,7 +301,7 @@ // // parse configuration descriptor // - InterfaceDescriptor = USBD_ParseConfigurationDescriptorEx(ConfigurationDescriptor, CurrentPosition, -1, -1, -1, -1, -1); + InterfaceDescriptor = USBD_ParseConfigurationDescriptorEx(ConfigurationDescriptor, ConfigurationDescriptor, InterfaceIndex, -1, -1, -1, -1); if (InterfaceDescriptor) { // Modified: branches/usb-bringup-trunk/drivers/usb/usbccgp/fdo.c URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/usb/u… ============================================================================== --- branches/usb-bringup-trunk/drivers/usb/usbccgp/fdo.c [iso-8859-1] (original) +++ branches/usb-bringup-trunk/drivers/usb/usbccgp/fdo.c [iso-8859-1] Mon Jan 30 10:41:52 2012 @@ -277,8 +277,10 @@ // PDODeviceExtension->Common.IsFDO = FALSE; PDODeviceExtension->FunctionDescriptor = &FDODeviceExtension->FunctionDescriptor[Index]; - PDODeviceExtension->NextDeviceObject = DeviceObject; + PDODeviceExtension->NextDeviceObject = FDODeviceExtension->NextDeviceObject; //DeviceObject; HACK PDODeviceExtension->FunctionIndex = Index; + PDODeviceExtension->InterfaceList = FDODeviceExtension->InterfaceList; + PDODeviceExtension->InterfaceListCount = FDODeviceExtension->InterfaceListCount; PDODeviceExtension->ConfigurationHandle = FDODeviceExtension->ConfigurationHandle; PDODeviceExtension->ConfigurationDescriptor = FDODeviceExtension->ConfigurationDescriptor; RtlCopyMemory(&PDODeviceExtension->Capabilities, &FDODeviceExtension->Capabilities, sizeof(DEVICE_CAPABILITIES)); @@ -421,7 +423,7 @@ // get stack location IoStack = IoGetCurrentIrpStackLocation(Irp); - + DPRINT1("[USBCCGP] PnP Minor %x\n", IoStack->MinorFunction); switch(IoStack->MinorFunction) { case IRP_MN_START_DEVICE: Modified: branches/usb-bringup-trunk/drivers/usb/usbccgp/function.c URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/usb/u… ============================================================================== --- branches/usb-bringup-trunk/drivers/usb/usbccgp/function.c [iso-8859-1] (original) +++ branches/usb-bringup-trunk/drivers/usb/usbccgp/function.c [iso-8859-1] Mon Jan 30 10:41:52 2012 @@ -650,13 +650,14 @@ for(Index = 0; Index < FDODeviceExtension->ConfigurationDescriptor->bNumInterfaces; Index++) { // get interface descriptor - InterfaceDescriptor = USBD_ParseConfigurationDescriptor(FDODeviceExtension->ConfigurationDescriptor, Index, 0); + InterfaceDescriptor = USBD_ParseConfigurationDescriptorEx(FDODeviceExtension->ConfigurationDescriptor, FDODeviceExtension->ConfigurationDescriptor, Index, 0, -1, -1, -1); if (InterfaceDescriptor == NULL) { // // failed to find interface descriptor // DPRINT1("[USBCCGP] Failed to find interface descriptor index %lu\n", Index); + ASSERT(FALSE); return STATUS_UNSUCCESSFUL; } @@ -720,6 +721,7 @@ PUSB_INTERFACE_DESCRIPTOR InterfaceDescriptor, FirstDescriptor = NULL; PFDO_DEVICE_EXTENSION FDODeviceExtension; NTSTATUS Status = STATUS_SUCCESS; + PVOID StartPosition; // // get device extension @@ -731,12 +733,21 @@ // // first check if all interfaces belong to the same audio class // - for(Index = 0; Index < FDODeviceExtension->ConfigurationDescriptor->bNumInterfaces; Index++) + StartPosition = FDODeviceExtension->ConfigurationDescriptor; + for(Index = 0; Index < CountInterfaceDescriptors(FDODeviceExtension->ConfigurationDescriptor); Index++) { // // get interface descriptor // - InterfaceDescriptor = USBD_ParseConfigurationDescriptorEx(FDODeviceExtension->ConfigurationDescriptor, FDODeviceExtension->ConfigurationDescriptor, Index, -1, -1, -1, -1); + InterfaceDescriptor = USBD_ParseConfigurationDescriptorEx(FDODeviceExtension->ConfigurationDescriptor, StartPosition, -1, -1, -1, -1, -1); + DPRINT1("Index %lu Descriptor %p\n", Index, InterfaceDescriptor); + ASSERT(InterfaceDescriptor); + + // + // move to next descriptor + // + StartPosition = (PVOID)((ULONG_PTR)InterfaceDescriptor + InterfaceDescriptor->bLength); + if (InterfaceDescriptor->bInterfaceClass != 0x1) { // Modified: branches/usb-bringup-trunk/drivers/usb/usbccgp/misc.c URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/usb/u… ============================================================================== --- branches/usb-bringup-trunk/drivers/usb/usbccgp/misc.c [iso-8859-1] (original) +++ branches/usb-bringup-trunk/drivers/usb/usbccgp/misc.c [iso-8859-1] Mon Jan 30 10:41:52 2012 @@ -200,7 +200,7 @@ IN PUSBC_FUNCTION_DESCRIPTOR FunctionDescriptor, IN ULONG FunctionDescriptorCount) { - ULONG Index; + ULONG Index, SubIndex; DPRINT1("FunctionCount %lu\n", FunctionDescriptorCount); @@ -212,6 +212,13 @@ DPRINT1("CompatibleId %wZ\n", &FunctionDescriptor[Index].CompatibleId); DPRINT1("FunctionDescription %wZ\n", &FunctionDescriptor[Index].FunctionDescription); DPRINT1("NumInterfaces %lu\n", FunctionDescriptor[Index].NumberOfInterfaces); + + for(SubIndex = 0; SubIndex < FunctionDescriptor[Index].NumberOfInterfaces; SubIndex++) + { + DPRINT1(" Interface %p\n", FunctionDescriptor[Index].InterfaceDescriptorList[SubIndex]); + DPRINT1(" Interface InterfaceNumber %x\n", FunctionDescriptor[Index].InterfaceDescriptorList[SubIndex]->bInterfaceNumber); + DPRINT1(" Interface Alternate %x\n", FunctionDescriptor[Index].InterfaceDescriptorList[SubIndex]->bAlternateSetting ); + } } } Modified: branches/usb-bringup-trunk/drivers/usb/usbccgp/pdo.c URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/usb/u… ============================================================================== --- branches/usb-bringup-trunk/drivers/usb/usbccgp/pdo.c [iso-8859-1] (original) +++ branches/usb-bringup-trunk/drivers/usb/usbccgp/pdo.c [iso-8859-1] Mon Jan 30 10:41:52 2012 @@ -523,7 +523,7 @@ PUSBD_INTERFACE_INFORMATION InterfaceInformation; ULONG InterfaceInformationCount, Index, InterfaceIndex; PUSBD_INTERFACE_LIST_ENTRY Entry; - ULONG NeedSelect; + ULONG NeedSelect, FoundInterface; // // get current stack location @@ -569,35 +569,66 @@ InterfaceInformation = &Urb->UrbSelectConfiguration.Interface; Index = 0; Entry = NULL; - + DPRINT1("Count %x\n", InterfaceInformationCount); do { - // - // search for the interface - // + DPRINT1("[USBCCGP] SelectConfiguration Function %x InterfaceNumber %x Alternative %x\n", PDODeviceExtension->FunctionDescriptor->FunctionNumber, InterfaceInformation->InterfaceNumber, InterfaceInformation->AlternateSetting); + + // + // search for the interface in the local interface list + // + FoundInterface = FALSE; for(InterfaceIndex = 0; InterfaceIndex < PDODeviceExtension->FunctionDescriptor->NumberOfInterfaces; InterfaceIndex++) + { + if (PDODeviceExtension->FunctionDescriptor->InterfaceDescriptorList[InterfaceIndex]->bInterfaceNumber == InterfaceInformation->InterfaceNumber) + { + // found interface entry + FoundInterface = TRUE; + break; + } + } + + if (!FoundInterface) + { + // + // invalid parameter + // + DPRINT1("InterfaceInformation InterfaceNumber %x Alternative %x NumberOfPipes %x not found\n", InterfaceInformation->InterfaceNumber, InterfaceInformation->AlternateSetting, InterfaceInformation->NumberOfPipes); + ASSERT(FALSE); + return STATUS_INVALID_PARAMETER; + } + + // + // now query the total interface list + // + Entry = NULL; + for(InterfaceIndex = 0; InterfaceIndex < PDODeviceExtension->InterfaceListCount; InterfaceIndex++) { if (PDODeviceExtension->InterfaceList[InterfaceIndex].Interface->InterfaceNumber == InterfaceInformation->InterfaceNumber) { - // found interface entry + // + // found entry + // Entry = &PDODeviceExtension->InterfaceList[InterfaceIndex]; - break; } } - if (!Entry || Entry->InterfaceDescriptor) - { - // - // invalid parameter - // - ASSERT(FALSE); - return STATUS_INVALID_PARAMETER; + // + // sanity check + // + ASSERT(Entry); + if (!Entry) + { + // + // corruption detected + // + KeBugCheck(0); } NeedSelect = FALSE; if (Entry->InterfaceDescriptor->bAlternateSetting == InterfaceInformation->AlternateSetting) { - for(InterfaceIndex = 0; Entry->InterfaceDescriptor->bNumEndpoints; InterfaceIndex++) + for(InterfaceIndex = 0; InterfaceIndex < Entry->InterfaceDescriptor->bNumEndpoints; InterfaceIndex++) { if (InterfaceInformation->Pipes[InterfaceIndex].MaximumTransferSize != Entry->Interface->Pipes[InterfaceIndex].MaximumTransferSize) { @@ -611,7 +642,7 @@ else { // - // need select + // need select as the interface number differ // NeedSelect = TRUE; } @@ -640,6 +671,16 @@ Index++; }while(Index < InterfaceInformationCount); + // + // store configuration handle + // + Urb->UrbSelectConfiguration.ConfigurationHandle = PDODeviceExtension->ConfigurationHandle; + + DPRINT1("[USBCCGP] SelectConfiguration Function %x Completed\n", PDODeviceExtension->FunctionDescriptor->FunctionNumber); + + // + // done + // return STATUS_SUCCESS; } @@ -721,9 +762,14 @@ return Status; } } - - - + else if (Urb->UrbHeader.Function == URB_FUNCTION_GET_DESCRIPTOR_FROM_INTERFACE) + { + DPRINT1("URB_FUNCTION_GET_DESCRIPTOR_FROM_INTERFACE\n"); + IoSkipCurrentIrpStackLocation(Irp); + Status = IoCallDriver(PDODeviceExtension->NextDeviceObject, Irp); + DPRINT1("URB_FUNCTION_GET_DESCRIPTOR_FROM_INTERFACE Status %x\n", Status); + return Status; + } } Modified: branches/usb-bringup-trunk/drivers/usb/usbccgp/usbccgp.c URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/usb/u… ============================================================================== --- branches/usb-bringup-trunk/drivers/usb/usbccgp/usbccgp.c [iso-8859-1] (original) +++ branches/usb-bringup-trunk/drivers/usb/usbccgp/usbccgp.c [iso-8859-1] Mon Jan 30 10:41:52 2012 @@ -136,6 +136,7 @@ { // initialize driver object + DPRINT1("[USBCCGP] DriverEntry\n"); DriverObject->DriverExtension->AddDevice = USBCCGP_AddDevice; DriverObject->MajorFunction[IRP_MJ_CREATE] = USBCCGP_Dispatch; DriverObject->MajorFunction[IRP_MJ_CLOSE] = USBCCGP_Dispatch;

12 years, 11 months

[ion] 55324: [SMSS2]: Implement KnownDLL and DOSDevice initialization now that the kernel bugs are gone. Compared to SMSS, SMSS2 is smarter and uses a Ldr callback to manually add any imported DLLs...

by ion＠svn.reactos.org

Author: ion Date: Mon Jan 30 10:22:21 2012 New Revision: 55324 URL: http://svn.reactos.org/svn/reactos?rev=55324&view=rev Log: [SMSS2]: Implement KnownDLL and DOSDevice initialization now that the kernel bugs are gone. Compared to SMSS, SMSS2 is smarter and uses a Ldr callback to manually add any imported DLLs of KnownDLLs to the KnownDLL list, which helps with long-term app launch performance. Next up will be environment and page file. Modified: trunk/reactos/base/system/smss2/sminit.c trunk/reactos/base/system/smss2/smss.h 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] Mon Jan 30 10:22:21 2012 @@ -30,7 +30,7 @@ LIST_ENTRY SmpSubSystemsToDefer, SmpExecuteList, NativeProcessList; ULONG SmBaseTag; -HANDLE SmpDebugPort; +HANDLE SmpDebugPort, SmpDosDevicesObjectDirectory; PVOID SmpHeap; PWCHAR SmpDefaultEnvironment, SmpDefaultLibPathBuffer; UNICODE_STRING SmpKnownDllPath, SmpDefaultLibPath; @@ -42,8 +42,8 @@ SECURITY_DESCRIPTOR SmpPrimarySDBody, SmpLiberalSDBody, SmpKnownDllsSDBody; SECURITY_DESCRIPTOR SmpApiPortSDBody; -PSECURITY_DESCRIPTOR SmpPrimarySecurityDescriptor, SmpLiberalSecurityDescriptor; -PSECURITY_DESCRIPTOR SmpKnownDllsSecurityDescriptor, SmpApiPortSecurityDescriptor; +PISECURITY_DESCRIPTOR SmpPrimarySecurityDescriptor, SmpLiberalSecurityDescriptor; +PISECURITY_DESCRIPTOR SmpKnownDllsSecurityDescriptor, SmpApiPortSecurityDescriptor; ULONG SmpAllowProtectedRenames, SmpProtectionMode = 1; BOOLEAN MiniNTBoot; @@ -353,7 +353,6 @@ IN PVOID EntryContext) { /* Save this is into a list */ - DPRINT1("PageFile or Execute Entry: %S-%S\n", ValueName, ValueData); return SmpSaveRegistryValue(EntryContext, ValueData, NULL, TRUE); } @@ -433,7 +432,6 @@ IN PVOID EntryContext) { /* Save into linked list */ - DPRINT1("DOS Device: %S-%S\n", ValueName, ValueData); return SmpSaveRegistryValue(EntryContext, ValueName, ValueData, TRUE); } @@ -480,7 +478,6 @@ if (_wcsicmp(ValueName, L"DllDirectory")) { /* Add to the linked list -- this is a file */ - DPRINT1("KnownDll: %S-%S\n", ValueName, ValueData); return SmpSaveRegistryValue(EntryContext, ValueName, ValueData, TRUE); } @@ -1101,14 +1098,400 @@ NTAPI SmpInitializeDosDevices(VOID) { - return STATUS_SUCCESS; + NTSTATUS Status; + PSMP_REGISTRY_VALUE RegEntry; + SECURITY_DESCRIPTOR_CONTROL OldFlag = 0; + OBJECT_ATTRIBUTES ObjectAttributes; + UNICODE_STRING DestinationString; + HANDLE DirHandle; + PLIST_ENTRY NextEntry, Head; + + /* Open the GLOBAL?? directory */ + RtlInitUnicodeString(&DestinationString, L"\\??"); + InitializeObjectAttributes(&ObjectAttributes, + &DestinationString, + OBJ_CASE_INSENSITIVE | OBJ_OPENIF | OBJ_PERMANENT, + NULL, + NULL); + Status = NtOpenDirectoryObject(&SmpDosDevicesObjectDirectory, + DIRECTORY_ALL_ACCESS, + &ObjectAttributes); + if (!NT_SUCCESS(Status)) + { + DPRINT1("SMSS: Unable to open %wZ directory - Status == %lx\n", + &DestinationString, Status); + return Status; + } + + /* Loop the DOS devices */ + Head = &SmpDosDevicesList; + while (!IsListEmpty(Head)) + { + /* Get the entry and remove it */ + NextEntry = RemoveHeadList(Head); + RegEntry = CONTAINING_RECORD(NextEntry, SMP_REGISTRY_VALUE, Entry); + + /* Initialize the attributes, and see which descriptor is being used */ + InitializeObjectAttributes(&ObjectAttributes, + &RegEntry->Name, + OBJ_CASE_INSENSITIVE | OBJ_OPENIF | OBJ_PERMANENT, + SmpDosDevicesObjectDirectory, + SmpPrimarySecurityDescriptor); + if (SmpPrimarySecurityDescriptor) + { + /* Save the old flag and set it while we create this link */ + OldFlag = SmpPrimarySecurityDescriptor->Control; + SmpPrimarySecurityDescriptor->Control |= SE_DACL_DEFAULTED; + } + + /* Create the symbolic link */ + DPRINT1("Creating symlink for %wZ to %wZ\n", &RegEntry->Name, &RegEntry->Value); + Status = NtCreateSymbolicLinkObject(&DirHandle, + SYMBOLIC_LINK_ALL_ACCESS, + &ObjectAttributes, + &RegEntry->Value); + if (Status == STATUS_OBJECT_NAME_EXISTS) + { + /* Make it temporary and get rid of the handle */ + NtMakeTemporaryObject(DirHandle); + NtClose(DirHandle); + + /* Treat this as success, and see if we got a name back */ + Status = STATUS_SUCCESS; + if (RegEntry->Value.Length) + { + /* Create it now with this name */ + ObjectAttributes.Attributes &= ~OBJ_OPENIF; + Status = NtCreateSymbolicLinkObject(&DirHandle, + SYMBOLIC_LINK_ALL_ACCESS, + &ObjectAttributes, + &RegEntry->Value); + } + } + + /* If we were using a security descriptor, restore the non-defaulted flag */ + if (ObjectAttributes.SecurityDescriptor) + { + SmpPrimarySecurityDescriptor->Control = OldFlag; + } + + /* Print a failure if we failed to create the symbolic link */ + if (!NT_SUCCESS(Status)) + { + DPRINT1("SMSS: Unable to create %wZ => %wZ symbolic link object - Status == 0x%lx\n", + &RegEntry->Name, + &RegEntry->Value, + Status); + break; + } + + /* Close the handle */ + NtClose(DirHandle); + + /* Free this entry */ + if (RegEntry->AnsiValue) RtlFreeHeap(RtlGetProcessHeap(), 0, RegEntry->AnsiValue); + if (RegEntry->Value.Buffer) RtlFreeHeap(RtlGetProcessHeap(), 0, RegEntry->Value.Buffer); + RtlFreeHeap(RtlGetProcessHeap(), 0, RegEntry); + } + + /* Return the status */ + return Status; +} + +VOID +NTAPI +SmpProcessModuleImports(IN PVOID Unused, + IN PCHAR ImportName) +{ + ULONG Length = 0, Chars; + WCHAR Buffer[MAX_PATH]; + PWCHAR DllName, DllValue; + ANSI_STRING ImportString; + UNICODE_STRING ImportUnicodeString; + NTSTATUS Status; + + /* Skip NTDLL since it's already always mapped */ + if (!_stricmp(ImportName, "ntdll.dll")) return; + + /* Initialize our strings */ + RtlInitAnsiString(&ImportString, ImportName); + RtlInitEmptyUnicodeString(&ImportUnicodeString, Buffer, sizeof(Buffer)); + Status = RtlAnsiStringToUnicodeString(&ImportUnicodeString, &ImportString, FALSE); + if (!NT_SUCCESS(Status)) return; + + /* Loop in case we find a forwarder */ + ImportUnicodeString.MaximumLength = ImportUnicodeString.Length + sizeof(UNICODE_NULL); + while (Length < ImportUnicodeString.Length) + { + if (ImportUnicodeString.Buffer[Length / sizeof(WCHAR)] == L'.') break; + Length += sizeof(WCHAR); + } + + /* Break up the values as needed */ + DllValue = ImportUnicodeString.Buffer; + DllName = &ImportUnicodeString.Buffer[ImportUnicodeString.MaximumLength / sizeof(WCHAR)]; + Chars = Length >> 1; + wcsncpy(DllName, ImportUnicodeString.Buffer, Chars); + DllName[Chars] = 0; + + /* Add the DLL to the list */ + SmpSaveRegistryValue(&SmpKnownDllsList, DllName, DllValue, TRUE); +} + +NTSTATUS +NTAPI +SmpInitializeKnownDllsInternal(IN PUNICODE_STRING Directory, + IN PUNICODE_STRING Path) +{ + HANDLE DirFileHandle, DirHandle, SectionHandle, FileHandle, LinkHandle; + UNICODE_STRING NtPath, DestinationString; + OBJECT_ATTRIBUTES ObjectAttributes; + NTSTATUS Status, Status1; + PLIST_ENTRY NextEntry; + PSMP_REGISTRY_VALUE RegEntry; + ULONG_PTR ErrorParameters[3]; + UNICODE_STRING ErrorResponse; + IO_STATUS_BLOCK IoStatusBlock; + ULONG OldFlag = 0; + USHORT ImageCharacteristics; + + /* Initialize to NULL */ + DirFileHandle = NULL; + DirHandle = NULL; + NtPath.Buffer = NULL; + + /* Create the \KnownDLLs directory */ + InitializeObjectAttributes(&ObjectAttributes, + Directory, + OBJ_CASE_INSENSITIVE | OBJ_OPENIF | OBJ_PERMANENT, + NULL, + SmpKnownDllsSecurityDescriptor); + Status = NtCreateDirectoryObject(&DirHandle, + DIRECTORY_ALL_ACCESS, + &ObjectAttributes); + if (!NT_SUCCESS(Status)) + { + /* Handle failure */ + DPRINT1("SMSS: Unable to create %wZ directory - Status == %lx\n", + Directory, Status); + return Status; + } + + /* Convert the path to native format */ + if (!RtlDosPathNameToNtPathName_U(Path->Buffer, &NtPath, NULL, NULL)) + { + /* Fail if this didn't work */ + DPRINT1("SMSS: Unable to to convert %wZ to an Nt path\n", Path); + Status = STATUS_OBJECT_NAME_INVALID; + goto Quickie; + } + + /* Open the path that was specified, which should be a directory */ + InitializeObjectAttributes(&ObjectAttributes, + &NtPath, + OBJ_CASE_INSENSITIVE, + NULL, + NULL); + Status = NtOpenFile(&DirFileHandle, + FILE_LIST_DIRECTORY | SYNCHRONIZE, + &ObjectAttributes, + &IoStatusBlock, + FILE_SHARE_READ | FILE_SHARE_WRITE, + FILE_DIRECTORY_FILE | FILE_SYNCHRONOUS_IO_NONALERT); + if (!NT_SUCCESS(Status)) + { + /* Fail if we couldn't open it */ + DPRINT1("SMSS: Unable to open a handle to the KnownDll directory (%wZ)" + "- Status == %lx\n", + Path, + Status); + FileHandle = NULL; + goto Quickie; + } + + /* Temporarily hack the SD to use a default DACL for this symbolic link */ + if (SmpPrimarySecurityDescriptor) + { + OldFlag = SmpPrimarySecurityDescriptor->Control; + SmpPrimarySecurityDescriptor->Control |= SE_DACL_DEFAULTED; + } + + /* Create a symbolic link to the directory in the object manager */ + RtlInitUnicodeString(&DestinationString, L"KnownDllPath"); + InitializeObjectAttributes(&ObjectAttributes, + &DestinationString, + OBJ_CASE_INSENSITIVE | OBJ_OPENIF | OBJ_PERMANENT, + DirHandle, + SmpPrimarySecurityDescriptor); + Status = NtCreateSymbolicLinkObject(&LinkHandle, + SYMBOLIC_LINK_ALL_ACCESS, + &ObjectAttributes, + Path); + + /* Undo the hack */ + if (SmpPrimarySecurityDescriptor) SmpPrimarySecurityDescriptor->Control = OldFlag; + + /* Check if the symlink was created */ + if (!NT_SUCCESS(Status)) + { + /* It wasn't, so bail out since the OS needs it to exist */ + DPRINT1("SMSS: Unable to create %wZ symbolic link - Status == %lx\n", + &DestinationString, Status); + LinkHandle = NULL; + goto Quickie; + } + + /* We created it permanent, we can go ahead and close the handle now */ + Status1 = NtClose(LinkHandle); + ASSERT(NT_SUCCESS(Status1)); + + /* Now loop the known DLLs */ + NextEntry = SmpKnownDllsList.Flink; + while (NextEntry != &SmpKnownDllsList) + { + /* Get the entry and skip it if it's in the exluded list */ + RegEntry = CONTAINING_RECORD(NextEntry, SMP_REGISTRY_VALUE, Entry); + DPRINT1("Processing known DLL: %wZ-%wZ\n", &RegEntry->Name, &RegEntry->Value); + if ((SmpFindRegistryValue(&SmpExcludeKnownDllsList, + RegEntry->Name.Buffer)) || + (SmpFindRegistryValue(&SmpExcludeKnownDllsList, + RegEntry->Value.Buffer))) + { + continue; + } + + /* Open the actual file */ + InitializeObjectAttributes(&ObjectAttributes, + &RegEntry->Value, + OBJ_CASE_INSENSITIVE, + DirFileHandle, + NULL); + Status = NtOpenFile(&FileHandle, + SYNCHRONIZE | FILE_EXECUTE, + &ObjectAttributes, + &IoStatusBlock, + FILE_SHARE_READ | FILE_SHARE_DELETE, + FILE_NON_DIRECTORY_FILE | + FILE_SYNCHRONOUS_IO_NONALERT); + if (!NT_SUCCESS(Status)) break; + + /* Checksum it */ + Status = LdrVerifyImageMatchesChecksum((HANDLE)((ULONG_PTR)FileHandle | 1), + SmpProcessModuleImports, + RegEntry, + &ImageCharacteristics); + if (!NT_SUCCESS(Status)) + { + /* Checksum failed, so don't even try going further -- kill SMSS */ + RtlInitUnicodeString(&ErrorResponse, + L"Verification of a KnownDLL failed."); + ErrorParameters[0] = (ULONG)&ErrorResponse; + ErrorParameters[1] = Status; + ErrorParameters[2] = (ULONG)&RegEntry->Value; + SmpTerminate(ErrorParameters, 5, RTL_NUMBER_OF(ErrorParameters)); + } + else if (!(ImageCharacteristics & IMAGE_FILE_DLL)) + { + /* An invalid known DLL entry will also kill SMSS */ + RtlInitUnicodeString(&ErrorResponse, + L"Non-DLL file included in KnownDLL list."); + ErrorParameters[0] = (ULONG)&ErrorResponse; + ErrorParameters[1] = STATUS_INVALID_IMPORT_OF_NON_DLL; + ErrorParameters[2] = (ULONG)&RegEntry->Value; + SmpTerminate(ErrorParameters, 5, RTL_NUMBER_OF(ErrorParameters)); + } + + /* Temporarily hack the SD to use a default DACL for this section */ + if (SmpLiberalSecurityDescriptor) + { + OldFlag = SmpLiberalSecurityDescriptor->Control; + SmpLiberalSecurityDescriptor->Control |= SE_DACL_DEFAULTED; + } + + /* Create the section for this known DLL */ + InitializeObjectAttributes(&ObjectAttributes, + &RegEntry->Value, + OBJ_PERMANENT, + DirHandle, + SmpLiberalSecurityDescriptor) + Status = NtCreateSection(&SectionHandle, + SECTION_ALL_ACCESS, + &ObjectAttributes, + 0, + PAGE_EXECUTE, + SEC_IMAGE, + FileHandle); + + /* Undo the hack */ + if (SmpLiberalSecurityDescriptor) SmpLiberalSecurityDescriptor->Control = OldFlag; + + /* Check if we created the section okay */ + if (NT_SUCCESS(Status)) + { + /* We can close it now, since it's marked permanent */ + Status1 = NtClose(SectionHandle); + ASSERT(NT_SUCCESS(Status1)); + } + else + { + /* If we couldn't make it "known", that's fine and keep going */ + DPRINT1("SMSS: CreateSection for KnownDll %wZ failed - Status == %lx\n", + &RegEntry->Value, Status); + } + + /* Close the file since we can move on to the next one */ + Status1 = NtClose(FileHandle); + ASSERT(NT_SUCCESS(Status1)); + + /* Go to the next entry */ + NextEntry = NextEntry->Flink; + } + +Quickie: + /* Close both handles and free the NT path buffer */ + if (DirHandle) + { + Status1 = NtClose(DirHandle); + ASSERT(NT_SUCCESS(Status1)); + } + if (DirFileHandle) + { + Status1 = NtClose(DirFileHandle); + ASSERT(NT_SUCCESS(Status1)); + } + if (NtPath.Buffer) RtlFreeHeap(RtlGetProcessHeap(), 0, NtPath.Buffer); + return Status; } NTSTATUS NTAPI SmpInitializeKnownDlls(VOID) { - return STATUS_SUCCESS; + NTSTATUS Status; + PSMP_REGISTRY_VALUE RegEntry; + UNICODE_STRING DestinationString; + PLIST_ENTRY Head, NextEntry; + + /* Call the internal function */ + RtlInitUnicodeString(&DestinationString, L"\\KnownDlls"); + Status = SmpInitializeKnownDllsInternal(&DestinationString, &SmpKnownDllPath); + + /* Wipe out the list regardless of success */ + Head = &SmpKnownDllsList; + while (!IsListEmpty(Head)) + { + /* Remove this entry */ + NextEntry = RemoveHeadList(Head); + + /* Free it */ + RegEntry = CONTAINING_RECORD(NextEntry, SMP_REGISTRY_VALUE, Entry); + RtlFreeHeap(RtlGetProcessHeap(), 0, RegEntry->AnsiValue); + RtlFreeHeap(RtlGetProcessHeap(), 0, RegEntry->Value.Buffer); + RtlFreeHeap(RtlGetProcessHeap(), 0, RegEntry); + } + + /* All done */ + return Status; } NTSTATUS Modified: trunk/reactos/base/system/smss2/smss.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/smss2/smss.h?r… ============================================================================== --- trunk/reactos/base/system/smss2/smss.h [iso-8859-1] (original) +++ trunk/reactos/base/system/smss2/smss.h [iso-8859-1] Mon Jan 30 10:22:21 2012 @@ -45,6 +45,14 @@ extern BOOLEAN RegPosixSingleInstance; /* FUNCTIONS ******************************************************************/ + +NTSTATUS +NTAPI +SmpTerminate( + IN PULONG_PTR Parameters, + IN ULONG ParameterMask, + IN ULONG ParameterCount +); NTSTATUS NTAPI

12 years, 11 months

[ion] 55323: [NTOSKRNL]: Here's another gem. SMSS2 couldn't call LdrVerifyImageCheckSum, nor could it create Known DLL sections (of course, magically SMSS could). Turns out what Mm expects in terms...

by ion＠svn.reactos.org

Author: ion Date: Mon Jan 30 10:15:29 2012 New Revision: 55323 URL: http://svn.reactos.org/svn/reactos?rev=55323&view=rev Log: [NTOSKRNL]: Here's another gem. SMSS2 couldn't call LdrVerifyImageCheckSum, nor could it create Known DLL sections (of course, magically SMSS could). Turns out what Mm expects in terms of file access rights when you map a section has almost nothing to do with what it should expect. Added a new function to ARM3 (which had most of the code there already) so correctly determine which file access rights should be needed. One big change is that you can now map sections with PAGE_EXECUTE if you only have FILE_EXECUTE (FILE_READ_DATA no longer required), as things should be. Modified: trunk/reactos/ntoskrnl/mm/ARM3/section.c trunk/reactos/ntoskrnl/mm/section.c Modified: trunk/reactos/ntoskrnl/mm/ARM3/section.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/section.c… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/section.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/section.c [iso-8859-1] Mon Jan 30 10:15:29 2012 @@ -27,6 +27,18 @@ SECTION_MAP_READ, SECTION_MAP_EXECUTE | SECTION_MAP_WRITE, SECTION_MAP_EXECUTE | SECTION_MAP_READ +}; + +ACCESS_MASK MmMakeFileAccess[8] = +{ + FILE_READ_DATA, + FILE_READ_DATA, + FILE_EXECUTE, + FILE_EXECUTE | FILE_READ_DATA, + FILE_WRITE_DATA | FILE_READ_DATA, + FILE_READ_DATA, + FILE_EXECUTE | FILE_WRITE_DATA | FILE_READ_DATA, + FILE_EXECUTE | FILE_READ_DATA }; CHAR MmUserProtectionToMask1[16] = @@ -73,6 +85,24 @@ /* PRIVATE FUNCTIONS **********************************************************/ +ACCESS_MASK +NTAPI +MiArm3GetCorrectFileAccessMask(IN ACCESS_MASK SectionPageProtection) +{ + ULONG ProtectionMask; + + /* Calculate the protection mask and make sure it's valid */ + ProtectionMask = MiMakeProtectionMask(SectionPageProtection); + if (ProtectionMask == MM_INVALID_PROTECTION) + { + DPRINT1("Invalid protection mask\n"); + return STATUS_INVALID_PAGE_PROTECTION; + } + + /* Now convert it to the required file access */ + return MmMakeFileAccess[ProtectionMask & 0x7]; +} + ULONG NTAPI MiMakeProtectionMask(IN ULONG Protect) Modified: trunk/reactos/ntoskrnl/mm/section.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/section.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/mm/section.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/section.c [iso-8859-1] Mon Jan 30 10:15:29 2012 @@ -150,6 +150,7 @@ PAGE_EXECUTE_READWRITE, /* 15 = WRITABLE, READABLE, EXECUTABLE, SHARED */ }; +ACCESS_MASK NTAPI MiArm3GetCorrectFileAccessMask(IN ACCESS_MASK SectionPageProtection); static GENERIC_MAPPING MmpSectionMapping = { STANDARD_RIGHTS_READ | SECTION_MAP_READ | SECTION_QUERY, STANDARD_RIGHTS_WRITE | SECTION_MAP_WRITE, @@ -3012,22 +3013,10 @@ Section->AllocationAttributes = AllocationAttributes; /* - * Check file access required - */ - if (SectionPageProtection & PAGE_READWRITE || - SectionPageProtection & PAGE_EXECUTE_READWRITE) - { - FileAccess = FILE_READ_DATA | FILE_WRITE_DATA; - } - else - { - FileAccess = FILE_READ_DATA; - } - - /* * Reference the file handle */ - Status = ObReferenceObjectByHandle(FileHandle, + FileAccess = MiArm3GetCorrectFileAccessMask(SectionPageProtection); + Status = ObReferenceObjectByHandle(FileHandle, FileAccess, IoFileObjectType, ExGetPreviousMode(), @@ -3882,22 +3871,10 @@ ULONG FileAccess = 0; /* - * Check file access required - */ - if (SectionPageProtection & PAGE_READWRITE || - SectionPageProtection & PAGE_EXECUTE_READWRITE) - { - FileAccess = FILE_READ_DATA | FILE_WRITE_DATA; - } - else - { - FileAccess = FILE_READ_DATA; - } - - /* * Reference the file handle */ - Status = ObReferenceObjectByHandle(FileHandle, + FileAccess = MiArm3GetCorrectFileAccessMask(SectionPageProtection); + Status = ObReferenceObjectByHandle(FileHandle, FileAccess, IoFileObjectType, ExGetPreviousMode(),

12 years, 11 months

[janderwald] 55322: [HIDUSB] - Pass the interface number in the request when issuing hid get report descriptor - Fixes wrong report descriptors being obtained

by janderwald＠svn.reactos.org

Author: janderwald Date: Mon Jan 30 09:53:18 2012 New Revision: 55322 URL: http://svn.reactos.org/svn/reactos?rev=55322&view=rev Log: [HIDUSB] - Pass the interface number in the request when issuing hid get report descriptor - Fixes wrong report descriptors being obtained Modified: branches/usb-bringup-trunk/drivers/hid/hidusb/hidusb.c Modified: branches/usb-bringup-trunk/drivers/hid/hidusb/hidusb.c URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/hid/h… ============================================================================== --- branches/usb-bringup-trunk/drivers/hid/hidusb/hidusb.c [iso-8859-1] (original) +++ branches/usb-bringup-trunk/drivers/hid/hidusb/hidusb.c [iso-8859-1] Mon Jan 30 09:53:18 2012 @@ -646,7 +646,7 @@ // FIXME: support old hid version // BufferLength = HidDeviceExtension->HidDescriptor->DescriptorList[0].wReportLength; - Status = Hid_GetDescriptor(DeviceObject, URB_FUNCTION_GET_DESCRIPTOR_FROM_INTERFACE, sizeof(struct _URB_CONTROL_DESCRIPTOR_REQUEST), &Report, &BufferLength, HidDeviceExtension->HidDescriptor->DescriptorList[0].bReportType, 0, 0); + Status = Hid_GetDescriptor(DeviceObject, URB_FUNCTION_GET_DESCRIPTOR_FROM_INTERFACE, sizeof(struct _URB_CONTROL_DESCRIPTOR_REQUEST), &Report, &BufferLength, HidDeviceExtension->HidDescriptor->DescriptorList[0].bReportType, 0, HidDeviceExtension->InterfaceInfo->InterfaceNumber); if (!NT_SUCCESS(Status)) { //

12 years, 11 months

[ion] 55321: [NDK]: LDR_CALLBACK's second parameter is a PCHAR.

by ion＠svn.reactos.org

Author: ion Date: Mon Jan 30 09:43:24 2012 New Revision: 55321 URL: http://svn.reactos.org/svn/reactos?rev=55321&view=rev Log: [NDK]: LDR_CALLBACK's second parameter is a PCHAR. Modified: trunk/reactos/include/ndk/umfuncs.h Modified: trunk/reactos/include/ndk/umfuncs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/umfuncs.h?rev=… ============================================================================== --- trunk/reactos/include/ndk/umfuncs.h [iso-8859-1] (original) +++ trunk/reactos/include/ndk/umfuncs.h [iso-8859-1] Mon Jan 30 09:43:24 2012 @@ -304,7 +304,7 @@ IN PVOID BaseAddress ); -typedef VOID (NTAPI *PLDR_CALLBACK)(PVOID CallbackContext, PVOID Name); +typedef VOID (NTAPI *PLDR_CALLBACK)(PVOID CallbackContext, PCHAR Name); NTSTATUS NTAPI LdrVerifyImageMatchesChecksum(

12 years, 11 months

[ion] 55320: [NTOSKRNL]: One of my favorite bugfixes to date: While working on SMSS2, I notice that Win32->NT path conversion is failing and %SystemRoot% is not being translated. Yet, this is suppo...

by ion＠svn.reactos.org

Author: ion Date: Mon Jan 30 09:42:47 2012 New Revision: 55320 URL: http://svn.reactos.org/svn/reactos?rev=55320&view=rev Log: [NTOSKRNL]: One of my favorite bugfixes to date: While working on SMSS2, I notice that Win32->NT path conversion is failing and %SystemRoot% is not being translated. Yet, this is supposed to be part of the core environment that the kernel sends to SMSS! I analyze the old SMSS, and in there, it works. Puzzled, I DPRINT1 out the environment only to see that it is empty. I do the same in the kernel -- empty! The old SMSS is currently manually regenerating its critical environment, as if the kernel never sent it (which perfectly hid the bug that our kernel...actually did never send it!). But why were we sending no environment? It turns out our environment string was 0x10000 bytes, just one byte longer than MAX_USHORT and overflowing back to zero -- hence our Appends were all silently failing. But why was our environment string 0x10000, when we allocate 0x1000 bytes only? And here comes the Mm bug. When you allocate virtual memory in Windows you are forced to use 64K alignment, and Windows internally will align the VAD on a 64K boundary. In ReactOS however, we actually allocate, map, and reserve a full 64K memory area, as well as actually modify the region size that the caller has sent, returning the caller a 64K-aligned size no matter what (whereas Windows would return the original 4KB size). I've thus added a simple hack which still allocates a full 64K memory area (who knows what would break if not), but only aligns the region size to a page size -- less swap pages are reserved, and the caller only receives a page-aligned region, instead of 64K. This now fixes ExpLoadInitialProcess and anyone else that was requesting a 4KB page and getting 64KB in exchange... Modified: trunk/reactos/ntoskrnl/mm/anonmem.c Modified: trunk/reactos/ntoskrnl/mm/anonmem.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/anonmem.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/mm/anonmem.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/anonmem.c [iso-8859-1] Mon Jan 30 09:42:47 2012 @@ -874,9 +874,15 @@ return(Status); } +#if 0 MemoryAreaLength = (ULONG_PTR)MemoryArea->EndingAddress - (ULONG_PTR)MemoryArea->StartingAddress; - +#else + ULONG_PTR EndingAddress; + EndingAddress = ((ULONG_PTR)MemoryArea->StartingAddress + RegionSize - 1) | (PAGE_SIZE - 1); + MemoryAreaLength = (ULONG_PTR)EndingAddress - (ULONG_PTR)MemoryArea->StartingAddress + 1; +#endif + MmInitializeRegion(&MemoryArea->Data.VirtualMemoryData.RegionListHead, MemoryAreaLength, Type, Protect);

12 years, 11 months

[ion] 55319: [SMSS]: Co-exist with SMSS2 by using OBJ_OPENIF when creating object directories and sections, in case SMSS2 has already done so (which now it probably will). [SMSS2]: Implement all th...

by ion＠svn.reactos.org

Author: ion Date: Mon Jan 30 08:02:17 2012 New Revision: 55319 URL: http://svn.reactos.org/svn/reactos?rev=55319&view=rev Log: [SMSS]: Co-exist with SMSS2 by using OBJ_OPENIF when creating object directories and sections, in case SMSS2 has already done so (which now it probably will). [SMSS2]: Implement all the required registry configuration parsing functions. KnownDLLs, DosDevices, PageFiles, Subsystems, ExcludedKnownDLLs, PendingFileRenameOperations, ObjectDirectories, Environment keys are all processed and put into lists. Other than creating the object directories and setting the environment variables, though, no other work happens -- but we do DPRINT1 what should happen. Modified: trunk/reactos/base/system/smss/initdosdev.c trunk/reactos/base/system/smss/initobdir.c trunk/reactos/base/system/smss/initwkdll.c trunk/reactos/base/system/smss2/sminit.c trunk/reactos/base/system/smss2/smss.h trunk/reactos/base/system/smss2/smsubsys.c Modified: trunk/reactos/base/system/smss/initdosdev.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/smss/initdosde… ============================================================================== --- trunk/reactos/base/system/smss/initdosdev.c [iso-8859-1] (original) +++ trunk/reactos/base/system/smss/initdosdev.c [iso-8859-1] Mon Jan 30 08:02:17 2012 @@ -50,7 +50,7 @@ /* create symbolic link */ InitializeObjectAttributes(&ObjectAttributes, &LinkName, - OBJ_PERMANENT|OBJ_CASE_INSENSITIVE, + OBJ_PERMANENT|OBJ_CASE_INSENSITIVE|OBJ_OPENIF, NULL, NULL); Status = NtCreateSymbolicLinkObject(&LinkHandle, Modified: trunk/reactos/base/system/smss/initobdir.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/smss/initobdir… ============================================================================== --- trunk/reactos/base/system/smss/initobdir.c [iso-8859-1] (original) +++ trunk/reactos/base/system/smss/initobdir.c [iso-8859-1] Mon Jan 30 08:02:17 2012 @@ -37,7 +37,7 @@ InitializeObjectAttributes(&ObjectAttributes, &UnicodeString, - 0, + OBJ_OPENIF, NULL, NULL); Modified: trunk/reactos/base/system/smss/initwkdll.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/smss/initwkdll… ============================================================================== --- trunk/reactos/base/system/smss/initwkdll.c [iso-8859-1] (original) +++ trunk/reactos/base/system/smss/initwkdll.c [iso-8859-1] Mon Jan 30 08:02:17 2012 @@ -82,7 +82,7 @@ InitializeObjectAttributes(&ObjectAttributes, &ImageName, - OBJ_CASE_INSENSITIVE | OBJ_PERMANENT, + OBJ_CASE_INSENSITIVE | OBJ_PERMANENT | OBJ_OPENIF, (HANDLE)EntryContext, NULL); Status = NtCreateSection(&SectionHandle, 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] Mon Jan 30 08:02:17 2012 @@ -32,7 +32,9 @@ ULONG SmBaseTag; HANDLE SmpDebugPort; PVOID SmpHeap; -PWCHAR SmpDefaultEnvironment; +PWCHAR SmpDefaultEnvironment, SmpDefaultLibPathBuffer; +UNICODE_STRING SmpKnownDllPath, SmpDefaultLibPath; +ULONG SmpCalledConfigEnv; ULONG SmpInitProgressByLine; NTSTATUS SmpInitReturnStatus; @@ -54,6 +56,174 @@ } /* REGISTRY CONFIGURATION *****************************************************/ + +NTSTATUS +NTAPI +SmpSaveRegistryValue(IN PLIST_ENTRY ListAddress, + IN PWSTR Name, + IN PWCHAR Value, + IN BOOLEAN Flags) +{ + PSMP_REGISTRY_VALUE RegEntry; + UNICODE_STRING NameString, ValueString; + ANSI_STRING AnsiValueString; + PLIST_ENTRY NextEntry; + + /* Convert to unicode strings */ + RtlInitUnicodeString(&NameString, Name); + RtlInitUnicodeString(&ValueString, Value); + + /* Check if we should do a duplicat echeck */ + if (Flags) + { + /* Loop the current list */ + NextEntry = ListAddress->Flink; + while (NextEntry != ListAddress) + { + /* Get each entry */ + RegEntry = CONTAINING_RECORD(NextEntry, SMP_REGISTRY_VALUE, Entry); + + /* Check if the value name matches */ + if (!RtlCompareUnicodeString(&RegEntry->Name, &NameString, TRUE)) + { + /* Check if the value is the exact same thing */ + if (((Value) && + (RtlCompareUnicodeString(&RegEntry->Value, &ValueString, TRUE))) || + (!(Value) && !(RegEntry->Value.Buffer))) + { + /* Fail -- the same setting is being set twice */ + return STATUS_OBJECT_NAME_EXISTS; + } + + /* We found the list, and this isn't a duplicate value */ + break; + } + + /* This wasn't a match, keep going */ + NextEntry = NextEntry->Flink; + RegEntry = NULL; + } + } + else + { + /* This should be the first value, so initialize a new list/structure */ + RegEntry = NULL; + } + + /* Are we adding on, or creating a new entry */ + if (!RegEntry) + { + /* A new entry -- allocate it */ + RegEntry = RtlAllocateHeap(RtlGetProcessHeap(), + SmBaseTag, + NameString.MaximumLength + + sizeof(SMP_REGISTRY_VALUE)); + if (!RegEntry) return STATUS_NO_MEMORY; + + /* Initialize the list and set all values to NULL */ + InitializeListHead(&RegEntry->Entry); + RegEntry->AnsiValue = NULL; + RegEntry->Value.Buffer = NULL; + + /* Copy and initialize the value name */ + RegEntry->Name.Buffer = (PWCHAR)(RegEntry + 1); + RegEntry->Name.Length = NameString.Length; + RegEntry->Name.MaximumLength = NameString.MaximumLength; + RtlCopyMemory(RegEntry->Name.Buffer, + NameString.Buffer, + NameString.MaximumLength); + + /* Add this entry into the list */ + InsertTailList(ListAddress, &RegEntry->Entry); + } + + /* Did we have an old value buffer? */ + if (RegEntry->Value.Buffer) + { + /* Free it */ + RtlFreeHeap(RtlGetProcessHeap(), 0, RegEntry->Value.Buffer); + } + + /* Is there no value associated? */ + if (!Value) + { + /* We're done here */ + RtlInitUnicodeString(&RegEntry->Value, NULL); + return STATUS_SUCCESS; + } + + /* There is a value, so allocate a buffer for it */ + RegEntry->Value.Buffer = RtlAllocateHeap(RtlGetProcessHeap(), + SmBaseTag, + ValueString.MaximumLength); + if (!RegEntry->Value.Buffer) + { + /* Out of memory, undo */ + RemoveEntryList(&RegEntry->Entry); + RtlFreeHeap(RtlGetProcessHeap(), 0, RegEntry); + return STATUS_NO_MEMORY; + } + + /* Copy the value into the entry */ + RegEntry->Value.Length = ValueString.Length; + RegEntry->Value.MaximumLength = ValueString.MaximumLength; + RtlCopyMemory(RegEntry->Value.Buffer, + ValueString.Buffer, + ValueString.MaximumLength); + + /* Now allocate memory for an ANSI copy of it */ + RegEntry->AnsiValue = RtlAllocateHeap(RtlGetProcessHeap(), + SmBaseTag, + (ValueString.Length / sizeof(WCHAR)) + + sizeof(ANSI_NULL)); + if (!RegEntry->AnsiValue) + { + /* Out of memory, undo */ + RtlFreeHeap(RtlGetProcessHeap(), 0, RegEntry->Value.Buffer); + RemoveEntryList(&RegEntry->Entry); + RtlFreeHeap(RtlGetProcessHeap(), 0, RegEntry); + return STATUS_NO_MEMORY; + } + + /* Convert the Unicode value string and return success */ + RtlInitEmptyAnsiString(&AnsiValueString, + RegEntry->AnsiValue, + (ValueString.Length / sizeof(WCHAR)) + + sizeof(ANSI_NULL)); + RtlUnicodeStringToAnsiString(&AnsiValueString, &ValueString, FALSE); + return STATUS_SUCCESS; +} + +PSMP_REGISTRY_VALUE +NTAPI +SmpFindRegistryValue(IN PLIST_ENTRY List, + IN PWSTR ValueName) +{ + PSMP_REGISTRY_VALUE RegEntry; + UNICODE_STRING ValueString; + PLIST_ENTRY NextEntry; + + /* Initialize the value name sting */ + RtlInitUnicodeString(&ValueString, ValueName); + + /* Loop the list */ + NextEntry = List->Flink; + while (NextEntry != List) + { + /* Get each entry */ + RegEntry = CONTAINING_RECORD(NextEntry, SMP_REGISTRY_VALUE, Entry); + + /* Check if the value name matches */ + if (!RtlCompareUnicodeString(&RegEntry->Name, &ValueString, TRUE)) break; + + /* It doesn't, move on */ + NextEntry = NextEntry->Flink; + } + + /* If we looped back, return NULL, otherwise return the entry we found */ + if (NextEntry == List) RegEntry = NULL; + return RegEntry; +} NTSTATUS NTAPI @@ -107,6 +277,334 @@ return STATUS_SUCCESS; } +NTSTATUS +NTAPI +SmpConfigureObjectDirectories(IN PWSTR ValueName, + IN ULONG ValueType, + IN PVOID ValueData, + IN ULONG ValueLength, + IN PVOID Context, + IN PVOID EntryContext) +{ + PISECURITY_DESCRIPTOR SecDescriptor; + NTSTATUS Status; + OBJECT_ATTRIBUTES ObjectAttributes; + HANDLE DirHandle; + UNICODE_STRING RpcString, WindowsString, SearchString; + PWCHAR SourceString = ValueData; + + /* Initialize the two strings we will be looking for */ + RtlInitUnicodeString(&RpcString, L"\\RPC Control"); + RtlInitUnicodeString(&WindowsString, L"\\Windows"); + + /* Loop the registry data we received */ + while (*SourceString) + { + /* Assume primary SD for most objects */ + RtlInitUnicodeString(&SearchString, SourceString); + SecDescriptor = SmpPrimarySecurityDescriptor; + + /* But for these two always set the liberal descriptor */ + if ((RtlEqualUnicodeString(&SearchString, &RpcString, TRUE)) || + (RtlEqualUnicodeString(&SearchString, &WindowsString, TRUE))) + { + SecDescriptor = SmpLiberalSecurityDescriptor; + } + + /* Create the requested directory with the requested descriptor */ + InitializeObjectAttributes(&ObjectAttributes, + &SearchString, + OBJ_CASE_INSENSITIVE | + OBJ_OPENIF | + OBJ_PERMANENT, + NULL, + SecDescriptor); + DPRINT1("Creating: %wZ directory\n", &SearchString); + Status = NtCreateDirectoryObject(&DirHandle, + DIRECTORY_ALL_ACCESS, + &ObjectAttributes); + if (!NT_SUCCESS(Status)) + { + /* Failure case */ + DPRINT1("SMSS: Unable to create %wZ object directory - Status == %lx\n", + &SearchString, Status); + } + else + { + /* It worked, now close the handle */ + NtClose(DirHandle); + } + + /* Move to the next requested object */ + while (*SourceString++); + } + + /* All done */ + return STATUS_SUCCESS; +} + +NTSTATUS +NTAPI +SmpConfigureMemoryMgmt(IN PWSTR ValueName, + IN ULONG ValueType, + IN PVOID ValueData, + IN ULONG ValueLength, + IN PVOID Context, + IN PVOID EntryContext) +{ + /* Save this is into a list */ + DPRINT1("PageFile or Execute Entry: %S-%S\n", ValueName, ValueData); + return SmpSaveRegistryValue(EntryContext, ValueData, NULL, TRUE); +} + +NTSTATUS +NTAPI +SmpConfigureFileRenames(IN PWSTR ValueName, + IN ULONG ValueType, + IN PVOID ValueData, + IN ULONG ValueLength, + IN PVOID Context, + IN PVOID EntryContext) +{ + NTSTATUS Status; + static PWCHAR Canary; + + /* Check if this is the second call */ + if (Canary) + { + /* Save the data into the list */ + DPRINT1("Renamed file: %S-%S\n", Canary, ValueData); + Status = SmpSaveRegistryValue(EntryContext, Canary, ValueData, FALSE); + Canary = 0; + } + else + { + /* This it the first call, do nothing until we get the second call */ + Canary = ValueData; + Status = STATUS_SUCCESS; + } + + /* Return the status */ + return Status; +} + +NTSTATUS +NTAPI +SmpConfigureExcludeKnownDlls(IN PWSTR ValueName, + IN ULONG ValueType, + IN PVOID ValueData, + IN ULONG ValueLength, + IN PVOID Context, + IN PVOID EntryContext) +{ + PWCHAR DllName; + NTSTATUS Status; + + /* Make sure the value type is valid */ + if ((ValueType == REG_MULTI_SZ) || (ValueType == REG_SZ)) + { + /* Keep going for each DLL in the list */ + DllName = ValueData; + while (*DllName) + { + /* Add this to the linked list */ + DPRINT1("Excluded DLL: %S\n", DllName); + Status = SmpSaveRegistryValue(EntryContext, DllName, NULL, TRUE); + + /* Bail out on failure or if only one DLL name was present */ + if (!(NT_SUCCESS(Status)) || (ValueType == REG_SZ)) return Status; + + /* Otherwise, move to the next DLL name */ + while (*DllName++); + } + } + + /* All done */ + return STATUS_SUCCESS; +} + +NTSTATUS +NTAPI +SmpConfigureDosDevices(IN PWSTR ValueName, + IN ULONG ValueType, + IN PVOID ValueData, + IN ULONG ValueLength, + IN PVOID Context, + IN PVOID EntryContext) +{ + /* Save into linked list */ + DPRINT1("DOS Device: %S-%S\n", ValueName, ValueData); + return SmpSaveRegistryValue(EntryContext, ValueName, ValueData, TRUE); +} + +NTSTATUS +NTAPI +SmpInitializeKnownDllPath(IN PUNICODE_STRING DllPath, + IN PWCHAR Buffer, + IN ULONG Length) +{ + NTSTATUS Status; + + /* Allocate the buffer */ + DllPath->Buffer = RtlAllocateHeap(RtlGetProcessHeap(), SmBaseTag, Length); + if (DllPath->Buffer) + { + /* Fill out the rest of the string */ + DllPath->MaximumLength = Length; + DllPath->Length = Length - sizeof(UNICODE_NULL); + + /* Copy the actual path and return success */ + RtlCopyMemory(DllPath->Buffer, Buffer, Length); + Status = STATUS_SUCCESS; + } + else + { + /* Fail with out of memory code */ + Status = STATUS_NO_MEMORY; + } + + /* Return result */ + return Status; +} + +NTSTATUS +NTAPI +SmpConfigureKnownDlls(IN PWSTR ValueName, + IN ULONG ValueType, + IN PVOID ValueData, + IN ULONG ValueLength, + IN PVOID Context, + IN PVOID EntryContext) +{ + /* Check which value is being set */ + if (_wcsicmp(ValueName, L"DllDirectory")) + { + /* Add to the linked list -- this is a file */ + DPRINT1("KnownDll: %S-%S\n", ValueName, ValueData); + return SmpSaveRegistryValue(EntryContext, ValueName, ValueData, TRUE); + } + + /* This is the directory, initialize it */ + DPRINT1("KnownDll Path: %S\n", ValueData); + return SmpInitializeKnownDllPath(&SmpKnownDllPath, ValueData, ValueLength); +} + +NTSTATUS +NTAPI +SmpConfigureEnvironment(IN PWSTR ValueName, + IN ULONG ValueType, + IN PVOID ValueData, + IN ULONG ValueLength, + IN PVOID Context, + IN PVOID EntryContext) +{ + NTSTATUS Status; + UNICODE_STRING ValueString, DataString; + + /* Convert the strings into UNICODE_STRING and set the variable defined */ + RtlInitUnicodeString(&ValueString, ValueName); + RtlInitUnicodeString(&DataString, ValueData); + DPRINT1("Setting %wZ = %wZ\n", &ValueString, &DataString); + Status = RtlSetEnvironmentVariable(0, &ValueString, &DataString); + if (!NT_SUCCESS(Status)) + { + DPRINT1("SMSS: 'SET %wZ = %wZ' failed - Status == %lx\n", + &ValueString, &DataString, Status); + return Status; + } + + /* Check if the path is being set, and wait for the second instantiation */ + if (!(_wcsicmp(ValueName, L"Path")) && (++SmpCalledConfigEnv == 2)) + { + /* Allocate the path buffer */ + SmpDefaultLibPathBuffer = RtlAllocateHeap(RtlGetProcessHeap(), + SmBaseTag, + ValueLength); + if (!SmpDefaultLibPathBuffer) return STATUS_NO_MEMORY; + + /* Copy the data into it and create the UNICODE_STRING to hold it */ + RtlCopyMemory(SmpDefaultLibPathBuffer, ValueData, ValueLength); + RtlInitUnicodeString(&SmpDefaultLibPath, SmpDefaultLibPathBuffer); + } + + /* All good */ + return STATUS_SUCCESS; +} + +NTSTATUS +NTAPI +SmpConfigureSubSystems(IN PWSTR ValueName, + IN ULONG ValueType, + IN PVOID ValueData, + IN ULONG ValueLength, + IN PVOID Context, + IN PVOID EntryContext) +{ + PSMP_REGISTRY_VALUE RegEntry; + PWCHAR SubsystemName; + + /* Is this a required or optional subsystem */ + if ((_wcsicmp(ValueName, L"Required")) && + (_wcsicmp(ValueName, L"Optional"))) + { + /* It isn't, is this the PSI flag? */ + if ((_wcsicmp(ValueName, L"PosixSingleInstance")) || + (ValueType != REG_DWORD)) + { + /* It isn't, must be a subsystem entry, add it to the list */ + DPRINT1("Subsystem entry: %S-%S\n", ValueName, ValueData); + return SmpSaveRegistryValue(EntryContext, ValueName, ValueData, TRUE); + } + + /* This was the PSI flag, save it and exit */ + RegPosixSingleInstance = TRUE; + return STATUS_SUCCESS; + } + + /* This should be one of the required/optional lists. Is the type valid? */ + if (ValueType == REG_MULTI_SZ) + { + /* It is, get the first subsystem */ + SubsystemName = ValueData; + while (*SubsystemName) + { + /* We should have already put it into the list when we found it */ + DPRINT1("Found subsystem: %S\n", SubsystemName); + RegEntry = SmpFindRegistryValue(EntryContext, SubsystemName); + if (!RegEntry) + { + /* This subsystem doesn't exist, so skip it */ + DPRINT1("SMSS: Invalid subsystem name - %ws\n", SubsystemName); + } + else + { + /* Found it -- remove it from the main list */ + RemoveEntryList(&RegEntry->Entry); + + /* Figure out which list to put it in */ + if (_wcsicmp(ValueName, L"Required")) + { + /* Put it into the optional list */ + DPRINT1("Optional\n"); + InsertTailList(&SmpSubSystemsToDefer, &RegEntry->Entry); + } + else + { + /* Put it into the required list */ + DPRINT1("Required\n"); + InsertTailList(&SmpSubSystemsToLoad, &RegEntry->Entry); + } + } + + /* Move to the next name */ + while (*SubsystemName++); + } + } + + /* All done! */ + return STATUS_SUCCESS; +} + RTL_QUERY_REGISTRY_TABLE SmpRegistryConfigurationTable[] = { @@ -119,15 +617,177 @@ NULL, 0 }, + { SmpConfigureAllowProtectedRenames, - RTL_QUERY_REGISTRY_DELETE, + 0, //RTL_QUERY_REGISTRY_DELETE, L"AllowProtectedRenames", NULL, REG_DWORD, NULL, 0 }, + + { + SmpConfigureObjectDirectories, + 0, + L"ObjectDirectories", + NULL, + REG_MULTI_SZ, + L"\\Windows\0\\RPC Control\0", + 0 + }, + + { + SmpConfigureMemoryMgmt, + 0, + L"BootExecute", + &SmpBootExecuteList, + REG_NONE, + NULL, + 0 + }, + + { + SmpConfigureMemoryMgmt, + RTL_QUERY_REGISTRY_TOPKEY, + L"SetupExecute", + &SmpSetupExecuteList, + REG_NONE, + NULL, + 0 + }, + + { + SmpConfigureFileRenames, + 0, //RTL_QUERY_REGISTRY_DELETE, + L"PendingFileRenameOperations", + &SmpFileRenameList, + REG_NONE, + NULL, + 0 + }, + + { + SmpConfigureFileRenames, + 0, //RTL_QUERY_REGISTRY_DELETE, + L"PendingFileRenameOperations2", + &SmpFileRenameList, + REG_NONE, + NULL, + 0 + }, + + { + SmpConfigureExcludeKnownDlls, + 0, + L"ExcludeFromKnownDlls", + &SmpExcludeKnownDllsList, + REG_MULTI_SZ, + L"\0", + 0 + }, + + { + NULL, + RTL_QUERY_REGISTRY_SUBKEY, + L"Memory Management", + NULL, + REG_NONE, + NULL, + 0 + }, + + { + SmpConfigureMemoryMgmt, + 0, + L"PagingFiles", + &SmpPagingFileList, + REG_MULTI_SZ, + L"?:\\pagefile.sys\0", + 0 + }, + + { + SmpConfigureDosDevices, + RTL_QUERY_REGISTRY_SUBKEY, + L"DOS Devices", + &SmpDosDevicesList, + REG_NONE, + NULL, + 0 + }, + + { + SmpConfigureKnownDlls, + RTL_QUERY_REGISTRY_SUBKEY, + L"KnownDlls", + &SmpKnownDllsList, + REG_NONE, + NULL, + 0 + }, + + { + SmpConfigureEnvironment, + RTL_QUERY_REGISTRY_SUBKEY, + L"Environment", + NULL, + REG_NONE, + NULL, + 0 + }, + + { + SmpConfigureSubSystems, + RTL_QUERY_REGISTRY_SUBKEY, + L"SubSystems", + &SmpSubSystemList, + REG_NONE, + NULL, + 0 + }, + + { + SmpConfigureSubSystems, + RTL_QUERY_REGISTRY_NOEXPAND, + L"Required", + &SmpSubSystemList, + REG_MULTI_SZ, + L"Debug\0Windows\0", + 0 + }, + + { + SmpConfigureSubSystems, + RTL_QUERY_REGISTRY_NOEXPAND, + L"Optional", + &SmpSubSystemList, + REG_NONE, + NULL, + 0 + }, + + { + SmpConfigureSubSystems, + 0, + L"Kmode", + &SmpSubSystemList, + REG_NONE, + NULL, + 0 + }, + + { + SmpConfigureMemoryMgmt, + RTL_QUERY_REGISTRY_TOPKEY, + L"Execute", + &SmpExecuteList, + REG_NONE, + NULL, + 0 + }, + {0}, }; @@ -477,7 +1137,7 @@ OBJECT_ATTRIBUTES ObjectAttributes; HANDLE KeyHandle; UNICODE_STRING DestinationString; - + /* Initialize the keywords we'll be looking for */ RtlInitUnicodeString(&SmpDebugKeyword, L"debug"); RtlInitUnicodeString(&SmpASyncKeyword, L"async"); Modified: trunk/reactos/base/system/smss2/smss.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/smss2/smss.h?r… ============================================================================== --- trunk/reactos/base/system/smss2/smss.h [iso-8859-1] (original) +++ trunk/reactos/base/system/smss2/smss.h [iso-8859-1] Mon Jan 30 08:02:17 2012 @@ -42,6 +42,7 @@ extern HANDLE SmpWindowsSubSysProcess; extern HANDLE SmpSessionsObjectDirectory; extern HANDLE SmpWindowsSubSysProcessId; +extern BOOLEAN RegPosixSingleInstance; /* FUNCTIONS ******************************************************************/ Modified: trunk/reactos/base/system/smss2/smsubsys.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/smss2/smsubsys… ============================================================================== --- trunk/reactos/base/system/smss2/smsubsys.c [iso-8859-1] (original) +++ trunk/reactos/base/system/smss2/smsubsys.c [iso-8859-1] Mon Jan 30 08:02:17 2012 @@ -18,6 +18,7 @@ LIST_ENTRY SmpKnownSubSysHead; HANDLE SmpWindowsSubSysProcess; HANDLE SmpWindowsSubSysProcessId; +BOOLEAN RegPosixSingleInstance; /* FUNCTIONS ******************************************************************/

12 years, 11 months

← Newer
1
2
3
4
5
6
7
...
56
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs January 2012