Ros-diffs July 2007

ros-diffs@reactos.org

20 participants
707 discussions

[cwittich] 27436: fix some PREfast issues
by cwittich＠svn.reactos.org 06 Jul '07

06 Jul '07

Author: cwittich Date: Sat Jul 7 01:33:51 2007 New Revision: 27436 URL: http://svn.reactos.org/svn/reactos?rev=27436&view=rev Log: fix some PREfast issues Modified: trunk/reactos/drivers/input/i8042prt/i8042prt.c trunk/reactos/drivers/input/i8042prt/i8042prt.h trunk/reactos/drivers/input/i8042prt/keyboard.c Modified: trunk/reactos/drivers/input/i8042prt/i8042prt.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/input/i8042prt/i80… ============================================================================== --- trunk/reactos/drivers/input/i8042prt/i8042prt.c (original) +++ trunk/reactos/drivers/input/i8042prt/i8042prt.c Sat Jul 7 01:33:51 2007 @@ -28,6 +28,19 @@ #define I8042_MAX_UPWARDS_STACK 5 UNICODE_STRING I8042RegistryPath; + +DRIVER_ADD_DEVICE I8042AddDevice; +static NTSTATUS STDCALL I8042AddDevice(PDRIVER_OBJECT DriverObject, + PDEVICE_OBJECT Pdo); + +DRIVER_STARTIO I8042StartIo; +static VOID STDCALL I8042StartIo(PDEVICE_OBJECT DeviceObject, PIRP Irp); + +DRIVER_DISPATCH I8042CreateDispatch; +static NTSTATUS STDCALL I8042CreateDispatch(PDEVICE_OBJECT DeviceObject, PIRP Irp); + +DRIVER_DISPATCH I8042InternalDeviceControl; +static NTSTATUS STDCALL I8042InternalDeviceControl(PDEVICE_OBJECT DeviceObject, PIRP Irp); /* FUNCTIONS *****************************************************************/ Modified: trunk/reactos/drivers/input/i8042prt/i8042prt.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/input/i8042prt/i80… ============================================================================== --- trunk/reactos/drivers/input/i8042prt/i8042prt.h (original) +++ trunk/reactos/drivers/input/i8042prt/i8042prt.h Sat Jul 7 01:33:51 2007 @@ -304,6 +304,7 @@ VOID I8042PacketDpc(PDEVICE_EXTENSION DevExt); +IO_WORKITEM_ROUTINE I8042SendHookWorkItem; VOID STDCALL I8042SendHookWorkItem(PDEVICE_OBJECT DeviceObject, PVOID Context); Modified: trunk/reactos/drivers/input/i8042prt/keyboard.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/input/i8042prt/key… ============================================================================== --- trunk/reactos/drivers/input/i8042prt/keyboard.c (original) +++ trunk/reactos/drivers/input/i8042prt/keyboard.c Sat Jul 7 01:33:51 2007 @@ -39,6 +39,7 @@ {0x45, KEYBOARD_NUM_LOCK_ON}, {0x46, KEYBOARD_SCROLL_LOCK_ON}}}; +IO_WORKITEM_ROUTINE I8042DebugWorkItem; static VOID STDCALL I8042DebugWorkItem(PDEVICE_OBJECT DeviceObject, PVOID Context);

1 0

[hpoussin] 27435: Simplify IoSynchronousInvalidateDeviceRelations/IoInvalidateDeviceRelations IoInvalidateDeviceRelations now creates a workitem, which will call IoSynchronousInvalidateDeviceRelations()
by hpoussin＠svn.reactos.org 06 Jul '07

06 Jul '07

