Ros-diffs February 2012

ros-diffs@reactos.org

22 participants
577 discussions

[tkreuzer] 55597: [FREELDR] Fix a bug in the new heap code and re-enable it. The previous problems seem to be gone. Thanks to Amine for testing.

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Tue Feb 14 19:48:04 2012 New Revision: 55597 URL: http://svn.reactos.org/svn/reactos?rev=55597&view=rev Log: [FREELDR] Fix a bug in the new heap code and re-enable it. The previous problems seem to be gone. Thanks to Amine for testing. Modified: trunk/reactos/boot/freeldr/freeldr/CMakeLists.txt trunk/reactos/boot/freeldr/freeldr/freeldr_base.rbuild trunk/reactos/boot/freeldr/freeldr/mm/heap_new.c trunk/reactos/boot/freeldr/freeldr/windows/wlmemory.c Modified: trunk/reactos/boot/freeldr/freeldr/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/CMake… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/CMakeLists.txt [iso-8859-1] Tue Feb 14 19:48:04 2012 @@ -54,7 +54,7 @@ inifile/parse.c mm/meminit.c mm/mm.c - mm/heap.c + mm/heap_new.c reactos/registry.c reactos/arcname.c reactos/archwsup.c @@ -155,7 +155,6 @@ list(APPEND FREELDR_BASE_SOURCE bootmgr.c # This file is compiled with custom definitions freeldr.c - rtl/bget.c rtl/libsupp.c) if (NOT MSVC) Modified: trunk/reactos/boot/freeldr/freeldr/freeldr_base.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/freel… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/freeldr_base.rbuild [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/freeldr_base.rbuild [iso-8859-1] Tue Feb 14 19:48:04 2012 @@ -40,7 +40,7 @@ <file>parse.c</file> </directory> <directory name="mm"> - <file>heap.c</file> + <file>heap_new.c</file> <file>meminit.c</file> <file>mm.c</file> </directory> @@ -51,7 +51,6 @@ <file>binhive.c</file> </directory> <directory name="rtl"> - <file>bget.c</file> <file>libsupp.c</file> </directory> <directory name="ui"> Modified: trunk/reactos/boot/freeldr/freeldr/mm/heap_new.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/mm/he… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/mm/heap_new.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/mm/heap_new.c [iso-8859-1] Tue Feb 14 19:48:04 2012 @@ -168,7 +168,7 @@ if (Block->Size == 0) { /* Align the end address up to cover the end of the heap */ - EndAddress = ALIGN_DOWN_POINTER_BY(Block->Data, PAGE_SIZE); + EndAddress = ALIGN_UP_POINTER_BY(Block->Data, PAGE_SIZE); } else { @@ -176,14 +176,19 @@ EndAddress = ALIGN_DOWN_POINTER_BY(Block->Data, PAGE_SIZE); } - FreePages = (PFN_COUNT)((EndAddress - StartAddress) / MM_PAGE_SIZE); - AllFreePages += FreePages; - - /* Now mark the pages free */ - MmMarkPagesInLookupTable(PageLookupTableAddress, - (ULONG_PTR)StartAddress / MM_PAGE_SIZE, - FreePages, - LoaderFree); + /* Check if we have free pages */ + if (EndAddress > StartAddress) + { + /* Calculate the size of the free region in pages */ + FreePages = (PFN_COUNT)((EndAddress - StartAddress) / MM_PAGE_SIZE); + AllFreePages += FreePages; + + /* Now mark the pages free */ + MmMarkPagesInLookupTable(PageLookupTableAddress, + (ULONG_PTR)StartAddress / MM_PAGE_SIZE, + FreePages, + LoaderFree); + } /* bail out, if it was the last block */ if (Block->Size == 0) break; @@ -460,8 +465,6 @@ HeapFree(FrLdrDefaultHeap, MemoryPointer, 'pHmM'); } - -#undef ExAllocatePoolWithTag PVOID NTAPI ExAllocatePoolWithTag( @@ -481,7 +484,6 @@ return HeapAllocate(FrLdrDefaultHeap, NumberOfBytes, 0); } -#undef ExFreePool VOID NTAPI ExFreePool( @@ -490,7 +492,6 @@ HeapFree(FrLdrDefaultHeap, P, 0); } -#undef ExFreePoolWithTag VOID NTAPI ExFreePoolWithTag( Modified: trunk/reactos/boot/freeldr/freeldr/windows/wlmemory.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/windo… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/windows/wlmemory.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/windows/wlmemory.c [iso-8859-1] Tue Feb 14 19:48:04 2012 @@ -203,7 +203,7 @@ //BOOLEAN Status; /* Cleanup heap */ - //HeapCleanupAll(); + HeapCleanupAll(); // // Creating a suitable memory map for Windows can be tricky, so let's

12 years, 7 months

[cgutman] 55596: [NTOSKRNL] - Change screen debug background to black for improved readability as per Johannes' request

by cgutman＠svn.reactos.org

Author: cgutman Date: Tue Feb 14 19:32:56 2012 New Revision: 55596 URL: http://svn.reactos.org/svn/reactos?rev=55596&view=rev Log: [NTOSKRNL] - Change screen debug background to black for improved readability as per Johannes' request Modified: trunk/reactos/ntoskrnl/kd/kdio.c trunk/reactos/ntoskrnl/kdbg/kdb.c Modified: trunk/reactos/ntoskrnl/kd/kdio.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/kd/kdio.c?rev=555… ============================================================================== --- trunk/reactos/ntoskrnl/kd/kdio.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/kd/kdio.c [iso-8859-1] Tue Feb 14 19:32:56 2012 @@ -488,7 +488,7 @@ /* Take control of the display */ InbvAcquireDisplayOwnership(); InbvResetDisplay(); - InbvSolidColorFill(0, 0, 639, 479, 6); + InbvSolidColorFill(0, 0, 639, 479, 0); InbvSetTextColor(15); InbvSetScrollRegion(0, 0, 639, 479); InbvInstallDisplayStringFilter(NULL); Modified: trunk/reactos/ntoskrnl/kdbg/kdb.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/kdbg/kdb.c?rev=55… ============================================================================== --- trunk/reactos/ntoskrnl/kdbg/kdb.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/kdbg/kdb.c [iso-8859-1] Tue Feb 14 19:32:56 2012 @@ -1250,8 +1250,8 @@ InbvAcquireDisplayOwnership(); InbvResetDisplay(); - /* Display blue screen */ - InbvSolidColorFill(0, 0, 639, 479, 6); + /* Display debugger prompt */ + InbvSolidColorFill(0, 0, 639, 479, 0); InbvSetTextColor(15); InbvInstallDisplayStringFilter(NULL); InbvEnableDisplayString(TRUE);

12 years, 7 months

[janderwald] 55595: [USBEHCI] - Remove bogus assert - Store full configuration descriptor - skip intermediate descriptors until the requested descriptor is found while parsing the configuration des...

by janderwald＠svn.reactos.org

