Ros-diffs April 2011

ros-diffs@reactos.org

19 participants
296 discussions

[janderwald] 51443: [USBEHCI_NEW] - Fix build - Implement retrieving configuration descriptor (USBHI_GetUsbDescriptors) - Implement function to build a setup packet from urb (taken from mjmartin us...

by janderwald＠svn.reactos.org

Author: janderwald Date: Sun Apr 24 09:26:22 2011 New Revision: 51443 URL: http://svn.reactos.org/svn/reactos?rev=51443&view=rev Log: [USBEHCI_NEW] - Fix build - Implement retrieving configuration descriptor (USBHI_GetUsbDescriptors) - Implement function to build a setup packet from urb (taken from mjmartin usbehci driver) Modified: branches/usb-bringup/drivers/usb/usbehci_new/hub_controller.cpp branches/usb-bringup/drivers/usb/usbehci_new/interfaces.h branches/usb-bringup/drivers/usb/usbehci_new/usb_device.cpp branches/usb-bringup/drivers/usb/usbehci_new/usb_request.cpp Modified: branches/usb-bringup/drivers/usb/usbehci_new/hub_controller.cpp URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup/drivers/usb/usbehci… ============================================================================== --- branches/usb-bringup/drivers/usb/usbehci_new/hub_controller.cpp [iso-8859-1] (original) +++ branches/usb-bringup/drivers/usb/usbehci_new/hub_controller.cpp [iso-8859-1] Sun Apr 24 09:26:22 2011 @@ -1050,7 +1050,7 @@ // // FIXME: retrieve values // - UsbHubDescriptor->bNumberOfPorts = PortCount; + UsbHubDescriptor->bNumberOfPorts = (UCHAR)PortCount; UsbHubDescriptor->wHubCharacteristics = 0x0012; UsbHubDescriptor->bPowerOnToPowerGood = 0x01; UsbHubDescriptor->bHubControlCurrent = 0x00; @@ -1842,8 +1842,6 @@ { PUSBDEVICE UsbDevice; CHubController * Controller; - NTSTATUS Status; - PURB Urb; DPRINT1("USBHI_GetUsbDescriptors\n"); @@ -1851,7 +1849,10 @@ // sanity check // PC_ASSERT(DeviceDescriptorBuffer); + PC_ASSERT(DeviceDescriptorBufferLength); PC_ASSERT(*DeviceDescriptorBufferLength >= sizeof(USB_DEVICE_DESCRIPTOR)); + PC_ASSERT(ConfigDescriptorBufferLength); + PC_ASSERT(*ConfigDescriptorBufferLength >= sizeof(USB_CONFIGURATION_DESCRIPTOR)); // // first get controller @@ -1890,54 +1891,14 @@ *DeviceDescriptorBufferLength = sizeof(USB_DEVICE_DESCRIPTOR); // - // allocate urb - // - Urb = (PURB)ExAllocatePoolWithTag(NonPagedPool, sizeof(URB), TAG_USBEHCI); - if (!Urb) - { - // - // no memory - // - return STATUS_INSUFFICIENT_RESOURCES; - } - - // - // zero request - // - RtlZeroMemory(Urb, sizeof(URB)); - - // - // initialize request - // - Urb->UrbHeader.Function = URB_FUNCTION_GET_DESCRIPTOR_FROM_DEVICE; - Urb->UrbHeader.Length = sizeof(_URB_CONTROL_DESCRIPTOR_REQUEST); - Urb->UrbControlDescriptorRequest.DescriptorType = USB_CONFIGURATION_DESCRIPTOR_TYPE; - Urb->UrbControlDescriptorRequest.TransferBuffer = ConfigDescriptorBuffer; - Urb->UrbControlDescriptorRequest.TransferBufferLength = *ConfigDescriptorBufferLength; - - // - // submit urb - // - //Status = UsbDevice->SubmitUrb(Urb); - UNIMPLEMENTED - - if (NT_SUCCESS(Status)) - { - // - // TransferBufferLength holds the number of bytes transferred - // - *ConfigDescriptorBufferLength = Urb->UrbControlDescriptorRequest.TransferBufferLength; - } - - // - // free urb - // - ExFreePoolWithTag(Urb, TAG_USBEHCI); + // get configuration descriptor + // + UsbDevice->GetConfigurationDescriptors((PUSB_CONFIGURATION_DESCRIPTOR)ConfigDescriptorBuffer, *ConfigDescriptorBufferLength, ConfigDescriptorBufferLength); // // complete the request // - return Status; + return STATUS_SUCCESS; } NTSTATUS @@ -2195,7 +2156,11 @@ // set length returned // *LengthReturned = ControllerInfo->ActualLength; - return STATUS_NOT_IMPLEMENTED; + + // + // done + // + return STATUS_SUCCESS; } NTSTATUS Modified: branches/usb-bringup/drivers/usb/usbehci_new/interfaces.h URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup/drivers/usb/usbehci… ============================================================================== --- branches/usb-bringup/drivers/usb/usbehci_new/interfaces.h [iso-8859-1] (original) +++ branches/usb-bringup/drivers/usb/usbehci_new/interfaces.h [iso-8859-1] Sun Apr 24 09:26:22 2011 @@ -748,6 +748,15 @@ virtual NTSTATUS SubmitIrp(PIRP Urb) = 0; +//----------------------------------------------------------------------------------------- +// +// GetConfigurationDescriptors +// +// Description: returns one or more configuration descriptors + + virtual VOID GetConfigurationDescriptors(IN PUSB_CONFIGURATION_DESCRIPTOR ConfigDescriptorBuffer, + IN ULONG BufferLength, + OUT PULONG OutBufferLength) = 0; }; typedef IUSBDevice *PUSBDEVICE; Modified: branches/usb-bringup/drivers/usb/usbehci_new/usb_device.cpp URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup/drivers/usb/usbehci… ============================================================================== --- branches/usb-bringup/drivers/usb/usbehci_new/usb_device.cpp [iso-8859-1] (original) +++ branches/usb-bringup/drivers/usb/usbehci_new/usb_device.cpp [iso-8859-1] Sun Apr 24 09:26:22 2011 @@ -65,6 +65,8 @@ virtual void GetDeviceDescriptor(PUSB_DEVICE_DESCRIPTOR DeviceDescriptor); virtual UCHAR GetConfigurationValue(); virtual NTSTATUS SubmitIrp(PIRP Irp); + virtual VOID GetConfigurationDescriptors(IN PUSB_CONFIGURATION_DESCRIPTOR ConfigDescriptorBuffer, IN ULONG BufferLength, OUT PULONG OutBufferLength); + // local function virtual NTSTATUS CommitIrp(PIRP Irp); @@ -113,7 +115,6 @@ IN ULONG PortStatus) { NTSTATUS Status; - USB_DEFAULT_PIPE_SETUP_PACKET CtrlSetup; // // initialize members @@ -835,6 +836,36 @@ // return Status; } +//---------------------------------------------------------------------------------------- +VOID +CUSBDevice::GetConfigurationDescriptors( + IN PUSB_CONFIGURATION_DESCRIPTOR ConfigDescriptorBuffer, + IN ULONG BufferLength, + OUT PULONG OutBufferLength) +{ + // + // sanity check + // + PC_ASSERT(BufferLength >= sizeof(USB_CONFIGURATION_DESCRIPTOR)); + PC_ASSERT(ConfigDescriptorBuffer); + PC_ASSERT(OutBufferLength); + + // + // FIXME: support multiple configurations + // + PC_ASSERT(m_DeviceDescriptor.bNumConfigurations == 1); + + // + // copy first configuration descriptor + // + RtlCopyMemory(ConfigDescriptorBuffer, &m_ConfigurationDescriptors[0].ConfigurationDescriptor, sizeof(USB_CONFIGURATION_DESCRIPTOR)); + + // + // store length + // + *OutBufferLength = sizeof(USB_CONFIGURATION_DESCRIPTOR); +} + //---------------------------------------------------------------------------------------- NTSTATUS Modified: branches/usb-bringup/drivers/usb/usbehci_new/usb_request.cpp URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup/drivers/usb/usbehci… ============================================================================== --- branches/usb-bringup/drivers/usb/usbehci_new/usb_request.cpp [iso-8859-1] (original) +++ branches/usb-bringup/drivers/usb/usbehci_new/usb_request.cpp [iso-8859-1] Sun Apr 24 09:26:22 2011 @@ -56,6 +56,7 @@ NTSTATUS CreateQueueHead(PQUEUE_HEAD *OutQueueHead); ULONG GetDeviceAddress(); NTSTATUS BuildSetupPacket(); + NTSTATUS BuildSetupPacketFromURB(); // constructor / destructor CUSBRequest(IUnknown *OuterUnknown){} @@ -83,7 +84,6 @@ // transfer buffer MDL // PMDL m_TransferBufferMDL; - // // caller provided setup packet @@ -181,7 +181,6 @@ { PIO_STACK_LOCATION IoStack; PURB Urb; - NTSTATUS Status; // // sanity checks @@ -409,6 +408,10 @@ DPRINT1("USB_ENDPOINT_TYPE_ISOCHRONOUS not implemented\n"); Status = STATUS_NOT_IMPLEMENTED; break; + default: + PC_ASSERT(FALSE); + Status = STATUS_NOT_IMPLEMENTED; + break; } if (NT_SUCCESS(Status)) @@ -838,11 +841,6 @@ PHYSICAL_ADDRESS PhysicalAddress; // - // FIXME: generate setup packet from urb request - // - PC_ASSERT(m_SetupPacket); - - // // allocate common buffer setup packet // Status = m_DmaManager->Allocate(sizeof(USB_DEFAULT_PIPE_SETUP_PACKET), (PVOID*)&m_DescriptorPacket, &PhysicalAddress); @@ -862,10 +860,167 @@ RtlCopyMemory(m_DescriptorPacket, m_SetupPacket, sizeof(USB_DEFAULT_PIPE_SETUP_PACKET)); m_DescriptorSetupPacket = PhysicalAddress; } + else + { + // + // build setup packet from urb + // + Status = BuildSetupPacketFromURB(); + } // // done // + return Status; +} + + +NTSTATUS +CUSBRequest::BuildSetupPacketFromURB() +{ + PIO_STACK_LOCATION IoStack; + PURB Urb; + NTSTATUS Status = STATUS_NOT_IMPLEMENTED; + + // + // sanity checks + // + PC_ASSERT(m_Irp); + PC_ASSERT(m_DescriptorPacket); + + // + // get stack location + // + IoStack = IoGetCurrentIrpStackLocation(m_Irp); + + // + // get urb + // + Urb = (PURB)IoStack->Parameters.Others.Argument1; + + // + // zero descriptor packet + // + RtlZeroMemory(m_DescriptorPacket, sizeof(USB_DEFAULT_PIPE_SETUP_PACKET)); + + + switch (Urb->UrbHeader.Function) + { + /* CLEAR FEATURE */ + case URB_FUNCTION_CLEAR_FEATURE_TO_DEVICE: + case URB_FUNCTION_CLEAR_FEATURE_TO_INTERFACE: + case URB_FUNCTION_CLEAR_FEATURE_TO_ENDPOINT: + UNIMPLEMENTED + break; + + /* GET CONFIG */ + case URB_FUNCTION_GET_CONFIGURATION: + m_DescriptorPacket->bRequest = USB_REQUEST_GET_CONFIGURATION; + m_DescriptorPacket->bmRequestType.B = 0x80; + m_DescriptorPacket->wLength = 1; + break; + + /* GET DESCRIPTOR */ + case URB_FUNCTION_GET_DESCRIPTOR_FROM_DEVICE: + m_DescriptorPacket->bRequest = USB_REQUEST_GET_DESCRIPTOR; + m_DescriptorPacket->wValue.LowByte = Urb->UrbControlDescriptorRequest.Index; + m_DescriptorPacket->wValue.HiByte = Urb->UrbControlDescriptorRequest.DescriptorType; + m_DescriptorPacket->wIndex.W = Urb->UrbControlDescriptorRequest.LanguageId; + m_DescriptorPacket->wLength = Urb->UrbControlDescriptorRequest.TransferBufferLength; + m_DescriptorPacket->bmRequestType.B = 0x80; + break; + + /* GET INTERFACE */ + case URB_FUNCTION_GET_INTERFACE: + m_DescriptorPacket->bRequest = USB_REQUEST_GET_CONFIGURATION; + m_DescriptorPacket->wIndex.W = Urb->UrbControlGetStatusRequest.Index; + m_DescriptorPacket->bmRequestType.B = 0x80; + m_DescriptorPacket->wLength = 1; + break; + + /* GET STATUS */ + case URB_FUNCTION_GET_STATUS_FROM_DEVICE: + m_DescriptorPacket->bRequest = USB_REQUEST_GET_STATUS; + ASSERT(Urb->UrbControlGetStatusRequest.Index == 0); + m_DescriptorPacket->wIndex.W = Urb->UrbControlGetStatusRequest.Index; + m_DescriptorPacket->bmRequestType.B = 0x80; + m_DescriptorPacket->wLength = 2; + break; + + case URB_FUNCTION_GET_STATUS_FROM_INTERFACE: + m_DescriptorPacket->bRequest = USB_REQUEST_GET_STATUS; + ASSERT(Urb->UrbControlGetStatusRequest.Index != 0); + m_DescriptorPacket->wIndex.W = Urb->UrbControlGetStatusRequest.Index; + m_DescriptorPacket->bmRequestType.B = 0x81; + m_DescriptorPacket->wLength = 2; + break; + + case URB_FUNCTION_GET_STATUS_FROM_ENDPOINT: + m_DescriptorPacket->bRequest = USB_REQUEST_GET_STATUS; + ASSERT(Urb->UrbControlGetStatusRequest.Index != 0); + m_DescriptorPacket->wIndex.W = Urb->UrbControlGetStatusRequest.Index; + m_DescriptorPacket->bmRequestType.B = 0x82; + m_DescriptorPacket->wLength = 2; + break; + + /* SET ADDRESS */ + + /* SET CONFIG */ + case URB_FUNCTION_SELECT_CONFIGURATION: + m_DescriptorPacket->bRequest = USB_REQUEST_SET_CONFIGURATION; + m_DescriptorPacket->wValue.W = Urb->UrbSelectConfiguration.ConfigurationDescriptor->bConfigurationValue; + m_DescriptorPacket->wIndex.W = 0; + m_DescriptorPacket->wLength = 0; + m_DescriptorPacket->bmRequestType.B = 0x00; + break; + + /* SET DESCRIPTOR */ + case URB_FUNCTION_SET_DESCRIPTOR_TO_DEVICE: + case URB_FUNCTION_SET_DESCRIPTOR_TO_INTERFACE: + case URB_FUNCTION_SET_DESCRIPTOR_TO_ENDPOINT: + UNIMPLEMENTED + break; + + /* SET FEATURE */ + case URB_FUNCTION_SET_FEATURE_TO_DEVICE: + m_DescriptorPacket->bRequest = USB_REQUEST_SET_FEATURE; + ASSERT(Urb->UrbControlGetStatusRequest.Index == 0); + m_DescriptorPacket->wIndex.W = Urb->UrbControlGetStatusRequest.Index; + m_DescriptorPacket->bmRequestType.B = 0x80; + break; + + case URB_FUNCTION_SET_FEATURE_TO_INTERFACE: + m_DescriptorPacket->bRequest = USB_REQUEST_SET_FEATURE; + ASSERT(Urb->UrbControlGetStatusRequest.Index == 0); + m_DescriptorPacket->wIndex.W = Urb->UrbControlGetStatusRequest.Index; + m_DescriptorPacket->bmRequestType.B = 0x81; + break; + + case URB_FUNCTION_SET_FEATURE_TO_ENDPOINT: + m_DescriptorPacket->bRequest = USB_REQUEST_SET_FEATURE; + ASSERT(Urb->UrbControlGetStatusRequest.Index == 0); + m_DescriptorPacket->wIndex.W = Urb->UrbControlGetStatusRequest.Index; + m_DescriptorPacket->bmRequestType.B = 0x82; + break; + + /* SET INTERFACE*/ + case URB_FUNCTION_SELECT_INTERFACE: + m_DescriptorPacket->bRequest = USB_REQUEST_SET_INTERFACE; + m_DescriptorPacket->wValue.W = Urb->UrbSelectInterface.Interface.AlternateSetting; + m_DescriptorPacket->wIndex.W = Urb->UrbSelectInterface.Interface.InterfaceNumber; + m_DescriptorPacket->wLength = 0; + m_DescriptorPacket->bmRequestType.B = 0x01; + break; + + /* SYNC FRAME */ + case URB_FUNCTION_SYNC_RESET_PIPE_AND_CLEAR_STALL: + UNIMPLEMENTED + break; + default: + UNIMPLEMENTED + break; + } + return Status; }

13 years, 8 months

[mjmartin] 51442: [ntoskrnl] - Fix a type from rev 19847. Only if the KernelMode List is not empty are there pending APCs.

by mjmartin＠svn.reactos.org

Author: mjmartin Date: Sun Apr 24 06:48:50 2011 New Revision: 51442 URL: http://svn.reactos.org/svn/reactos?rev=51442&view=rev Log: [ntoskrnl] - Fix a type from rev 19847. Only if the KernelMode List is not empty are there pending APCs. Modified: trunk/reactos/ntoskrnl/ke/procobj.c Modified: trunk/reactos/ntoskrnl/ke/procobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/procobj.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/ke/procobj.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/procobj.c [iso-8859-1] Sun Apr 24 06:48:50 2011 @@ -538,7 +538,7 @@ KiExitDispatcher(ApcLock.OldIrql); /* Check if we have pending APCs */ - if (IsListEmpty(&Thread->ApcState.ApcListHead[KernelMode])) + if (!(IsListEmpty(&Thread->ApcState.ApcListHead[KernelMode]))) { /* What do you know, we do! Request them to be delivered */ Thread->ApcState.KernelApcPending = TRUE; @@ -705,7 +705,7 @@ KiExitDispatcher(ApcLock.OldIrql); /* Check if we have pending APCs */ - if (IsListEmpty(&Thread->ApcState.ApcListHead[KernelMode])) + if (!(IsListEmpty(&Thread->ApcState.ApcListHead[KernelMode]))) { /* What do you know, we do! Request them to be delivered */ Thread->ApcState.KernelApcPending = TRUE;

13 years, 8 months

[spetreolle] 51441: [CMAKE] * msvc compatibility fixes for doskey.

by spetreolle＠svn.reactos.org

Author: spetreolle Date: Sat Apr 23 20:05:19 2011 New Revision: 51441 URL: http://svn.reactos.org/svn/reactos?rev=51441&view=rev Log: [CMAKE] * msvc compatibility fixes for doskey. Modified: branches/cmake-bringup/base/applications/cmdutils/doskey/doskey.c Modified: branches/cmake-bringup/base/applications/cmdutils/doskey/doskey.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… ============================================================================== --- branches/cmake-bringup/base/applications/cmdutils/doskey/doskey.c [iso-8859-1] (original) +++ branches/cmake-bringup/base/applications/cmdutils/doskey/doskey.c [iso-8859-1] Sat Apr 23 20:05:19 2011 @@ -10,7 +10,7 @@ LPWSTR pszExeName = L"cmd.exe"; /* Function pointers */ -typedef DWORD (WINAPI *GetConsoleCommandHistoryW_t) (LPWSTR sCommands, DWORD nBufferLength, LPWSTR sExeName); +typedef DWORD (WINAPI *GetConsoleCommandHistoryW_t) (LPWSTR sCommands, DWORD nBufferLength, LPWSTR sExeName); typedef DWORD (WINAPI *GetConsoleCommandHistoryLengthW_t) (LPWSTR sExeName); typedef BOOL (WINAPI *SetConsoleNumberOfCommandsW_t)(DWORD nNumber, LPWSTR sExeName); typedef VOID (WINAPI *ExpungeConsoleCommandHistoryW_t)(LPWSTR sExeName); @@ -142,7 +142,7 @@ return; } - while ( fgetws(line, MAX_PATH, fp) != NULL) + while ( fgetws(line, MAX_PATH, fp) != NULL) { /* Remove newline character */ WCHAR *end = &line[wcslen(line) - 1]; @@ -191,13 +191,16 @@ int wmain(VOID) { - setlocale(LC_ALL, ""); + WCHAR *pArgStart; + WCHAR *pArgEnd; + HMODULE hKernel32; + + setlocale(LC_ALL, ""); /* Get the full command line using GetCommandLine(). We can't just use argv, * because then a parameter like "gotoroot=cd \" wouldn't be passed completely. */ - WCHAR *pArgStart; - WCHAR *pArgEnd = GetCommandLine(); - HMODULE hKernel32 = LoadLibraryW(L"kernel32.dll"); + pArgEnd = GetCommandLine(); + hKernel32 = LoadLibraryW(L"kernel32.dll"); /* Get function pointers */ pGetConsoleCommandHistoryW = (GetConsoleCommandHistoryW_t)GetProcAddress( hKernel32, "GetConsoleCommandHistoryW");

13 years, 8 months

[janderwald] 51440: [USBEHCI_NEW] - Create member for storing the request object - Add interface function which is invoked when the queue head should be freed - Add support functions which deal wit...

by janderwald＠svn.reactos.org

Author: janderwald Date: Sat Apr 23 19:36:23 2011 New Revision: 51440 URL: http://svn.reactos.org/svn/reactos?rev=51440&view=rev Log: [USBEHCI_NEW] - Create member for storing the request object - Add interface function which is invoked when the queue head should be freed - Add support functions which deal with completed queue heads Modified: branches/usb-bringup/drivers/usb/usbehci_new/hardware.h branches/usb-bringup/drivers/usb/usbehci_new/interfaces.h branches/usb-bringup/drivers/usb/usbehci_new/usb_queue.cpp branches/usb-bringup/drivers/usb/usbehci_new/usb_request.cpp Modified: branches/usb-bringup/drivers/usb/usbehci_new/hardware.h URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup/drivers/usb/usbehci… ============================================================================== --- branches/usb-bringup/drivers/usb/usbehci_new/hardware.h [iso-8859-1] (original) +++ branches/usb-bringup/drivers/usb/usbehci_new/hardware.h [iso-8859-1] Sat Apr 23 19:36:23 2011 @@ -194,6 +194,7 @@ PIRP IrpToComplete; PMDL Mdl; PKEVENT Event; + PVOID Request; } QUEUE_HEAD, *PQUEUE_HEAD; // Modified: branches/usb-bringup/drivers/usb/usbehci_new/interfaces.h URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup/drivers/usb/usbehci… ============================================================================== --- branches/usb-bringup/drivers/usb/usbehci_new/interfaces.h [iso-8859-1] (original) +++ branches/usb-bringup/drivers/usb/usbehci_new/interfaces.h [iso-8859-1] Sat Apr 23 19:36:23 2011 @@ -474,6 +474,14 @@ // If the request was initialized with an setup packet, it will return false virtual BOOLEAN ShouldReleaseRequestAfterCompletion() = 0; + +//---------------------------------------------------------------------------------------- +// +// FreeQueueHead +// +// Description: frees the queue head with the associated transfer descriptors + + virtual VOID FreeQueueHead(struct _QUEUE_HEAD * QueueHead) = 0; }; typedef IUSBRequest *PUSBREQUEST; Modified: branches/usb-bringup/drivers/usb/usbehci_new/usb_queue.cpp URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup/drivers/usb/usbehci… ============================================================================== --- branches/usb-bringup/drivers/usb/usbehci_new/usb_queue.cpp [iso-8859-1] (original) +++ branches/usb-bringup/drivers/usb/usbehci_new/usb_queue.cpp [iso-8859-1] Sat Apr 23 19:36:23 2011 @@ -51,10 +51,17 @@ PQUEUE_HEAD AsyncListQueueHead; PQUEUE_HEAD PendingListQueueHead; + // queue head manipulation functions VOID LinkQueueHead(PQUEUE_HEAD HeadQueueHead, PQUEUE_HEAD NewQueueHead); VOID UnlinkQueueHead(PQUEUE_HEAD QueueHead); VOID LinkQueueHeadChain(PQUEUE_HEAD HeadQueueHead, PQUEUE_HEAD NewQueueHead); PQUEUE_HEAD UnlinkQueueHeadChain(PQUEUE_HEAD HeadQueueHead, ULONG Count); + + // called for each completed queue head + NTSTATUS QueueHeadCompletion(PQUEUE_HEAD QueueHead, NTSTATUS Status); + + // called when the completion queue is cleaned up + VOID QueueHeadCleanup(PQUEUE_HEAD QueueHead); }; //================================================================================================= @@ -141,6 +148,11 @@ // Add it to the pending list // LinkQueueHead(PendingListQueueHead, QueueHead); + + // + // add extra reference which is released when the request is completed + // + Request->AddRef(); return STATUS_SUCCESS; } @@ -315,6 +327,154 @@ } NTSTATUS +CUSBQueue::QueueHeadCompletion( + PQUEUE_HEAD CurrentQH, + NTSTATUS Status) +{ + IUSBRequest *Request; + USBD_STATUS UrbStatus; + PQUEUE_HEAD NewQueueHead; + + // + // this function is called when a queue head has been completed + // + PC_ASSERT(CurrentQH->Token.Bits.Active == 0); + + // + // get contained usb request + // + Request = (IUSBRequest*)CurrentQH->Request; + + // + // sanity check + // + PC_ASSERT(Request); + + // + // check if the queue head was completed with errors + // + if (CurrentQH->Token.Bits.Halted) + { + if (CurrentQH->Token.Bits.DataBufferError) + { + // + // data buffer error + // + UrbStatus = USBD_STATUS_DATA_BUFFER_ERROR; + } + else if (CurrentQH->Token.Bits.BabbleDetected) + { + // + // babble detected + // + UrbStatus = USBD_STATUS_BABBLE_DETECTED; + } + else + { + // + // stall pid + // + UrbStatus = USBD_STATUS_STALL_PID; + } + } + else + { + // + // well done ;) + // + UrbStatus = USBD_STATUS_SUCCESS; + } + + // + // notify request that a queue head has been completed + // + Request->CompletionCallback(Status, UrbStatus, CurrentQH); + + // + // now unlink the queue head + // FIXME: implement chained queue heads + // + UnlinkQueueHead(CurrentQH); + + // + // check if the request is complete + // + if (Request->IsRequestComplete() == FALSE) + { + // + // request is still in complete + // get new queue head + // + Status = Request->GetQueueHead(&NewQueueHead); + + // + // add to pending list + // + LinkQueueHead(PendingListQueueHead, NewQueueHead); + } + else + { + // + // FIXME: put queue head into completed queue head list + // + } + + // + // done + // + return STATUS_SUCCESS; +} + +VOID +CUSBQueue::QueueHeadCleanup( + PQUEUE_HEAD CurrentQH) +{ + IUSBRequest * Request; + BOOLEAN ShouldReleaseWhenDone; + + // + // sanity checks + // + PC_ASSERT(CurrentQH->Token.Bits.Active == 0); + PC_ASSERT(CurrentQH->Request); + + // + // get request + // + Request = (IUSBRequest*)CurrentQH->Request; + + // + // let IUSBRequest free the queue head + // + Request->FreeQueueHead(CurrentQH); + + // + // check if we should release request when done + // + ShouldReleaseWhenDone = Request->ShouldReleaseRequestAfterCompletion(); + + // + // release reference when the request was added + // + Request->Release(); + + // + // check if the operation was asynchronous + // + if (ShouldReleaseWhenDone) + { + // + // release outstanding reference count + // + Request->Release(); + } + + // + // request is now released + // +} + +NTSTATUS CreateUSBQueue( PUSBQUEUE *OutUsbQueue) { Modified: branches/usb-bringup/drivers/usb/usbehci_new/usb_request.cpp URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup/drivers/usb/usbehci… ============================================================================== --- branches/usb-bringup/drivers/usb/usbehci_new/usb_request.cpp [iso-8859-1] (original) +++ branches/usb-bringup/drivers/usb/usbehci_new/usb_request.cpp [iso-8859-1] Sat Apr 23 19:36:23 2011 @@ -46,6 +46,7 @@ virtual VOID GetResultStatus(OUT OPTIONAL NTSTATUS *NtStatusCode, OUT OPTIONAL PULONG UrbStatusCode); virtual BOOLEAN IsRequestInitialized(); virtual BOOLEAN ShouldReleaseRequestAfterCompletion(); + virtual VOID FreeQueueHead(struct _QUEUE_HEAD * QueueHead); // local functions ULONG InternalGetTransferType(); @@ -416,6 +417,11 @@ // store queue head // m_QueueHead = *OutHead; + + // + // store request object + // + (*OutHead)->Request = PVOID(this); } // @@ -936,6 +942,58 @@ } } +//----------------------------------------------------------------------------------------- +VOID +CUSBRequest::FreeQueueHead( + IN struct _QUEUE_HEAD * QueueHead) +{ + // + // FIXME: support chained queue heads + // + PC_ASSERT(QueueHead == m_QueueHead); + + // + // release queue head + // + m_DmaManager->Release(QueueHead, sizeof(QUEUE_HEAD)); + + // + // nullify pointer + // + m_QueueHead = 0; + + // + // release transfer descriptors + // + + if (m_TransferDescriptors[0]) + { + // + // release transfer descriptors + // + m_DmaManager->Release(m_TransferDescriptors[0], sizeof(QUEUE_TRANSFER_DESCRIPTOR)); + m_TransferDescriptors[0] = 0; + } + + if (m_TransferDescriptors[1]) + { + // + // release transfer descriptors + // + m_DmaManager->Release(m_TransferDescriptors[1], sizeof(QUEUE_TRANSFER_DESCRIPTOR)); + m_TransferDescriptors[1] = 0; + } + + if (m_TransferDescriptors[2]) + { + // + // release transfer descriptors + // + m_DmaManager->Release(m_TransferDescriptors[2], sizeof(QUEUE_TRANSFER_DESCRIPTOR)); + m_TransferDescriptors[2] = 0; + } +} + NTSTATUS InternalCreateUSBRequest( PUSBREQUEST *OutRequest)

13 years, 8 months

[ekohl] 51439: [SERVICES] Disable more debug messages.

by ekohl＠svn.reactos.org

Author: ekohl Date: Sat Apr 23 14:40:30 2011 New Revision: 51439 URL: http://svn.reactos.org/svn/reactos?rev=51439&view=rev Log: [SERVICES] Disable more debug messages. Modified: trunk/reactos/base/system/services/database.c Modified: trunk/reactos/base/system/services/database.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/services/datab… ============================================================================== --- trunk/reactos/base/system/services/database.c [iso-8859-1] (original) +++ trunk/reactos/base/system/services/database.c [iso-8859-1] Sat Apr 23 14:40:30 2011 @@ -923,7 +923,7 @@ /* Create '\\.\pipe\net\NtControlPipeXXX' instance */ swprintf(NtControlPipeName, L"\\\\.\\pipe\\net\\NtControlPipe%u", ServiceCurrent); - DPRINT1("Service: %p ImagePath: %wZ PipeName: %S\n", Service, &ImagePath, NtControlPipeName); + DPRINT("Service: %p ImagePath: %wZ PipeName: %S\n", Service, &ImagePath, NtControlPipeName); Service->ControlPipeHandle = CreateNamedPipeW(NtControlPipeName, PIPE_ACCESS_DUPLEX, @@ -1039,13 +1039,13 @@ DPRINT("ScmStartService() called\n"); - DPRINT1("Start Service %p (%S)\n", Service, Service->lpServiceName); + DPRINT("Start Service %p (%S)\n", Service, Service->lpServiceName); EnterCriticalSection(&ControlServiceCriticalSection); if (Service->Status.dwCurrentState != SERVICE_STOPPED) { - DPRINT1("Service %S is already running!\n", Service->lpServiceName); + DPRINT("Service %S is already running!\n", Service->lpServiceName); LeaveCriticalSection(&ControlServiceCriticalSection); return ERROR_SERVICE_ALREADY_RUNNING; }

13 years, 8 months

[ekohl] 51438: [NPFS] Silence some debug messages.

by ekohl＠svn.reactos.org

Author: ekohl Date: Sat Apr 23 11:26:16 2011 New Revision: 51438 URL: http://svn.reactos.org/svn/reactos?rev=51438&view=rev Log: [NPFS] Silence some debug messages. Modified: trunk/reactos/drivers/filesystems/npfs/fsctrl.c Modified: trunk/reactos/drivers/filesystems/npfs/fsctrl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/npfs/f… ============================================================================== --- trunk/reactos/drivers/filesystems/npfs/fsctrl.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/npfs/fsctrl.c [iso-8859-1] Sat Apr 23 11:26:16 2011 @@ -98,14 +98,14 @@ /* Fail, if the CCB is not a pipe CCB */ if (Ccb->Type != CCB_PIPE) { - DPRINT1("Not a pipe\n"); + DPRINT("Not a pipe\n"); return STATUS_ILLEGAL_FUNCTION; } /* Fail, if the CCB is not a server end CCB */ if (Ccb->PipeEnd != FILE_PIPE_SERVER_END) { - DPRINT1("Not the server end\n"); + DPRINT("Not the server end\n"); return STATUS_ILLEGAL_FUNCTION; } @@ -209,14 +209,14 @@ /* Fail, if the CCB is not a pipe CCB */ if (Ccb->Type != CCB_PIPE) { - DPRINT1("Not a pipe\n"); + DPRINT("Not a pipe\n"); return STATUS_ILLEGAL_FUNCTION; } /* Fail, if the CCB is not a server end CCB */ if (Ccb->PipeEnd != FILE_PIPE_SERVER_END) { - DPRINT1("Not the server end\n"); + DPRINT("Not the server end\n"); return STATUS_ILLEGAL_FUNCTION; } @@ -336,7 +336,7 @@ FileObject = IoStack->FileObject; ASSERT(FileObject); - DPRINT1("Waiting on Pipe %wZ\n", &FileObject->FileName); + DPRINT("Waiting on Pipe %wZ\n", &FileObject->FileName); WaitPipe = (PFILE_PIPE_WAIT_FOR_BUFFER)Irp->AssociatedIrp.SystemBuffer; @@ -359,7 +359,7 @@ /* Fail if not pipe was found */ if (Fcb == NULL) { - DPRINT1("No pipe found!\n", Fcb); + DPRINT("No pipe found!\n", Fcb); return STATUS_OBJECT_NAME_NOT_FOUND; }

13 years, 8 months

[ekohl] 51437: [CLASS2] Prepare ReactOS for the change from the ancient 32 sectors / 64 tracks disk layout (used until Windows NT4) to the modern 63 sectors / 255 tracks disk layout (used since Win...

by ekohl＠svn.reactos.org

Author: ekohl Date: Sat Apr 23 10:52:01 2011 New Revision: 51437 URL: http://svn.reactos.org/svn/reactos?rev=51437&view=rev Log: [CLASS2] Prepare ReactOS for the change from the ancient 32 sectors / 64 tracks disk layout (used until Windows NT4) to the modern 63 sectors / 255 tracks disk layout (used since Windows 2000). Modified: trunk/reactos/drivers/storage/class/class2/class2.c Modified: trunk/reactos/drivers/storage/class/class2/class2.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/class/clas… ============================================================================== --- trunk/reactos/drivers/storage/class/class2/class2.c [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/class/class2/class2.c [iso-8859-1] Sat Apr 23 10:52:01 2011 @@ -27,6 +27,14 @@ #define INQUIRY_DATA_SIZE 2048 #define START_UNIT_TIMEOUT 30 + +/* Disk layout used by Windows NT4 and earlier versions. */ +#define DEFAULT_SECTORS_PER_TRACK 32 +#define DEFAULT_TRACKS_PER_CYLINDER 64 + +/* Disk layout used by Windows 2000 and later versions. */ +//#define DEFAULT_SECTORS_PER_TRACK 63 +//#define DEFAULT_TRACKS_PER_CYLINDER 255 NTSTATUS NTAPI @@ -798,7 +806,7 @@ // Calculate number of cylinders. // - deviceExtension->DiskGeometry->Geometry.Cylinders.QuadPart = (LONGLONG)((lastSector + 1)/(32 * 64)); + deviceExtension->DiskGeometry->Geometry.Cylinders.QuadPart = (LONGLONG)((lastSector + 1)/(DEFAULT_SECTORS_PER_TRACK * DEFAULT_TRACKS_PER_CYLINDER)); deviceExtension->PartitionLength.QuadPart = (deviceExtension->PartitionLength.QuadPart << deviceExtension->SectorShift); @@ -821,16 +829,16 @@ } // - // Assume sectors per track are 32; - // - - deviceExtension->DiskGeometry->Geometry.SectorsPerTrack = 32; - - // - // Assume tracks per cylinder (number of heads) is 64. - // - - deviceExtension->DiskGeometry->Geometry.TracksPerCylinder = 64; + // Assume sectors per track are DEFAULT_SECTORS_PER_TRACK; + // + + deviceExtension->DiskGeometry->Geometry.SectorsPerTrack = DEFAULT_SECTORS_PER_TRACK; + + // + // Assume tracks per cylinder (number of heads) is DEFAULT_TRACKS_PER_CYLINDER. + // + + deviceExtension->DiskGeometry->Geometry.TracksPerCylinder = DEFAULT_TRACKS_PER_CYLINDER; } if (status == STATUS_VERIFY_REQUIRED) {

13 years, 8 months

[gschneider] 51436: [shell32] Split declarations and operations, in case any pure C compiler cares

by gschneider＠svn.reactos.org

Author: gschneider Date: Fri Apr 22 22:58:09 2011 New Revision: 51436 URL: http://svn.reactos.org/svn/reactos?rev=51436&view=rev Log: [shell32] Split declarations and operations, in case any pure C compiler cares Modified: trunk/reactos/dll/win32/shell32/shlexec.c Modified: trunk/reactos/dll/win32/shell32/shlexec.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shlexec.… ============================================================================== --- trunk/reactos/dll/win32/shell32/shlexec.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/shlexec.c [iso-8859-1] Fri Apr 22 22:58:09 2011 @@ -1429,8 +1429,10 @@ void do_error_dialog( UINT_PTR retval, HWND hwnd, WCHAR* filename) { WCHAR msg[2048]; - DWORD error_code = GetLastError(); DWORD_PTR msgArguments[3] = { (DWORD_PTR)filename, 0, 0 }; + DWORD error_code; + + error_code = GetLastError(); if (retval == SE_ERR_NOASSOC) LoadStringW(shell32_hInstance, IDS_SHLEXEC_NOASSOC, msg, sizeof(msg)/sizeof(WCHAR));

13 years, 8 months

[gschneider] 51435: [shell32] Pass an argument array to FormatMessage to insert the filename details into error messages (instead of failing) See issue #5977 for more details.

by gschneider＠svn.reactos.org

Author: gschneider Date: Fri Apr 22 22:53:31 2011 New Revision: 51435 URL: http://svn.reactos.org/svn/reactos?rev=51435&view=rev Log: [shell32] Pass an argument array to FormatMessage to insert the filename details into error messages (instead of failing) See issue #5977 for more details. Modified: trunk/reactos/dll/win32/shell32/shlexec.c Modified: trunk/reactos/dll/win32/shell32/shlexec.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shlexec.… ============================================================================== --- trunk/reactos/dll/win32/shell32/shlexec.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/shlexec.c [iso-8859-1] Fri Apr 22 22:53:31 2011 @@ -1426,15 +1426,22 @@ return retval; } -void do_error_dialog( UINT_PTR retval, HWND hwnd ) +void do_error_dialog( UINT_PTR retval, HWND hwnd, WCHAR* filename) { WCHAR msg[2048]; - int error_code=GetLastError(); + DWORD error_code = GetLastError(); + DWORD_PTR msgArguments[3] = { (DWORD_PTR)filename, 0, 0 }; if (retval == SE_ERR_NOASSOC) LoadStringW(shell32_hInstance, IDS_SHLEXEC_NOASSOC, msg, sizeof(msg)/sizeof(WCHAR)); else - FormatMessageW(FORMAT_MESSAGE_FROM_SYSTEM, NULL, error_code, 0, msg, sizeof(msg)/sizeof(WCHAR), NULL); + FormatMessageW(FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_ARGUMENT_ARRAY, + NULL, + error_code, + LANG_USER_DEFAULT, + msg, + sizeof(msg)/sizeof(WCHAR), + (va_list*)msgArguments); MessageBoxW(hwnd, msg, NULL, MB_ICONERROR); } @@ -1596,7 +1603,7 @@ Info.oaifInFlags = OAIF_ALLOW_REGISTRATION | OAIF_EXEC; //if (SHOpenWithDialog(sei_tmp.hwnd, &Info) != S_OK) - do_error_dialog(retval, sei_tmp.hwnd); + do_error_dialog(retval, sei_tmp.hwnd, wszApplicationName); } HeapFree(GetProcessHeap(), 0, wszApplicationName); if (wszParameters != parametersBuffer) @@ -1824,7 +1831,7 @@ Info.oaifInFlags = OAIF_ALLOW_REGISTRATION | OAIF_EXEC; //if (SHOpenWithDialog(sei_tmp.hwnd, &Info) != S_OK) - do_error_dialog(retval, sei_tmp.hwnd); + do_error_dialog(retval, sei_tmp.hwnd, wszApplicationName); } HeapFree(GetProcessHeap(), 0, wszApplicationName);

13 years, 8 months

[gschneider] 51434: [ipconfig] Respect the size parameter in the LoadStringAndOem helper function, fixes "ipconfig /?" See issue #6146 for more details.

by gschneider＠svn.reactos.org

Author: gschneider Date: Fri Apr 22 21:29:30 2011 New Revision: 51434 URL: http://svn.reactos.org/svn/reactos?rev=51434&view=rev Log: [ipconfig] Respect the size parameter in the LoadStringAndOem helper function, fixes "ipconfig /?" See issue #6146 for more details. Modified: trunk/reactos/base/applications/network/ipconfig/ipconfig.c Modified: trunk/reactos/base/applications/network/ipconfig/ipconfig.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… ============================================================================== --- trunk/reactos/base/applications/network/ipconfig/ipconfig.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/network/ipconfig/ipconfig.c [iso-8859-1] Fri Apr 22 21:29:30 2011 @@ -28,13 +28,21 @@ int LoadStringAndOem(HINSTANCE hInst, UINT uID, LPTSTR szNode, - int Siz -) -{ - TCHAR szTmp[25]; - int res = LoadString(hInst, uID, szTmp, sizeof(szTmp)); + int byteSize +) +{ + TCHAR *szTmp; + int res; + + szTmp = (LPTSTR)HeapAlloc(ProcessHeap, 0, byteSize); + if (szTmp == NULL) + { + return 0; + } + res = LoadString(hInst, uID, szTmp, byteSize); CharToOem(szTmp, szNode); - return(res); + HeapFree(ProcessHeap, 0, szTmp); + return res; } LPTSTR GetNodeTypeName(UINT NodeType) @@ -702,7 +710,7 @@ Size)) { _tprintf(_T("%s"), lpUsage); - } + } } }

13 years, 8 months

← Newer
1
...
5
6
7
8
9
10
11
...
30
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 April 2011