Author: hpoussin Date: Sat Jul 7 01:12:44 2007 New Revision: 27435 URL: http://svn.reactos.org/svn/reactos?rev=27435&view=rev Log: Simplify IoSynchronousInvalidateDeviceRelations/IoInvalidateDeviceRelations IoInvalidateDeviceRelations now creates a workitem, which will call IoSynchronousInvalidateDeviceRelations() Modified: trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c Modified: trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.… ============================================================================== --- trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c (original) +++ trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c Sat Jul 7 01:12:44 2007 @@ -37,16 +37,10 @@ typedef struct _INVALIDATE_DEVICE_RELATION_DATA { + PDEVICE_OBJECT DeviceObject; DEVICE_RELATION_TYPE Type; PIO_WORKITEM WorkItem; - PKEVENT Event; - NTSTATUS Status; } INVALIDATE_DEVICE_RELATION_DATA, *PINVALIDATE_DEVICE_RELATION_DATA; - -static VOID NTAPI -IopInvalidateDeviceRelations( - IN PDEVICE_OBJECT DeviceObject, - IN PVOID InvalidateContext); VOID NTAPI @@ -253,6 +247,22 @@ &Stack); } +static VOID NTAPI +IopAsynchronousInvalidateDeviceRelations( + IN PDEVICE_OBJECT DeviceObject, + IN PVOID InvalidateContext) +{ + PINVALIDATE_DEVICE_RELATION_DATA Data = InvalidateContext; + + IoSynchronousInvalidateDeviceRelations( + Data->DeviceObject, + Data->Type); + + ObDereferenceObject(Data->WorkItem); + IoFreeWorkItem(Data->WorkItem); + ExFreePool(Data); +} + /* * @implemented */ @@ -275,53 +285,16 @@ return; } + ObReferenceObject(DeviceObject); + Data->DeviceObject = DeviceObject; Data->Type = Type; Data->WorkItem = WorkItem; - Data->Event = NULL; IoQueueWorkItem( WorkItem, - IopInvalidateDeviceRelations, + IopAsynchronousInvalidateDeviceRelations, DelayedWorkQueue, Data); -} - -/* - * @implemented - */ -VOID -NTAPI -IoSynchronousInvalidateDeviceRelations( - IN PDEVICE_OBJECT DeviceObject, - IN DEVICE_RELATION_TYPE Type) -{ - PIO_WORKITEM WorkItem; - PINVALIDATE_DEVICE_RELATION_DATA Data; - KEVENT Event; - - Data = ExAllocatePool(PagedPool, sizeof(INVALIDATE_DEVICE_RELATION_DATA)); - if (!Data) - return; - WorkItem = IoAllocateWorkItem(DeviceObject); - if (!WorkItem) - { - ExFreePool(Data); - return; - } - - KeInitializeEvent(&Event, NotificationEvent, FALSE); - Data->Type = Type; - Data->WorkItem = WorkItem; - Data->Event = &Event; - - IoQueueWorkItem( - WorkItem, - IopInvalidateDeviceRelations, - DelayedWorkQueue, - Data); - - KeWaitForSingleObject(&Event, Executive, KernelMode, FALSE, NULL); - ExFreePool(Data); } /* @@ -2186,359 +2159,15 @@ } /* - * IopActionConfigureChildServices - * - * Retrieve configuration for all (direct) child nodes of a parent node. - * - * Parameters - * DeviceNode - * Pointer to device node. - * Context - * Pointer to parent node to retrieve child node configuration for. - * - * Remarks - * We only return a status code indicating an error (STATUS_UNSUCCESSFUL) - * when we reach a device node which is not a direct child of the device - * node for which we configure child services for. Any errors that occur is - * logged instead so that all child services have a chance of beeing - * configured. + * @implemented */ - -NTSTATUS -IopActionConfigureChildServices(PDEVICE_NODE DeviceNode, - PVOID Context) -{ - RTL_QUERY_REGISTRY_TABLE QueryTable[3]; - PDEVICE_NODE ParentDeviceNode; - PUNICODE_STRING Service; - UNICODE_STRING ClassGUID; - NTSTATUS Status; - - DPRINT("IopActionConfigureChildServices(%p, %p)\n", DeviceNode, Context); - - ParentDeviceNode = (PDEVICE_NODE)Context; - - /* - * We are called for the parent too, but we don't need to do special - * handling for this node - */ - if (DeviceNode == ParentDeviceNode) - { - DPRINT("Success\n"); - return STATUS_SUCCESS; - } - - /* - * Make sure this device node is a direct child of the parent device node - * that is given as an argument - */ - if (DeviceNode->Parent != ParentDeviceNode) - { - /* Stop the traversal immediately and indicate successful operation */ - DPRINT("Stop\n"); - return STATUS_UNSUCCESSFUL; - } - - if (!IopDeviceNodeHasFlag(DeviceNode, DNF_DISABLED)) - { - WCHAR RegKeyBuffer[MAX_PATH]; - UNICODE_STRING RegKey; - - RegKey.Length = 0; - RegKey.MaximumLength = sizeof(RegKeyBuffer); - RegKey.Buffer = RegKeyBuffer; - - /* - * Retrieve configuration from Enum key - */ - - Service = &DeviceNode->ServiceName; - - RtlZeroMemory(QueryTable, sizeof(QueryTable)); - RtlInitUnicodeString(Service, NULL); - RtlInitUnicodeString(&ClassGUID, NULL); - - QueryTable[0].Name = L"Service"; - QueryTable[0].Flags = RTL_QUERY_REGISTRY_DIRECT | RTL_QUERY_REGISTRY_REQUIRED; - QueryTable[0].EntryContext = Service; - - QueryTable[1].Name = L"ClassGUID"; - QueryTable[1].Flags = RTL_QUERY_REGISTRY_DIRECT; - QueryTable[1].EntryContext = &ClassGUID; - QueryTable[1].DefaultType = REG_SZ; - QueryTable[1].DefaultData = L""; - QueryTable[1].DefaultLength = 0; - - RtlAppendUnicodeToString(&RegKey, L"\\Registry\\Machine\\System\\CurrentControlSet\\Enum\\"); - RtlAppendUnicodeStringToString(&RegKey, &DeviceNode->InstancePath); - - Status = RtlQueryRegistryValues(RTL_REGISTRY_ABSOLUTE, - RegKey.Buffer, QueryTable, NULL, NULL); - - if (!NT_SUCCESS(Status)) - { - /* FIXME: Log the error */ - DPRINT("Could not retrieve configuration for device %wZ (Status 0x%08x)\n", - &DeviceNode->InstancePath, Status); - IopDeviceNodeSetFlag(DeviceNode, DNF_DISABLED); - return STATUS_SUCCESS; - } - - if (Service->Buffer == NULL) - { - IopDeviceNodeSetFlag(DeviceNode, DNF_DISABLED); - - if (ClassGUID.Length != 0) - { - /* Device has a ClassGUID value, but no Service value. - * Suppose it is using the NULL driver, so state the - * device is started */ - DPRINT1("%wZ is using NULL driver\n", &DeviceNode->InstancePath); - IopDeviceNodeSetFlag(DeviceNode, DNF_STARTED); - DeviceNode->Flags |= DN_STARTED; - } - return STATUS_SUCCESS; - } - - DPRINT("Got Service %S\n", Service->Buffer); - } - - return STATUS_SUCCESS; -} - -/* - * IopActionInitChildServices - * - * Initialize the service for all (direct) child nodes of a parent node - * - * Parameters - * DeviceNode - * Pointer to device node. - * Context - * Pointer to parent node to initialize child node services for. - * BootDrivers - * Load only driver marked as boot start. - * - * Remarks - * If the driver image for a service is not loaded and initialized - * it is done here too. We only return a status code indicating an - * error (STATUS_UNSUCCESSFUL) when we reach a device node which is - * not a direct child of the device node for which we initialize - * child services for. Any errors that occur is logged instead so - * that all child services have a chance of being initialized. - */ - -NTSTATUS -IopActionInitChildServices(PDEVICE_NODE DeviceNode, - PVOID Context, - BOOLEAN BootDrivers) -{ - PDEVICE_NODE ParentDeviceNode; - NTSTATUS Status; - - DPRINT("IopActionInitChildServices(%p, %p, %d)\n", DeviceNode, Context, - BootDrivers); - - ParentDeviceNode = (PDEVICE_NODE)Context; - - /* - * We are called for the parent too, but we don't need to do special - * handling for this node - */ - if (DeviceNode == ParentDeviceNode) - { - DPRINT("Success\n"); - return STATUS_SUCCESS; - } - - /* - * Make sure this device node is a direct child of the parent device node - * that is given as an argument - */ -#if 0 - if (DeviceNode->Parent != ParentDeviceNode) - { - /* - * Stop the traversal immediately and indicate unsuccessful operation - */ - DPRINT("Stop\n"); - return STATUS_UNSUCCESSFUL; - } -#endif - - if (!IopDeviceNodeHasFlag(DeviceNode, DNF_DISABLED) && - !IopDeviceNodeHasFlag(DeviceNode, DNF_ADDED) && - !IopDeviceNodeHasFlag(DeviceNode, DNF_STARTED)) - { - PLDR_DATA_TABLE_ENTRY ModuleObject; - PDRIVER_OBJECT DriverObject; - - /* Get existing DriverObject pointer (in case the driver has - already been loaded and initialized) */ - Status = IopGetDriverObject( - &DriverObject, - &DeviceNode->ServiceName, - FALSE); - - if (!NT_SUCCESS(Status)) - { - /* Driver is not initialized, try to load it */ - Status = IopLoadServiceModule(&DeviceNode->ServiceName, &ModuleObject); - - if (NT_SUCCESS(Status) || Status == STATUS_IMAGE_ALREADY_LOADED) - { - /* STATUS_IMAGE_ALREADY_LOADED means this driver - was loaded by the bootloader */ - if (Status != STATUS_IMAGE_ALREADY_LOADED) - { - /* Initialize the driver */ - Status = IopInitializeDriverModule(DeviceNode, ModuleObject, - &DeviceNode->ServiceName, FALSE, &DriverObject); - } - else - { - Status = STATUS_SUCCESS; - } - } - else - { - DPRINT1("IopLoadServiceModule(%wZ) failed with status 0x%08x\n", - &DeviceNode->ServiceName, Status); - } - } - - /* Driver is loaded and initialized at this point */ - if (NT_SUCCESS(Status)) - { - /* We have a driver for this DeviceNode */ - DeviceNode->Flags |= DN_DRIVER_LOADED; - /* Attach lower level filter drivers. */ - IopAttachFilterDrivers(DeviceNode, TRUE); - /* Initialize the function driver for the device node */ - Status = IopInitializeDevice(DeviceNode, DriverObject); - - if (NT_SUCCESS(Status)) - { - /* Attach upper level filter drivers. */ - IopAttachFilterDrivers(DeviceNode, FALSE); - IopDeviceNodeSetFlag(DeviceNode, DNF_STARTED); - - Status = IopStartDevice(DeviceNode); - } - else - { - DPRINT1("IopInitializeDevice(%wZ) failed with status 0x%08x\n", - &DeviceNode->InstancePath, Status); - } - } - else - { - /* - * Don't disable when trying to load only boot drivers - */ - if (!BootDrivers) - { - IopDeviceNodeSetFlag(DeviceNode, DNF_DISABLED); - IopDeviceNodeSetFlag(DeviceNode, DNF_START_FAILED); - /* FIXME: Log the error (possibly in IopInitializeDeviceNodeService) */ - CPRINT("Initialization of service %S failed (Status %x)\n", - DeviceNode->ServiceName.Buffer, Status); - } - } - } - else - { - DPRINT("Device %wZ is disabled or already initialized\n", - &DeviceNode->InstancePath); - } - - return STATUS_SUCCESS; -} - -/* - * IopActionInitAllServices - * - * Initialize the service for all (direct) child nodes of a parent node. This - * function just calls IopActionInitChildServices with BootDrivers = FALSE. - */ - -NTSTATUS -IopActionInitAllServices(PDEVICE_NODE DeviceNode, - PVOID Context) -{ - return IopActionInitChildServices(DeviceNode, Context, FALSE); -} - -/* - * IopActionInitBootServices - * - * Initialize the boot start services for all (direct) child nodes of a - * parent node. This function just calls IopActionInitChildServices with - * BootDrivers = TRUE. - */ -NTSTATUS -IopActionInitBootServices(PDEVICE_NODE DeviceNode, - PVOID Context) -{ - return IopActionInitChildServices(DeviceNode, Context, TRUE); -} - -/* - * IopInitializePnpServices - * - * Initialize services for discovered children - * - * Parameters - * DeviceNode - * Top device node to start initializing services. - * - * BootDrivers - * When set to TRUE, only drivers marked as boot start will - * be loaded. Otherwise, all drivers will be loaded. - * - * Return Value - * Status - */ -NTSTATUS -IopInitializePnpServices(IN PDEVICE_NODE DeviceNode, - IN BOOLEAN BootDrivers) -{ - DEVICETREE_TRAVERSE_CONTEXT Context; - - DPRINT("IopInitializePnpServices(%p, %d)\n", DeviceNode, BootDrivers); - - if (BootDrivers) - { - IopInitDeviceTreeTraverseContext( - &Context, - DeviceNode, - IopActionInitBootServices, - DeviceNode); - } - else - { - IopInitDeviceTreeTraverseContext( - &Context, - DeviceNode, - IopActionInitAllServices, - DeviceNode); - } - - return IopTraverseDeviceTree(&Context); -} - -/* Invalidate device list enumerated by a device node. - * The call can be make synchronous by defining the Event field - * of the INVALIDATE_DEVICE_RELATION_DATA structure - */ -static VOID NTAPI -IopInvalidateDeviceRelations( +VOID +NTAPI +IoSynchronousInvalidateDeviceRelations( IN PDEVICE_OBJECT DeviceObject, - IN PVOID InvalidateContext) /* PINVALIDATE_DEVICE_RELATION_DATA */ -{ - PINVALIDATE_DEVICE_RELATION_DATA Data = InvalidateContext; + IN DEVICE_RELATION_TYPE Type) +{ PDEVICE_NODE DeviceNode = IopGetDeviceNode(DeviceObject); - PKEVENT Event = Data->Event; DEVICETREE_TRAVERSE_CONTEXT Context; PDEVICE_RELATIONS DeviceRelations; IO_STATUS_BLOCK IoStatusBlock; @@ -2555,7 +2184,7 @@ DPRINT("Sending IRP_MN_QUERY_DEVICE_RELATIONS to device stack\n"); - Stack.Parameters.QueryDeviceRelations.Type = Data->Type; + Stack.Parameters.QueryDeviceRelations.Type = Type; Status = IopInitiatePnpIrp( DeviceObject, @@ -2565,7 +2194,7 @@ if (!NT_SUCCESS(Status)) { DPRINT("IopInitiatePnpIrp() failed with status 0x%08lx\n", Status); - goto cleanup; + return; } DeviceRelations = (PDEVICE_RELATIONS)IoStatusBlock.Information; @@ -2577,8 +2206,7 @@ { ExFreePool(DeviceRelations); } - Status = STATUS_SUCCESS; - goto cleanup; + return; } DPRINT("Got %d PDOs\n", DeviceRelations->Count); @@ -2605,8 +2233,7 @@ for (i = 0; i < DeviceRelations->Count; i++) ObDereferenceObject(DeviceRelations->Objects[i]); ExFreePool(DeviceRelations); - Status = STATUS_NO_MEMORY; - goto cleanup; + return; } } ExFreePool(DeviceRelations); @@ -2624,7 +2251,7 @@ if (!NT_SUCCESS(Status)) { DPRINT("IopTraverseDeviceTree() failed with status 0x%08lx\n", Status); - goto cleanup; + return; } /* @@ -2640,7 +2267,7 @@ if (!NT_SUCCESS(Status)) { DPRINT("IopTraverseDeviceTree() failed with status 0x%08lx\n", Status); - goto cleanup; + return; } /* @@ -2677,21 +2304,352 @@ if (!NT_SUCCESS(Status)) { DPRINT("IopInitializePnpServices() failed with status 0x%08lx\n", Status); - goto cleanup; + return; } DPRINT("IopInvalidateDeviceRelations() finished\n"); - Status = STATUS_SUCCESS; - -cleanup: - IoFreeWorkItem(Data->WorkItem); - if (Event) - { - Data->Status = Status; - KeSetEvent(Event, 0, FALSE); - } - else - ExFreePool(Data); +} + +/* + * IopActionConfigureChildServices + * + * Retrieve configuration for all (direct) child nodes of a parent node. + * + * Parameters + * DeviceNode + * Pointer to device node. + * Context + * Pointer to parent node to retrieve child node configuration for. + * + * Remarks + * We only return a status code indicating an error (STATUS_UNSUCCESSFUL) + * when we reach a device node which is not a direct child of the device + * node for which we configure child services for. Any errors that occur is + * logged instead so that all child services have a chance of beeing + * configured. + */ + +NTSTATUS +IopActionConfigureChildServices(PDEVICE_NODE DeviceNode, + PVOID Context) +{ + RTL_QUERY_REGISTRY_TABLE QueryTable[3]; + PDEVICE_NODE ParentDeviceNode; + PUNICODE_STRING Service; + UNICODE_STRING ClassGUID; + NTSTATUS Status; + + DPRINT("IopActionConfigureChildServices(%p, %p)\n", DeviceNode, Context); + + ParentDeviceNode = (PDEVICE_NODE)Context; + + /* + * We are called for the parent too, but we don't need to do special + * handling for this node + */ + if (DeviceNode == ParentDeviceNode) + { + DPRINT("Success\n"); + return STATUS_SUCCESS; + } + + /* + * Make sure this device node is a direct child of the parent device node + * that is given as an argument + */ + if (DeviceNode->Parent != ParentDeviceNode) + { + /* Stop the traversal immediately and indicate successful operation */ + DPRINT("Stop\n"); + return STATUS_UNSUCCESSFUL; + } + + if (!IopDeviceNodeHasFlag(DeviceNode, DNF_DISABLED)) + { + WCHAR RegKeyBuffer[MAX_PATH]; + UNICODE_STRING RegKey; + + RegKey.Length = 0; + RegKey.MaximumLength = sizeof(RegKeyBuffer); + RegKey.Buffer = RegKeyBuffer; + + /* + * Retrieve configuration from Enum key + */ + + Service = &DeviceNode->ServiceName; + + RtlZeroMemory(QueryTable, sizeof(QueryTable)); + RtlInitUnicodeString(Service, NULL); + RtlInitUnicodeString(&ClassGUID, NULL); + + QueryTable[0].Name = L"Service"; + QueryTable[0].Flags = RTL_QUERY_REGISTRY_DIRECT | RTL_QUERY_REGISTRY_REQUIRED; + QueryTable[0].EntryContext = Service; + + QueryTable[1].Name = L"ClassGUID"; + QueryTable[1].Flags = RTL_QUERY_REGISTRY_DIRECT; + QueryTable[1].EntryContext = &ClassGUID; + QueryTable[1].DefaultType = REG_SZ; + QueryTable[1].DefaultData = L""; + QueryTable[1].DefaultLength = 0; + + RtlAppendUnicodeToString(&RegKey, L"\\Registry\\Machine\\System\\CurrentControlSet\\Enum\\"); + RtlAppendUnicodeStringToString(&RegKey, &DeviceNode->InstancePath); + + Status = RtlQueryRegistryValues(RTL_REGISTRY_ABSOLUTE, + RegKey.Buffer, QueryTable, NULL, NULL); + + if (!NT_SUCCESS(Status)) + { + /* FIXME: Log the error */ + DPRINT("Could not retrieve configuration for device %wZ (Status 0x%08x)\n", + &DeviceNode->InstancePath, Status); + IopDeviceNodeSetFlag(DeviceNode, DNF_DISABLED); + return STATUS_SUCCESS; + } + + if (Service->Buffer == NULL) + { + IopDeviceNodeSetFlag(DeviceNode, DNF_DISABLED); + + if (ClassGUID.Length != 0) + { + /* Device has a ClassGUID value, but no Service value. + * Suppose it is using the NULL driver, so state the + * device is started */ + DPRINT1("%wZ is using NULL driver\n", &DeviceNode->InstancePath); + IopDeviceNodeSetFlag(DeviceNode, DNF_STARTED); + DeviceNode->Flags |= DN_STARTED; + } + return STATUS_SUCCESS; + } + + DPRINT("Got Service %S\n", Service->Buffer); + } + + return STATUS_SUCCESS; +} + +/* + * IopActionInitChildServices + * + * Initialize the service for all (direct) child nodes of a parent node + * + * Parameters + * DeviceNode + * Pointer to device node. + * Context + * Pointer to parent node to initialize child node services for. + * BootDrivers + * Load only driver marked as boot start. + * + * Remarks + * If the driver image for a service is not loaded and initialized + * it is done here too. We only return a status code indicating an + * error (STATUS_UNSUCCESSFUL) when we reach a device node which is + * not a direct child of the device node for which we initialize + * child services for. Any errors that occur is logged instead so + * that all child services have a chance of being initialized. + */ + +NTSTATUS +IopActionInitChildServices(PDEVICE_NODE DeviceNode, + PVOID Context, + BOOLEAN BootDrivers) +{ + PDEVICE_NODE ParentDeviceNode; + NTSTATUS Status; + + DPRINT("IopActionInitChildServices(%p, %p, %d)\n", DeviceNode, Context, + BootDrivers); + + ParentDeviceNode = (PDEVICE_NODE)Context; + + /* + * We are called for the parent too, but we don't need to do special + * handling for this node + */ + if (DeviceNode == ParentDeviceNode) + { + DPRINT("Success\n"); + return STATUS_SUCCESS; + } + + /* + * Make sure this device node is a direct child of the parent device node + * that is given as an argument + */ +#if 0 + if (DeviceNode->Parent != ParentDeviceNode) + { + /* + * Stop the traversal immediately and indicate unsuccessful operation + */ + DPRINT("Stop\n"); + return STATUS_UNSUCCESSFUL; + } +#endif + + if (!IopDeviceNodeHasFlag(DeviceNode, DNF_DISABLED) && + !IopDeviceNodeHasFlag(DeviceNode, DNF_ADDED) && + !IopDeviceNodeHasFlag(DeviceNode, DNF_STARTED)) + { + PLDR_DATA_TABLE_ENTRY ModuleObject; + PDRIVER_OBJECT DriverObject; + + /* Get existing DriverObject pointer (in case the driver has + already been loaded and initialized) */ + Status = IopGetDriverObject( + &DriverObject, + &DeviceNode->ServiceName, + FALSE); + + if (!NT_SUCCESS(Status)) + { + /* Driver is not initialized, try to load it */ + Status = IopLoadServiceModule(&DeviceNode->ServiceName, &ModuleObject); + + if (NT_SUCCESS(Status) || Status == STATUS_IMAGE_ALREADY_LOADED) + { + /* STATUS_IMAGE_ALREADY_LOADED means this driver + was loaded by the bootloader */ + if (Status != STATUS_IMAGE_ALREADY_LOADED) + { + /* Initialize the driver */ + Status = IopInitializeDriverModule(DeviceNode, ModuleObject, + &DeviceNode->ServiceName, FALSE, &DriverObject); + } + else + { + Status = STATUS_SUCCESS; + } + } + else + { + DPRINT1("IopLoadServiceModule(%wZ) failed with status 0x%08x\n", + &DeviceNode->ServiceName, Status); + } + } + + /* Driver is loaded and initialized at this point */ + if (NT_SUCCESS(Status)) + { + /* We have a driver for this DeviceNode */ + DeviceNode->Flags |= DN_DRIVER_LOADED; + /* Attach lower level filter drivers. */ + IopAttachFilterDrivers(DeviceNode, TRUE); + /* Initialize the function driver for the device node */ + Status = IopInitializeDevice(DeviceNode, DriverObject); + + if (NT_SUCCESS(Status)) + { + /* Attach upper level filter drivers. */ + IopAttachFilterDrivers(DeviceNode, FALSE); + IopDeviceNodeSetFlag(DeviceNode, DNF_STARTED); + + Status = IopStartDevice(DeviceNode); + } + else + { + DPRINT1("IopInitializeDevice(%wZ) failed with status 0x%08x\n", + &DeviceNode->InstancePath, Status); + } + } + else + { + /* + * Don't disable when trying to load only boot drivers + */ + if (!BootDrivers) + { + IopDeviceNodeSetFlag(DeviceNode, DNF_DISABLED); + IopDeviceNodeSetFlag(DeviceNode, DNF_START_FAILED); + /* FIXME: Log the error (possibly in IopInitializeDeviceNodeService) */ + CPRINT("Initialization of service %S failed (Status %x)\n", + DeviceNode->ServiceName.Buffer, Status); + } + } + } + else + { + DPRINT("Device %wZ is disabled or already initialized\n", + &DeviceNode->InstancePath); + } + + return STATUS_SUCCESS; +} + +/* + * IopActionInitAllServices + * + * Initialize the service for all (direct) child nodes of a parent node. This + * function just calls IopActionInitChildServices with BootDrivers = FALSE. + */ + +NTSTATUS +IopActionInitAllServices(PDEVICE_NODE DeviceNode, + PVOID Context) +{ + return IopActionInitChildServices(DeviceNode, Context, FALSE); +} + +/* + * IopActionInitBootServices + * + * Initialize the boot start services for all (direct) child nodes of a + * parent node. This function just calls IopActionInitChildServices with + * BootDrivers = TRUE. + */ +NTSTATUS +IopActionInitBootServices(PDEVICE_NODE DeviceNode, + PVOID Context) +{ + return IopActionInitChildServices(DeviceNode, Context, TRUE); +} + +/* + * IopInitializePnpServices + * + * Initialize services for discovered children + * + * Parameters + * DeviceNode + * Top device node to start initializing services. + * + * BootDrivers + * When set to TRUE, only drivers marked as boot start will + * be loaded. Otherwise, all drivers will be loaded. + * + * Return Value + * Status + */ +NTSTATUS +IopInitializePnpServices(IN PDEVICE_NODE DeviceNode, + IN BOOLEAN BootDrivers) +{ + DEVICETREE_TRAVERSE_CONTEXT Context; + + DPRINT("IopInitializePnpServices(%p, %d)\n", DeviceNode, BootDrivers); + + if (BootDrivers) + { + IopInitDeviceTreeTraverseContext( + &Context, + DeviceNode, + IopActionInitBootServices, + DeviceNode); + } + else + { + IopInitDeviceTreeTraverseContext( + &Context, + DeviceNode, + IopActionInitAllServices, + DeviceNode); + } + + return IopTraverseDeviceTree(&Context); } static NTSTATUS INIT_FUNCTION