Author: janderwald Date: Tue Feb 14 19:10:34 2012 New Revision: 55595 URL: http://svn.reactos.org/svn/reactos?rev=55595&view=rev Log: [USBEHCI] - Remove bogus assert - Store full configuration descriptor - skip intermediate descriptors until the requested descriptor is found while parsing the configuration descriptor - simplify CUSBDevice::GetConfigurationDescriptors - check if an interface descriptor has endpoint descriptors Modified: trunk/reactos/drivers/usb/usbehci/hub_controller.cpp trunk/reactos/drivers/usb/usbehci/usb_device.cpp trunk/reactos/drivers/usb/usbehci/usbehci.h Modified: trunk/reactos/drivers/usb/usbehci/hub_controller.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbehci/hub_co… ============================================================================== --- trunk/reactos/drivers/usb/usbehci/hub_controller.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbehci/hub_controller.cpp [iso-8859-1] Tue Feb 14 19:10:34 2012 @@ -1575,11 +1575,6 @@ // perform work in IUSBDevice // UsbDevice->GetConfigurationDescriptors((PUSB_CONFIGURATION_DESCRIPTOR)Urb->UrbControlDescriptorRequest.TransferBuffer, Urb->UrbControlDescriptorRequest.TransferBufferLength, &Length); - - // - // sanity check - // - PC_ASSERT(Urb->UrbControlDescriptorRequest.TransferBufferLength >= Length); // // store result size Modified: trunk/reactos/drivers/usb/usbehci/usb_device.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbehci/usb_de… ============================================================================== --- trunk/reactos/drivers/usb/usbehci/usb_device.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbehci/usb_device.cpp [iso-8859-1] Tue Feb 14 19:10:34 2012 @@ -784,7 +784,7 @@ // // request is complete, initialize configuration descriptor // - RtlCopyMemory(&m_ConfigurationDescriptors[Index].ConfigurationDescriptor, ConfigurationDescriptor, ConfigurationDescriptor->bLength); + m_ConfigurationDescriptors[Index].ConfigurationDescriptor = ConfigurationDescriptor; // // now allocate interface descriptors @@ -814,68 +814,93 @@ // for(InterfaceIndex = 0; InterfaceIndex < ConfigurationDescriptor->bNumInterfaces; InterfaceIndex++) { - // - // sanity check - // - PC_ASSERT(InterfaceDescriptor->bLength == sizeof(USB_INTERFACE_DESCRIPTOR)); - PC_ASSERT(InterfaceDescriptor->bNumEndpoints); + while(InterfaceDescriptor->bDescriptorType != USB_INTERFACE_DESCRIPTOR_TYPE && InterfaceDescriptor->bLength != sizeof(USB_INTERFACE_DESCRIPTOR)) + { + // + // move to next descriptor + // + InterfaceDescriptor = (PUSB_INTERFACE_DESCRIPTOR)((ULONG_PTR)InterfaceDescriptor + InterfaceDescriptor->bLength); + } + + // + // sanity checks + // + ASSERT(InterfaceDescriptor->bDescriptorType == USB_INTERFACE_DESCRIPTOR_TYPE); + ASSERT(InterfaceDescriptor->bLength == sizeof(USB_INTERFACE_DESCRIPTOR)); // // copy current interface descriptor // RtlCopyMemory(&m_ConfigurationDescriptors[Index].Interfaces[InterfaceIndex].InterfaceDescriptor, InterfaceDescriptor, InterfaceDescriptor->bLength); - // - // allocate end point descriptors - // - m_ConfigurationDescriptors[Index].Interfaces[InterfaceIndex].EndPoints = (PUSB_ENDPOINT)ExAllocatePoolWithTag(NonPagedPool, sizeof(USB_ENDPOINT) * InterfaceDescriptor->bNumEndpoints, TAG_USBEHCI); - if (!m_ConfigurationDescriptors[Index].Interfaces[InterfaceIndex].EndPoints) + if (InterfaceDescriptor->bNumEndpoints) { // - // failed to allocate endpoint - // - Status = STATUS_INSUFFICIENT_RESOURCES; - break; + // allocate end point descriptors + // + m_ConfigurationDescriptors[Index].Interfaces[InterfaceIndex].EndPoints = (PUSB_ENDPOINT)ExAllocatePoolWithTag(NonPagedPool, sizeof(USB_ENDPOINT) * InterfaceDescriptor->bNumEndpoints, TAG_USBEHCI); + if (!m_ConfigurationDescriptors[Index].Interfaces[InterfaceIndex].EndPoints) + { + // + // failed to allocate endpoint + // + Status = STATUS_INSUFFICIENT_RESOURCES; + break; + } + + // + // zero memory + // + RtlZeroMemory(m_ConfigurationDescriptors[Index].Interfaces[InterfaceIndex].EndPoints, sizeof(USB_ENDPOINT) * InterfaceDescriptor->bNumEndpoints); + + // + // initialize end point descriptors + // + EndPointDescriptor = (PUSB_ENDPOINT_DESCRIPTOR)(InterfaceDescriptor + 1); + + for(EndPointIndex = 0; EndPointIndex < InterfaceDescriptor->bNumEndpoints; EndPointIndex++) + { + // + // skip other descriptors + // + while(EndPointDescriptor->bDescriptorType != USB_ENDPOINT_DESCRIPTOR_TYPE && EndPointDescriptor->bLength != sizeof(USB_ENDPOINT_DESCRIPTOR)) + { + // + // assert when next interface descriptor is reached before the next endpoint + // + ASSERT(EndPointDescriptor->bDescriptorType != USB_INTERFACE_DESCRIPTOR_TYPE); + ASSERT(EndPointDescriptor->bLength); + DPRINT1("InterfaceDescriptor bNumEndpoints´%x EndpointIndex %x Skipping Descriptor Type %x\n", InterfaceDescriptor->bNumEndpoints, EndPointIndex, EndPointDescriptor->bDescriptorType); + + // + // move to next descriptor + // + EndPointDescriptor = (PUSB_ENDPOINT_DESCRIPTOR)((ULONG_PTR)EndPointDescriptor + EndPointDescriptor->bLength); + } + + // + // sanity check + // + ASSERT(EndPointDescriptor->bDescriptorType == USB_ENDPOINT_DESCRIPTOR_TYPE); + ASSERT(EndPointDescriptor->bLength == sizeof(USB_ENDPOINT_DESCRIPTOR)); + + // + // copy endpoint descriptor + // + RtlCopyMemory(&m_ConfigurationDescriptors[Index].Interfaces[InterfaceIndex].EndPoints[EndPointIndex].EndPointDescriptor, EndPointDescriptor, EndPointDescriptor->bLength); + + // + // move to next offset + // + EndPointDescriptor = (PUSB_ENDPOINT_DESCRIPTOR)((ULONG_PTR)EndPointDescriptor + EndPointDescriptor->bLength); + } + + // + // update interface descriptor offset + // + InterfaceDescriptor = (PUSB_INTERFACE_DESCRIPTOR)EndPointDescriptor; } - - // - // zero memory - // - RtlZeroMemory(m_ConfigurationDescriptors[Index].Interfaces[InterfaceIndex].EndPoints, sizeof(USB_ENDPOINT) * InterfaceDescriptor->bNumEndpoints); - - // - // initialize end point descriptors - // - EndPointDescriptor = (PUSB_ENDPOINT_DESCRIPTOR)(InterfaceDescriptor + 1); - - for(EndPointIndex = 0; EndPointIndex < InterfaceDescriptor->bNumEndpoints; EndPointIndex++) - { - // - // sanity check - // - PC_ASSERT(EndPointDescriptor->bLength == sizeof(USB_ENDPOINT_DESCRIPTOR)); - - // - // copy endpoint descriptor - // - RtlCopyMemory(&m_ConfigurationDescriptors[Index].Interfaces[InterfaceIndex].EndPoints[EndPointIndex].EndPointDescriptor, EndPointDescriptor, EndPointDescriptor->bLength); - - // - // move to next offset - // - EndPointDescriptor = (PUSB_ENDPOINT_DESCRIPTOR)((ULONG_PTR)EndPointDescriptor + EndPointDescriptor->bLength); - } - - // - // update interface descriptor offset - // - InterfaceDescriptor = (PUSB_INTERFACE_DESCRIPTOR)EndPointDescriptor; - } - - // - // free buffer - // - ExFreePoolWithTag(Buffer, TAG_USBEHCI); + } // // done @@ -889,9 +914,6 @@ IN ULONG BufferLength, OUT PULONG OutBufferLength) { - PVOID Buffer; - ULONG InterfaceIndex, EndpointIndex; - // // sanity check // @@ -910,78 +932,10 @@ PC_ASSERT(m_DeviceDescriptor.bNumConfigurations == 1); // - // copy first configuration descriptor - // - RtlCopyMemory(ConfigDescriptorBuffer, &m_ConfigurationDescriptors[0].ConfigurationDescriptor, sizeof(USB_CONFIGURATION_DESCRIPTOR)); - - // - // subtract length - // - BufferLength -= sizeof(USB_CONFIGURATION_DESCRIPTOR); - *OutBufferLength += sizeof(USB_CONFIGURATION_DESCRIPTOR); - - // - // increment offset - // - Buffer = (PVOID)(ConfigDescriptorBuffer + 1); - - for(InterfaceIndex = 0; InterfaceIndex < m_ConfigurationDescriptors[0].ConfigurationDescriptor.bNumInterfaces; InterfaceIndex++) - { - if (BufferLength < sizeof(USB_INTERFACE_DESCRIPTOR)) - { - // - // no more room in buffer - // - return; - } - - // - // copy interface descriptor - // - RtlCopyMemory(Buffer, &m_ConfigurationDescriptors[0].Interfaces[InterfaceIndex].InterfaceDescriptor, sizeof(USB_INTERFACE_DESCRIPTOR)); - - // - // increment offset - // - Buffer = (PVOID)((ULONG_PTR)Buffer + sizeof(USB_INTERFACE_DESCRIPTOR)); - BufferLength -= sizeof(USB_INTERFACE_DESCRIPTOR); - *OutBufferLength += sizeof(USB_INTERFACE_DESCRIPTOR); - - // - // does the interface have endpoints - // - if (m_ConfigurationDescriptors[0].Interfaces[InterfaceIndex].InterfaceDescriptor.bNumEndpoints) - { - // - // is enough space available - // - if (BufferLength < sizeof(USB_ENDPOINT_DESCRIPTOR) * m_ConfigurationDescriptors[0].Interfaces[InterfaceIndex].InterfaceDescriptor.bNumEndpoints) - { - // - // no buffer - // - return; - } - - // - // copy end points - // - for(EndpointIndex = 0; EndpointIndex < m_ConfigurationDescriptors[0].Interfaces[InterfaceIndex].InterfaceDescriptor.bNumEndpoints; EndpointIndex++) - { - // - // copy endpoint - // - RtlCopyMemory(Buffer, &m_ConfigurationDescriptors[0].Interfaces[InterfaceIndex].EndPoints[EndpointIndex].EndPointDescriptor, sizeof(USB_ENDPOINT_DESCRIPTOR)); - - // - // increment buffer offset - // - Buffer = (PVOID)((ULONG_PTR)Buffer + sizeof(USB_ENDPOINT_DESCRIPTOR)); - BufferLength -= sizeof(USB_ENDPOINT_DESCRIPTOR); - *OutBufferLength += sizeof(USB_ENDPOINT_DESCRIPTOR); - } - } - } + // copy configuration descriptor + // + RtlCopyMemory(ConfigDescriptorBuffer, m_ConfigurationDescriptors[0].ConfigurationDescriptor, min(m_ConfigurationDescriptors[0].ConfigurationDescriptor->wTotalLength, BufferLength)); + *OutBufferLength = m_ConfigurationDescriptors[0].ConfigurationDescriptor->wTotalLength; } //---------------------------------------------------------------------------------------- @@ -993,7 +947,7 @@ // PC_ASSERT(m_DeviceDescriptor.bNumConfigurations == 1); - return m_ConfigurationDescriptors[0].ConfigurationDescriptor.wTotalLength; + return m_ConfigurationDescriptors[0].ConfigurationDescriptor->wTotalLength; } //---------------------------------------------------------------------------------------- VOID @@ -1094,12 +1048,12 @@ // sanity checks // ASSERT(ConfigurationDescriptor->iConfiguration < m_DeviceDescriptor.bNumConfigurations); - ASSERT(ConfigurationDescriptor->iConfiguration == m_ConfigurationDescriptors[ConfigurationDescriptor->iConfiguration].ConfigurationDescriptor.iConfiguration); + ASSERT(ConfigurationDescriptor->iConfiguration == m_ConfigurationDescriptors[ConfigurationDescriptor->iConfiguration].ConfigurationDescriptor->iConfiguration); // // sanity check // - ASSERT(ConfigurationDescriptor->bNumInterfaces <= m_ConfigurationDescriptors[ConfigurationDescriptor->iConfiguration].ConfigurationDescriptor.bNumInterfaces); + ASSERT(ConfigurationDescriptor->bNumInterfaces <= m_ConfigurationDescriptors[ConfigurationDescriptor->iConfiguration].ConfigurationDescriptor->bNumInterfaces); // // now build setup packet @@ -1209,10 +1163,10 @@ // // sanity check // - ASSERT(Configuration->ConfigurationDescriptor.bDescriptorType == USB_CONFIGURATION_DESCRIPTOR_TYPE); - ASSERT(Configuration->ConfigurationDescriptor.bLength == sizeof(USB_CONFIGURATION_DESCRIPTOR)); - ASSERT(Configuration->ConfigurationDescriptor.iConfiguration < m_DeviceDescriptor.bNumConfigurations); - ASSERT(&m_ConfigurationDescriptors[Configuration->ConfigurationDescriptor.iConfiguration] == Configuration); + ASSERT(Configuration->ConfigurationDescriptor->bDescriptorType == USB_CONFIGURATION_DESCRIPTOR_TYPE); + ASSERT(Configuration->ConfigurationDescriptor->bLength == sizeof(USB_CONFIGURATION_DESCRIPTOR)); + ASSERT(Configuration->ConfigurationDescriptor->iConfiguration < m_DeviceDescriptor.bNumConfigurations); + ASSERT(&m_ConfigurationDescriptors[Configuration->ConfigurationDescriptor->iConfiguration] == Configuration); // // initialize setup packet @@ -1244,7 +1198,7 @@ // // sanity checks // - PC_ASSERT(Configuration->ConfigurationDescriptor.bNumInterfaces > InterfaceInfo->InterfaceNumber); + PC_ASSERT(Configuration->ConfigurationDescriptor->bNumInterfaces > InterfaceInfo->InterfaceNumber); PC_ASSERT(Configuration->Interfaces[InterfaceInfo->InterfaceNumber].InterfaceDescriptor.bNumEndpoints == InterfaceInfo->NumberOfPipes); #ifdef _MSC_VER PC_ASSERT(InterfaceInfo->Length == FIELD_OFFSET(USBD_INTERFACE_INFORMATION, Pipes[InterfaceInfo->NumberOfPipes])); @@ -1273,7 +1227,7 @@ // // data toggle is reset on select interface requests // - m_ConfigurationDescriptors[Configuration->ConfigurationDescriptor.iConfiguration].Interfaces[InterfaceInfo->InterfaceNumber].EndPoints[PipeIndex].DataToggle = FALSE; + m_ConfigurationDescriptors[Configuration->ConfigurationDescriptor->iConfiguration].Interfaces[InterfaceInfo->InterfaceNumber].EndPoints[PipeIndex].DataToggle = FALSE; if (Configuration->Interfaces[InterfaceInfo->InterfaceNumber].EndPoints[PipeIndex].EndPointDescriptor.bmAttributes & (USB_ENDPOINT_TYPE_ISOCHRONOUS | USB_ENDPOINT_TYPE_INTERRUPT)) { Modified: trunk/reactos/drivers/usb/usbehci/usbehci.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbehci/usbehc… ============================================================================== --- trunk/reactos/drivers/usb/usbehci/usbehci.h [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbehci/usbehci.h [iso-8859-1] Tue Feb 14 19:10:34 2012 @@ -55,11 +55,9 @@ typedef struct _USB_CONFIGURATION { - USB_CONFIGURATION_DESCRIPTOR ConfigurationDescriptor; + PUSB_CONFIGURATION_DESCRIPTOR ConfigurationDescriptor; USB_INTERFACE *Interfaces; } USB_CONFIGURATION, *PUSB_CONFIGURATION; - - typedef struct {

