Ros-diffs November 2007

ros-diffs@reactos.org

20 participants
888 discussions

[fireball] 30619: - Implement some roothub URB handling, and generic URB completion (copied from EHCI's). - Now OHCI is able to read ports statuses, and even discovers a low-speed device connected to the port, however port status clearing doesn't seem to work.
by fireball＠svn.reactos.org 21 Nov '07

21 Nov '07

Author: fireball Date: Wed Nov 21 14:15:43 2007 New Revision: 30619 URL: http://svn.reactos.org/svn/reactos?rev=30619&view=rev Log: - Implement some roothub URB handling, and generic URB completion (copied from EHCI's). - Now OHCI is able to read ports statuses, and even discovers a low-speed device connected to the port, however port status clearing doesn't seem to work. Modified: trunk/reactos/drivers/usb/nt4compat/usbdriver/ohci.c Modified: trunk/reactos/drivers/usb/nt4compat/usbdriver/ohci.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/nt4compat/usbd… ============================================================================== --- trunk/reactos/drivers/usb/nt4compat/usbdriver/ohci.c (original) +++ trunk/reactos/drivers/usb/nt4compat/usbdriver/ohci.c Wed Nov 21 14:15:43 2007 @@ -990,6 +990,7 @@ PHUB2_EXTENSION hub_ext; PUSB_PORT_STATUS ps, psret; UCHAR port_count; + ULONG i; USE_NON_PENDING_IRQL; if (pdev == NULL || purb == NULL) @@ -1028,32 +1029,29 @@ ps = &hub_ext->rh_port_status[psetup->wIndex]; psret = (PUSB_PORT_STATUS) purb->data_buffer; -#if 0 - i = EHCI_PORTSC + 4 * (psetup->wIndex - 1); // USBPORTSC1; - status = EHCI_READ_PORT_ULONG((PULONG) (ehci->port_base + i)); - ps = &hub_ext->rh_port_status[psetup->wIndex]; - - psret = (PUSB_PORT_STATUS) purb->data_buffer; + status = + OHCI_READ_PORT_ULONG((PULONG)&ohci->regs->roothub.portstatus[psetup->wIndex-1]); + ps->wPortStatus = 0; - if (status & PORT_CCS) + if (status & RH_PS_CCS) { ps->wPortStatus |= USB_PORT_STAT_CONNECTION; } - if (status & PORT_PE) + if (status & RH_PS_PES) { ps->wPortStatus |= USB_PORT_STAT_ENABLE; - ps->wPortStatus |= USB_PORT_STAT_HIGH_SPEED; // ehci spec + //ps->wPortStatus |= USB_PORT_STAT_HIGH_SPEED; // ehci spec } - if (status & PORT_PR) + if (status & RH_PS_PRS) { ps->wPortStatus |= USB_PORT_STAT_RESET; } - if (status & PORT_SUSP) + if (status & RH_PS_PSS) { ps->wPortStatus |= USB_PORT_STAT_SUSPEND; } - if (PORT_USB11(status)) + if (status & RH_PS_LSDA) { ps->wPortStatus |= USB_PORT_STAT_LOW_SPEED; } @@ -1062,15 +1060,15 @@ ps->wPortStatus |= USB_PORT_STAT_POWER; //now set change field - if ((status & PORT_CSC) && !(ps->wPortStatus & USB_PORT_STAT_LOW_SPEED)) + if ((status & RH_PS_CSC) && !(ps->wPortStatus & USB_PORT_STAT_LOW_SPEED)) { ps->wPortChange |= USB_PORT_STAT_C_CONNECTION; } - if ((status & PORT_PEC) && !(ps->wPortStatus & USB_PORT_STAT_LOW_SPEED)) + if ((status & RH_PS_PESC) && !(ps->wPortStatus & USB_PORT_STAT_LOW_SPEED)) { ps->wPortChange |= USB_PORT_STAT_C_ENABLE; } -#endif + //don't touch other fields, might be filled by //other function @@ -1093,8 +1091,8 @@ purb->status = STATUS_INVALID_PARAMETER; break; } -#if 0 - i = EHCI_PORTSC + 4 * (psetup->wIndex - 1); // USBPORTSC1; + + i = psetup->wIndex - 1; ps = &hub_ext->rh_port_status[psetup->wIndex]; purb->status = STATUS_SUCCESS; @@ -1102,19 +1100,19 @@ { case USB_PORT_FEAT_C_CONNECTION: { - SET_RH2_PORTSTAT(i, USBPORTSC_CSC); - status = EHCI_READ_PORT_ULONG((PULONG) (ehci->port_base + i)); + OHCI_WRITE_PORT_ULONG((PULONG)&ohci->regs->roothub.portstatus[i], RH_PS_CSC); + status = OHCI_READ_PORT_ULONG((PULONG)&ohci->regs->roothub.portstatus[i]); usb_dbg_print(DBGLVL_MAXIMUM, - ("ehci_rh_submit_urb(): clear csc, port%d=0x%x\n", psetup->wIndex)); + ("ohci_rh_submit_urb(): clear csc, port%d=0x%x\n", psetup->wIndex, status)); ps->wPortChange &= ~USB_PORT_STAT_C_CONNECTION; break; } case USB_PORT_FEAT_C_ENABLE: { - SET_RH2_PORTSTAT(i, USBPORTSC_PEC); - status = EHCI_READ_PORT_ULONG((PULONG) (ehci->port_base + i)); + OHCI_WRITE_PORT_ULONG((PULONG)&ohci->regs->roothub.portstatus[i], RH_PS_PESC); + status = OHCI_READ_PORT_ULONG((PULONG)&ohci->regs->roothub.portstatus[i]); usb_dbg_print(DBGLVL_MAXIMUM, - ("ehci_rh_submit_urb(): clear pec, port%d=0x%x\n", psetup->wIndex)); + ("ohci_rh_submit_urb(): clear pec, port%d=0x%x\n", psetup->wIndex, status)); ps->wPortChange &= ~USB_PORT_STAT_C_ENABLE; break; } @@ -1125,23 +1123,23 @@ // enable or not is set by host controller // status = EHCI_READ_PORT_ULONG( ( PUSHORT ) ( ehci->port_base + i ) ); usb_dbg_print(DBGLVL_MAXIMUM, - ("ehci_rh_submit_urb(): clear pr, enable pe, port%d=0x%x\n", - psetup->wIndex)); + ("ohci_rh_submit_urb(): clear pr, enable pe, port%d=0x%x\n", + psetup->wIndex, 0)); break; } case USB_PORT_FEAT_ENABLE: { ps->wPortStatus &= ~USB_PORT_STAT_ENABLE; - CLR_RH2_PORTSTAT(i, USBPORTSC_PE); - status = EHCI_READ_PORT_ULONG((PULONG) (ehci->port_base + i)); + OHCI_WRITE_PORT_ULONG((PULONG)&ohci->regs->roothub.portstatus[i], RH_PS_PES); + status = OHCI_READ_PORT_ULONG((PULONG)&ohci->regs->roothub.portstatus[i]); usb_dbg_print(DBGLVL_MAXIMUM, - ("ehci_rh_submit_urb(): clear pe, port%d=0x%x\n", psetup->wIndex)); + ("ohci_rh_submit_urb(): clear pe, port%d=0x%x\n", psetup->wIndex, status)); break; } default: purb->status = STATUS_UNSUCCESSFUL; } -#endif + break; } else if (psetup->bmRequestType == 0xd3 && psetup->bRequest == HUB_REQ_GET_STATE) @@ -1170,7 +1168,7 @@ { purb->status = STATUS_INVALID_PARAMETER; ehci_dbg_print(DBGLVL_MAXIMUM, - ("ehci_rh_submit_urb(): set feature with wValue=0x%x\n", psetup->wValue)); + ("ohci_rh_submit_urb(): set feature with wValue=0x%x\n", psetup->wValue)); break; } @@ -1187,7 +1185,7 @@ OHCI_READ_PORT_ULONG((PULONG)&ohci->regs->roothub.portstatus[psetup->wIndex-1]); usb_dbg_print(DBGLVL_MAXIMUM, - ("ehci_rh_submit_urb(): reset port, port%d=0x%x\n", psetup->wIndex, status)); + ("ohci_rh_submit_urb(): reset port, port%d=0x%x\n", psetup->wIndex, status)); InsertTailList(&dev_mgr->timer_svc_list, &ptimer->timer_svc_link); purb->status = STATUS_PENDING; } @@ -1294,7 +1292,7 @@ else purb->bytes_to_transfer = purb->data_length; - ehci_dbg_print(DBGLVL_MEDIUM, ("ehci_submit_urb(): bytes_to_transfer=0x%x\n", purb->bytes_to_transfer)); + ehci_dbg_print(DBGLVL_MEDIUM, ("ohci_submit_urb(): bytes_to_transfer=0x%x\n", purb->bytes_to_transfer)); purb->bytes_transfered = 0; InitializeListHead(&purb->trasac_list); @@ -1419,7 +1417,87 @@ VOID ohci_generic_urb_completion(PURB purb, PVOID context) { - DbgPrint("ohci_generic_urb_completion called, but not implemented!\n"); + PUSB_DEV pdev; + BOOLEAN is_ctrl = FALSE; + USE_NON_PENDING_IRQL; + + old_irql = KeGetCurrentIrql(); + if (old_irql > DISPATCH_LEVEL) + TRAP(); + + if (old_irql < DISPATCH_LEVEL) + KeRaiseIrql(DISPATCH_LEVEL, &old_irql); + + pdev = purb->pdev; + if (purb == NULL) + goto LBL_LOWER_IRQL; + + if (pdev == NULL) + goto LBL_LOWER_IRQL; + + lock_dev(pdev, TRUE); + + if (dev_state(pdev) == USB_DEV_STATE_ZOMB) + { + // no need to do following statistics + unlock_dev(pdev, TRUE); + goto LBL_CLIENT_PROCESS; + } + if (usb_error(purb->status)) + { + pdev->error_count++; + } + + if (purb->pendp == &pdev->default_endp) + { + if (usb_halted(purb->status)) + { + pdev->time_out_count++; + if (pdev->time_out_count > 3) + { + dev_set_state(pdev, USB_DEV_STATE_ZOMB); + ohci_dbg_print(DBGLVL_MAXIMUM, + ("ohci_generic_urb_completion(): contiguous error 3 times, dev 0x%x is deactivated\n", + pdev)); + } + } + else + pdev->time_out_count = 0; + + } + + if (endp_type(purb->pendp) == USB_ENDPOINT_XFER_CONTROL) + is_ctrl = TRUE; + + unlock_dev(pdev, TRUE); + + LBL_CLIENT_PROCESS: + if (!is_ctrl) + { + if (purb->completion) + purb->completion(purb, context); + } + else + { + if (purb->ctrl_req_context.ctrl_stack_count == 0) + { + if (purb->completion) + purb->completion(purb, context); + } + else + { + // pstack = &purb->ctrl_req_stack[ purb->ctrl_req_context.ctrl_cur_stack ]; + // if( pstack->urb_completion ) + // pstack->urb_completion( purb, pstack->context ); + usb_call_ctrl_completion(purb); + } + } + + LBL_LOWER_IRQL: + if (old_irql < DISPATCH_LEVEL) + KeLowerIrql(old_irql); + + return; } BOOLEAN

1 0

[cwittich] 30618: fix some PREfast warnings
by cwittich＠svn.reactos.org 21 Nov '07

21 Nov '07

Author: cwittich Date: Wed Nov 21 14:09:47 2007 New Revision: 30618 URL: http://svn.reactos.org/svn/reactos?rev=30618&view=rev Log: fix some PREfast warnings Modified: trunk/reactos/drivers/storage/ide/pciidex/miniport.c trunk/reactos/drivers/storage/ide/pciidex/pciidex.h Modified: trunk/reactos/drivers/storage/ide/pciidex/miniport.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/pciide… ============================================================================== --- trunk/reactos/drivers/storage/ide/pciidex/miniport.c (original) +++ trunk/reactos/drivers/storage/ide/pciidex/miniport.c Wed Nov 21 14:09:47 2007 @@ -12,6 +12,7 @@ #define INITGUID #include "pciidex.h" +static DRIVER_DISPATCH PciIdeXForwardOrIgnore; static NTSTATUS NTAPI PciIdeXForwardOrIgnore( IN PDEVICE_OBJECT DeviceObject, @@ -43,6 +44,7 @@ } } +static DRIVER_DISPATCH PciIdeXPnpDispatch; static NTSTATUS NTAPI PciIdeXPnpDispatch( IN PDEVICE_OBJECT DeviceObject, Modified: trunk/reactos/drivers/storage/ide/pciidex/pciidex.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/pciide… ============================================================================== --- trunk/reactos/drivers/storage/ide/pciidex/pciidex.h (original) +++ trunk/reactos/drivers/storage/ide/pciidex/pciidex.h Wed Nov 21 14:09:47 2007 @@ -40,6 +40,7 @@ /* fdo.c */ +DRIVER_ADD_DEVICE PciIdeXAddDevice; NTSTATUS NTAPI PciIdeXAddDevice( IN PDRIVER_OBJECT DriverObject, @@ -52,6 +53,7 @@ /* misc.c */ +IO_COMPLETION_ROUTINE PciIdeXGenericCompletion; NTSTATUS NTAPI PciIdeXGenericCompletion( IN PDEVICE_OBJECT DeviceObject,

1 0

[cwittich] 30617: don't try to free CurrentBuffer when allocation failed
by cwittich＠svn.reactos.org 21 Nov '07

21 Nov '07

Author: cwittich Date: Wed Nov 21 13:57:25 2007 New Revision: 30617 URL: http://svn.reactos.org/svn/reactos?rev=30617&view=rev Log: don't try to free CurrentBuffer when allocation failed Modified: trunk/reactos/drivers/storage/ide/pciidex/miniport.c Modified: trunk/reactos/drivers/storage/ide/pciidex/miniport.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/pciide… ============================================================================== --- trunk/reactos/drivers/storage/ide/pciidex/miniport.c (original) +++ trunk/reactos/drivers/storage/ide/pciidex/miniport.c Wed Nov 21 13:57:25 2007 @@ -140,7 +140,7 @@ if (!CurrentBuffer) { Status = STATUS_INSUFFICIENT_RESOURCES; - goto cleanup; + return Status; } Status = PciIdeXGetBusData(DeviceExtension, Buffer, ConfigDataOffset, BufferLength);

1 0

[fireball] 30616: - Start implementing URB operations (so that at least roothub URB could come through).
by fireball＠svn.reactos.org 21 Nov '07

21 Nov '07

Author: fireball Date: Wed Nov 21 12:51:03 2007 New Revision: 30616 URL: http://svn.reactos.org/svn/reactos?rev=30616&view=rev Log: - Start implementing URB operations (so that at least roothub URB could come through). Modified: trunk/reactos/drivers/usb/nt4compat/usbdriver/ohci.c trunk/reactos/drivers/usb/nt4compat/usbdriver/ohci.h Modified: trunk/reactos/drivers/usb/nt4compat/usbdriver/ohci.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/nt4compat/usbd… ============================================================================== --- trunk/reactos/drivers/usb/nt4compat/usbdriver/ohci.c (original) +++ trunk/reactos/drivers/usb/nt4compat/usbdriver/ohci.c Wed Nov 21 12:51:03 2007 @@ -37,6 +37,7 @@ //BOOLEAN ohci_start(PHCD hcd); VOID ohci_init_hcd_interface(POHCI_DEV ohci); BOOLEAN ohci_rh_reset_port(PHCD hcd, UCHAR port_idx); +VOID ohci_generic_urb_completion(PURB purb, PVOID context); // shared with EHCI NTSTATUS ehci_dispatch_irp(IN PDEVICE_OBJECT DeviceObject, IN PIRP irp); @@ -46,8 +47,10 @@ UCHAR ehci_get_id(PHCD hcd); UCHAR ehci_alloc_addr(PHCD hcd); VOID ehci_free_addr(PHCD hcd, UCHAR addr); - BOOLEAN NTAPI ehci_cal_cpu_freq(PVOID context); + +VOID rh_timer_svc_int_completion(PUSB_DEV pdev, PVOID context); +VOID rh_timer_svc_reset_port_completion(PUSB_DEV pdev, PVOID context); extern USB_DEV_MANAGER g_dev_mgr; @@ -109,6 +112,58 @@ /* this timer value might be vendor-specific ... */ #define PORT_RESET_HW_MSEC 10 +#define DEFAULT_ENDP( enDP ) \ +( enDP->flags & USB_ENDP_FLAG_DEFAULT_ENDP ) + +#define dev_from_endp( enDP ) \ +( DEFAULT_ENDP( enDP )\ + ? ( ( PUSB_DEV )( enDP )->pusb_if )\ + : ( ( enDP )->pusb_if->pusb_config->pusb_dev ) ) + +#define endp_state( enDP ) ( ( enDP )->flags & USB_ENDP_FLAG_STAT_MASK ) + +#define endp_num( enDP ) \ +( DEFAULT_ENDP( enDP )\ + ? 0 \ + : ( ( enDP )->pusb_endp_desc->bEndpointAddress & 0x0f ) ) + +#define endp_dir( enDP ) \ +( DEFAULT_ENDP( enDP )\ + ? 0L\ + : ( ( enDP )->pusb_endp_desc->bEndpointAddress & USB_DIR_IN ) ) + +#define dev_set_state( pdEV, staTE ) \ +( pdEV->flags = ( ( pdEV )->flags & ( ~USB_DEV_STATE_MASK ) ) | ( staTE ) ) + +#define endp_max_packet_size( enDP ) \ +( DEFAULT_ENDP( enDP )\ + ? ( ( ( PUSB_DEV )enDP->pusb_if )->pusb_dev_desc ? \ + ( ( PUSB_DEV )enDP->pusb_if )->pusb_dev_desc->bMaxPacketSize0\ + : 8 )\ + : ( enDP->pusb_endp_desc->wMaxPacketSize & 0x7ff ) ) + +#define endp_mult_count( endp ) ( ( ( endp->pusb_endp_desc->wMaxPacketSize & 0x1800 ) >> 11 ) + 1 ) + +#define get_parent_hs_hub( pDEV, parent_HUB, port_IDX ) \ +{\ + parent_HUB = pDEV->parent_dev;\ + port_IDX = pdev->port_idx;\ + while( parent_HUB )\ + {\ + if( ( parent_HUB->flags & USB_DEV_CLASS_MASK ) != USB_DEV_CLASS_HUB )\ + {\ + parent_HUB = NULL;\ + break;\ + }\ + if( ( parent_HUB->flags & USB_DEV_FLAG_HIGH_SPEED ) == 0 )\ + {\ + port_IDX = parent_HUB->port_idx;\ + parent_HUB = parent_HUB->parent_dev;\ + continue;\ + }\ + break;\ + }\ +} VOID ohci_wait_ms(POHCI_DEV ohci, LONG ms) @@ -396,13 +451,6 @@ } #if 0 - //init ehci_caps - // i = ( ( PEHCI_HCS_CONTENT )( &pdev_ext->ehci->ehci_caps.hcs_params ) )->length; - - ehci_get_capabilities(pdev_ext->ehci, pdev_ext->ehci->port_base); - i = pdev_ext->ehci->ehci_caps.length; - pdev_ext->ehci->port_base += i; - if (ehci_init_schedule(pdev_ext->ehci, pdev_ext->padapter) == FALSE) { release_adapter(pdev_ext->padapter); @@ -410,16 +458,18 @@ ehci_delete_device(pdev); return NULL; } - - InitializeListHead(&pdev_ext->ehci->urb_list); - KeInitializeSpinLock(&pdev_ext->ehci->pending_endp_list_lock); - InitializeListHead(&pdev_ext->ehci->pending_endp_list); - - ehci_dbg_print(DBGLVL_MAXIMUM, ("ehci_alloc(): pending_endp_list=0x%x\n", - &pdev_ext->ehci->pending_endp_list)); - - init_pending_endp_pool(&pdev_ext->ehci->pending_endp_pool); - +#endif + + InitializeListHead(&pdev_ext->ohci->urb_list); + KeInitializeSpinLock(&pdev_ext->ohci->pending_endp_list_lock); + InitializeListHead(&pdev_ext->ohci->pending_endp_list); + + ohci_dbg_print(DBGLVL_MAXIMUM, ("ohci_alloc(): pending_endp_list=0x%x\n", + &pdev_ext->ohci->pending_endp_list)); + + init_pending_endp_pool(&pdev_ext->ohci->pending_endp_pool); + +#if 0 vector = HalGetInterruptVector(PCIBus, bus, pdev_ext->res_interrupt.level, @@ -660,6 +710,648 @@ return TRUE; } +static VOID NTAPI +ohci_cancel_pending_endp_urb(IN PVOID Parameter) +{ + PLIST_ENTRY abort_list; + PUSB_DEV pdev; + PURB purb; + USE_BASIC_NON_PENDING_IRQL; + + abort_list = (PLIST_ENTRY) Parameter; + + if (abort_list == NULL) + return; + + while (IsListEmpty(abort_list) == FALSE) + { + //these devs are protected by purb's ref-count + purb = (PURB) RemoveHeadList(abort_list); + pdev = purb->pdev; + // purb->status is set when they are added to abort_list + + ohci_generic_urb_completion(purb, purb->context); + + lock_dev(pdev, FALSE); + pdev->ref_count--; + unlock_dev(pdev, FALSE); + } + usb_free_mem(abort_list); + return; +} + +static NTSTATUS +ohci_internal_submit_bulk(POHCI_DEV ohci, PURB purb) +{ + return STATUS_SUCCESS; +} + +static NTSTATUS +ohci_internal_submit_ctrl(POHCI_DEV ohci, PURB purb) +{ + return STATUS_SUCCESS; +} + +static NTSTATUS +ohci_internal_submit_int(POHCI_DEV ohci, PURB purb) +{ + return STATUS_SUCCESS; +} + +static NTSTATUS +ohci_internal_submit_iso(POHCI_DEV ohci, PURB purb) +{ + return STATUS_SUCCESS; +} + + +static BOOLEAN +ohci_process_pending_endp(POHCI_DEV ehci) +{ + PUSB_DEV pdev; + LIST_ENTRY temp_list, abort_list; + PLIST_ENTRY pthis; + PURB purb; + PUSB_ENDPOINT pendp; + NTSTATUS can_submit = STATUS_SUCCESS; + PWORK_QUEUE_ITEM pwork_item; + PLIST_ENTRY cancel_list; + PUSB_DEV pparent = NULL; + UCHAR port_idx = 0; + BOOLEAN tt_needed; + UCHAR hub_addr = 0; + USE_BASIC_IRQL; + + if (ehci == NULL) + return FALSE; + + InitializeListHead(&temp_list); + InitializeListHead(&abort_list); + + purb = NULL; + ohci_dbg_print(DBGLVL_MEDIUM, ("ohci_process_pending_endp(): entering..., ehci=0x%x\n", ehci)); + + lock_pending_endp_list(&ehci->pending_endp_list_lock); + while (IsListEmpty(&ehci->pending_endp_list) == FALSE) + { + + ehci_dbg_print(DBGLVL_MAXIMUM, ("ohci_process_pending_endp(): pending_endp_list=0x%x\n", + &ehci->pending_endp_list)); + + tt_needed = FALSE; + pthis = RemoveHeadList(&ehci->pending_endp_list); + pendp = ((PUHCI_PENDING_ENDP) pthis)->pendp; + pdev = dev_from_endp(pendp); + lock_dev(pdev, TRUE); + + if (dev_state(pdev) == USB_DEV_STATE_ZOMB) + { + unlock_dev(pdev, TRUE); + free_pending_endp(&ehci->pending_endp_pool, struct_ptr(pthis, UHCI_PENDING_ENDP, endp_link)); + //delegate to ehci_remove_device for remiving the purb queue on the endpoint + continue; + } + if ((pdev->flags & USB_DEV_FLAG_HIGH_SPEED) == 0) + { + // prepare split transaction + unlock_dev(pdev, TRUE); + + // pparent won't be removed when pending_endp_list_lock is acquired. + get_parent_hs_hub(pdev, pparent, port_idx); + + if (pparent == NULL) + { + TRAP(); + ehci_dbg_print(DBGLVL_MEDIUM, + ("ohci_process_pending_endp(): full/low speed device with no parent!!!\n")); + free_pending_endp(&ehci->pending_endp_pool, struct_ptr(pthis, UHCI_PENDING_ENDP, endp_link)); + continue; + } + + if (hub_lock_tt(pparent, port_idx, (UCHAR) endp_type(pendp)) == FALSE) + { + lock_dev(pdev, TRUE); + if (dev_state(pdev) != USB_DEV_STATE_ZOMB) + { + // reinsert the pending-endp to the list + InsertTailList(&temp_list, pthis); + unlock_dev(pdev, TRUE); + } + else + { + // delegate to ehci_remove_device for purb removal + unlock_dev(pdev, TRUE); + free_pending_endp(&ehci->pending_endp_pool, + struct_ptr(pthis, UHCI_PENDING_ENDP, endp_link)); + } + continue; + } + + // backup the hub address for future use + hub_addr = pparent->dev_addr; + + lock_dev(pdev, TRUE); + if (dev_state(pdev) == USB_DEV_STATE_ZOMB) + { + unlock_dev(pdev, TRUE); + free_pending_endp(&ehci->pending_endp_pool, struct_ptr(pthis, UHCI_PENDING_ENDP, endp_link)); + hub_unlock_tt(pparent, port_idx, (UCHAR) endp_type(pendp)); + continue; + } + tt_needed = TRUE; + // go on processing + } + + if (endp_state(pendp) == USB_ENDP_FLAG_STALL) + { + while (IsListEmpty(&pendp->urb_list) == FALSE) + { + purb = (PURB) RemoveHeadList(&pendp->urb_list); + purb->status = USB_STATUS_ENDPOINT_HALTED; + InsertTailList(&abort_list, (LIST_ENTRY *) purb); + } + InitializeListHead(&pendp->urb_list); + unlock_dev(pdev, TRUE); + free_pending_endp(&ehci->pending_endp_pool, struct_ptr(pthis, UHCI_PENDING_ENDP, endp_link)); + if (tt_needed) + hub_unlock_tt(pparent, port_idx, (UCHAR) endp_type(pendp)); + continue; + } + + if (IsListEmpty(&pendp->urb_list) == FALSE) + { + purb = (PURB) RemoveHeadList(&pendp->urb_list); + ASSERT(purb); + } + else + { + InitializeListHead(&pendp->urb_list); + unlock_dev(pdev, TRUE); + free_pending_endp(&ehci->pending_endp_pool, struct_ptr(pthis, UHCI_PENDING_ENDP, endp_link)); + if (tt_needed) + hub_unlock_tt(pparent, port_idx, (UCHAR) endp_type(pendp)); + continue; + } + + if (tt_needed) + { + ((PURB_HS_CONTEXT_CONTENT) & purb->hs_context)->hub_addr = hub_addr; + ((PURB_HS_CONTEXT_CONTENT) & purb->hs_context)->port_idx = port_idx; + } + + // if can_submit is STATUS_SUCCESS, the purb is inserted into the schedule + switch (endp_type(pendp)) + { + case USB_ENDPOINT_XFER_BULK: + { + can_submit = ohci_internal_submit_bulk(ehci, purb); + break; + } + case USB_ENDPOINT_XFER_CONTROL: + { + can_submit = ohci_internal_submit_ctrl(ehci, purb); + break; + } + case USB_ENDPOINT_XFER_INT: + { + can_submit = ohci_internal_submit_int(ehci, purb); + break; + } + case USB_ENDPOINT_XFER_ISOC: + { + can_submit = ohci_internal_submit_iso(ehci, purb); + break; + } + } + + if (can_submit == STATUS_NO_MORE_ENTRIES) + { + //no enough bandwidth or tds + InsertHeadList(&pendp->urb_list, (PLIST_ENTRY) purb); + InsertTailList(&temp_list, pthis); + } + else + { + // otherwise error or success + free_pending_endp(&ehci->pending_endp_pool, struct_ptr(pthis, UHCI_PENDING_ENDP, endp_link)); + + if (can_submit != STATUS_SUCCESS) + { + //abort these URBs + InsertTailList(&abort_list, (LIST_ENTRY *) purb); + purb->status = can_submit; + } + } + unlock_dev(pdev, TRUE); + if (can_submit != STATUS_SUCCESS && tt_needed) + { + hub_unlock_tt(pparent, port_idx, (UCHAR) endp_type(pendp)); + } + } + + if (IsListEmpty(&temp_list) == FALSE) + { + //re-append them to the pending_endp_list + ListFirst(&temp_list, pthis); + RemoveEntryList(&temp_list); + MergeList(&ehci->pending_endp_list, pthis); + } + unlock_pending_endp_list(&ehci->pending_endp_list_lock); + + if (IsListEmpty(&abort_list) == FALSE) + { + PLIST_ENTRY pthis; + cancel_list = (PLIST_ENTRY) usb_alloc_mem(NonPagedPool, sizeof(WORK_QUEUE_ITEM) + sizeof(LIST_ENTRY)); + ASSERT(cancel_list); + + ListFirst(&abort_list, pthis); + RemoveEntryList(&abort_list); + InsertTailList(pthis, cancel_list); + + pwork_item = (PWORK_QUEUE_ITEM) & cancel_list[1]; + + // we do not need to worry the ehci_cancel_pending_endp_urb running when the + // driver is unloading since purb-reference count will prevent the dev_mgr to + // quit till all the reference count to the dev drop to zero. + ExInitializeWorkItem(pwork_item, ohci_cancel_pending_endp_urb, (PVOID) cancel_list); + ExQueueWorkItem(pwork_item, DelayedWorkQueue); + } + return TRUE; +} + +NTSTATUS +ohci_rh_submit_urb(PUSB_DEV pdev, PURB purb) +{ + PUSB_DEV_MANAGER dev_mgr; + PTIMER_SVC ptimer; + PUSB_CTRL_SETUP_PACKET psetup; + POHCI_DEV ohci; + NTSTATUS status; + PHUB2_EXTENSION hub_ext; + PUSB_PORT_STATUS ps, psret; + UCHAR port_count; + + USE_NON_PENDING_IRQL; + if (pdev == NULL || purb == NULL) + return STATUS_INVALID_PARAMETER; + + dev_mgr = dev_mgr_from_dev(pdev); + + KeAcquireSpinLock(&dev_mgr->timer_svc_list_lock, &old_irql); + lock_dev(pdev, FALSE); + if (dev_state(pdev) == USB_DEV_STATE_ZOMB) + { + unlock_dev(pdev, FALSE); + KeReleaseSpinLock(&dev_mgr->timer_svc_list_lock, old_irql); + return STATUS_DEVICE_DOES_NOT_EXIST; + } + + ohci = ohci_from_hcd(pdev->hcd); + psetup = (PUSB_CTRL_SETUP_PACKET) purb->setup_packet; + + hub_ext = ((PHUB2_EXTENSION) pdev->dev_ext); + port_count = ohci->num_ports; + + switch (endp_type(purb->pendp)) + { + case USB_ENDPOINT_XFER_CONTROL: + { + if (psetup->bmRequestType == 0xa3 && psetup->bRequest == USB_REQ_GET_STATUS) + { + //get-port-status + if (psetup->wIndex == 0 || psetup->wIndex > port_count || psetup->wLength < 4) + { + purb->status = STATUS_INVALID_PARAMETER; + break; + } + + ps = &hub_ext->rh_port_status[psetup->wIndex]; + psret = (PUSB_PORT_STATUS) purb->data_buffer; + +#if 0 + i = EHCI_PORTSC + 4 * (psetup->wIndex - 1); // USBPORTSC1; + status = EHCI_READ_PORT_ULONG((PULONG) (ehci->port_base + i)); + ps = &hub_ext->rh_port_status[psetup->wIndex]; + + psret = (PUSB_PORT_STATUS) purb->data_buffer; + ps->wPortStatus = 0; + + if (status & PORT_CCS) + { + ps->wPortStatus |= USB_PORT_STAT_CONNECTION; + } + if (status & PORT_PE) + { + ps->wPortStatus |= USB_PORT_STAT_ENABLE; + ps->wPortStatus |= USB_PORT_STAT_HIGH_SPEED; // ehci spec + } + if (status & PORT_PR) + { + ps->wPortStatus |= USB_PORT_STAT_RESET; + } + if (status & PORT_SUSP) + { + ps->wPortStatus |= USB_PORT_STAT_SUSPEND; + } + if (PORT_USB11(status)) + { + ps->wPortStatus |= USB_PORT_STAT_LOW_SPEED; + } + + //always power on + ps->wPortStatus |= USB_PORT_STAT_POWER; + + //now set change field + if ((status & PORT_CSC) && !(ps->wPortStatus & USB_PORT_STAT_LOW_SPEED)) + { + ps->wPortChange |= USB_PORT_STAT_C_CONNECTION; + } + if ((status & PORT_PEC) && !(ps->wPortStatus & USB_PORT_STAT_LOW_SPEED)) + { + ps->wPortChange |= USB_PORT_STAT_C_ENABLE; + } +#endif + //don't touch other fields, might be filled by + //other function + + usb_dbg_print(DBGLVL_MAXIMUM, + ("ohci_rh_submit_urb(): get port status, wPortStatus=0x%x, wPortChange=0x%x, address=0x%x\n", + ps->wPortStatus, ps->wPortChange, ps)); + + psret->wPortChange = ps->wPortChange; + psret->wPortStatus = ps->wPortStatus; + + purb->status = STATUS_SUCCESS; + + break; + } + else if (psetup->bmRequestType == 0x23 && psetup->bRequest == USB_REQ_CLEAR_FEATURE) + { + //clear-port-feature + if (psetup->wIndex == 0 || psetup->wIndex > port_count) + { + purb->status = STATUS_INVALID_PARAMETER; + break; + } +#if 0 + i = EHCI_PORTSC + 4 * (psetup->wIndex - 1); // USBPORTSC1; + ps = &hub_ext->rh_port_status[psetup->wIndex]; + + purb->status = STATUS_SUCCESS; + switch (psetup->wValue) + { + case USB_PORT_FEAT_C_CONNECTION: + { + SET_RH2_PORTSTAT(i, USBPORTSC_CSC); + status = EHCI_READ_PORT_ULONG((PULONG) (ehci->port_base + i)); + usb_dbg_print(DBGLVL_MAXIMUM, + ("ehci_rh_submit_urb(): clear csc, port%d=0x%x\n", psetup->wIndex)); + ps->wPortChange &= ~USB_PORT_STAT_C_CONNECTION; + break; + } + case USB_PORT_FEAT_C_ENABLE: + { + SET_RH2_PORTSTAT(i, USBPORTSC_PEC); + status = EHCI_READ_PORT_ULONG((PULONG) (ehci->port_base + i)); + usb_dbg_print(DBGLVL_MAXIMUM, + ("ehci_rh_submit_urb(): clear pec, port%d=0x%x\n", psetup->wIndex)); + ps->wPortChange &= ~USB_PORT_STAT_C_ENABLE; + break; + } + case USB_PORT_FEAT_C_RESET: + { + ps->wPortChange &= ~USB_PORT_STAT_C_RESET; + //the reset signal is down in rh_timer_svc_reset_port_completion + // enable or not is set by host controller + // status = EHCI_READ_PORT_ULONG( ( PUSHORT ) ( ehci->port_base + i ) ); + usb_dbg_print(DBGLVL_MAXIMUM, + ("ehci_rh_submit_urb(): clear pr, enable pe, port%d=0x%x\n", + psetup->wIndex)); + break; + } + case USB_PORT_FEAT_ENABLE: + { + ps->wPortStatus &= ~USB_PORT_STAT_ENABLE; + CLR_RH2_PORTSTAT(i, USBPORTSC_PE); + status = EHCI_READ_PORT_ULONG((PULONG) (ehci->port_base + i)); + usb_dbg_print(DBGLVL_MAXIMUM, + ("ehci_rh_submit_urb(): clear pe, port%d=0x%x\n", psetup->wIndex)); + break; + } + default: + purb->status = STATUS_UNSUCCESSFUL; + } +#endif + break; + } + else if (psetup->bmRequestType == 0xd3 && psetup->bRequest == HUB_REQ_GET_STATE) + { + // get bus state + if (psetup->wIndex == 0 || psetup->wIndex > port_count || psetup->wLength == 0) + { + purb->status = STATUS_INVALID_PARAMETER; + break; + } +#if 0 + i = EHCI_PORTSC + 4 * (psetup->wIndex - 1); // USBPORTSC1; + status = EHCI_READ_PORT_ULONG((PULONG) (ehci->port_base + i)); + purb->data_buffer[0] = (status & USBPORTSC_LS); + + // reverse the order + purb->data_buffer[0] ^= 0x3; +#endif + purb->status = STATUS_SUCCESS; + break; + } + else if (psetup->bmRequestType == 0x23 && psetup->bRequest == USB_REQ_SET_FEATURE) + { + //reset port + if (psetup->wValue != USB_PORT_FEAT_RESET) + { + purb->status = STATUS_INVALID_PARAMETER; + ehci_dbg_print(DBGLVL_MAXIMUM, + ("ehci_rh_submit_urb(): set feature with wValue=0x%x\n", psetup->wValue)); + break; + } + + ptimer = alloc_timer_svc(&dev_mgr->timer_svc_pool, 1); + ptimer->threshold = 0; // within [ 50ms, 60ms ], one tick is 10 ms + ptimer->context = (ULONG) purb; + ptimer->pdev = pdev; + ptimer->func = rh_timer_svc_reset_port_completion; + + //start the timer + pdev->ref_count += 2; //one for timer and one for purb + + status = + OHCI_READ_PORT_ULONG((PULONG)&ohci->regs->roothub.portstatus[psetup->wIndex-1]); + + usb_dbg_print(DBGLVL_MAXIMUM, + ("ehci_rh_submit_urb(): reset port, port%d=0x%x\n", psetup->wIndex, status)); + InsertTailList(&dev_mgr->timer_svc_list, &ptimer->timer_svc_link); + purb->status = STATUS_PENDING; + } + else + { + purb->status = STATUS_INVALID_PARAMETER; + } + break; + } + case USB_ENDPOINT_XFER_INT: + { + ptimer = alloc_timer_svc(&dev_mgr->timer_svc_pool, 1); + ptimer->threshold = RH_INTERVAL; + ptimer->context = (ULONG) purb; + ptimer->pdev = pdev; + ptimer->func = rh_timer_svc_int_completion; + + //start the timer + InsertTailList(&dev_mgr->timer_svc_list, &ptimer->timer_svc_link); + + //usb_dbg_print(DBGLVL_MAXIMUM, + // ("ehci_rh_submit_urb(): current rh's ref_count=0x%x\n", pdev->ref_count)); + pdev->ref_count += 2; //one for timer and one for purb + + purb->status = STATUS_PENDING; + break; + } + case USB_ENDPOINT_XFER_BULK: + case USB_ENDPOINT_XFER_ISOC: + default: + { + purb->status = STATUS_INVALID_PARAMETER; + break; + } + } + unlock_dev(pdev, FALSE); + KeReleaseSpinLock(&dev_mgr->timer_svc_list_lock, old_irql); + return purb->status; +} + +NTSTATUS +ohci_submit_urb(POHCI_DEV ehci, PUSB_DEV pdev, PUSB_ENDPOINT pendp, PURB purb) +{ + int i; + PUHCI_PENDING_ENDP pending_endp; + NTSTATUS status; + USE_BASIC_IRQL; + + if (ehci == NULL) + return STATUS_INVALID_PARAMETER; + + if (pdev == NULL || pendp == NULL || purb == NULL) + { + // give a chance to those pending urb, especially for clearing hub tt + ohci_process_pending_endp(ehci); + return STATUS_INVALID_PARAMETER; + } + + lock_pending_endp_list(&ehci->pending_endp_list_lock); + lock_dev(pdev, TRUE); + + if (dev_state(pdev) == USB_DEV_STATE_ZOMB) + { + status = purb->status = STATUS_DEVICE_DOES_NOT_EXIST; + goto LBL_OUT; + } + + if (dev_class(pdev) == USB_DEV_CLASS_ROOT_HUB) + { + unlock_dev(pdev, TRUE); + unlock_pending_endp_list(&ehci->pending_endp_list_lock); + status = ohci_rh_submit_urb(pdev, purb); + return status; + } + + if (pendp) + purb->pendp = pendp; + else + purb->pendp = &pdev->default_endp; + + if (dev_from_endp(purb->pendp) != pdev) + { + status = purb->status = STATUS_INVALID_PARAMETER; + goto LBL_OUT; + } + + if (endp_state(purb->pendp) == USB_ENDP_FLAG_STALL) + { + status = purb->status = USB_STATUS_ENDPOINT_HALTED; + goto LBL_OUT; + } + + if ((pdev->flags & USB_DEV_FLAG_HIGH_SPEED) == 0) + { + // wait one ms + usb_wait_ms_dpc(1); + } + + purb->pdev = pdev; + purb->rest_bytes = purb->data_length; + + if (endp_type(purb->pendp) == USB_ENDPOINT_XFER_BULK) + purb->bytes_to_transfer = (purb->data_length > EHCI_MAX_SIZE_TRANSFER ? EHCI_MAX_SIZE_TRANSFER : purb->data_length); //multiple transfer for large data block + else + purb->bytes_to_transfer = purb->data_length; + + ehci_dbg_print(DBGLVL_MEDIUM, ("ehci_submit_urb(): bytes_to_transfer=0x%x\n", purb->bytes_to_transfer)); + + purb->bytes_transfered = 0; + InitializeListHead(&purb->trasac_list); + purb->last_finished_td = &purb->trasac_list; + purb->flags &= ~(URB_FLAG_STATE_MASK | URB_FLAG_IN_SCHEDULE | URB_FLAG_FORCE_CANCEL); + purb->flags |= URB_FLAG_STATE_PENDING; + + + i = IsListEmpty(&pendp->urb_list); + InsertTailList(&pendp->urb_list, &purb->urb_link); + + pdev->ref_count++; //for purb reference + + if (i == FALSE) + { + //there is purb pending, simply queue it and return + status = purb->status = STATUS_PENDING; + goto LBL_OUT; + } + else if (usb_endp_busy_count(purb->pendp) && endp_type(purb->pendp) != USB_ENDPOINT_XFER_ISOC) + { + // + //No purb waiting but purb overlap not allowed, + //so leave it in queue and return, will be scheduled + //later + // + status = purb->status = STATUS_PENDING; + goto LBL_OUT; + } + + pending_endp = alloc_pending_endp(&ehci->pending_endp_pool, 1); + if (pending_endp == NULL) + { + //panic + status = purb->status = STATUS_UNSUCCESSFUL; + goto LBL_OUT2; + } + + pending_endp->pendp = purb->pendp; + InsertTailList(&ehci->pending_endp_list, (PLIST_ENTRY) pending_endp); + + unlock_dev(pdev, TRUE); + unlock_pending_endp_list(&ehci->pending_endp_list_lock); + + ohci_process_pending_endp(ehci); + return STATUS_PENDING; + + LBL_OUT2: + pdev->ref_count--; + RemoveEntryList((PLIST_ENTRY) purb); + + LBL_OUT: + unlock_dev(pdev, TRUE); + unlock_pending_endp_list(&ehci->pending_endp_list_lock); + ohci_process_pending_endp(ehci); + return status; +} ULONG ohci_get_type(PHCD hcd) @@ -670,8 +1362,7 @@ NTSTATUS ohci_submit_urb2(PHCD hcd, PUSB_DEV pdev, PUSB_ENDPOINT pendp, PURB purb) { - DbgPrint("ohci_submit_urb2 caled, but not implemented!\n"); - return STATUS_UNSUCCESSFUL; + return ohci_submit_urb(ohci_from_hcd(hcd), pdev, pendp, purb); } PUSB_DEV Modified: trunk/reactos/drivers/usb/nt4compat/usbdriver/ohci.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/nt4compat/usbd… ============================================================================== --- trunk/reactos/drivers/usb/nt4compat/usbdriver/ohci.h (original) +++ trunk/reactos/drivers/usb/nt4compat/usbdriver/ohci.h Wed Nov 21 12:51:03 2007 @@ -315,6 +315,15 @@ USHORT num_ports; + LIST_HEAD urb_list; // active urb-list + + // + //for iso and int bandwidth claim, bandwidth schedule + // + KSPIN_LOCK pending_endp_list_lock; //lock to access the following two + LIST_HEAD pending_endp_list; + UHCI_PENDING_ENDP_POOL pending_endp_pool; + KTIMER reset_timer; //used to reset the host controller struct _OHCI_DEVICE_EXTENSION *pdev_ext; PUSB_DEV root_hub; //root hub

1 0

[fireball] 30615: Andrey Korotaev <unC0Rr@inbox.ru> - Fix inverted logic in fs recognizer, and some comment fixes. See issue #2325 for more details.
by fireball＠svn.reactos.org 21 Nov '07

21 Nov '07

Author: fireball Date: Wed Nov 21 12:18:32 2007 New Revision: 30615 URL: http://svn.reactos.org/svn/reactos?rev=30615&view=rev Log: Andrey Korotaev <unC0Rr(a)inbox.ru> - Fix inverted logic in fs recognizer, and some comment fixes. See issue #2325 for more details. Modified: trunk/reactos/drivers/filesystems/fs_rec/ntfs.c Modified: trunk/reactos/drivers/filesystems/fs_rec/ntfs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fs_rec… ============================================================================== --- trunk/reactos/drivers/filesystems/fs_rec/ntfs.c (original) +++ trunk/reactos/drivers/filesystems/fs_rec/ntfs.c Wed Nov 21 12:18:32 2007 @@ -24,8 +24,8 @@ PAGED_CODE(); BOOLEAN Result; - /* Assume success */ - Result = TRUE; + /* Assume failure */ + Result = FALSE; if ((BootSector->Oem[0] == 'N') && (BootSector->Oem[1] == 'T') && @@ -36,8 +36,8 @@ (BootSector->Oem[6] == ' ') && (BootSector->Oem[7] == ' ')) { - /* Fail */ - Result = FALSE; + /* Success */ + Result = TRUE; } /* Return the result */ @@ -84,7 +84,7 @@ (PVOID)&Bpb, NULL)) { - /* Check if it's an actual FAT volume */ + /* Check if it's an actual NTFS volume */ if (FsRecIsNtfsVolume(Bpb, SectorSize, &SectorCount)) { /* It is! */ @@ -98,7 +98,7 @@ (PVOID)&Bpb, NULL)) { - /* Check if it's an actual FAT volume */ + /* Check if it's an actual NTFS volume */ if (FsRecIsNtfsVolume(Bpb, SectorSize, &SectorCount)) { /* It is! */ @@ -112,7 +112,7 @@ (PVOID)&Bpb, NULL)) { - /* Check if it's an actual FAT volume */ + /* Check if it's an actual NTFS volume */ if (FsRecIsNtfsVolume(Bpb, SectorSize, &SectorCount)) { /* It is! */

1 0

[cwittich] 30614: initialize FileName and SourceBuffer
by cwittich＠svn.reactos.org 21 Nov '07

21 Nov '07

Author: cwittich Date: Wed Nov 21 12:13:33 2007 New Revision: 30614 URL: http://svn.reactos.org/svn/reactos?rev=30614&view=rev Log: initialize FileName and SourceBuffer Modified: trunk/reactos/base/setup/usetup/cabinet.c trunk/reactos/base/setup/usetup/drivesup.c Modified: trunk/reactos/base/setup/usetup/cabinet.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/cabinet.… ============================================================================== --- trunk/reactos/base/setup/usetup/cabinet.c (original) +++ trunk/reactos/base/setup/usetup/cabinet.c Wed Nov 21 12:13:33 2007 @@ -712,7 +712,7 @@ PCFFILE Prev; ANSI_STRING AnsiString; UNICODE_STRING UnicodeString; - WCHAR FileName[MAX_PATH]; + WCHAR FileName[MAX_PATH] = {L'\0'}; if( wcscmp( Search->Cabinet, CabinetName ) != 0 ) Search->File = 0; // restart search of cabinet has changed since last find Modified: trunk/reactos/base/setup/usetup/drivesup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/drivesup… ============================================================================== --- trunk/reactos/base/setup/usetup/drivesup.c (original) +++ trunk/reactos/base/setup/usetup/drivesup.c Wed Nov 21 12:13:33 2007 @@ -41,7 +41,7 @@ OBJECT_ATTRIBUTES ObjectAttributes; UNICODE_STRING LinkName; UNICODE_STRING SourceName; - WCHAR SourceBuffer[MAX_PATH]; + WCHAR SourceBuffer[MAX_PATH] = {L'\0'}; HANDLE Handle; NTSTATUS Status; ULONG Length;

1 0

[weiden] 30613: Make dialogs update the UI state
by weiden＠svn.reactos.org 21 Nov '07

21 Nov '07

Author: weiden Date: Wed Nov 21 12:12:20 2007 New Revision: 30613 URL: http://svn.reactos.org/svn/reactos?rev=30613&view=rev Log: Make dialogs update the UI state Modified: trunk/reactos/dll/win32/user32/windows/defwnd.c trunk/reactos/dll/win32/user32/windows/dialog.c Modified: trunk/reactos/dll/win32/user32/windows/defwnd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/d… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/defwnd.c (original) +++ trunk/reactos/dll/win32/user32/windows/defwnd.c Wed Nov 21 12:12:20 2007 @@ -1683,7 +1683,7 @@ { /* We're a child window and we need to pass this message down until we reach the root */ - hWnd = UserHMGetHandle(Wnd->Parent); + hWnd = UserHMGetHandle((PWINDOW)DesktopPtrToUser(Wnd->Parent)); } else { Modified: trunk/reactos/dll/win32/user32/windows/dialog.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/d… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/dialog.c (original) +++ trunk/reactos/dll/win32/user32/windows/dialog.c Wed Nov 21 12:12:20 2007 @@ -816,6 +816,8 @@ SetFocus( dlgInfo->hwndFocus ); } + SendMessageW( hwnd, WM_CHANGEUISTATE, MAKEWPARAM(UIS_INITIALIZE, 0), 0); + if (template.style & WS_VISIBLE && !(GetWindowLongW( hwnd, GWL_STYLE ) & WS_VISIBLE)) { ShowWindow( hwnd, SW_SHOWNORMAL ); /* SW_SHOW doesn't always work */ @@ -2207,6 +2209,8 @@ case VK_TAB: if (!(dlgCode & DLGC_WANTTAB)) { + SendMessageW(hDlg, WM_CHANGEUISTATE, MAKEWPARAM(UIS_CLEAR, UISF_HIDEFOCUS), 0); + /* I am not sure under which circumstances the TAB is handled * each way. All I do know is that it does not always simply * send WM_NEXTDLGCTL. (Personally I have never yet seen it @@ -2306,6 +2310,10 @@ return TRUE; } break; + + case WM_SYSKEYDOWN: + SendMessageW(hDlg, WM_CHANGEUISTATE, MAKEWPARAM(UIS_CLEAR, UISF_HIDEFOCUS), 0); + break; } TranslateMessage( lpMsg );

1 0

[weiden] 30612: Check SPI_GETKEYBOARDCUES to find out if we should process WM_CHANGEUISTATE and WM_UPDATEUISTATE
by weiden＠svn.reactos.org 21 Nov '07

21 Nov '07

Author: weiden Date: Wed Nov 21 11:43:20 2007 New Revision: 30612 URL: http://svn.reactos.org/svn/reactos?rev=30612&view=rev Log: Check SPI_GETKEYBOARDCUES to find out if we should process WM_CHANGEUISTATE and WM_UPDATEUISTATE Modified: trunk/reactos/dll/win32/user32/windows/defwnd.c Modified: trunk/reactos/dll/win32/user32/windows/defwnd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/d… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/defwnd.c (original) +++ trunk/reactos/dll/win32/user32/windows/defwnd.c Wed Nov 21 11:43:20 2007 @@ -1618,9 +1618,16 @@ case WM_CHANGEUISTATE: { + BOOL AlwaysShowCues = TRUE; WORD Action = LOWORD(wParam); WORD Flags = HIWORD(wParam); - PWINDOW Wnd = ValidateHwnd(hWnd); + PWINDOW Wnd; + + SystemParametersInfoW(SPI_GETKEYBOARDCUES, 0, &AlwaysShowCues, 0); + if (AlwaysShowCues) + break; + + Wnd= ValidateHwnd(hWnd); if (!Wnd || lParam != 0) break; @@ -1693,9 +1700,16 @@ case WM_UPDATEUISTATE: { BOOL Change = TRUE; + BOOL AlwaysShowCues = TRUE; WORD Action = LOWORD(wParam); WORD Flags = HIWORD(wParam); - PWINDOW Wnd = ValidateHwnd(hWnd); + PWINDOW Wnd; + + SystemParametersInfoW(SPI_GETKEYBOARDCUES, 0, &AlwaysShowCues, 0); + if (AlwaysShowCues) + break; + + Wnd = ValidateHwnd(hWnd); if (!Wnd || lParam != 0) break;

1 0

[weiden] 30611: Implement WM_QUERYUISTATE, WM_CHANGEUISTATE and WM_UPDATEUISTATE
by weiden＠svn.reactos.org 21 Nov '07

21 Nov '07

Author: weiden Date: Wed Nov 21 11:32:45 2007 New Revision: 30611 URL: http://svn.reactos.org/svn/reactos?rev=30611&view=rev Log: Implement WM_QUERYUISTATE, WM_CHANGEUISTATE and WM_UPDATEUISTATE Modified: trunk/reactos/dll/win32/user32/include/user32.h trunk/reactos/dll/win32/user32/misc/misc.c trunk/reactos/dll/win32/user32/windows/defwnd.c trunk/reactos/include/reactos/win32k/ntuser.h trunk/reactos/subsystems/win32/win32k/include/window.h trunk/reactos/subsystems/win32/win32k/ntuser/misc.c trunk/reactos/subsystems/win32/win32k/ntuser/msgqueue.c trunk/reactos/subsystems/win32/win32k/ntuser/window.c Modified: trunk/reactos/dll/win32/user32/include/user32.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/include/u… ============================================================================== --- trunk/reactos/dll/win32/user32/include/user32.h (original) +++ trunk/reactos/dll/win32/user32/include/user32.h Wed Nov 21 11:32:45 2007 @@ -91,6 +91,19 @@ return ti->Hooks != 0; } +static __inline PDESKTOP +GetThreadDesktopInfo(VOID) +{ + PW32THREADINFO ti; + PDESKTOP di = NULL; + + ti = GetW32ThreadInfo(); + if (ti != NULL) + di = DesktopPtrToUser(ti->Desktop); + + return di; +} + PCALLPROC FASTCALL ValidateCallProc(HANDLE hCallProc); PWINDOW FASTCALL ValidateHwnd(HWND hwnd); PWINDOW FASTCALL ValidateHwndOrDesk(HWND hwnd); Modified: trunk/reactos/dll/win32/user32/misc/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/misc/misc… ============================================================================== --- trunk/reactos/dll/win32/user32/misc/misc.c (original) +++ trunk/reactos/dll/win32/user32/misc/misc.c Wed Nov 21 11:32:45 2007 @@ -146,19 +146,6 @@ } return pi; -} - -static PDESKTOP -GetThreadDesktopInfo(VOID) -{ - PW32THREADINFO ti; - PDESKTOP di = NULL; - - ti = GetW32ThreadInfo(); - if (ti != NULL) - di = DesktopPtrToUser(ti->Desktop); - - return di; } Modified: trunk/reactos/dll/win32/user32/windows/defwnd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/d… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/defwnd.c (original) +++ trunk/reactos/dll/win32/user32/windows/defwnd.c Wed Nov 21 11:32:45 2007 @@ -988,6 +988,18 @@ SendMessageW(hwnd, WM_PRINTCLIENT, (WPARAM)hdc, PRF_CLIENT); } +static BOOL CALLBACK +UserSendUiUpdateMsg(HWND hwnd, LPARAM lParam) +{ + WPARAM wParam; + + /* Unpack WPARAM */ + wParam = MAKEWPARAM((lParam >> 3) & 0x3, + lParam & (UISF_HIDEFOCUS | UISF_HIDEACCEL | UISF_ACTIVE)); + SendMessageW(hwnd, WM_UPDATEUISTATE, wParam, 0); + return TRUE; +} + VOID FASTCALL DefWndScreenshot(HWND hWnd) @@ -1590,6 +1602,168 @@ if (wParam) PostQuitMessage(0); return 0; + case WM_QUERYUISTATE: + { + LRESULT Ret = 0; + PWINDOW Wnd = ValidateHwnd(hWnd); + if (Wnd != NULL) + { + if (Wnd->HideFocus) + Ret |= UISF_HIDEFOCUS; + if (Wnd->HideAccel) + Ret |= UISF_HIDEACCEL; + } + return Ret; + } + + case WM_CHANGEUISTATE: + { + WORD Action = LOWORD(wParam); + WORD Flags = HIWORD(wParam); + PWINDOW Wnd = ValidateHwnd(hWnd); + if (!Wnd || lParam != 0) + break; + + if (Flags & ~(UISF_HIDEFOCUS | UISF_HIDEACCEL | UISF_ACTIVE)) + break; + + if (Flags & UISF_ACTIVE) + { + WARN("WM_CHANGEUISTATE does not yet support UISF_ACTIVE!\n"); + } + + if (Action == UIS_INITIALIZE) + { + PDESKTOP Desk = GetThreadDesktopInfo(); + if (Desk == NULL) + break; + + Action = Desk->LastInputWasKbd ? UIS_CLEAR : UIS_SET; + Flags = UISF_HIDEFOCUS | UISF_HIDEACCEL; + + /* We need to update wParam in case we need to send out messages */ + wParam = MAKEWPARAM(Action, Flags); + } + + switch (Action) + { + case UIS_SET: + /* See if we actually need to change something */ + if ((Flags & UISF_HIDEFOCUS) && !Wnd->HideFocus) + break; + if ((Flags & UISF_HIDEACCEL) && !Wnd->HideAccel) + break; + + /* Don't need to do anything... */ + return 0; + + case UIS_CLEAR: + /* See if we actually need to change something */ + if ((Flags & UISF_HIDEFOCUS) && Wnd->HideFocus) + break; + if ((Flags & UISF_HIDEACCEL) && Wnd->HideAccel) + break; + + /* Don't need to do anything... */ + return 0; + + default: + WARN("WM_CHANGEUISTATE: Unsupported Action 0x%x\n", Action); + break; + } + + if ((Wnd->Style & WS_CHILD) && Wnd->Parent != NULL) + { + /* We're a child window and we need to pass this message down until + we reach the root */ + hWnd = UserHMGetHandle(Wnd->Parent); + } + else + { + /* We're a top level window, we need to change the UI state */ + Msg = WM_UPDATEUISTATE; + } + + if (bUnicode) + return SendMessageW(hWnd, Msg, wParam, lParam); + else + return SendMessageA(hWnd, Msg, wParam, lParam); + } + + case WM_UPDATEUISTATE: + { + BOOL Change = TRUE; + WORD Action = LOWORD(wParam); + WORD Flags = HIWORD(wParam); + PWINDOW Wnd = ValidateHwnd(hWnd); + if (!Wnd || lParam != 0) + break; + + if (Flags & ~(UISF_HIDEFOCUS | UISF_HIDEACCEL | UISF_ACTIVE)) + break; + + if (Flags & UISF_ACTIVE) + { + WARN("WM_UPDATEUISTATE does not yet support UISF_ACTIVE!\n"); + } + + if (Action == UIS_INITIALIZE) + { + PDESKTOP Desk = GetThreadDesktopInfo(); + if (Desk == NULL) + break; + + Action = Desk->LastInputWasKbd ? UIS_CLEAR : UIS_SET; + Flags = UISF_HIDEFOCUS | UISF_HIDEACCEL; + + /* We need to update wParam for broadcasting the update */ + wParam = MAKEWPARAM(Action, Flags); + } + + switch (Action) + { + case UIS_SET: + /* See if we actually need to change something */ + if ((Flags & UISF_HIDEFOCUS) && !Wnd->HideFocus) + break; + if ((Flags & UISF_HIDEACCEL) && !Wnd->HideAccel) + break; + + /* Don't need to do anything... */ + Change = FALSE; + break; + + case UIS_CLEAR: + /* See if we actually need to change something */ + if ((Flags & UISF_HIDEFOCUS) && Wnd->HideFocus) + break; + if ((Flags & UISF_HIDEACCEL) && Wnd->HideAccel) + break; + + /* Don't need to do anything... */ + Change = FALSE; + break; + + default: + WARN("WM_UPDATEUISTATE: Unsupported Action 0x%x\n", Action); + return 0; + } + + /* Pack the information and call win32k */ + if (Change) + { + if (!NtUserCallTwoParam((DWORD)hWnd, (DWORD)Flags | ((DWORD)Action << 3), TWOPARAM_ROUTINE_ROS_UPDATEUISTATE)) + break; + } + + /* Always broadcast the update to all children */ + EnumChildWindows(hWnd, + UserSendUiUpdateMsg, + (LPARAM)Flags | ((LPARAM)Action << 3)); + + break; + } + } return 0; } Modified: trunk/reactos/include/reactos/win32k/ntuser.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/win32k/ntu… ============================================================================== --- trunk/reactos/include/reactos/win32k/ntuser.h (original) +++ trunk/reactos/include/reactos/win32k/ntuser.h Wed Nov 21 11:32:45 2007 @@ -35,6 +35,15 @@ HWND hTaskManWindow; HWND hProgmanWindow; struct _WINDOW *Wnd; + + union + { + UINT Dummy; + struct + { + UINT LastInputWasKbd : 1; + }; + }; WCHAR szDesktopName[1]; } DESKTOP, *PDESKTOP; @@ -154,6 +163,8 @@ /* Indicates whether the window is derived from a system class */ UINT IsSystem : 1; UINT InternalPosInitialized : 1; + UINT HideFocus : 1; + UINT HideAccel : 1; } WINDOW, *PWINDOW; typedef struct _W32PROCESSINFO @@ -669,6 +680,7 @@ #define TWOPARAM_ROUTINE_ROS_ISACTIVEICON 0x1001 #define TWOPARAM_ROUTINE_ROS_NCDESTROY 0x1002 #define TWOPARAM_ROUTINE_ROS_REGSYSCLASSES 0x1003 +#define TWOPARAM_ROUTINE_ROS_UPDATEUISTATE 0x1004 DWORD NTAPI NtUserCallTwoParam( Modified: trunk/reactos/subsystems/win32/win32k/include/window.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/window.h (original) +++ trunk/reactos/subsystems/win32/win32k/include/window.h Wed Nov 21 11:32:45 2007 @@ -12,6 +12,8 @@ #include <include/dce.h> #include <include/prop.h> #include <include/scroll.h> + +BOOL FASTCALL UserUpdateUiState(PWINDOW Wnd, WPARAM wParam); typedef struct _WINDOW_OBJECT { Modified: trunk/reactos/subsystems/win32/win32k/ntuser/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/misc.c (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/misc.c Wed Nov 21 11:32:45 2007 @@ -593,6 +593,19 @@ DPRINT1("ROS_SHOWWINDOW ---> 0x%x\n",Window->Flags); RETURN( 0 ); } + + case TWOPARAM_ROUTINE_ROS_UPDATEUISTATE: + { + WPARAM wParam; + Window = UserGetWindowObject((HWND)Param1); + if (!Window) RETURN(0); + + /* Unpack wParam */ + wParam = MAKEWPARAM((Param2 >> 3) & 0x3, + Param2 & (UISF_HIDEFOCUS | UISF_HIDEACCEL | UISF_ACTIVE)); + + RETURN( UserUpdateUiState(Window->Wnd, wParam) ); + } case TWOPARAM_ROUTINE_SWITCHTOTHISWINDOW: UNIMPLEMENTED Modified: trunk/reactos/subsystems/win32/win32k/ntuser/msgqueue.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/msgqueue.c (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/msgqueue.c Wed Nov 21 11:32:45 2007 @@ -478,6 +478,7 @@ NTSTATUS WaitStatus; DECLARE_RETURN(BOOL); USER_REFERENCE_ENTRY Ref; + PDESKTOP Desk = NULL; WaitObjects[1] = MessageQueue->NewMessages; WaitObjects[0] = &HardwareMessageQueueLock; @@ -499,7 +500,11 @@ DesktopWindow = UserGetWindowObject(IntGetDesktopWindow()); - if (DesktopWindow) UserRefObjectCo(DesktopWindow, &Ref);//can DesktopWindow be NULL? + if (DesktopWindow) + { + UserRefObjectCo(DesktopWindow, &Ref);//can DesktopWindow be NULL? + Desk = DesktopWindow->ti->Desktop; + } /* Process messages in the message queue itself. */ IntLockHardwareMessageQueue(MessageQueue); @@ -512,7 +517,6 @@ if (Current->Msg.message >= WM_MOUSEFIRST && Current->Msg.message <= WM_MOUSELAST) { - Accept = co_MsqTranslateMouseMessage(MessageQueue, hWnd, FilterLow, FilterHigh, @@ -527,6 +531,9 @@ IntUnLockHardwareMessageQueue(MessageQueue); IntUnLockSystemHardwareMessageQueueLock(FALSE); *Message = Current; + + if (Desk) + Desk->LastInputWasKbd = FALSE; RETURN(TRUE); } @@ -723,6 +730,9 @@ { Msg.hwnd = FocusMessageQueue->FocusWindow; DPRINT("Msg.hwnd = %x\n", Msg.hwnd); + + FocusMessageQueue->Desktop->DesktopInfo->LastInputWasKbd = TRUE; + IntGetCursorLocation(FocusMessageQueue->Desktop->WindowStation, &Msg.pt); MsqPostMessage(FocusMessageQueue, &Msg, FALSE, QS_KEY); Modified: trunk/reactos/subsystems/win32/win32k/ntuser/window.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/window.c (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/window.c Wed Nov 21 11:32:45 2007 @@ -66,6 +66,40 @@ /* HELPER FUNCTIONS ***********************************************************/ +BOOL FASTCALL UserUpdateUiState(PWINDOW Wnd, WPARAM wParam) +{ + WORD Action = LOWORD(wParam); + WORD Flags = HIWORD(wParam); + + if (Flags & ~(UISF_HIDEFOCUS | UISF_HIDEACCEL | UISF_ACTIVE)) + { + SetLastWin32Error(ERROR_INVALID_PARAMETER); + return FALSE; + } + + switch (Action) + { + case UIS_INITIALIZE: + SetLastWin32Error(ERROR_INVALID_PARAMETER); + return FALSE; + + case UIS_SET: + if (Flags & UISF_HIDEFOCUS) + Wnd->HideFocus = TRUE; + if (Flags & UISF_HIDEACCEL) + Wnd->HideAccel = TRUE; + break; + + case UIS_CLEAR: + if (Flags & UISF_HIDEFOCUS) + Wnd->HideFocus = FALSE; + if (Flags & UISF_HIDEACCEL) + Wnd->HideAccel = FALSE; + break; + } + + return TRUE; +} PWINDOW_OBJECT FASTCALL IntGetWindowObject(HWND hWnd) { @@ -1639,6 +1673,11 @@ IntReferenceMessageQueue(Window->MessageQueue); Window->Parent = ParentWindow; Wnd->Parent = ParentWindow ? ParentWindow->Wnd : NULL; + if (Wnd->Parent != NULL && hWndParent != 0) + { + Wnd->HideFocus = Wnd->Parent->HideFocus; + Wnd->HideAccel = Wnd->Parent->HideAccel; + } if((OwnerWindow = UserGetWindowObject(OwnerWindowHandle))) {

1 0

[weiden] 30610: Store the internal window placement directly inside the WINDOW structure
by weiden＠svn.reactos.org 21 Nov '07

21 Nov '07

Author: weiden Date: Wed Nov 21 08:35:33 2007 New Revision: 30610 URL: http://svn.reactos.org/svn/reactos?rev=30610&view=rev Log: Store the internal window placement directly inside the WINDOW structure Modified: trunk/reactos/dll/win32/user32/windows/window.c trunk/reactos/include/reactos/win32k/ntuser.h trunk/reactos/subsystems/win32/win32k/include/window.h trunk/reactos/subsystems/win32/win32k/include/winpos.h trunk/reactos/subsystems/win32/win32k/ntuser/misc.c trunk/reactos/subsystems/win32/win32k/ntuser/window.c trunk/reactos/subsystems/win32/win32k/ntuser/winpos.c Modified: trunk/reactos/dll/win32/user32/windows/window.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/w… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/window.c (original) +++ trunk/reactos/dll/win32/user32/windows/window.c Wed Nov 21 08:35:33 2007 @@ -1854,7 +1854,13 @@ STDCALL GetWindowContextHelpId(HWND hwnd) { - return NtUserGetWindowContextHelpId(hwnd); + PWINDOW Wnd = ValidateHwnd(hwnd); + if (Wnd != NULL) + { + return Wnd->ContextHelpId; + } + + return 0; } /* Modified: trunk/reactos/include/reactos/win32k/ntuser.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/win32k/ntu… ============================================================================== --- trunk/reactos/include/reactos/win32k/ntuser.h (original) +++ trunk/reactos/include/reactos/win32k/ntuser.h Wed Nov 21 08:35:33 2007 @@ -140,10 +140,20 @@ PWINDOWCLASS Class; /* Window name. */ UNICODE_STRING WindowName; + /* Context help id */ + DWORD ContextHelpId; + + struct + { + RECT NormalRect; + POINT IconPos; + POINT MaxPos; + } InternalPos; UINT Unicode : 1; /* Indicates whether the window is derived from a system class */ UINT IsSystem : 1; + UINT InternalPosInitialized : 1; } WINDOW, *PWINDOW; typedef struct _W32PROCESSINFO Modified: trunk/reactos/subsystems/win32/win32k/include/window.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/window.h (original) +++ trunk/reactos/subsystems/win32/win32k/include/window.h Wed Nov 21 08:35:33 2007 @@ -13,17 +13,6 @@ #include <include/prop.h> #include <include/scroll.h> - -VOID FASTCALL -WinPosSetupInternalPos(VOID); - -typedef struct _INTERNALPOS -{ - RECT NormalRect; - POINT IconPos; - POINT MaxPos; -} INTERNALPOS, *PINTERNALPOS; - typedef struct _WINDOW_OBJECT { /* NOTE: Do *NOT* Move this pointer anywhere in this structure! This @@ -36,8 +25,6 @@ PW32THREADINFO ti; /* Pointer to the desktop */ PDESKTOP Desktop; - /* Context help id */ - DWORD ContextHelpId; /* system menu handle. */ HMENU SystemMenu; /* Entry in the thread's list of windows. */ @@ -71,7 +58,6 @@ PWINDOW_SCROLLINFO Scroll; PETHREAD OwnerThread; HWND hWndLastPopup; /* handle to last active popup window (wine doesn't use pointer, for unk. reason)*/ - PINTERNALPOS InternalPos; ULONG Status; /* counter for tiled child windows */ ULONG TiledCounter; Modified: trunk/reactos/subsystems/win32/win32k/include/winpos.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/winpos.h (original) +++ trunk/reactos/subsystems/win32/win32k/include/winpos.h Wed Nov 21 08:35:33 2007 @@ -35,7 +35,7 @@ PWINDOW_OBJECT* Window); VOID FASTCALL co_WinPosActivateOtherWindow(PWINDOW_OBJECT Window); -PINTERNALPOS FASTCALL WinPosInitInternalPos(PWINDOW_OBJECT WindowObject, - POINT *pt, PRECT RestoreRect); +VOID FASTCALL WinPosInitInternalPos(PWINDOW_OBJECT WindowObject, + POINT *pt, PRECT RestoreRect); #endif /* _WIN32K_WINPOS_H */ Modified: trunk/reactos/subsystems/win32/win32k/ntuser/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/misc.c (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/misc.c Wed Nov 21 08:35:33 2007 @@ -301,7 +301,7 @@ RETURN( FALSE); } - Result = Window->ContextHelpId; + Result = Window->Wnd->ContextHelpId; RETURN( Result); } @@ -605,7 +605,7 @@ RETURN( (DWORD)FALSE); } - Window->ContextHelpId = Param2; + Window->Wnd->ContextHelpId = Param2; RETURN( (DWORD)TRUE); Modified: trunk/reactos/subsystems/win32/win32k/ntuser/window.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/window.c (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/window.c Wed Nov 21 08:35:33 2007 @@ -1618,7 +1618,7 @@ Class = NULL; Window->SystemMenu = (HMENU)0; - Window->ContextHelpId = 0; + Wnd->ContextHelpId = 0; Wnd->IDMenu = 0; Wnd->Instance = hInstance; Window->hSelf = hWnd; @@ -3883,7 +3883,6 @@ { PWINDOW_OBJECT Window; PWINDOW Wnd; - PINTERNALPOS InternalPos; POINT Size; WINDOWPLACEMENT Safepl; NTSTATUS Status; @@ -3930,18 +3929,12 @@ Size.x = Wnd->WindowRect.left; Size.y = Wnd->WindowRect.top; - InternalPos = WinPosInitInternalPos(Window, &Size, - &Wnd->WindowRect); - if (InternalPos) - { - Safepl.rcNormalPosition = InternalPos->NormalRect; - Safepl.ptMinPosition = InternalPos->IconPos; - Safepl.ptMaxPosition = InternalPos->MaxPos; - } - else - { - RETURN( FALSE); - } + WinPosInitInternalPos(Window, &Size, + &Wnd->WindowRect); + + Safepl.rcNormalPosition = Wnd->InternalPos.NormalRect; + Safepl.ptMinPosition = Wnd->InternalPos.IconPos; + Safepl.ptMaxPosition = Wnd->InternalPos.MaxPos; Status = MmCopyToCaller(lpwndpl, &Safepl, sizeof(WINDOWPLACEMENT)); if(!NT_SUCCESS(Status)) @@ -4334,11 +4327,10 @@ /* FIXME - change window status */ co_WinPosShowWindow(Window, Safepl.showCmd); - if (Window->InternalPos == NULL) - Window->InternalPos = ExAllocatePoolWithTag(PagedPool, sizeof(INTERNALPOS), TAG_WININTLIST); - Window->InternalPos->NormalRect = Safepl.rcNormalPosition; - Window->InternalPos->IconPos = Safepl.ptMinPosition; - Window->InternalPos->MaxPos = Safepl.ptMaxPosition; + Wnd->InternalPosInitialized = TRUE; + Wnd->InternalPos.NormalRect = Safepl.rcNormalPosition; + Wnd->InternalPos.IconPos = Safepl.ptMinPosition; + Wnd->InternalPos.MaxPos = Safepl.ptMaxPosition; UserDerefObjectCo(Window); RETURN(TRUE); Modified: trunk/reactos/subsystems/win32/win32k/ntuser/winpos.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/winpos.c (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/winpos.c Wed Nov 21 08:35:33 2007 @@ -267,14 +267,14 @@ /* FIXME */ } -PINTERNALPOS FASTCALL +VOID FASTCALL WinPosInitInternalPos(PWINDOW_OBJECT Window, POINT *pt, PRECT RestoreRect) { - PWINDOW_OBJECT Parent; - UINT XInc, YInc; - PWINDOW Wnd = Window->Wnd; - - if (Window->InternalPos == NULL) + PWINDOW_OBJECT Parent; + UINT XInc, YInc; + PWINDOW Wnd = Window->Wnd; + + if (!Wnd->InternalPosInitialized) { RECT WorkArea; PDESKTOP_OBJECT Desktop = PsGetCurrentThreadWin32Thread()->Desktop; /* Or rather get it from the window? */ @@ -290,51 +290,43 @@ else IntGetDesktopWorkArea(Desktop, &WorkArea); - Window->InternalPos = ExAllocatePoolWithTag(PagedPool, sizeof(INTERNALPOS), TAG_WININTLIST); - if(!Window->InternalPos) - { - DPRINT1("Failed to allocate INTERNALPOS structure for window 0x%x\n", Window->hSelf); - return NULL; - } - Window->InternalPos->NormalRect = Window->Wnd->WindowRect; + Wnd->InternalPos.NormalRect = Window->Wnd->WindowRect; IntGetWindowBorderMeasures(Window, &XInc, &YInc); - Window->InternalPos->MaxPos.x = WorkArea.left - XInc; - Window->InternalPos->MaxPos.y = WorkArea.top - YInc; - Window->InternalPos->IconPos.x = WorkArea.left; - Window->InternalPos->IconPos.y = WorkArea.bottom - UserGetSystemMetrics(SM_CYMINIMIZED); + Wnd->InternalPos.MaxPos.x = WorkArea.left - XInc; + Wnd->InternalPos.MaxPos.y = WorkArea.top - YInc; + Wnd->InternalPos.IconPos.x = WorkArea.left; + Wnd->InternalPos.IconPos.y = WorkArea.bottom - UserGetSystemMetrics(SM_CYMINIMIZED); + + Wnd->InternalPosInitialized = TRUE; } if (Wnd->Style & WS_MINIMIZE) { - Window->InternalPos->IconPos = *pt; + Wnd->InternalPos.IconPos = *pt; } else if (Wnd->Style & WS_MAXIMIZE) { - Window->InternalPos->MaxPos = *pt; + Wnd->InternalPos.MaxPos = *pt; } else if (RestoreRect != NULL) { - Window->InternalPos->NormalRect = *RestoreRect; - } - return(Window->InternalPos); + Wnd->InternalPos.NormalRect = *RestoreRect; + } } UINT FASTCALL co_WinPosMinMaximize(PWINDOW_OBJECT Window, UINT ShowFlag, RECT* NewPos) { POINT Size; - PINTERNALPOS InternalPos; UINT SwpFlags = 0; PWINDOW Wnd; ASSERT_REFS_CO(Window); Wnd = Window->Wnd; - Size.x = Window->Wnd->WindowRect.left; - Size.y = Window->Wnd->WindowRect.top; - InternalPos = WinPosInitInternalPos(Window, &Size, &Window->Wnd->WindowRect); - - if (InternalPos) - { + Size.x = Wnd->WindowRect.left; + Size.y = Wnd->WindowRect.top; + WinPosInitInternalPos(Window, &Size, &Wnd->WindowRect); + if (Wnd->Style & WS_MINIMIZE) { if (!co_IntSendMessage(Window->hSelf, WM_QUERYOPEN, 0, 0)) @@ -359,8 +351,8 @@ co_UserRedrawWindow(Window, NULL, 0, RDW_VALIDATE | RDW_NOERASE | RDW_NOINTERNALPAINT); Wnd->Style |= WS_MINIMIZE; - WinPosFindIconPos(Window, &InternalPos->IconPos); - IntGdiSetRect(NewPos, InternalPos->IconPos.x, InternalPos->IconPos.y, + WinPosFindIconPos(Window, &Wnd->InternalPos.IconPos); + IntGdiSetRect(NewPos, Wnd->InternalPos.IconPos.x, Wnd->InternalPos.IconPos.y, UserGetSystemMetrics(SM_CXMINIMIZED), UserGetSystemMetrics(SM_CYMINIMIZED)); SwpFlags |= SWP_NOCOPYBITS; @@ -369,16 +361,16 @@ case SW_MAXIMIZE: { - co_WinPosGetMinMaxInfo(Window, &Size, &InternalPos->MaxPos, + co_WinPosGetMinMaxInfo(Window, &Size, &Wnd->InternalPos.MaxPos, NULL, NULL); DPRINT("Maximize: %d,%d %dx%d\n", - InternalPos->MaxPos.x, InternalPos->MaxPos.y, Size.x, Size.y); + Wnd->InternalPos.MaxPos.x, Wnd->InternalPos.MaxPos.y, Size.x, Size.y); if (Wnd->Style & WS_MINIMIZE) { Wnd->Style &= ~WS_MINIMIZE; } Wnd->Style |= WS_MAXIMIZE; - IntGdiSetRect(NewPos, InternalPos->MaxPos.x, InternalPos->MaxPos.y, + IntGdiSetRect(NewPos, Wnd->InternalPos.MaxPos.x, Wnd->InternalPos.MaxPos.y, Size.x, Size.y); break; } @@ -391,15 +383,15 @@ if (Window->Flags & WINDOWOBJECT_RESTOREMAX) { co_WinPosGetMinMaxInfo(Window, &Size, - &InternalPos->MaxPos, NULL, NULL); + &Wnd->InternalPos.MaxPos, NULL, NULL); Wnd->Style |= WS_MAXIMIZE; - IntGdiSetRect(NewPos, InternalPos->MaxPos.x, - InternalPos->MaxPos.y, Size.x, Size.y); + IntGdiSetRect(NewPos, Wnd->InternalPos.MaxPos.x, + Wnd->InternalPos.MaxPos.y, Size.x, Size.y); break; } else { - *NewPos = InternalPos->NormalRect; + *NewPos = Wnd->InternalPos.NormalRect; NewPos->right -= NewPos->left; NewPos->bottom -= NewPos->top; break; @@ -412,18 +404,14 @@ return 0; } Wnd->Style &= ~WS_MAXIMIZE; - *NewPos = InternalPos->NormalRect; + *NewPos = Wnd->InternalPos.NormalRect; NewPos->right -= NewPos->left; NewPos->bottom -= NewPos->top; break; } } } - } - else - { - SwpFlags |= SWP_NOSIZE | SWP_NOMOVE; - } + return(SwpFlags); } @@ -447,9 +435,9 @@ Info->ptMaxTrackSize.x = Info->ptMaxSize.x; Info->ptMaxTrackSize.y = Info->ptMaxSize.y; - if (Window->InternalPos != NULL) - { - Info->ptMaxPosition = Window->InternalPos->MaxPos; + if (Window->Wnd->InternalPosInitialized) + { + Info->ptMaxPosition = Window->Wnd->InternalPos.MaxPos; } else { @@ -1696,8 +1684,8 @@ BOOL SendMessage) { POINT Size; - PINTERNALPOS InternalPos; PWINDOW_OBJECT Window = NULL; + PWINDOW Wnd; MINMAXINFO SafeMinMax; NTSTATUS Status; DECLARE_RETURN(BOOL); @@ -1712,33 +1700,30 @@ } UserRefObjectCo(Window, &Ref); + Wnd = Window->Wnd; Size.x = Window->Wnd->WindowRect.left; Size.y = Window->Wnd->WindowRect.top; - InternalPos = WinPosInitInternalPos(Window, &Size, - &Window->Wnd->WindowRect); - if(InternalPos) - { - if(SendMessage) - { - co_WinPosGetMinMaxInfo(Window, &SafeMinMax.ptMaxSize, &SafeMinMax.ptMaxPosition, - &SafeMinMax.ptMinTrackSize, &SafeMinMax.ptMaxTrackSize); - } - else - { - WinPosFillMinMaxInfoStruct(Window, &SafeMinMax); - } - Status = MmCopyToCaller(MinMaxInfo, &SafeMinMax, sizeof(MINMAXINFO)); - if(!NT_SUCCESS(Status)) - { - SetLastNtError(Status); - RETURN( FALSE); - } - - RETURN( TRUE); - } - - RETURN( FALSE); + WinPosInitInternalPos(Window, &Size, + &Wnd->WindowRect); + + if(SendMessage) + { + co_WinPosGetMinMaxInfo(Window, &SafeMinMax.ptMaxSize, &SafeMinMax.ptMaxPosition, + &SafeMinMax.ptMinTrackSize, &SafeMinMax.ptMaxTrackSize); + } + else + { + WinPosFillMinMaxInfoStruct(Window, &SafeMinMax); + } + Status = MmCopyToCaller(MinMaxInfo, &SafeMinMax, sizeof(MINMAXINFO)); + if(!NT_SUCCESS(Status)) + { + SetLastNtError(Status); + RETURN( FALSE); + } + + RETURN( TRUE); CLEANUP: if (Window) UserDerefObjectCo(Window);

1 0

← Newer
1
...
28
29
30
31
32
33
34
...
89
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs November 2007