1 0

[cwittich] 27434: -some minor changes to be able to build the driver with PREfast -use ExAllocatePoolWithTag instead of ExAllocatePool
by cwittich＠svn.reactos.org 06 Jul '07

06 Jul '07

Author: cwittich Date: Sat Jul 7 00:25:40 2007 New Revision: 27434 URL: http://svn.reactos.org/svn/reactos?rev=27434&view=rev Log: -some minor changes to be able to build the driver with PREfast -use ExAllocatePoolWithTag instead of ExAllocatePool Modified: trunk/reactos/drivers/bus/pci/fdo.c trunk/reactos/drivers/bus/pci/pci.c trunk/reactos/drivers/bus/pci/pci.h trunk/reactos/drivers/bus/pci/pdo.c Modified: trunk/reactos/drivers/bus/pci/fdo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/pci/fdo.c?rev=… ============================================================================== --- trunk/reactos/drivers/bus/pci/fdo.c (original) +++ trunk/reactos/drivers/bus/pci/fdo.c Sat Jul 7 00:25:40 2007 @@ -9,7 +9,9 @@ #include "pci.h" +#ifndef NDEBUG #define NDEBUG +#endif #include <debug.h> /*** PRIVATE *****************************************************************/ @@ -122,7 +124,7 @@ Status = FdoLocateChildDevice(&Device, DeviceExtension, SlotNumber, &PciConfig); if (!NT_SUCCESS(Status)) { - Device = (PPCI_DEVICE)ExAllocatePool(NonPagedPool, sizeof(PCI_DEVICE)); + Device = (PPCI_DEVICE)ExAllocatePoolWithTag(NonPagedPool, sizeof(PCI_DEVICE),TAG_PCI); if (!Device) { /* FIXME: Cleanup resources for already discovered devices */ @@ -204,7 +206,7 @@ Size = sizeof(DEVICE_RELATIONS) + sizeof(Relations->Objects) * (DeviceExtension->DeviceListCount - 1); - Relations = (PDEVICE_RELATIONS)ExAllocatePool(PagedPool, Size); + Relations = (PDEVICE_RELATIONS)ExAllocatePoolWithTag(PagedPool, Size, TAG_PCI); if (!Relations) return STATUS_INSUFFICIENT_RESOURCES; Modified: trunk/reactos/drivers/bus/pci/pci.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/pci/pci.c?rev=… ============================================================================== --- trunk/reactos/drivers/bus/pci/pci.c (original) +++ trunk/reactos/drivers/bus/pci/pci.c Sat Jul 7 00:25:40 2007 @@ -10,7 +10,9 @@ #define INITGUID #include "pci.h" +#ifndef NDEBUG #define NDEBUG +#endif #include <debug.h> @@ -280,7 +282,7 @@ Buffer[Index] = UNICODE_NULL; - BufferU.Length = BufferU.MaximumLength = Index * sizeof(WCHAR); + BufferU.Length = BufferU.MaximumLength = (USHORT) Index * sizeof(WCHAR); BufferU.Buffer = Buffer; return RtlDuplicateUnicodeString(0, &BufferU, HardwareIDs); @@ -344,7 +346,7 @@ Buffer[Index] = UNICODE_NULL; - BufferU.Length = BufferU.MaximumLength = Index * sizeof(WCHAR); + BufferU.Length = BufferU.MaximumLength = (USHORT)Index * sizeof(WCHAR); BufferU.Buffer = Buffer; return RtlDuplicateUnicodeString(0, &BufferU, CompatibleIDs); Modified: trunk/reactos/drivers/bus/pci/pci.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/pci/pci.h?rev=… ============================================================================== --- trunk/reactos/drivers/bus/pci/pci.h (original) +++ trunk/reactos/drivers/bus/pci/pci.h Sat Jul 7 00:25:40 2007 @@ -4,6 +4,15 @@ #include <ntifs.h> #include <wdmguid.h> #include <stdio.h> +#include <ntddk.h> + +#ifdef _MSC_VER + #define STDCALL + #define DDKAPI +#endif + +#define TAG(A, B, C, D) (ULONG)(((A)<<0) + ((B)<<8) + ((C)<<16) + ((D)<<24)) +#define TAG_PCI TAG('P', 'C', 'I', '0') typedef struct _PCI_DEVICE { Modified: trunk/reactos/drivers/bus/pci/pdo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/pci/pdo.c?rev=… ============================================================================== --- trunk/reactos/drivers/bus/pci/pdo.c (original) +++ trunk/reactos/drivers/bus/pci/pdo.c Sat Jul 7 00:25:40 2007 @@ -9,7 +9,9 @@ #include "pci.h" +#ifndef NDEBUG #define NDEBUG +#endif #include <debug.h> /*** PRIVATE *****************************************************************/ @@ -134,7 +136,7 @@ DeviceExtension = (PPDO_DEVICE_EXTENSION)DeviceObject->DeviceExtension; FdoDeviceExtension = (PFDO_DEVICE_EXTENSION)DeviceExtension->Fdo->DeviceExtension; - BusInformation = ExAllocatePool(PagedPool, sizeof(PNP_BUS_INFORMATION)); + BusInformation = ExAllocatePoolWithTag(PagedPool, sizeof(PNP_BUS_INFORMATION), TAG_PCI); Irp->IoStatus.Information = (ULONG_PTR)BusInformation; if (BusInformation != NULL) { @@ -397,8 +399,8 @@ DPRINT("ListSize %lu (0x%lx)\n", ListSize, ListSize); /* Allocate the resource requirements list */ - ResourceList = ExAllocatePool(PagedPool, - ListSize); + ResourceList = ExAllocatePoolWithTag(PagedPool, + ListSize, TAG_PCI); if (ResourceList == NULL) { Irp->IoStatus.Information = 0; @@ -702,8 +704,8 @@ + ResCount * sizeof(CM_PARTIAL_RESOURCE_DESCRIPTOR); /* Allocate the resource list */ - ResourceList = ExAllocatePool(PagedPool, - ListSize); + ResourceList = ExAllocatePoolWithTag(PagedPool, + ListSize, TAG_PCI); if (ResourceList == NULL) return STATUS_INSUFFICIENT_RESOURCES;