12 years, 7 months

[janderwald] 55594: [USBEHCI] [USBOHCI] - Do not queue a work item twice

by janderwald＠svn.reactos.org

Author: janderwald Date: Tue Feb 14 19:04:23 2012 New Revision: 55594 URL: http://svn.reactos.org/svn/reactos?rev=55594&view=rev Log: [USBEHCI] [USBOHCI] - Do not queue a work item twice Modified: trunk/reactos/drivers/usb/usbehci/hardware.cpp trunk/reactos/drivers/usb/usbohci/hardware.cpp Modified: trunk/reactos/drivers/usb/usbehci/hardware.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbehci/hardwa… ============================================================================== --- trunk/reactos/drivers/usb/usbehci/hardware.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbehci/hardware.cpp [iso-8859-1] Tue Feb 14 19:04:23 2012 @@ -1377,7 +1377,7 @@ IN PVOID SystemArgument2) { CUSBHardwareDevice *This; - ULONG CStatus, PortStatus, PortCount, i, ShouldRingDoorBell; + ULONG CStatus, PortStatus, PortCount, i, ShouldRingDoorBell, QueueSCEWorkItem; NTSTATUS Status = STATUS_SUCCESS; EHCI_USBCMD_CONTENT UsbCmd; @@ -1462,10 +1462,10 @@ This->GetDeviceDetails(NULL, NULL, &PortCount, NULL); if (CStatus & EHCI_STS_PCD) { + QueueSCEWorkItem = FALSE; for (i = 0; i < PortCount; i++) { PortStatus = This->EHCI_READ_REGISTER_ULONG(EHCI_PORTSC + (4 * i)); - // // Device connected or removed // @@ -1492,27 +1492,33 @@ continue; } } + + // + // work to do + // + QueueSCEWorkItem = TRUE; } else { DPRINT1("Device disconnected on port %d\n", i); + + // + // work to do + // + QueueSCEWorkItem = TRUE; } - - // - // is there a status change callback - // - if (This->m_SCECallBack != NULL) - { - // - // queue work item for processing - // - ExQueueWorkItem(&This->m_StatusChangeWorkItem, DelayedWorkQueue); - } - - // - // FIXME: This needs to be saved somewhere - // } + } + + // + // is there a status change callback and a high speed device connected / disconnected + // + if (QueueSCEWorkItem && This->m_SCECallBack != NULL) + { + // + // queue work item for processing + // + ExQueueWorkItem(&This->m_StatusChangeWorkItem, DelayedWorkQueue); } } return; Modified: trunk/reactos/drivers/usb/usbohci/hardware.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbohci/hardwa… ============================================================================== --- trunk/reactos/drivers/usb/usbohci/hardware.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbohci/hardware.cpp [iso-8859-1] Tue Feb 14 19:04:23 2012 @@ -1589,7 +1589,7 @@ { CUSBHardwareDevice *This; ULONG CStatus, Index, PortStatus; - ULONG DoneHead; + ULONG DoneHead, QueueSCEWorkItem; // // get parameters @@ -1612,6 +1612,7 @@ // // device connected, lets check which port // + QueueSCEWorkItem = FALSE; for(Index = 0; Index < This->m_NumberOfPorts; Index++) { // @@ -1648,20 +1649,23 @@ } // - // is there a status change callback + // work to do // - if (This->m_SCECallBack != NULL) - { - // - // queue work item for processing - // - ExQueueWorkItem(&This->m_StatusChangeWorkItem, DelayedWorkQueue); - } + QueueSCEWorkItem = TRUE; } } - } - - + + // + // is there a status change callback and a device connected / disconnected + // + if (QueueSCEWorkItem && This->m_SCECallBack != NULL) + { + // + // queue work item for processing + // + ExQueueWorkItem(&This->m_StatusChangeWorkItem, DelayedWorkQueue); + } + } } VOID

12 years, 7 months

[rharabien] 55593: [COMCTL32] - If no control or one of wizard buttons has focus in PROPSHEET_SetWizButtons, set focus to default wizard button. Tested in Win2k3. Worse fix was already in diff but ...

by rharabien＠svn.reactos.org

Author: rharabien Date: Tue Feb 14 14:17:18 2012 New Revision: 55593 URL: http://svn.reactos.org/svn/reactos?rev=55593&view=rev Log: [COMCTL32] - If no control or one of wizard buttons has focus in PROPSHEET_SetWizButtons, set focus to default wizard button. Tested in Win2k3. Worse fix was already in diff but wasn't applied. Modified: trunk/reactos/dll/win32/comctl32/comctl32_ros.diff trunk/reactos/dll/win32/comctl32/propsheet.c Modified: trunk/reactos/dll/win32/comctl32/comctl32_ros.diff URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/comctl3… ============================================================================== --- trunk/reactos/dll/win32/comctl32/comctl32_ros.diff [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comctl32/comctl32_ros.diff [iso-8859-1] Tue Feb 14 14:17:18 2012 @@ -125,37 +125,17 @@ =================================================================== --- propsheet.c (revision 38890) +++ propsheet.c (working copy) -@@ -2417,6 +2417,29 @@ - return FALSE; - } - -+BOOL CALLBACK -+EnumChildProc(HWND hwnd, LPARAM lParam) -+{ -+ WCHAR szType[20]; -+ RealGetWindowClassW(hwnd, szType, 20); -+ -+ if (strcmpW(szType, WC_EDITW) == 0) -+ { -+ if (IsWindowEnabled(hwnd) && IsWindowVisible(hwnd)) -+ { -+ SetFocus(hwnd); -+ return FALSE; -+ } -+ } -+ else -+ { -+ EnumChildWindows(hwnd, EnumChildProc, 0); -+ } -+ -+ return TRUE; -+} -+ -+ - /****************************************************************************** - * PROPSHEET_SetWizButtons - * -@@ -2438,17 +2461,6 @@ +@@ -2425,6 +2425,9 @@ + HWND hwndBack = GetDlgItem(hwndDlg, IDC_BACK_BUTTON); + HWND hwndNext = GetDlgItem(hwndDlg, IDC_NEXT_BUTTON); + HWND hwndFinish = GetDlgItem(hwndDlg, IDC_FINISH_BUTTON); ++ HWND hwndCancel = GetDlgItem(hwndDlg, IDCANCEL); ++ INT iDefItem = 0; ++ HWND hwndFocus; + + TRACE("%d\n", dwFlags); + +@@ -2432,17 +2435,6 @@ EnableWindow(hwndNext, FALSE); EnableWindow(hwndFinish, FALSE); @@ -173,35 +153,26 @@ if (dwFlags & PSWIZB_BACK) EnableWindow(hwndBack, TRUE); -@@ -2478,6 +2490,31 @@ +@@ -2472,6 +2464,22 @@ } else if (!(dwFlags & PSWIZB_DISABLEDFINISH)) EnableWindow(hwndFinish, TRUE); + -+ /* set the default pushbutton to an enabled button and give it focus */ ++ /* set the default pushbutton to an enabled button */ + if (((dwFlags & PSWIZB_FINISH) || psInfo->hasFinish) && !(dwFlags & PSWIZB_DISABLEDFINISH)) -+ { -+ SendMessageW(hwndDlg, DM_SETDEFID, IDC_FINISH_BUTTON, 0); -+ SetFocus(hwndFinish); -+ } ++ iDefItem = IDC_FINISH_BUTTON; + else if (dwFlags & PSWIZB_NEXT) -+ { -+ SendMessageW(hwndDlg, DM_SETDEFID, IDC_NEXT_BUTTON, 0); -+ SetFocus(hwndNext); -+ } ++ iDefItem = IDC_NEXT_BUTTON; + else if (dwFlags & PSWIZB_BACK) -+ { -+ SendMessageW(hwndDlg, DM_SETDEFID, IDC_BACK_BUTTON, 0); -+ SetFocus(hwndBack); -+ } ++ iDefItem = IDC_BACK_BUTTON; + else -+ { -+ SendMessageW(hwndDlg, DM_SETDEFID, IDCANCEL, 0); -+ SetFocus(GetDlgItem(hwndDlg, IDCANCEL)); -+ } -+ -+ /* Now try to find an edit control that deserves focus */ -+ EnumChildWindows(PropSheet_GetCurrentPageHwnd(hwndDlg), EnumChildProc, 0); ++ iDefItem = IDCANCEL; ++ SendMessageW(hwndDlg, DM_SETDEFID, iDefItem, 0); ++ ++ /* Set focus if no control has it */ ++ hwndFocus = GetFocus(); ++ if (!hwndFocus || hwndFocus == hwndCancel) ++ SetFocus(GetDlgItem(hwndDlg, iDefItem)); } /****************************************************************************** Modified: trunk/reactos/dll/win32/comctl32/propsheet.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/propshe… ============================================================================== --- trunk/reactos/dll/win32/comctl32/propsheet.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comctl32/propsheet.c [iso-8859-1] Tue Feb 14 14:17:18 2012 @@ -2425,23 +2425,15 @@ HWND hwndBack = GetDlgItem(hwndDlg, IDC_BACK_BUTTON); HWND hwndNext = GetDlgItem(hwndDlg, IDC_NEXT_BUTTON); HWND hwndFinish = GetDlgItem(hwndDlg, IDC_FINISH_BUTTON); + HWND hwndCancel = GetDlgItem(hwndDlg, IDCANCEL); + INT iDefItem = 0; + HWND hwndFocus; TRACE("%d\n", dwFlags); EnableWindow(hwndBack, FALSE); EnableWindow(hwndNext, FALSE); EnableWindow(hwndFinish, FALSE); - - /* set the default pushbutton to an enabled button */ - if (((dwFlags & PSWIZB_FINISH) || psInfo->hasFinish) && !(dwFlags & PSWIZB_DISABLEDFINISH)) - SendMessageW(hwndDlg, DM_SETDEFID, IDC_FINISH_BUTTON, 0); - else if (dwFlags & PSWIZB_NEXT) - SendMessageW(hwndDlg, DM_SETDEFID, IDC_NEXT_BUTTON, 0); - else if (dwFlags & PSWIZB_BACK) - SendMessageW(hwndDlg, DM_SETDEFID, IDC_BACK_BUTTON, 0); - else - SendMessageW(hwndDlg, DM_SETDEFID, IDCANCEL, 0); - if (dwFlags & PSWIZB_BACK) EnableWindow(hwndBack, TRUE); @@ -2472,6 +2464,22 @@ } else if (!(dwFlags & PSWIZB_DISABLEDFINISH)) EnableWindow(hwndFinish, TRUE); + + /* set the default pushbutton to an enabled button */ + if (((dwFlags & PSWIZB_FINISH) || psInfo->hasFinish) && !(dwFlags & PSWIZB_DISABLEDFINISH)) + iDefItem = IDC_FINISH_BUTTON; + else if (dwFlags & PSWIZB_NEXT) + iDefItem = IDC_NEXT_BUTTON; + else if (dwFlags & PSWIZB_BACK) + iDefItem = IDC_BACK_BUTTON; + else + iDefItem = IDCANCEL; + SendMessageW(hwndDlg, DM_SETDEFID, iDefItem, 0); + + /* Set focus if no control has it */ + hwndFocus = GetFocus(); + if (!hwndFocus || hwndFocus == hwndCancel) + SetFocus(GetDlgItem(hwndDlg, iDefItem)); } /******************************************************************************

12 years, 7 months

[spetreolle] 55592: [ROSAPPS] Add cmdutils apps to build.

by spetreolle＠svn.reactos.org

Author: spetreolle Date: Tue Feb 14 14:03:05 2012 New Revision: 55592 URL: http://svn.reactos.org/svn/reactos?rev=55592&view=rev Log: [ROSAPPS] Add cmdutils apps to build. Added: trunk/rosapps/applications/cmdutils/CMakeLists.txt (with props) trunk/rosapps/applications/cmdutils/appwiz/CMakeLists.txt (with props) trunk/rosapps/applications/cmdutils/comp/CMakeLists.txt (with props) trunk/rosapps/applications/cmdutils/mode/CMakeLists.txt (with props) trunk/rosapps/applications/cmdutils/sort/CMakeLists.txt (with props) trunk/rosapps/applications/cmdutils/tee/CMakeLists.txt (with props) trunk/rosapps/applications/cmdutils/touch/CMakeLists.txt (with props) trunk/rosapps/applications/cmdutils/uptime/CMakeLists.txt (with props) trunk/rosapps/applications/cmdutils/y/CMakeLists.txt (with props) Modified: trunk/rosapps/applications/CMakeLists.txt trunk/rosapps/applications/cmdutils/cmdutils.rbuild trunk/rosapps/applications/cmdutils/mode/mode.c Modified: trunk/rosapps/applications/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/CMakeLists.tx… ============================================================================== --- trunk/rosapps/applications/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rosapps/applications/CMakeLists.txt [iso-8859-1] Tue Feb 14 14:03:05 2012 @@ -1,4 +1,4 @@ -#add_subdirectory(cmdutils) +add_subdirectory(cmdutils) #add_subdirectory(devutils) #add_subdirectory(fraginator) #add_subdirectory(net) Added: trunk/rosapps/applications/cmdutils/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/cmdutils/CMak… ============================================================================== --- trunk/rosapps/applications/cmdutils/CMakeLists.txt (added) +++ trunk/rosapps/applications/cmdutils/CMakeLists.txt [iso-8859-1] Tue Feb 14 14:03:05 2012 @@ -1,0 +1,8 @@ +add_subdirectory(appwiz) +add_subdirectory(comp) +add_subdirectory(mode) +add_subdirectory(sort) +add_subdirectory(tee) +add_subdirectory(touch) +add_subdirectory(uptime) +add_subdirectory(y) Propchange: trunk/rosapps/applications/cmdutils/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rosapps/applications/cmdutils/appwiz/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/cmdutils/appw… ============================================================================== --- trunk/rosapps/applications/cmdutils/appwiz/CMakeLists.txt (added) +++ trunk/rosapps/applications/cmdutils/appwiz/CMakeLists.txt [iso-8859-1] Tue Feb 14 14:03:05 2012 @@ -1,0 +1,6 @@ + +add_executable(appwiz.exe appwiz.c appwiz.rc) +set_module_type(appwiz.exe win32cui) +set_target_properties(appwiz.exe PROPERTIES SUFFIX "") +add_importlibs(appwiz.exe advapi32 user32 shell32 msvcrt kernel32) +add_cd_file(TARGET appwiz.exe DESTINATION reactos/system32 FOR all) Propchange: trunk/rosapps/applications/cmdutils/appwiz/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/rosapps/applications/cmdutils/cmdutils.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/cmdutils/cmdu… ============================================================================== --- trunk/rosapps/applications/cmdutils/cmdutils.rbuild [iso-8859-1] (original) +++ trunk/rosapps/applications/cmdutils/cmdutils.rbuild [iso-8859-1] Tue Feb 14 14:03:05 2012 @@ -18,10 +18,10 @@ <directory name="touch"> <xi:include href="touch/touch.rbuild" /> </directory> + <directory name="uptime"> + <xi:include href="uptime/uptime.rbuild" /> + </directory> <directory name="y"> <xi:include href="y/y.rbuild" /> </directory> - <directory name="uptime"> - <xi:include href="uptime/uptime.rbuild" /> - </directory> </group> Added: trunk/rosapps/applications/cmdutils/comp/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/cmdutils/comp… ============================================================================== --- trunk/rosapps/applications/cmdutils/comp/CMakeLists.txt (added) +++ trunk/rosapps/applications/cmdutils/comp/CMakeLists.txt [iso-8859-1] Tue Feb 14 14:03:05 2012 @@ -1,0 +1,5 @@ + +add_executable(comp comp.c comp.rc) +set_module_type(comp win32cui) +add_importlibs(comp msvcrt kernel32) +add_cd_file(TARGET comp DESTINATION reactos/system32 FOR all) Propchange: trunk/rosapps/applications/cmdutils/comp/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rosapps/applications/cmdutils/mode/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/cmdutils/mode… ============================================================================== --- trunk/rosapps/applications/cmdutils/mode/CMakeLists.txt (added) +++ trunk/rosapps/applications/cmdutils/mode/CMakeLists.txt [iso-8859-1] Tue Feb 14 14:03:05 2012 @@ -1,0 +1,5 @@ + +add_executable(mode mode.c mode.rc) +set_module_type(mode win32cui) +add_importlibs(mode shell32 user32 msvcrt kernel32) +add_cd_file(TARGET mode DESTINATION reactos/system32 FOR all) Propchange: trunk/rosapps/applications/cmdutils/mode/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/rosapps/applications/cmdutils/mode/mode.c URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/cmdutils/mode… ============================================================================== --- trunk/rosapps/applications/cmdutils/mode/mode.c [iso-8859-1] (original) +++ trunk/rosapps/applications/cmdutils/mode/mode.c [iso-8859-1] Tue Feb 14 14:03:05 2012 @@ -72,7 +72,7 @@ int QueryDevices() { - TCHAR buffer[10240]; + TCHAR buffer[20240]; int len; TCHAR* ptr = buffer; @@ -87,12 +87,12 @@ } else if (_tcsstr(ptr, _T("LPT"))) { _tprintf(_T(" Found parallel device - %s\n"), ptr); } else { - _tprintf(_T(" Found other device - %s\n"), ptr); + //_tprintf(_T(" Found other device - %s\n"), ptr); } ptr += (len+1); } } else { - _tprintf(_T(" ERROR: QueryDosDevice(...) failed.\n")); + _tprintf(_T(" ERROR: QueryDosDevice(...) failed.%ld\n"), GetLastError()); } return 1; } Added: trunk/rosapps/applications/cmdutils/sort/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/cmdutils/sort… ============================================================================== --- trunk/rosapps/applications/cmdutils/sort/CMakeLists.txt (added) +++ trunk/rosapps/applications/cmdutils/sort/CMakeLists.txt [iso-8859-1] Tue Feb 14 14:03:05 2012 @@ -1,0 +1,5 @@ + +add_executable(sort sort.c sort.rc) +set_module_type(sort win32cui) +add_importlibs(sort msvcrt kernel32) +add_cd_file(TARGET sort DESTINATION reactos/system32 FOR all) Propchange: trunk/rosapps/applications/cmdutils/sort/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rosapps/applications/cmdutils/tee/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/cmdutils/tee/… ============================================================================== --- trunk/rosapps/applications/cmdutils/tee/CMakeLists.txt (added) +++ trunk/rosapps/applications/cmdutils/tee/CMakeLists.txt [iso-8859-1] Tue Feb 14 14:03:05 2012 @@ -1,0 +1,5 @@ + +add_executable(tee tee.c tee.rc) +set_module_type(tee win32cui) +add_importlibs(tee msvcrt kernel32) +add_cd_file(TARGET tee DESTINATION reactos/system32 FOR all) Propchange: trunk/rosapps/applications/cmdutils/tee/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rosapps/applications/cmdutils/touch/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/cmdutils/touc… ============================================================================== --- trunk/rosapps/applications/cmdutils/touch/CMakeLists.txt (added) +++ trunk/rosapps/applications/cmdutils/touch/CMakeLists.txt [iso-8859-1] Tue Feb 14 14:03:05 2012 @@ -1,0 +1,10 @@ + +add_executable(touch err.c touch.c touch.rc) +target_link_libraries(touch getopt) +set_module_type(touch win32cui) +add_importlibs(touch msvcrt kernel32) +if(MSVC) + target_link_libraries(touch oldnames) +endif() + +add_cd_file(TARGET touch DESTINATION reactos/system32 FOR all) Propchange: trunk/rosapps/applications/cmdutils/touch/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rosapps/applications/cmdutils/uptime/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/cmdutils/upti… ============================================================================== --- trunk/rosapps/applications/cmdutils/uptime/CMakeLists.txt (added) +++ trunk/rosapps/applications/cmdutils/uptime/CMakeLists.txt [iso-8859-1] Tue Feb 14 14:03:05 2012 @@ -1,0 +1,9 @@ +#add_definitions(-DLINUX_OUTPUT) + +add_executable(uptime uptime.c uptime.rc) +set_module_type(uptime win32cui) +add_importlibs(uptime msvcrt kernel32) +if(MSVC) + add_importlibs(uptime ntdll) +endif() +add_cd_file(TARGET uptime DESTINATION reactos/system32 FOR all) Propchange: trunk/rosapps/applications/cmdutils/uptime/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rosapps/applications/cmdutils/y/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/cmdutils/y/CM… ============================================================================== --- trunk/rosapps/applications/cmdutils/y/CMakeLists.txt (added) +++ trunk/rosapps/applications/cmdutils/y/CMakeLists.txt [iso-8859-1] Tue Feb 14 14:03:05 2012 @@ -1,0 +1,5 @@ + +add_executable(y y.c y.rc) +set_module_type(y win32cui) +add_importlibs(y msvcrt kernel32) +add_cd_file(TARGET y DESTINATION reactos/system32 FOR all) Propchange: trunk/rosapps/applications/cmdutils/y/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native