1 0

[cwittich] 27433: -some minor changes to be able to build the driver with PREfast -use ExAllocatePoolWithTag instead of ExAllocatePool
by cwittich＠svn.reactos.org 06 Jul '07

06 Jul '07

Author: cwittich Date: Sat Jul 7 00:25:30 2007 New Revision: 27433 URL: http://svn.reactos.org/svn/reactos?rev=27433&view=rev Log: -some minor changes to be able to build the driver with PREfast -use ExAllocatePoolWithTag instead of ExAllocatePool Modified: trunk/reactos/drivers/bus/isapnp/isapnp.c trunk/reactos/drivers/bus/isapnp/isapnp.h Modified: trunk/reactos/drivers/bus/isapnp/isapnp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/isapnp/isapnp.… ============================================================================== --- trunk/reactos/drivers/bus/isapnp/isapnp.c (original) +++ trunk/reactos/drivers/bus/isapnp/isapnp.c Sat Jul 7 00:25:30 2007 @@ -8,10 +8,11 @@ * UPDATE HISTORY: * 01-05-2001 CSH Created */ -#include <ntddk.h> #include <isapnp.h> +#ifndef NDEBUG #define NDEBUG +#endif #include <debug.h> @@ -155,7 +156,7 @@ static __inline VOID SetReadDataPort(ULONG Port) { IsaPnPReadPort = (PUCHAR)Port; - WriteUchar(0x00, Port >> 2); + WriteUchar(0x00, (UCHAR) (Port >> 2)); KeStallExecutionProcessor(100); } @@ -328,7 +329,7 @@ if ((checksum != 0x00) && (checksum == chksum)) { csn++; - WriteUchar(0x06, csn); + WriteUchar(0x06, (UCHAR) csn); KeStallExecutionProcessor(250); iteration++; SendWake(0x00); @@ -491,7 +492,7 @@ Priority); List = (PISAPNP_CONFIGURATION_LIST) - ExAllocatePool(PagedPool, sizeof(ISAPNP_CONFIGURATION_LIST)); + ExAllocatePoolWithTag(PagedPool, sizeof(ISAPNP_CONFIGURATION_LIST), TAG_ISAPNP); if (!List) return STATUS_INSUFFICIENT_RESOURCES; @@ -531,13 +532,13 @@ LogicalDevice->DescriptorCount); d = (PISAPNP_DESCRIPTOR) - ExAllocatePool(PagedPool, sizeof(ISAPNP_DESCRIPTOR)); + ExAllocatePoolWithTag(PagedPool, sizeof(ISAPNP_DESCRIPTOR), TAG_ISAPNP); if (!d) return STATUS_NO_MEMORY; RtlZeroMemory(d, sizeof(ISAPNP_DESCRIPTOR)); - d->Descriptor.Option = Option; + d->Descriptor.Option = (UCHAR) Option; *Descriptor = d; @@ -907,8 +908,8 @@ Peek(tmp, Size); - LogicalDevice = (PISAPNP_LOGICAL_DEVICE)ExAllocatePool( - PagedPool, sizeof(ISAPNP_LOGICAL_DEVICE)); + LogicalDevice = (PISAPNP_LOGICAL_DEVICE)ExAllocatePoolWithTag( + PagedPool, sizeof(ISAPNP_LOGICAL_DEVICE), TAG_ISAPNP); if (!LogicalDevice) return NULL; @@ -953,7 +954,7 @@ DPRINT("Card %d Size %d\n", Card->CardId, Size); - LogicalDevice = ParseLogicalDevice(DeviceExtension, Card, Size, number++); + LogicalDevice = ParseLogicalDevice(DeviceExtension, Card, Size, (USHORT) number++); if (!LogicalDevice) return FALSE; @@ -970,7 +971,7 @@ case ISAPNP_SRIN_LDEVICE_ID: if ((Size >= 5) && (Size <= 6)) { LogicalDevice = ParseLogicalDevice( - DeviceExtension, Card, Size, number++); + DeviceExtension, Card, Size, (USHORT)number++); if (!LogicalDevice) return FALSE; Size = 0; @@ -1286,8 +1287,8 @@ LogicalDevice->DescriptorCount); LogicalDevice->ResourceLists = - (PIO_RESOURCE_REQUIREMENTS_LIST)ExAllocatePool( - PagedPool, ListSize); + (PIO_RESOURCE_REQUIREMENTS_LIST)ExAllocatePoolWithTag( + PagedPool, ListSize, TAG_ISAPNP); if (!LogicalDevice->ResourceLists) return STATUS_INSUFFICIENT_RESOURCES; @@ -1377,7 +1378,7 @@ SendWait(); SendKey(); for (csn = 1; csn <= 10; csn++) { - SendWake(csn); + SendWake((UCHAR)csn); Peek(header, 9); checksum = Checksum(header); @@ -1388,14 +1389,14 @@ header[0], header[1], header[2], header[3], header[4], header[5], header[6], header[7], header[8]); - Card = (PISAPNP_CARD)ExAllocatePool( - PagedPool, sizeof(ISAPNP_CARD)); + Card = (PISAPNP_CARD)ExAllocatePoolWithTag( + PagedPool, sizeof(ISAPNP_CARD), TAG_ISAPNP); if (!Card) return STATUS_INSUFFICIENT_RESOURCES; RtlZeroMemory(Card, sizeof(ISAPNP_CARD)); - Card->CardId = csn; + Card->CardId = (USHORT) csn; Card->VendorId = (header[1] << 8) | header[0]; Card->DeviceId = (header[3] << 8) | header[2]; Card->Serial = (header[7] << 24) | (header[6] << 16) | (header[5] << 8) | header[4]; @@ -1439,7 +1440,7 @@ Size = sizeof(DEVICE_RELATIONS) + sizeof(Relations->Objects) * (DeviceExtension->DeviceListCount - 1); - Relations = (PDEVICE_RELATIONS)ExAllocatePool(PagedPool, Size); + Relations = (PDEVICE_RELATIONS)ExAllocatePoolWithTag(PagedPool, Size, TAG_ISAPNP); if (!Relations) return STATUS_INSUFFICIENT_RESOURCES; Modified: trunk/reactos/drivers/bus/isapnp/isapnp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/isapnp/isapnp.… ============================================================================== --- trunk/reactos/drivers/bus/isapnp/isapnp.h (original) +++ trunk/reactos/drivers/bus/isapnp/isapnp.h Sat Jul 7 00:25:30 2007 @@ -1,9 +1,19 @@ #ifndef __ISAPNP_H #define __ISAPNP_H + +#include <ntddk.h> + +#ifdef _MSC_VER + #define STDCALL + #define DDKAPI +#endif #ifdef __cplusplus extern "C" { #endif + +#define TAG(A, B, C, D) (ULONG)(((A)<<0) + ((B)<<8) + ((C)<<16) + ((D)<<24)) +#define TAG_ISAPNP TAG('I', 'P', 'N', 'P') #define IO_RESOURCE_REQUIRED 0x00 //ROS Extension

1 0

[fireball] 27432: [AUDIT] - There are plenty of information about PCI, about bus drivers in Windows, and where there is too small information, the testing helps. - Code is logical, authors are known.
by fireball＠svn.reactos.org 06 Jul '07

06 Jul '07

Author: fireball Date: Sat Jul 7 00:24:15 2007 New Revision: 27432 URL: http://svn.reactos.org/svn/reactos?rev=27432&view=rev Log: [AUDIT] - There are plenty of information about PCI, about bus drivers in Windows, and where there is too small information, the testing helps. - Code is logical, authors are known. Modified: trunk/reactos/drivers/bus/pci/fdo.c (props changed) trunk/reactos/drivers/bus/pci/pci.c (props changed) trunk/reactos/drivers/bus/pci/pci.h (props changed) trunk/reactos/drivers/bus/pci/pci.rc (props changed) trunk/reactos/drivers/bus/pci/pcidef.h (props changed) trunk/reactos/drivers/bus/pci/pdo.c (props changed) Propchange: trunk/reactos/drivers/bus/pci/fdo.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/drivers/bus/pci/pci.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/drivers/bus/pci/pci.h ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/drivers/bus/pci/pci.rc ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/drivers/bus/pci/pcidef.h ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/drivers/bus/pci/pdo.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -*