12 years, 7 months

[janderwald] 55591: [USBSTOR] - Display errors when csw fails

by janderwald＠svn.reactos.org

Author: janderwald Date: Tue Feb 14 08:57:22 2012 New Revision: 55591 URL: http://svn.reactos.org/svn/reactos?rev=55591&view=rev Log: [USBSTOR] - Display errors when csw fails Modified: trunk/reactos/drivers/usb/usbstor/scsi.c Modified: trunk/reactos/drivers/usb/usbstor/scsi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbstor/scsi.c… ============================================================================== --- trunk/reactos/drivers/usb/usbstor/scsi.c [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbstor/scsi.c [iso-8859-1] Tue Feb 14 08:57:22 2012 @@ -270,9 +270,20 @@ // // sanity checks // - ASSERT(Context->csw->Signature == CSW_SIGNATURE); - ASSERT(Context->csw->Tag == (ULONG)Context->csw); - ASSERT(Context->csw->Status == 0x00); + if (Context->csw->Signature != CSW_SIGNATURE) + { + DPRINT1("[USBSTOR] Expected Signature %x but got %x\n", CSW_SIGNATURE, Context->csw->Signature); + } + + if (Context->csw->Tag != (ULONG)Context->csw) + { + DPRINT1("[USBSTOR] Expected Tag %x but got %x\n", (ULONG)Context->csw, Context->csw->Tag); + } + + if (Context->csw->Status != 0x00) + { + DPRINT1("[USBSTOR] Expected Status 0x00 but got %x\n", Context->csw->Status); + } // // free cbw

12 years, 7 months

[ion] 55590: [CSRSS]: Remove unneeded initialization code, and move Win32k.sys related initailization to win32csr. Note that the "VDM IVT" stuff should move to videoprt's handler for IRP_MJ_CREATE, ...

by ion＠svn.reactos.org