1 0

[fireball] 27431: [AUDIT] - isapnp is based on a linux driver, and mainly had only fixes after importing that code. Clean.
by fireball＠svn.reactos.org 06 Jul '07

06 Jul '07

Author: fireball Date: Sat Jul 7 00:18:43 2007 New Revision: 27431 URL: http://svn.reactos.org/svn/reactos?rev=27431&view=rev Log: [AUDIT] - isapnp is based on a linux driver, and mainly had only fixes after importing that code. Clean. Modified: trunk/reactos/drivers/bus/isapnp/isapnp.c (props changed) trunk/reactos/drivers/bus/isapnp/isapnp.h (props changed) trunk/reactos/drivers/bus/isapnp/isapnp.rc (props changed) Propchange: trunk/reactos/drivers/bus/isapnp/isapnp.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/drivers/bus/isapnp/isapnp.h ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/drivers/bus/isapnp/isapnp.rc ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -*

1 0

[cwittich] 27430: -some minor changes to be able to build the driver with PREfast -declare I8042InterruptService* routines as KSERVICE_ROUTINE
by cwittich＠svn.reactos.org 06 Jul '07

06 Jul '07

Author: cwittich Date: Fri Jul 6 22:14:23 2007 New Revision: 27430 URL: http://svn.reactos.org/svn/reactos?rev=27430&view=rev Log: -some minor changes to be able to build the driver with PREfast -declare I8042InterruptService* routines as KSERVICE_ROUTINE Modified: trunk/reactos/drivers/input/i8042prt/i8042prt.c trunk/reactos/drivers/input/i8042prt/i8042prt.h trunk/reactos/drivers/input/i8042prt/keyboard.c trunk/reactos/drivers/input/i8042prt/mouse.c trunk/reactos/drivers/input/i8042prt/ps2pp.c trunk/reactos/drivers/input/i8042prt/registry.c Modified: trunk/reactos/drivers/input/i8042prt/i8042prt.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/input/i8042prt/i80… ============================================================================== --- trunk/reactos/drivers/input/i8042prt/i8042prt.c (original) +++ trunk/reactos/drivers/input/i8042prt/i8042prt.c Fri Jul 6 22:14:23 2007 @@ -10,10 +10,12 @@ /* INCLUDES ****************************************************************/ +#include "i8042prt.h" + +#ifndef NDEBUG #define NDEBUG +#endif #include <debug.h> - -#include "i8042prt.h" /* GLOBALS *******************************************************************/ Modified: trunk/reactos/drivers/input/i8042prt/i8042prt.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/input/i8042prt/i80… ============================================================================== --- trunk/reactos/drivers/input/i8042prt/i8042prt.h (original) +++ trunk/reactos/drivers/input/i8042prt/i8042prt.h Fri Jul 6 22:14:23 2007 @@ -320,6 +320,7 @@ UCHAR Value, BOOLEAN WaitForAck); +KSERVICE_ROUTINE I8042InterruptServiceKbd; BOOLEAN STDCALL I8042InterruptServiceKbd(struct _KINTERRUPT *Interrupt, VOID * Context); @@ -354,6 +355,7 @@ PVOID SystemArgument1, PVOID SystemArgument2); +KSERVICE_ROUTINE I8042InterruptServiceMouse; BOOLEAN STDCALL I8042InterruptServiceMouse(struct _KINTERRUPT *Interrupt, VOID *Context); Modified: trunk/reactos/drivers/input/i8042prt/keyboard.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/input/i8042prt/key… ============================================================================== --- trunk/reactos/drivers/input/i8042prt/keyboard.c (original) +++ trunk/reactos/drivers/input/i8042prt/keyboard.c Fri Jul 6 22:14:23 2007 @@ -12,9 +12,14 @@ /* INCLUDES ****************************************************************/ #include "i8042prt.h" + +#ifdef __REACTOS__ #include "kdfuncs.h" - +#endif + +#ifndef NDEBUG #define NDEBUG +#endif #include <debug.h> /* GLOBALS *******************************************************************/ Modified: trunk/reactos/drivers/input/i8042prt/mouse.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/input/i8042prt/mou… ============================================================================== --- trunk/reactos/drivers/input/i8042prt/mouse.c (original) +++ trunk/reactos/drivers/input/i8042prt/mouse.c Fri Jul 6 22:14:23 2007 @@ -13,7 +13,9 @@ #include "i8042prt.h" +#ifndef NDEBUG #define NDEBUG +#endif #include <debug.h> /* Modified: trunk/reactos/drivers/input/i8042prt/ps2pp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/input/i8042prt/ps2… ============================================================================== --- trunk/reactos/drivers/input/i8042prt/ps2pp.c (original) +++ trunk/reactos/drivers/input/i8042prt/ps2pp.c Fri Jul 6 22:14:23 2007 @@ -9,13 +9,12 @@ /* INCLUDES ****************************************************************/ +#include "i8042prt.h" + #ifndef NDEBUG #define NDEBUG #endif #include <debug.h> - -#include "i8042prt.h" - VOID I8042MouseHandlePs2pp(PDEVICE_EXTENSION DevExt, UCHAR Input) { Modified: trunk/reactos/drivers/input/i8042prt/registry.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/input/i8042prt/reg… ============================================================================== --- trunk/reactos/drivers/input/i8042prt/registry.c (original) +++ trunk/reactos/drivers/input/i8042prt/registry.c Fri Jul 6 22:14:23 2007 @@ -11,12 +11,12 @@ /* INCLUDES ****************************************************************/ +#include "i8042prt.h" + #ifndef NDEBUG #define NDEBUG #endif #include <debug.h> - -#include "i8042prt.h" /* FUNCTIONS *****************************************************************/

1 0

[cwittich] 27429: Never call IoCompleteRequest while holding a spin lock. Attempting to complete an IRP while holding a spin lock can cause deadlocks.
by cwittich＠svn.reactos.org 06 Jul '07

06 Jul '07

Author: cwittich Date: Fri Jul 6 21:14:24 2007 New Revision: 27429 URL: http://svn.reactos.org/svn/reactos?rev=27429&view=rev Log: Never call IoCompleteRequest while holding a spin lock. Attempting to complete an IRP while holding a spin lock can cause deadlocks. Modified: trunk/reactos/drivers/input/kbdclass/kbdclass.c trunk/reactos/drivers/input/mouclass/mouclass.c Modified: trunk/reactos/drivers/input/kbdclass/kbdclass.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/input/kbdclass/kbd… ============================================================================== --- trunk/reactos/drivers/input/kbdclass/kbdclass.c (original) +++ trunk/reactos/drivers/input/kbdclass/kbdclass.c Fri Jul 6 21:14:24 2007 @@ -797,10 +797,10 @@ /* Go to next packet and complete this request */ Irp->IoStatus.Status = Status; + KeReleaseSpinLock(&DeviceExtension->SpinLock, oldIrql); + IoCompleteRequest(Irp, IO_KEYBOARD_INCREMENT); - IoStartNextPacket(DeviceObject, FALSE); - KeReleaseSpinLock(&DeviceExtension->SpinLock, oldIrql); } else { Modified: trunk/reactos/drivers/input/mouclass/mouclass.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/input/mouclass/mou… ============================================================================== --- trunk/reactos/drivers/input/mouclass/mouclass.c (original) +++ trunk/reactos/drivers/input/mouclass/mouclass.c Fri Jul 6 21:14:24 2007 @@ -773,10 +773,10 @@ /* Go to next packet and complete this request */ Irp->IoStatus.Status = Status; + KeReleaseSpinLock(&DeviceExtension->SpinLock, oldIrql); + IoCompleteRequest(Irp, IO_MOUSE_INCREMENT); - IoStartNextPacket(DeviceObject, FALSE); - KeReleaseSpinLock(&DeviceExtension->SpinLock, oldIrql); } else {

1 0

[gedmurphy] 27428: missed adding the files for the blank netcard form
by gedmurphy＠svn.reactos.org 06 Jul '07

06 Jul '07