Author: ion Date: Tue Feb 14 08:23:01 2012 New Revision: 55590 URL: http://svn.reactos.org/svn/reactos?rev=55590&view=rev Log: [CSRSS]: Remove unneeded initialization code, and move Win32k.sys related initailization to win32csr. Note that the "VDM IVT" stuff should move to videoprt's handler for IRP_MJ_CREATE, and opening the "\\DISPLAY1" needs to go in Win32k.sys (under NtUserInitialize I think). [BOOT REGISTRY]: Cleanup subsystem entries to match Windows. Modified: trunk/reactos/boot/bootdata/hivesys_amd64.inf trunk/reactos/boot/bootdata/hivesys_arm.inf trunk/reactos/boot/bootdata/hivesys_i386.inf trunk/reactos/subsystems/win32/csrss/csrsrv/init.c trunk/reactos/subsystems/win32/csrss/win32csr/dllmain.c trunk/reactos/subsystems/win32/csrss/win32csr/w32csr.h Modified: trunk/reactos/boot/bootdata/hivesys_amd64.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivesys_amd6… ============================================================================== --- trunk/reactos/boot/bootdata/hivesys_amd64.inf [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/hivesys_amd64.inf [iso-8859-1] Tue Feb 14 08:23:01 2012 @@ -1074,12 +1074,10 @@ ; Subsystems HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\Subsystems","Debug",0x00020000,"" HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\Subsystems","Kmode",0x00020000,"%SystemRoot%\system32\win32k.sys" -HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\Subsystems","Optional",0x00010000,"Posix","Os2","Vms" -HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\Subsystems","Os2",0x00020000,"%SystemRoot%\system32\csr.exe ObjectDirectory=\OS2 SharedSection=128 Windows=Off SubSystemType=Text ServerDll=os2srv,1 ProfileControl=Off RequestThreads=2 MaxRequestThreads=2 Sessions=Off" -HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\Subsystems","Posix",0x00020000,"%SystemRoot%\system32\csr.exe ObjectDirectory=\POSIX SharedSection=128 Windows=Off SubSystemType=Text ServerDll=psxsrv,1 ProfileControl=Off RequestThreads=2 MaxRequestThreads=2 Sessions=Off" +HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\Subsystems","Optional",0x00010000,"Posix" +HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\Subsystems","Posix",0x00020000,"%SystemRoot%\system32\psxss.exe" HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\Subsystems","Required",0x00010000,"Debug","Windows" -HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\Subsystems","Vms",0x00020000,"%SystemRoot%\system32\csr.exe ObjectDirectory=\VMS SharedSection=128 Windows=Off SubSystemType=Text ServerDll=vmssrv,1 ProfileControl=Off RequestThreads=2 MaxRequestThreads=2 Sessions=Off" -HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\Subsystems","Windows",0x00020000,"%SystemRoot%\system32\csrss.exe" +HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\Subsystems","Windows",0x00020000,"%SystemRoot%\system32\csrss.exe ObjectDirectory=\Windows SharedSection=1024,12288,512 Windows=On SubSystemType=Windows ServerDll=basesrv,1 ServerDll=winsrv:UserServerDllInitialization,3 ServerDll=winsrv:ConServerDllInitialization,2 ProfileControl=Off MaxRequestThreads=16" ; WOW Support HKLM,"SYSTEM\CurrentControlSet\Control\Wow","",0x00000000,"" Modified: trunk/reactos/boot/bootdata/hivesys_arm.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivesys_arm.… ============================================================================== --- trunk/reactos/boot/bootdata/hivesys_arm.inf [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/hivesys_arm.inf [iso-8859-1] Tue Feb 14 08:23:01 2012 @@ -790,12 +790,10 @@ ; Subsystems HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\Subsystems","Debug",0x00020000,"" HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\Subsystems","Kmode",0x00020000,"%SystemRoot%\system32\win32k.sys" -HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\Subsystems","Optional",0x00010000,"Posix","Os2","Vms" -HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\Subsystems","Os2",0x00020000,"%SystemRoot%\system32\csr.exe ObjectDirectory=\OS2 SharedSection=128 Windows=Off SubSystemType=Text ServerDll=os2srv,1 ProfileControl=Off RequestThreads=2 MaxRequestThreads=2 Sessions=Off" -HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\Subsystems","Posix",0x00020000,"%SystemRoot%\system32\csr.exe ObjectDirectory=\POSIX SharedSection=128 Windows=Off SubSystemType=Text ServerDll=psxsrv,1 ProfileControl=Off RequestThreads=2 MaxRequestThreads=2 Sessions=Off" +HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\Subsystems","Optional",0x00010000,"Posix" +HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\Subsystems","Posix",0x00020000,"%SystemRoot%\system32\psxss.exe" HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\Subsystems","Required",0x00010000,"Debug","Windows" -HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\Subsystems","Vms",0x00020000,"%SystemRoot%\system32\csr.exe ObjectDirectory=\VMS SharedSection=128 Windows=Off SubSystemType=Text ServerDll=vmssrv,1 ProfileControl=Off RequestThreads=2 MaxRequestThreads=2 Sessions=Off" -HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\Subsystems","Windows",0x00020000,"%SystemRoot%\system32\csrss.exe" +HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\Subsystems","Windows",0x00020000,"%SystemRoot%\system32\csrss.exe ObjectDirectory=\Windows SharedSection=1024,12288,512 Windows=On SubSystemType=Windows ServerDll=basesrv,1 ServerDll=winsrv:UserServerDllInitialization,3 ServerDll=winsrv:ConServerDllInitialization,2 ProfileControl=Off MaxRequestThreads=16" ; WOW Support HKLM,"SYSTEM\CurrentControlSet\Control\Wow","",0x00000000,"" Modified: trunk/reactos/boot/bootdata/hivesys_i386.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivesys_i386… ============================================================================== --- trunk/reactos/boot/bootdata/hivesys_i386.inf [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/hivesys_i386.inf [iso-8859-1] Tue Feb 14 08:23:01 2012 @@ -1225,12 +1225,10 @@ ; Subsystems HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\Subsystems","Debug",0x00020000,"" HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\Subsystems","Kmode",0x00020000,"%SystemRoot%\system32\win32k.sys" -HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\Subsystems","Optional",0x00010000,"Posix","Os2","Vms" -HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\Subsystems","Os2",0x00020000,"%SystemRoot%\system32\csr.exe ObjectDirectory=\OS2 SharedSection=128 Windows=Off SubSystemType=Text ServerDll=os2srv,1 ProfileControl=Off RequestThreads=2 MaxRequestThreads=2 Sessions=Off" -HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\Subsystems","Posix",0x00020000,"%SystemRoot%\system32\csr.exe ObjectDirectory=\POSIX SharedSection=128 Windows=Off SubSystemType=Text ServerDll=psxsrv,1 ProfileControl=Off RequestThreads=2 MaxRequestThreads=2 Sessions=Off" +HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\Subsystems","Optional",0x00010000,"Posix" +HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\Subsystems","Posix",0x00020000,"%SystemRoot%\system32\psxss.exe" HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\Subsystems","Required",0x00010000,"Debug","Windows" -HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\Subsystems","Vms",0x00020000,"%SystemRoot%\system32\csr.exe ObjectDirectory=\VMS SharedSection=128 Windows=Off SubSystemType=Text ServerDll=vmssrv,1 ProfileControl=Off RequestThreads=2 MaxRequestThreads=2 Sessions=Off" -HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\Subsystems","Windows",0x00020000,"%SystemRoot%\system32\csrss.exe" +HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\Subsystems","Windows",0x00020000,"%SystemRoot%\system32\csrss.exe ObjectDirectory=\Windows SharedSection=1024,12288,512 Windows=On SubSystemType=Windows ServerDll=basesrv,1 ServerDll=winsrv:UserServerDllInitialization,3 ServerDll=winsrv:ConServerDllInitialization,2 ProfileControl=Off MaxRequestThreads=16" ; WOW Support HKLM,"SYSTEM\CurrentControlSet\Control\Wow","",0x00000000,"" Modified: trunk/reactos/subsystems/win32/csrss/csrsrv/init.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/csr… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/csrsrv/init.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrss/csrsrv/init.c [iso-8859-1] Tue Feb 14 08:23:01 2012 @@ -27,113 +27,6 @@ /* PRIVATE FUNCTIONS **********************************************************/ -ULONG -InitializeVideoAddressSpace(VOID) -{ - OBJECT_ATTRIBUTES ObjectAttributes; - UNICODE_STRING PhysMemName = RTL_CONSTANT_STRING(L"\\Device\\PhysicalMemory"); - NTSTATUS Status; - HANDLE PhysMemHandle; - PVOID BaseAddress; - LARGE_INTEGER Offset; - SIZE_T ViewSize; - CHAR IVTAndBda[1024+256]; - - /* Free the 1MB pre-reserved region. In reality, ReactOS should simply support us mapping the view into the reserved area, but it doesn't. */ - BaseAddress = 0; - ViewSize = 1024 * 1024; - Status = ZwFreeVirtualMemory(NtCurrentProcess(), - &BaseAddress, - &ViewSize, - MEM_RELEASE); - if (!NT_SUCCESS(Status)) - { - DPRINT1("Couldn't unmap reserved memory (%x)\n", Status); - return 0; - } - - /* Open the physical memory section */ - InitializeObjectAttributes(&ObjectAttributes, - &PhysMemName, - 0, - NULL, - NULL); - Status = ZwOpenSection(&PhysMemHandle, - SECTION_ALL_ACCESS, - &ObjectAttributes); - if (!NT_SUCCESS(Status)) - { - DPRINT1("Couldn't open \\Device\\PhysicalMemory\n"); - return 0; - } - - /* Map the BIOS and device registers into the address space */ - Offset.QuadPart = 0xa0000; - ViewSize = 0x100000 - 0xa0000; - BaseAddress = (PVOID)0xa0000; - Status = ZwMapViewOfSection(PhysMemHandle, - NtCurrentProcess(), - &BaseAddress, - 0, - ViewSize, - &Offset, - &ViewSize, - ViewUnmap, - 0, - PAGE_EXECUTE_READWRITE); - if (!NT_SUCCESS(Status)) - { - DPRINT1("Couldn't map physical memory (%x)\n", Status); - ZwClose(PhysMemHandle); - return 0; - } - - /* Close physical memory section handle */ - ZwClose(PhysMemHandle); - - if (BaseAddress != (PVOID)0xa0000) - { - DPRINT1("Couldn't map physical memory at the right address (was %x)\n", - BaseAddress); - return 0; - } - - /* Allocate some low memory to use for the non-BIOS - * parts of the v86 mode address space - */ - BaseAddress = (PVOID)0x1; - ViewSize = 0xa0000 - 0x1000; - Status = ZwAllocateVirtualMemory(NtCurrentProcess(), - &BaseAddress, - 0, - &ViewSize, - MEM_RESERVE | MEM_COMMIT, - PAGE_EXECUTE_READWRITE); - if (!NT_SUCCESS(Status)) - { - DPRINT1("Failed to allocate virtual memory (Status %x)\n", Status); - return 0; - } - if (BaseAddress != (PVOID)0x0) - { - DPRINT1("Failed to allocate virtual memory at right address (was %x)\n", - BaseAddress); - return 0; - } - - /* Get the real mode IVT and BDA from the kernel */ - Status = NtVdmControl(VdmInitialize, IVTAndBda); - if (!NT_SUCCESS(Status)) - { - DPRINT1("NtVdmControl failed (status %x)\n", Status); - return 0; - } - - /* Return success */ - return 1; -} - - static NTSTATUS FASTCALL CsrpAddServerProcs(CSRPLUGIN_SERVER_PROCS *Procs) { @@ -258,43 +151,6 @@ DIRECTORY_ALL_ACCESS, &Attributes); return Status; -} - -/********************************************************************** - * CsrpInitVideo/3 - * - * TODO: we need a virtual device for sessions other than - * TODO: the console one - */ -static NTSTATUS -CsrpInitVideo (int argc, char ** argv, char ** envp) -{ - OBJECT_ATTRIBUTES ObjectAttributes; - UNICODE_STRING DeviceName = RTL_CONSTANT_STRING(L"\\??\\DISPLAY1"); - IO_STATUS_BLOCK Iosb; - HANDLE VideoHandle = (HANDLE) 0; - NTSTATUS Status = STATUS_SUCCESS; - - DPRINT("CSR: %s called\n", __FUNCTION__); - - InitializeVideoAddressSpace(); - - InitializeObjectAttributes(&ObjectAttributes, - &DeviceName, - 0, - NULL, - NULL); - Status = NtOpenFile(&VideoHandle, - FILE_ALL_ACCESS, - &ObjectAttributes, - &Iosb, - 0, - 0); - if (NT_SUCCESS(Status)) - { - NtClose(VideoHandle); - } - return Status; } /********************************************************************** @@ -604,52 +460,6 @@ return Status; } -#if 0 -/********************************************************************** - * CsrpLoadKernelModeDriver/3 - */ -static NTSTATUS -CsrpLoadKernelModeDriver (int argc, char ** argv, char ** envp) -{ - NTSTATUS Status = STATUS_SUCCESS; - WCHAR Data [MAX_PATH + 1]; - ULONG DataLength = sizeof Data; - ULONG DataType = 0; - //UNICODE_STRING Environment; - - - DPRINT1("SM: %s called\n", __FUNCTION__); - - - //EnvpToUnicodeString (envp, & Environment); - Status = SmLookupSubsystem (L"Kmode", - Data, - & DataLength, - & DataType, - NULL); - //RtlFreeUnicodeString (& Environment); - if((STATUS_SUCCESS == Status) && (DataLength > sizeof Data[0])) - { - WCHAR ImagePath [MAX_PATH + 1] = {0}; - UNICODE_STRING ModuleName; - - wcscpy (ImagePath, L"\\SYSTEMROOT\\system32\\win32k.sys"); -// wcscat (ImagePath, Data); - RtlInitUnicodeString (& ModuleName, ImagePath); - Status = NtSetSystemInformation(/* FIXME: SystemLoadAndCallImage */ - SystemExtendServiceTableInformation, - & ModuleName, - sizeof ModuleName); - if(!NT_SUCCESS(Status)) - { - DPRINT1("WIN: %s: loading Kmode failed (Status=0x%08lx)\n", - __FUNCTION__, Status); - } - } - return Status; -} -#endif - /********************************************************************** * CsrpCreateApiPort/2 */ @@ -671,75 +481,6 @@ CsrpApiRegisterDef (int argc, char ** argv, char ** envp) { return CsrApiRegisterDefinitions(NativeDefinitions); -} - -/********************************************************************** - * CsrpCCTS/2 - */ -static NTSTATUS -CsrpCCTS (int argc, char ** argv, char ** envp) -{ - ULONG Dummy; - ULONG DummyLength = sizeof(Dummy); - return CsrClientConnectToServer(L"\\Windows", - 0, &Dummy, &DummyLength, NULL); -} - -/********************************************************************** - * CsrpRunWinlogon/0 - * - * Start the logon process (winlogon.exe). - * - * TODO: this should be moved in CsrpCreateSession/x (one per session) - * TODO: in its own desktop (one logon desktop per winstation). - */ -static NTSTATUS -CsrpRunWinlogon (int argc, char ** argv, char ** envp) -{ - NTSTATUS Status = STATUS_SUCCESS; - UNICODE_STRING ImagePath; - UNICODE_STRING CommandLine; - PRTL_USER_PROCESS_PARAMETERS ProcessParameters = NULL; - RTL_USER_PROCESS_INFORMATION ProcessInfo; - - - DPRINT("CSR: %s called\n", __FUNCTION__); - if (g_ModernSm) return STATUS_SUCCESS; - - /* initialize the process parameters */ - RtlInitUnicodeString (& ImagePath, L"\\SystemRoot\\system32\\winlogon.exe"); - RtlInitUnicodeString (& CommandLine, L""); - RtlCreateProcessParameters(& ProcessParameters, - & ImagePath, - NULL, - NULL, - & CommandLine, - NULL, - NULL, - NULL, - NULL, - NULL); - /* Create the winlogon process */ - Status = RtlCreateUserProcess (& ImagePath, - OBJ_CASE_INSENSITIVE, - ProcessParameters, - NULL, - NULL, - NULL, - FALSE, - NULL, - NULL, - & ProcessInfo); - /* Cleanup */ - RtlDestroyProcessParameters (ProcessParameters); - if (!NT_SUCCESS(Status)) - { - DPRINT1("SM: %s: loading winlogon.exe failed (Status=%08lx)\n", - __FUNCTION__, Status); - } - - ZwResumeThread(ProcessInfo.ThreadHandle, NULL); - return Status; } static NTSTATUS @@ -755,19 +496,15 @@ CSR_INIT_ROUTINE EntryPoint; PCHAR ErrorMessage; } InitRoutine [] = { - {TRUE, CsrpCreateBNODirectory, "create base named objects directory"}, + {TRUE, CsrpCreateBNODirectory, "create base named objects directory"}, {TRUE, CsrpCreateHeap, "create the CSR heap"}, {TRUE, CsrpCreateApiPort, "create the api port \\Windows\\ApiPort"}, {TRUE, CsrpCreateHardErrorPort, "create the hard error port"}, {TRUE, CsrpCreateObjectDirectory,"create the object directory \\Windows"}, -// {TRUE, CsrpLoadKernelModeDriver, "load Kmode driver"}, - {TRUE, CsrpInitVideo, "initialize video"}, {TRUE, CsrpApiRegisterDef, "initialize api definitions"}, - {TRUE, CsrpCCTS, "connect client to server"}, {TRUE, CsrpInitWin32Csr, "load usermode dll"}, {TRUE, CsrpCreateCallbackPort, "create the callback port \\Windows\\SbApiPort"}, {TRUE, CsrpRegisterSubsystem, "register with SM"}, - {TRUE, CsrpRunWinlogon, "run WinLogon"}, }; /* PUBLIC FUNCTIONS ***********************************************************/ @@ -799,7 +536,6 @@ } if (CallInitComplete()) { - Status = SmCompleteSession (hSmApiPort,hSbApiPort,hApiPort); return STATUS_SUCCESS; } Modified: trunk/reactos/subsystems/win32/csrss/win32csr/dllmain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/win… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/win32csr/dllmain.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrss/win32csr/dllmain.c [iso-8859-1] Tue Feb 14 08:23:01 2012 @@ -109,6 +109,149 @@ return CallNextHookEx(hhk, nCode, wParam, lParam); } +ULONG +InitializeVideoAddressSpace(VOID) +{ + OBJECT_ATTRIBUTES ObjectAttributes; + UNICODE_STRING PhysMemName = RTL_CONSTANT_STRING(L"\\Device\\PhysicalMemory"); + NTSTATUS Status; + HANDLE PhysMemHandle; + PVOID BaseAddress; + LARGE_INTEGER Offset; + SIZE_T ViewSize; + CHAR IVTAndBda[1024+256]; + + /* Free the 1MB pre-reserved region. In reality, ReactOS should simply support us mapping the view into the reserved area, but it doesn't. */ + BaseAddress = 0; + ViewSize = 1024 * 1024; + Status = ZwFreeVirtualMemory(NtCurrentProcess(), + &BaseAddress, + &ViewSize, + MEM_RELEASE); + if (!NT_SUCCESS(Status)) + { + DPRINT1("Couldn't unmap reserved memory (%x)\n", Status); + return 0; + } + + /* Open the physical memory section */ + InitializeObjectAttributes(&ObjectAttributes, + &PhysMemName, + 0, + NULL, + NULL); + Status = ZwOpenSection(&PhysMemHandle, + SECTION_ALL_ACCESS, + &ObjectAttributes); + if (!NT_SUCCESS(Status)) + { + DPRINT1("Couldn't open \\Device\\PhysicalMemory\n"); + return 0; + } + + /* Map the BIOS and device registers into the address space */ + Offset.QuadPart = 0xa0000; + ViewSize = 0x100000 - 0xa0000; + BaseAddress = (PVOID)0xa0000; + Status = ZwMapViewOfSection(PhysMemHandle, + NtCurrentProcess(), + &BaseAddress, + 0, + ViewSize, + &Offset, + &ViewSize, + ViewUnmap, + 0, + PAGE_EXECUTE_READWRITE); + if (!NT_SUCCESS(Status)) + { + DPRINT1("Couldn't map physical memory (%x)\n", Status); + ZwClose(PhysMemHandle); + return 0; + } + + /* Close physical memory section handle */ + ZwClose(PhysMemHandle); + + if (BaseAddress != (PVOID)0xa0000) + { + DPRINT1("Couldn't map physical memory at the right address (was %x)\n", + BaseAddress); + return 0; + } + + /* Allocate some low memory to use for the non-BIOS + * parts of the v86 mode address space + */ + BaseAddress = (PVOID)0x1; + ViewSize = 0xa0000 - 0x1000; + Status = ZwAllocateVirtualMemory(NtCurrentProcess(), + &BaseAddress, + 0, + &ViewSize, + MEM_RESERVE | MEM_COMMIT, + PAGE_EXECUTE_READWRITE); + if (!NT_SUCCESS(Status)) + { + DPRINT1("Failed to allocate virtual memory (Status %x)\n", Status); + return 0; + } + if (BaseAddress != (PVOID)0x0) + { + DPRINT1("Failed to allocate virtual memory at right address (was %x)\n", + BaseAddress); + return 0; + } + + /* Get the real mode IVT and BDA from the kernel */ + Status = NtVdmControl(VdmInitialize, IVTAndBda); + if (!NT_SUCCESS(Status)) + { + DPRINT1("NtVdmControl failed (status %x)\n", Status); + return 0; + } + + /* Return success */ + return 1; +} + +/********************************************************************** + * CsrpInitVideo/3 + * + * TODO: we need a virtual device for sessions other than + * TODO: the console one + */ +NTSTATUS +CsrpInitVideo (VOID) +{ + OBJECT_ATTRIBUTES ObjectAttributes; + UNICODE_STRING DeviceName = RTL_CONSTANT_STRING(L"\\??\\DISPLAY1"); + IO_STATUS_BLOCK Iosb; + HANDLE VideoHandle = (HANDLE) 0; + NTSTATUS Status = STATUS_SUCCESS; + + DPRINT("CSR: %s called\n", __FUNCTION__); + + InitializeVideoAddressSpace(); + + InitializeObjectAttributes(&ObjectAttributes, + &DeviceName, + 0, + NULL, + NULL); + Status = NtOpenFile(&VideoHandle, + FILE_ALL_ACCESS, + &ObjectAttributes, + &Iosb, + 0, + 0); + if (NT_SUCCESS(Status)) + { + NtClose(VideoHandle); + } + return Status; +} + BOOL WINAPI DllMain(HANDLE hDll, DWORD dwReason, @@ -200,6 +343,8 @@ CsrExports = *Exports; Win32CsrApiHeap = CsrssApiHeap; + + CsrpInitVideo(); NtUserInitialize(0, NULL, NULL); Modified: trunk/reactos/subsystems/win32/csrss/win32csr/w32csr.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/win… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/win32csr/w32csr.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrss/win32csr/w32csr.h [iso-8859-1] Tue Feb 14 08:23:01 2012 @@ -2,10 +2,7 @@ #define WIN32_NO_STATUS #include <windows.h> #define NTOS_MODE_USER -#include <ndk/mmtypes.h> -#include <ndk/mmfuncs.h> -#include <ndk/obfuncs.h> -#include <ndk/umfuncs.h> +#include <ndk/ntndk.h> #include <psapi.h> /* External Winlogon Header */