Author: gedmurphy Date: Fri Jul 6 19:23:26 2007 New Revision: 27428 URL: http://svn.reactos.org/svn/reactos?rev=27428&view=rev Log: missed adding the files for the blank netcard form Added: trunk/tools/RosTE/GUI/NewNetCardForm.Designer.cs trunk/tools/RosTE/GUI/NewNetCardForm.cs trunk/tools/RosTE/GUI/NewNetCardForm.resx Added: trunk/tools/RosTE/GUI/NewNetCardForm.Designer.cs URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosTE/GUI/NewNetCardForm.Des… ============================================================================== --- trunk/tools/RosTE/GUI/NewNetCardForm.Designer.cs (added) +++ trunk/tools/RosTE/GUI/NewNetCardForm.Designer.cs Fri Jul 6 19:23:26 2007 @@ -1,0 +1,114 @@ +namespace RosTEGUI +{ + partial class NewNetCardForm + { + /// <summary> + /// Required designer variable. + /// </summary> + private System.ComponentModel.IContainer components = null; + + /// <summary> + /// Clean up any resources being used. + /// </summary> + /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param> + protected override void Dispose(bool disposing) + { + if (disposing && (components != null)) + { + components.Dispose(); + } + base.Dispose(disposing); + } + + #region Windows Form Designer generated code + + /// <summary> + /// Required method for Designer support - do not modify + /// the contents of this method with the code editor. + /// </summary> + private void InitializeComponent() + { + System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(NewNetCardForm)); + this.newhdHeaderpanel = new System.Windows.Forms.Panel(); + this.pictureBox1 = new System.Windows.Forms.PictureBox(); + this.label5 = new System.Windows.Forms.Label(); + this.newhdSepLight = new System.Windows.Forms.Panel(); + this.newhdSepDark = new System.Windows.Forms.Panel(); + this.newhdHeaderpanel.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit(); + this.SuspendLayout(); + // + // newhdHeaderpanel + // + this.newhdHeaderpanel.BackColor = System.Drawing.SystemColors.ControlLightLight; + this.newhdHeaderpanel.Controls.Add(this.pictureBox1); + this.newhdHeaderpanel.Controls.Add(this.label5); + this.newhdHeaderpanel.Location = new System.Drawing.Point(0, 0); + this.newhdHeaderpanel.Name = "newhdHeaderpanel"; + this.newhdHeaderpanel.Size = new System.Drawing.Size(292, 44); + this.newhdHeaderpanel.TabIndex = 21; + // + // pictureBox1 + // + this.pictureBox1.Image = ((System.Drawing.Image)(resources.GetObject("pictureBox1.Image"))); + this.pictureBox1.Location = new System.Drawing.Point(3, 6); + this.pictureBox1.Name = "pictureBox1"; + this.pictureBox1.Size = new System.Drawing.Size(45, 31); + this.pictureBox1.SizeMode = System.Windows.Forms.PictureBoxSizeMode.CenterImage; + this.pictureBox1.TabIndex = 12; + this.pictureBox1.TabStop = false; + // + // label5 + // + this.label5.AutoSize = true; + this.label5.Location = new System.Drawing.Point(56, 8); + this.label5.Name = "label5"; + this.label5.Size = new System.Drawing.Size(132, 26); + this.label5.TabIndex = 13; + this.label5.Text = "Add a new netcard for use\r\nwith your virtual machine"; + // + // newhdSepLight + // + this.newhdSepLight.BackColor = System.Drawing.SystemColors.ActiveCaptionText; + this.newhdSepLight.Location = new System.Drawing.Point(-2, 45); + this.newhdSepLight.Name = "newhdSepLight"; + this.newhdSepLight.Size = new System.Drawing.Size(292, 1); + this.newhdSepLight.TabIndex = 20; + // + // newhdSepDark + // + this.newhdSepDark.BackColor = System.Drawing.SystemColors.ControlDarkDark; + this.newhdSepDark.Location = new System.Drawing.Point(-2, 44); + this.newhdSepDark.Name = "newhdSepDark"; + this.newhdSepDark.Size = new System.Drawing.Size(292, 1); + this.newhdSepDark.TabIndex = 19; + // + // NewNetCardForm + // + this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.ClientSize = new System.Drawing.Size(292, 266); + this.Controls.Add(this.newhdHeaderpanel); + this.Controls.Add(this.newhdSepLight); + this.Controls.Add(this.newhdSepDark); + this.MaximizeBox = false; + this.MinimizeBox = false; + this.Name = "NewNetCardForm"; + this.ShowIcon = false; + this.Text = "New Netcard"; + this.newhdHeaderpanel.ResumeLayout(false); + this.newhdHeaderpanel.PerformLayout(); + ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).EndInit(); + this.ResumeLayout(false); + + } + + #endregion + + private System.Windows.Forms.Panel newhdHeaderpanel; + private System.Windows.Forms.PictureBox pictureBox1; + private System.Windows.Forms.Label label5; + private System.Windows.Forms.Panel newhdSepLight; + private System.Windows.Forms.Panel newhdSepDark; + } +} Added: trunk/tools/RosTE/GUI/NewNetCardForm.cs URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosTE/GUI/NewNetCardForm.cs?… ============================================================================== --- trunk/tools/RosTE/GUI/NewNetCardForm.cs (added) +++ trunk/tools/RosTE/GUI/NewNetCardForm.cs Fri Jul 6 19:23:26 2007 @@ -1,0 +1,18 @@ +using System; +using System.Collections.Generic; +using System.ComponentModel; +using System.Data; +using System.Drawing; +using System.Text; +using System.Windows.Forms; + +namespace RosTEGUI +{ + public partial class NewNetCardForm : Form + { + public NewNetCardForm() + { + InitializeComponent(); + } + } +} Added: trunk/tools/RosTE/GUI/NewNetCardForm.resx URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosTE/GUI/NewNetCardForm.res… ============================================================================== --- trunk/tools/RosTE/GUI/NewNetCardForm.resx (added) +++ trunk/tools/RosTE/GUI/NewNetCardForm.resx Fri Jul 6 19:23:26 2007 @@ -1,0 +1,152 @@ +<?xml version="1.0" encoding="utf-8"?> +<root> +  + <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata"> + <xsd:import namespace="http://www.w3.org/XML/1998/namespace" /> + <xsd:element name="root" msdata:IsDataSet="true"> + <xsd:complexType> + <xsd:choice maxOccurs="unbounded"> + <xsd:element name="metadata"> + <xsd:complexType> + <xsd:sequence> + <xsd:element name="value" type="xsd:string" minOccurs="0" /> + </xsd:sequence> + <xsd:attribute name="name" use="required" type="xsd:string" /> + <xsd:attribute name="type" type="xsd:string" /> + <xsd:attribute name="mimetype" type="xsd:string" /> + <xsd:attribute ref="xml:space" /> + </xsd:complexType> + </xsd:element> + <xsd:element name="assembly"> + <xsd:complexType> + <xsd:attribute name="alias" type="xsd:string" /> + <xsd:attribute name="name" type="xsd:string" /> + </xsd:complexType> + </xsd:element> + <xsd:element name="data"> + <xsd:complexType> + <xsd:sequence> + <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" /> + <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" /> + </xsd:sequence> + <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" /> + <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" /> + <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" /> + <xsd:attribute ref="xml:space" /> + </xsd:complexType> + </xsd:element> + <xsd:element name="resheader"> + <xsd:complexType> + <xsd:sequence> + <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" /> + </xsd:sequence> + <xsd:attribute name="name" type="xsd:string" use="required" /> + </xsd:complexType> + </xsd:element> + </xsd:choice> + </xsd:complexType> + </xsd:element> + </xsd:schema> + <resheader name="resmimetype"> + <value>text/microsoft-resx</value> + </resheader> + <resheader name="version"> + <value>2.0</value> + </resheader> + <resheader name="reader"> + <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> + </resheader> + <resheader name="writer"> + <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> + </resheader> + <assembly alias="System.Drawing" name="System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" /> + <data name="pictureBox1.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64"> + <value> + iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAAN3wAA + Dd8BZqKTHQAABbBJREFUWEe1V21M1VUYz2zVYmm1Xj5YK7/pRAKGvAkBiiAlunsvW4FLxwpukBTcGDTo + 4mwwZ0hkDCl5NWwDNJVgyQfeY6MPweaYIIIgXN7lRV7l1afnd+a5+4OXy2US22/n3MPz8nue8zznnP+m + ZxR/mZmZ1vxzF+N55fpTzmdYvz4kJKRvVTvseEt+fn5xY2MjdXd3k8FgeAI9PT20FkzpdXV1UV1d3UJ2 + dnYS+9lkkkReXt7loaEh6u/vp3v37hGUAJCRMGV85ZpSXtrAODw8TLdv3yYm8PUTBHhxOzOk+/fvL3MK + 4yA1OTlJMzMzJjE9PU1TU1MCkJuYmKCxsTHq6+sTGZSEQAL/v3r1qoH9LefACx82NzeL6GVESDUMLSws + 0MOHD1clYI7YwMCA2DJJZGRkhCorK5GFl5cx4IXDSA8IQKG3t1dEAOerObBkHQHAlqyb0dFRqq6uBoFX + TRIAY+kcqX9aAuPj4yIQAHZByCyBwcFBIYxMoGjm5+efOgMICvZgd00CiBoKAAjMzc0ZC0wWGsYbN26Q + nZ0d2djY0L59+4S88v9yjpQjKGnzwYMH5jOALoACiKBgUHyoXCVQzQkJCbRjxw7auXOnGMvKykQHrZRF + ELAFwC62xOwWSAUYA3u0GJQkmpqayNramnbv3k22trYiCxixplKplslCB45hE/YwR4uaJYCoIQwl7Bci + QtokqqqqhMM9e/aQs7Mzubi4kJOTEzk4OJCHh8cyWegg9bApSZgl0NraKqKGMJRAAFFglAABR0dHcnNz + I09PT/Ly8hKO9+7dS97e3stkoYPig01JAgHV1NSYbkMQgBKEoYQI5G+sASAA5/v37ydfX1/y8/MTI4hg + LuXkKFtPkkBxmiUApxCGYzlHRiRAAJEf9vejAM0ROhqkok8+PixI+Pv7G+WkPE5AGQjsWkRAOkf6lVWM + IkIBIdW6r/wpLiaA8jICKDdDTYcOfURqtdpY8bLy0TGwI0mgqM1mQArLqpftgxYCcLEkJyfT6dNJlJJy + llJTU/n3D5SYmEgFBQVCRonOzk5R+bKW1k1AnmIoJktQUVFBly5dEjcq5Ds6OowEkIU1CUi2cpTnuCUj + MlCQGUtN/5Zxhk4LIi0tLcYrGgRwgZndgpUE1nr9yKv2fHo6/VWUTEvt39O84XfhqL6+nk6ePEnXr183 + tvS6CICMJS+gkpIS+qMonx616Wlh5B+anZ0VqUbPY+/Ly8tJr9dTaWmp2S44iHQpMwADSL3yWWVqjgiR + 7ra2NnF7goDyhSQPN8jFx8dTOmeL3wNWK98D23hvlpAisAYRebHgMLl7965Ae3u7cATcuXNHoLi4mLKy + sqiwsJAaGhrEBYYMYM8xB9DOKGh00YkTJxZNPkpzcnKy4AwkpHMYki8fOZdGESmAc+PUqVOiDYuKikSR + yQAMhh5xsC0uLoq1iopKioiImDRJgNPyYm5u7q+1tbVLeJ7haLYUN2/epKioKGJ9unLlingvIGpkE2fB + rVvN4nWFLWKyg2a/MZjImwzPCxcu+KSlpfmdOXPmCCsFxMXFBUZHR38aGRkZzGn8PDw8PDQsLEwgODg4 + XKPR6Hx8fP7EHl+7dk0AXYKzQK9P4L0/zxm6jC0YUKnUjuv50MGHxGbGCwwUz1bGa4zXGW8oxvd4bs0X + UxqTfoTawLbwnLTaL+jYseMUG/stn5pJFB7+5TyTOL4eEqvJgpz80nnuMbHt7u7u3/GraRGVn5GRQZyl + OY0moF+ni+bfv9DFi78t6XTftDCJ9zeChNIGMrWFsc3V1fUzrosZrVY7ZW9vH2JlZWXn63vwbGRkVA+T + 6D137ue/Q0O1gWq15tmNJoGM4MP2FX68fMDPNk+ev8t4m/GWt/eBAzExsSkpKT9GM3YFBQWZ/lbcAFYw + jG1B7bz0GJhvDgw8+k5q6k9buWP+N+fr4v8fstS6M3QkeZgAAAAASUVORK5CYII= +</value> + </data> +</root>

1 0

[gedmurphy] 27427: err, creating dirs which already exist is a waste of everyone's time
by gedmurphy＠svn.reactos.org 06 Jul '07

06 Jul '07

Author: gedmurphy Date: Fri Jul 6 18:28:41 2007 New Revision: 27427 URL: http://svn.reactos.org/svn/reactos?rev=27427&view=rev Log: err, creating dirs which already exist is a waste of everyone's time Modified: trunk/tools/RosTE/GUI/MainForm.cs Modified: trunk/tools/RosTE/GUI/MainForm.cs URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosTE/GUI/MainForm.cs?rev=27… ============================================================================== --- trunk/tools/RosTE/GUI/MainForm.cs (original) +++ trunk/tools/RosTE/GUI/MainForm.cs Fri Jul 6 18:28:41 2007 @@ -102,7 +102,8 @@ { try { - Directory.CreateDirectory(wizFrm.DefDir); + if (!Directory.Exists(wizFrm.DefDir)) + Directory.CreateDirectory(wizFrm.DefDir); } catch (Exception ex) {

1 0

← Newer
1
...
60
61
62
63
64
65
66
...
71
Older →

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 July 2007