12 years, 7 months

[ion] 55589: [SMSS2/SMSS]: Nuke SMSS. SMSS2 is now in full control.

by ion＠svn.reactos.org

Author: ion Date: Tue Feb 14 06:06:39 2012 New Revision: 55589 URL: http://svn.reactos.org/svn/reactos?rev=55589&view=rev Log: [SMSS2/SMSS]: Nuke SMSS. SMSS2 is now in full control. Removed: trunk/reactos/base/system/smss/ Modified: trunk/reactos/base/system/CMakeLists.txt trunk/reactos/base/system/smss2/CMakeLists.txt trunk/reactos/base/system/smss2/pagefile.c trunk/reactos/base/system/smss2/smss.c trunk/reactos/base/system/smss2/smss2.rbuild trunk/reactos/base/system/system.rbuild trunk/reactos/boot/bootdata/packages/reactos.dff trunk/reactos/boot/bootdata/txtsetup.sif trunk/reactos/ntoskrnl/ex/init.c Modified: trunk/reactos/base/system/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/CMakeLists.txt… ============================================================================== --- trunk/reactos/base/system/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/base/system/CMakeLists.txt [iso-8859-1] Tue Feb 14 06:06:39 2012 @@ -12,7 +12,6 @@ add_subdirectory(rundll32) add_subdirectory(runonce) add_subdirectory(services) -add_subdirectory(smss) add_subdirectory(smss2) add_subdirectory(subst) add_subdirectory(userinit) Modified: trunk/reactos/base/system/smss2/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/smss2/CMakeLis… ============================================================================== --- trunk/reactos/base/system/smss2/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/base/system/smss2/CMakeLists.txt [iso-8859-1] Tue Feb 14 06:06:39 2012 @@ -13,12 +13,12 @@ smss.c smss.rc) -add_executable(smss2 WIN32 ${SOURCE}) +add_executable(smss WIN32 ${SOURCE}) -target_link_libraries(smss2 nt pseh smlib) +target_link_libraries(smss nt pseh smlib) -add_pch(smss2 smss.h) +add_pch(smss smss.h) -set_module_type(smss2 nativecui) -add_importlibs(smss2 ntdll) -add_cd_file(TARGET smss2 DESTINATION reactos/system32 NO_CAB FOR all) +set_module_type(smss nativecui) +add_importlibs(smss ntdll) +add_cd_file(TARGET smss DESTINATION reactos/system32 FOR all) Modified: trunk/reactos/base/system/smss2/pagefile.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/smss2/pagefile… ============================================================================== --- trunk/reactos/base/system/smss2/pagefile.c [iso-8859-1] (original) +++ trunk/reactos/base/system/smss2/pagefile.c [iso-8859-1] Tue Feb 14 06:06:39 2012 @@ -457,8 +457,7 @@ NTSTATUS Status; /* Tell the kernel to create the pagefile */ - //Status = NtCreatePagingFile(Name, MinSize, MaxSize, Priority); - Status = STATUS_SUCCESS; + Status = NtCreatePagingFile(Name, MinSize, MaxSize, Priority); if (NT_SUCCESS(Status)) { DPRINT1("SMSS:PFILE: NtCreatePagingFile (%wZ, %I64X, %I64X) succeeded. \n", Modified: trunk/reactos/base/system/smss2/smss.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/smss2/smss.c?r… ============================================================================== --- trunk/reactos/base/system/smss2/smss.c [iso-8859-1] (original) +++ trunk/reactos/base/system/smss2/smss.c [iso-8859-1] Tue Feb 14 06:06:39 2012 @@ -13,18 +13,6 @@ #include "debug.h" /* GLOBALS ********************************************************************/ - -typedef struct _INIT_BUFFER -{ - WCHAR DebugBuffer[256]; - RTL_USER_PROCESS_INFORMATION ProcessInfo; -} INIT_BUFFER, *PINIT_BUFFER; - -/* NT Initial User Application */ -WCHAR NtInitialUserProcessBuffer[128] = L"\\SystemRoot\\System32\\smss.exe"; -ULONG NtInitialUserProcessBufferLength = sizeof(NtInitialUserProcessBuffer) - - sizeof(WCHAR); -ULONG NtInitialUserProcessBufferType = REG_SZ; UNICODE_STRING SmpSystemRoot; ULONG AttachedSessionId = -1; @@ -398,234 +386,6 @@ NTSTATUS NTAPI -ExpLoadInitialProcess(IN PINIT_BUFFER InitBuffer, - OUT PRTL_USER_PROCESS_PARAMETERS *ProcessParameters, - OUT PCHAR *ProcessEnvironment) -{ - NTSTATUS Status; - SIZE_T Size; - PWSTR p; - UNICODE_STRING NullString = RTL_CONSTANT_STRING(L""); - UNICODE_STRING SmssName, DebugString; - PVOID EnvironmentPtr = NULL; - PRTL_USER_PROCESS_INFORMATION ProcessInformation; - PRTL_USER_PROCESS_PARAMETERS ProcessParams = NULL; - - NullString.Length = sizeof(WCHAR); - - /* Use the initial buffer, after the strings */ - ProcessInformation = &InitBuffer->ProcessInfo; - - /* Allocate memory for the process parameters */ - Size = sizeof(*ProcessParams) + ((MAX_PATH * 6) * sizeof(WCHAR)); - Status = ZwAllocateVirtualMemory(NtCurrentProcess(), - (PVOID*)&ProcessParams, - 0, - &Size, - MEM_COMMIT, - PAGE_READWRITE); - if (!NT_SUCCESS(Status)) - { - /* Failed, display error */ - p = InitBuffer->DebugBuffer; - _snwprintf(p, - 256 * sizeof(WCHAR), - L"INIT: Unable to allocate Process Parameters. 0x%lx", - Status); - RtlInitUnicodeString(&DebugString, p); - ZwDisplayString(&DebugString); - - /* Bugcheck the system */ - return Status; - } - - /* Setup the basic header, and give the process the low 1MB to itself */ - ProcessParams->Length = (ULONG)Size; - ProcessParams->MaximumLength = (ULONG)Size; - ProcessParams->Flags = RTL_USER_PROCESS_PARAMETERS_NORMALIZED | - RTL_USER_PROCESS_PARAMETERS_RESERVE_1MB; - - /* Allocate a page for the environment */ - Size = PAGE_SIZE; - Status = ZwAllocateVirtualMemory(NtCurrentProcess(), - &EnvironmentPtr, - 0, - &Size, - MEM_COMMIT, - PAGE_READWRITE); - if (!NT_SUCCESS(Status)) - { - /* Failed, display error */ - p = InitBuffer->DebugBuffer; - _snwprintf(p, - 256 * sizeof(WCHAR), - L"INIT: Unable to allocate Process Environment. 0x%lx", - Status); - RtlInitUnicodeString(&DebugString, p); - ZwDisplayString(&DebugString); - - /* Bugcheck the system */ - return Status; - } - - /* Write the pointer */ - ProcessParams->Environment = EnvironmentPtr; - - /* Make a buffer for the DOS path */ - p = (PWSTR)(ProcessParams + 1); - ProcessParams->CurrentDirectory.DosPath.Buffer = p; - ProcessParams->CurrentDirectory.DosPath.MaximumLength = MAX_PATH * - sizeof(WCHAR); - - /* Copy the DOS path */ - RtlCopyUnicodeString(&ProcessParams->CurrentDirectory.DosPath, - &SmpSystemRoot); - - /* Make a buffer for the DLL Path */ - p = (PWSTR)((PCHAR)ProcessParams->CurrentDirectory.DosPath.Buffer + - ProcessParams->CurrentDirectory.DosPath.MaximumLength); - ProcessParams->DllPath.Buffer = p; - ProcessParams->DllPath.MaximumLength = MAX_PATH * sizeof(WCHAR); - - /* Copy the DLL path and append the system32 directory */ - RtlCopyUnicodeString(&ProcessParams->DllPath, - &ProcessParams->CurrentDirectory.DosPath); - RtlAppendUnicodeToString(&ProcessParams->DllPath, L"\\System32"); - - /* Make a buffer for the image name */ - p = (PWSTR)((PCHAR)ProcessParams->DllPath.Buffer + - ProcessParams->DllPath.MaximumLength); - ProcessParams->ImagePathName.Buffer = p; - ProcessParams->ImagePathName.MaximumLength = MAX_PATH * sizeof(WCHAR); - - /* Make sure the buffer is a valid string which within the given length */ - if ((NtInitialUserProcessBufferType != REG_SZ) || - ((NtInitialUserProcessBufferLength != MAXULONG) && - ((NtInitialUserProcessBufferLength < sizeof(WCHAR)) || - (NtInitialUserProcessBufferLength > - sizeof(NtInitialUserProcessBuffer) - sizeof(WCHAR))))) - { - /* Invalid initial process string, bugcheck */ - return STATUS_INVALID_PARAMETER; - } - - /* Cut out anything after a space */ - p = NtInitialUserProcessBuffer; - while ((*p) && (*p != L' ')) p++; - - /* Set the image path length */ - ProcessParams->ImagePathName.Length = - (USHORT)((PCHAR)p - (PCHAR)NtInitialUserProcessBuffer); - - /* Copy the actual buffer */ - RtlCopyMemory(ProcessParams->ImagePathName.Buffer, - NtInitialUserProcessBuffer, - ProcessParams->ImagePathName.Length); - - /* Null-terminate it */ - ProcessParams->ImagePathName.Buffer[ProcessParams->ImagePathName.Length / - sizeof(WCHAR)] = UNICODE_NULL; - - /* Make a buffer for the command line */ - p = (PWSTR)((PCHAR)ProcessParams->ImagePathName.Buffer + - ProcessParams->ImagePathName.MaximumLength); - ProcessParams->CommandLine.Buffer = p; - ProcessParams->CommandLine.MaximumLength = MAX_PATH * sizeof(WCHAR); - - /* Add the image name to the command line */ - RtlAppendUnicodeToString(&ProcessParams->CommandLine, - NtInitialUserProcessBuffer); - - /* Create the environment string */ - ProcessParams->Environment = SmpDefaultEnvironment; - - /* Create SMSS process */ - SmssName = ProcessParams->ImagePathName; - Status = RtlCreateUserProcess(&SmssName, - OBJ_CASE_INSENSITIVE, - RtlDeNormalizeProcessParams(ProcessParams), - NULL, - NULL, - NULL, - FALSE, - NULL, - NULL, - ProcessInformation); - if (!NT_SUCCESS(Status)) - { - /* Failed, display error */ - p = InitBuffer->DebugBuffer; - _snwprintf(p, - 256 * sizeof(WCHAR), - L"INIT: Unable to create Session Manager. 0x%lx", - Status); - RtlInitUnicodeString(&DebugString, p); - ZwDisplayString(&DebugString); - - /* Bugcheck the system */ - return Status; - } - - /* Resume the thread */ - Status = ZwResumeThread(ProcessInformation->ThreadHandle, NULL); - if (!NT_SUCCESS(Status)) - { - /* Failed, display error */ - p = InitBuffer->DebugBuffer; - _snwprintf(p, - 256 * sizeof(WCHAR), - L"INIT: Unable to resume Session Manager. 0x%lx", - Status); - RtlInitUnicodeString(&DebugString, p); - ZwDisplayString(&DebugString); - - /* Bugcheck the system */ - return Status; - } - - /* Return success */ - *ProcessParameters = ProcessParams; - *ProcessEnvironment = EnvironmentPtr; - return STATUS_SUCCESS; -} - -NTSTATUS -NTAPI -LaunchOldSmss(VOID) -{ - PINIT_BUFFER InitBuffer; - PRTL_USER_PROCESS_PARAMETERS ProcessParameters = NULL; - PRTL_USER_PROCESS_INFORMATION ProcessInfo; - NTSTATUS Status; - PCHAR Environment; - - /* Initialize the system root */ - RtlInitUnicodeString(&SmpSystemRoot, SharedUserData->NtSystemRoot); - - /* Allocate the initialization buffer */ - InitBuffer = RtlAllocateHeap(RtlGetProcessHeap(), 0, sizeof(INIT_BUFFER)); - if (!InitBuffer) - { - /* Bugcheck */ - return STATUS_NO_MEMORY; - } - - /* Launch initial process */ - ProcessInfo = &InitBuffer->ProcessInfo; - Status = ExpLoadInitialProcess(InitBuffer, &ProcessParameters, &Environment); - if (!NT_SUCCESS(Status)) - { - /* Failed, display error */ - DPRINT1("INIT: Session Manager failed to load.\n"); - return Status; - } - - /* Return the handle and status */ - return Status; -} - -NTSTATUS -NTAPI SmpTerminate(IN PULONG_PTR Parameters, IN ULONG ParameterMask, IN ULONG ParameterCount) @@ -719,8 +479,6 @@ /* Enter SEH so we can terminate correctly if anything goes wrong */ _SEH2_TRY { - LARGE_INTEGER Infinite = {{0x80000000, 0x7FFFFFFF}}; - /* Initialize SMSS */ Status = SmpInit(&InitialCommand, Handles); if (!NT_SUCCESS(Status)) @@ -728,11 +486,7 @@ DPRINT1("SMSS: SmpInit return failure - Status == %x\n", Status); RtlInitUnicodeString(&DbgString, L"Session Manager Initialization"); Parameters[1] = Status; - DPRINT1("SMSS-2 Loaded... Launching original SMSS\n"); - //_SEH2_LEAVE; Hack so that setup can work. will go away later - Status = LaunchOldSmss(); - if (!NT_SUCCESS(Status)) return Status; - return NtDelayExecution(FALSE, &Infinite); + _SEH2_LEAVE; } /* Get the global flags */ @@ -758,11 +512,7 @@ RtlInitUnicodeString(&DbgString, L"Session Manager ExecuteInitialCommand"); Parameters[1] = Status; - //_SEH2_LEAVE; - DPRINT1("SMSS-2 Loaded... Launching original SMSS\n"); - Status = LaunchOldSmss(); - if (!NT_SUCCESS(Status)) return Status; - return NtDelayExecution(FALSE, &Infinite); + _SEH2_LEAVE; } /* Check if we're already attached to a session */ Modified: trunk/reactos/base/system/smss2/smss2.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/smss2/smss2.rb… ============================================================================== --- trunk/reactos/base/system/smss2/smss2.rbuild [iso-8859-1] (original) +++ trunk/reactos/base/system/smss2/smss2.rbuild [iso-8859-1] Tue Feb 14 06:06:39 2012 @@ -1,8 +1,7 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> -<module name="smss2" type="nativecui" installbase="system32" installname="smss2.exe"> - <bootstrap installbase="$(CDOUTPUT)/system32" /> - <include base="smss2">.</include> +<module name="smss" type="nativecui" installbase="system32" installname="smss.exe"> + <include base="smss">.</include> <include base="ReactOS">include/reactos/subsys</include> <library>nt</library> <library>pseh</library> Modified: trunk/reactos/base/system/system.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/system.rbuild?… ============================================================================== --- trunk/reactos/base/system/system.rbuild [iso-8859-1] (original) +++ trunk/reactos/base/system/system.rbuild [iso-8859-1] Tue Feb 14 06:06:39 2012 @@ -37,9 +37,6 @@ <directory name="services"> <xi:include href="services/services.rbuild" /> </directory> - <directory name="smss"> - <xi:include href="smss/smss.rbuild" /> - </directory> <directory name="smss2"> <xi:include href="smss2/smss2.rbuild" /> </directory> Modified: trunk/reactos/boot/bootdata/packages/reactos.dff URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/packages/rea… ============================================================================== --- trunk/reactos/boot/bootdata/packages/reactos.dff [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/packages/reactos.dff [iso-8859-1] Tue Feb 14 06:06:39 2012 @@ -127,8 +127,7 @@ base\system\rundll32\rundll32.exe 1 base\system\runonce\runonce.exe 1 base\system\services\services.exe 1 -base\system\smss\smss.exe 1 -base\system\smss2\smss2.exe 1 +base\system\smss2\smss.exe 1 base\system\userinit\userinit.exe 1 base\system\winlogon\winlogon.exe 1 Modified: trunk/reactos/boot/bootdata/txtsetup.sif URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/txtsetup.sif… ============================================================================== --- trunk/reactos/boot/bootdata/txtsetup.sif [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/txtsetup.sif [iso-8859-1] Tue Feb 14 06:06:39 2012 @@ -58,7 +58,6 @@ pcmcia.sys=,,,,,,,,,,,,4 swenum.sys=,,,,,,,,,,,,4 ntdll.dll=,,,,,,,,,,,,2 -smss2.exe=,,,,,,,,,,,,2 [HardwareIdsDatabase] ;*PNP0A00 = isapnp Modified: trunk/reactos/ntoskrnl/ex/init.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/init.c?rev=555… ============================================================================== --- trunk/reactos/ntoskrnl/ex/init.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ex/init.c [iso-8859-1] Tue Feb 14 06:06:39 2012 @@ -66,7 +66,7 @@ UNICODE_STRING NtSystemRoot; /* NT Initial User Application */ -WCHAR NtInitialUserProcessBuffer[128] = L"\\SystemRoot\\System32\\smss2.exe"; +WCHAR NtInitialUserProcessBuffer[128] = L"\\SystemRoot\\System32\\smss.exe"; ULONG NtInitialUserProcessBufferLength = sizeof(NtInitialUserProcessBuffer) - sizeof(WCHAR); ULONG NtInitialUserProcessBufferType = REG_SZ;

12 years, 7 months

[cgutman] 55588: [USB] - Disable support for external USB hubs until they are properly supported

by cgutman＠svn.reactos.org

Author: cgutman Date: Tue Feb 14 04:15:57 2012 New Revision: 55588 URL: http://svn.reactos.org/svn/reactos?rev=55588&view=rev Log: [USB] - Disable support for external USB hubs until they are properly supported Modified: trunk/reactos/boot/bootdata/txtsetup.sif trunk/reactos/media/inf/usb.inf Modified: trunk/reactos/boot/bootdata/txtsetup.sif URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/txtsetup.sif… ============================================================================== --- trunk/reactos/boot/bootdata/txtsetup.sif [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/txtsetup.sif [iso-8859-1] Tue Feb 14 04:15:57 2012 @@ -72,7 +72,7 @@ PCI\CC_0105 = uniata PCI\CC_0106 = uniata *PNP0600 = uniata -USB\CLASS_09 = usbhub +;USB\CLASS_09 = usbhub USB\ROOT_HUB = usbhub USB\ROOT_HUB20 = usbhub ;PCI\CC_0C0300 = usbuhci Modified: trunk/reactos/media/inf/usb.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/usb.inf?rev=5558… ============================================================================== Binary files - no diff available.

12 years, 7 months

← Newer
1
...
32
33
34
35
36
37
38
...
58
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 February 2012