Ros-diffs

ros-diffs@reactos.org

81390 discussions

[akhaldi] 51467: [CMAKE] * msc.cmake: Apply a consistent formatting.
by akhaldi＠svn.reactos.org 27 Apr '11

27 Apr '11

Author: akhaldi Date: Wed Apr 27 21:48:41 2011 New Revision: 51467 URL: http://svn.reactos.org/svn/reactos?rev=51467&view=rev Log: [CMAKE] * msc.cmake: Apply a consistent formatting. Modified: branches/cmake-bringup/msc.cmake Modified: branches/cmake-bringup/msc.cmake URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/msc.cmake?rev=514… ============================================================================== --- branches/cmake-bringup/msc.cmake [iso-8859-1] (original) +++ branches/cmake-bringup/msc.cmake [iso-8859-1] Wed Apr 27 21:48:41 2011 @@ -17,9 +17,9 @@ add_definitions(-Dinline=__inline -D__STDC__=1) if(${_MACHINE_ARCH_FLAG} MATCHES X86) - set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /SAFESEH:NO") - set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} /SAFESEH:NO") - set(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} /SAFESEH:NO") + set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /SAFESEH:NO") + set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} /SAFESEH:NO") + set(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} /SAFESEH:NO") endif() if(${ARCH} MATCHES amd64)

1 0

[janderwald] 51466: [USBEHCI_NEW] - Return the physical address of the async queue head in CUSBHardwareDevice::GetAsyncListRegister - Remove superflous entries from queue head structure, they are p...
by janderwald＠svn.reactos.org 27 Apr '11

27 Apr '11

Author: janderwald Date: Wed Apr 27 16:23:42 2011 New Revision: 51466 URL: http://svn.reactos.org/svn/reactos?rev=51466&view=rev Log: [USBEHCI_NEW] - Return the physical address of the async queue head in CUSBHardwareDevice::GetAsyncListRegister - Remove superflous entries from queue head structure, they are processed within IUSBRequest class - Remove USBHI_GetPortHackFlags, this function has been deprecated - Add interface functions for IUSBRequest / IUSBQueue - Callback into IUSBQueue when a hardware interrupt arrives - Implement callback function to check for completed queue heads / free completed queue head depending on the Async Advance interrupt bit Modified: branches/usb-bringup/drivers/usb/usbehci_new/hardware.cpp branches/usb-bringup/drivers/usb/usbehci_new/hardware.h 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_queue.cpp branches/usb-bringup/drivers/usb/usbehci_new/usb_request.cpp Modified: branches/usb-bringup/drivers/usb/usbehci_new/hardware.cpp URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup/drivers/usb/usbehci… ============================================================================== --- branches/usb-bringup/drivers/usb/usbehci_new/hardware.cpp [iso-8859-1] (original) +++ branches/usb-bringup/drivers/usb/usbehci_new/hardware.cpp [iso-8859-1] Wed Apr 27 16:23:42 2011 @@ -87,30 +87,39 @@ virtual ~CUSBHardwareDevice(){} protected: - LONG m_Ref; - PDRIVER_OBJECT m_DriverObject; - PDEVICE_OBJECT m_PhysicalDeviceObject; - PDEVICE_OBJECT m_FunctionalDeviceObject; - PDEVICE_OBJECT m_NextDeviceObject; - KSPIN_LOCK m_Lock; - PKINTERRUPT m_Interrupt; - KDPC m_IntDpcObject; - PVOID VirtualBase; - PHYSICAL_ADDRESS PhysicalAddress; - PULONG m_Base; - PDMA_ADAPTER m_Adapter; - ULONG m_MapRegisters; - EHCI_CAPS m_Capabilities; - USHORT m_VendorID; - USHORT m_DeviceID; - PQUEUE_HEAD AsyncQueueHead; - PUSBQUEUE m_UsbQueue; - PDMAMEMORYMANAGER m_MemoryManager; - HD_INIT_CALLBACK* m_SCECallBack; - PVOID m_SCEContext; + LONG m_Ref; // reference count + PDRIVER_OBJECT m_DriverObject; // driver object + PDEVICE_OBJECT m_PhysicalDeviceObject; // pdo + PDEVICE_OBJECT m_FunctionalDeviceObject; // fdo (hcd controller) + PDEVICE_OBJECT m_NextDeviceObject; // lower device object + KSPIN_LOCK m_Lock; // hardware lock + PKINTERRUPT m_Interrupt; // interrupt object + KDPC m_IntDpcObject; // dpc object for deferred isr processing + PVOID VirtualBase; // virtual base for memory manager + PHYSICAL_ADDRESS PhysicalAddress; // physical base for memory manager + PULONG m_Base; // EHCI operational port base registers + PDMA_ADAPTER m_Adapter; // dma adapter object + ULONG m_MapRegisters; // map registers count + EHCI_CAPS m_Capabilities; // EHCI caps + USHORT m_VendorID; // vendor id + USHORT m_DeviceID; // device id + PQUEUE_HEAD AsyncQueueHead; // async queue head terminator + PUSBQUEUE m_UsbQueue; // usb request queue + PDMAMEMORYMANAGER m_MemoryManager; // memory manager + HD_INIT_CALLBACK* m_SCECallBack; // status change callback routine + PVOID m_SCEContext; // status change callback routine context + BOOLEAN m_DoorBellRingInProgress; // door bell ring in progress + + // set command VOID SetCommandRegister(PEHCI_USBCMD_CONTENT UsbCmd); + + // get command VOID GetCommandRegister(PEHCI_USBCMD_CONTENT UsbCmd); + + // read register ULONG EHCI_READ_REGISTER_ULONG(ULONG Offset); + + // write register VOID EHCI_WRITE_REGISTER_ULONG(ULONG Offset, ULONG Value); }; @@ -315,6 +324,7 @@ m_Capabilities.HCCParamsLong = READ_REGISTER_ULONG((PULONG)((ULONG)ResourceBase + 8)); DPRINT1("Controller has %d Ports\n", m_Capabilities.HCSParams.PortCount); + DPRINT1("Controller EHCI Version %x\n", m_Capabilities.HCIVersion); if (m_Capabilities.HCSParams.PortRouteRules) { for (Count = 0; Count < m_Capabilities.HCSParams.PortCount; Count++) @@ -850,7 +860,7 @@ ULONG CUSBHardwareDevice::GetAsyncListRegister() { - return PhysicalAddress.LowPart; + return AsyncQueueHead->PhysicalAddr; } ULONG CUSBHardwareDevice::GetPeriodicListRegister() @@ -946,10 +956,85 @@ IN PVOID SystemArgument2) { CUSBHardwareDevice *This; - ULONG CStatus, PortStatus, PortCount, i; + ULONG CStatus, PortStatus, PortCount, i, ShouldRingDoorBell; + NTSTATUS Status = STATUS_SUCCESS; + EHCI_USBCMD_CONTENT UsbCmd; This = (CUSBHardwareDevice*) SystemArgument1; CStatus = (ULONG) SystemArgument2; + + + // + // check for completion of async schedule + // + if (CStatus & (EHCI_STS_RECL| EHCI_STS_INT | EHCI_ERROR_INT)) + { + if (CStatus & EHCI_ERROR_INT) + { + // + // controller reported error + // + Status = STATUS_UNSUCCESSFUL; + } + + // + // check if there is a door bell ring in progress + // + if (This->m_DoorBellRingInProgress == FALSE) + { + // + // inform IUSBQueue of a completed queue head + // + This->m_UsbQueue->InterruptCallback(Status, &ShouldRingDoorBell); + + // + // was a queue head completed? + // + if (ShouldRingDoorBell) + { + // + // set door ring bell in progress status flag + // + This->m_DoorBellRingInProgress = TRUE; + + // + // get command register + // + This->GetCommandRegister(&UsbCmd); + + // + // set door rang bell bit + // + UsbCmd.DoorBell = TRUE; + + // + // update command status + // + This->SetCommandRegister(&UsbCmd); + } + } + } + + // + // check if the controller has acknowledged the door bell + // + if (CStatus & EHCI_STS_IAA) + { + // + // controller has acknowledged, assert we rang the bell + // + PC_ASSERT(This->m_DoorBellRingInProgress == TRUE); + + // + // now notify IUSBQueue that it can free completed requests + // + This->m_UsbQueue->CompleteAsyncRequests(); + + // + // door ring bell completed + // + This->m_DoorBellRingInProgress = FALSE; + } This->GetDeviceDetails(NULL, NULL, &PortCount, NULL); if (CStatus & EHCI_STS_PCD) 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] Wed Apr 27 16:23:42 2011 @@ -190,10 +190,6 @@ //Software ULONG PhysicalAddr; LIST_ENTRY LinkedQueueHeads; - PQUEUE_TRANSFER_DESCRIPTOR TransferDescriptor; - PIRP IrpToComplete; - PMDL Mdl; - PKEVENT Event; PVOID Request; } QUEUE_HEAD, *PQUEUE_HEAD; 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] Wed Apr 27 16:23:42 2011 @@ -1988,16 +1988,6 @@ NTSTATUS USB_BUSIFFN -USBHI_GetPortHackFlags( - PVOID BusContext, - PULONG Flags) -{ - UNIMPLEMENTED - return STATUS_NOT_IMPLEMENTED; -} - -NTSTATUS -USB_BUSIFFN USBHI_QueryDeviceInformation( PVOID BusContext, PUSB_DEVICE_HANDLE DeviceHandle, @@ -2565,7 +2555,6 @@ InterfaceHub->GetUsbDescriptors = USBHI_GetUsbDescriptors; InterfaceHub->RemoveUsbDevice = USBHI_RemoveUsbDevice; InterfaceHub->RestoreUsbDevice = USBHI_RestoreUsbDevice; - InterfaceHub->GetPortHackFlags = USBHI_GetPortHackFlags; InterfaceHub->QueryDeviceInformation = USBHI_QueryDeviceInformation; } 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] Wed Apr 27 16:23:42 2011 @@ -482,7 +482,26 @@ // Description: frees the queue head with the associated transfer descriptors virtual VOID FreeQueueHead(struct _QUEUE_HEAD * QueueHead) = 0; + +//--------------------------------------------------------------------------------------- +// +// GetTransferBuffer +// +// Description: this function returns the transfer buffer mdl and length +// Used by IUSBQueue for mapping buffer contents with DMA + + virtual VOID GetTransferBuffer(OUT PMDL * OutMDL, + OUT PULONG TransferLength) = 0; + +//-------------------------------------------------------------------------------------- +// +// IsQueueHeadComplete +// +// Description: returns true when the queue head which was passed as a parameter has been completed + + virtual BOOLEAN IsQueueHeadComplete(struct _QUEUE_HEAD * QueueHead) = 0; }; + typedef IUSBRequest *PUSBREQUEST; @@ -539,6 +558,24 @@ // Description: creates an usb request virtual NTSTATUS CreateUSBRequest(IUSBRequest **OutRequest) = 0; + +//-------------------------------------------------------------------------------------- +// +// InterruptCallback +// +// Description: callback when the periodic / asynchronous queue has been completed / queue head been completed + + virtual VOID InterruptCallback(IN NTSTATUS Status, OUT PULONG ShouldRingDoorBell) = 0; + +//-------------------------------------------------------------------------------------- +// +// CompleteAsyncRequests +// +// Description: once a request has been completed it is moved to pending queue. Since a queue head should only be freed +// after a door bell ring, this needs some synchronization. +// This function gets called by IUSBHardware after it the Interrupt on Async Advance bit has been set + + virtual VOID CompleteAsyncRequests() = 0; }; typedef IUSBQueue *PUSBQUEUE; 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] Wed Apr 27 16:23:42 2011 @@ -33,12 +33,14 @@ return m_Ref; } - NTSTATUS Initialize(IN PUSBHARDWAREDEVICE Hardware, PDMA_ADAPTER AdapterObject, IN OPTIONAL PKSPIN_LOCK Lock); - ULONG GetPendingRequestCount(); - NTSTATUS AddUSBRequest(PURB Urb); - NTSTATUS AddUSBRequest(IUSBRequest * Request); - NTSTATUS CancelRequests(); - NTSTATUS CreateUSBRequest(IUSBRequest **OutRequest); + virtual NTSTATUS Initialize(IN PUSBHARDWAREDEVICE Hardware, PDMA_ADAPTER AdapterObject, IN OPTIONAL PKSPIN_LOCK Lock); + virtual ULONG GetPendingRequestCount(); + virtual NTSTATUS AddUSBRequest(PURB Urb); + virtual NTSTATUS AddUSBRequest(IUSBRequest * Request); + virtual NTSTATUS CancelRequests(); + virtual NTSTATUS CreateUSBRequest(IUSBRequest **OutRequest); + virtual VOID InterruptCallback(IN NTSTATUS Status, OUT PULONG ShouldRingDoorBell); + virtual VOID CompleteAsyncRequests(); // constructor / destructor CUSBQueue(IUnknown *OuterUnknown){} @@ -50,6 +52,7 @@ PDMA_ADAPTER m_Adapter; PQUEUE_HEAD AsyncListQueueHead; PQUEUE_HEAD PendingListQueueHead; + LIST_ENTRY m_CompletedRequestAsyncList; // queue head manipulation functions VOID LinkQueueHead(PQUEUE_HEAD HeadQueueHead, PQUEUE_HEAD NewQueueHead); @@ -57,8 +60,11 @@ VOID LinkQueueHeadChain(PQUEUE_HEAD HeadQueueHead, PQUEUE_HEAD NewQueueHead); PQUEUE_HEAD UnlinkQueueHeadChain(PQUEUE_HEAD HeadQueueHead, ULONG Count); + // processes the async list + VOID ProcessAsyncList(IN NTSTATUS Status, OUT PULONG ShouldRingDoorBell); + // called for each completed queue head - NTSTATUS QueueHeadCompletion(PQUEUE_HEAD QueueHead, NTSTATUS Status); + VOID QueueHeadCompletion(PQUEUE_HEAD QueueHead, NTSTATUS Status); // called when the completion queue is cleaned up VOID QueueHeadCleanup(PQUEUE_HEAD QueueHead); @@ -120,6 +126,17 @@ // InitializeListHead(&PendingListQueueHead->LinkedQueueHeads); + // + // fake the queue head as the first queue head + // + PendingListQueueHead->PhysicalAddr = ((ULONG_PTR)AsyncListQueueHead | QH_TYPE_QH); + + // + // Initialize completed async list head + // + InitializeListHead(&m_CompletedRequestAsyncList); + + return Status; } @@ -234,13 +251,44 @@ PQUEUE_HEAD PreviousQH, NextQH; PLIST_ENTRY Entry; + // + // sanity check: there must be at least one queue head with halted bit set + // + PC_ASSERT(QueueHead->Token.Bits.Halted == 0); + + // + // get previous link + // Entry = QueueHead->LinkedQueueHeads.Blink; + + // + // get queue head structure + // PreviousQH = CONTAINING_RECORD(Entry, QUEUE_HEAD, LinkedQueueHeads); + + // + // get next link + // Entry = QueueHead->LinkedQueueHeads.Flink; + + // + // get queue head structure + // NextQH = CONTAINING_RECORD(Entry, QUEUE_HEAD, LinkedQueueHeads); + + // + // sanity check + // ASSERT(QueueHead->HorizontalLinkPointer == (NextQH->PhysicalAddr | QH_TYPE_QH)); + + // + // remove queue head from linked list + // PreviousQH->HorizontalLinkPointer = NextQH->PhysicalAddr | QH_TYPE_QH; + // + // remove software link + // RemoveEntryList(&QueueHead->LinkedQueueHeads); } @@ -326,7 +374,7 @@ return FirstQueueHead; } -NTSTATUS +VOID CUSBQueue::QueueHeadCompletion( PQUEUE_HEAD CurrentQH, NTSTATUS Status) @@ -415,14 +463,94 @@ else { // - // FIXME: put queue head into completed queue head list - // - } - - // - // done - // - return STATUS_SUCCESS; + // put queue head into completed queue head list + // + InsertTailList(&m_CompletedRequestAsyncList, &CurrentQH->LinkedQueueHeads); + } +} + +VOID +CUSBQueue::ProcessAsyncList( + IN NTSTATUS Status, + OUT PULONG ShouldRingDoorBell) +{ + KIRQL OldLevel; + PLIST_ENTRY Entry; + PQUEUE_HEAD QueueHead; + IUSBRequest * Request; + + // + // lock completed async list + // + KeAcquireSpinLock(&m_Lock, &OldLevel); + + // + // walk async list + // + Entry = PendingListQueueHead->LinkedQueueHeads.Flink; + + while(Entry != &PendingListQueueHead->LinkedQueueHeads) + { + // + // get queue head structure + // + QueueHead = (PQUEUE_HEAD)CONTAINING_RECORD(Entry, QUEUE_HEAD, LinkedQueueHeads); + + // + // sanity check + // + PC_ASSERT(QueueHead->Request); + + // + // get IUSBRequest interface + // + Request = (IUSBRequest*)QueueHead->Request; + + + // + // move to next entry + // + Entry = Entry->Flink; + + // + // check if queue head is complete + // + if (Request->IsQueueHeadComplete(QueueHead)) + { + // + // current queue head is complete + // + QueueHeadCompletion(QueueHead, Status); + + // + // ring door bell is going to be necessary + // + *ShouldRingDoorBell = TRUE; + } + } + + // + // release lock + // + KeReleaseSpinLock(&m_Lock, OldLevel); + +} + + +VOID +CUSBQueue::InterruptCallback( + IN NTSTATUS Status, + OUT PULONG ShouldRingDoorBell) +{ + // + // iterate asynchronous list + // + *ShouldRingDoorBell = FALSE; + ProcessAsyncList(Status, ShouldRingDoorBell); + + // + // TODO: implement periodic schedule processing + // } VOID @@ -472,6 +600,47 @@ // // request is now released // +} + +VOID +CUSBQueue::CompleteAsyncRequests() +{ + KIRQL OldLevel; + PLIST_ENTRY Entry; + PQUEUE_HEAD CurrentQH; + + // + // first acquire request lock + // + KeAcquireSpinLock(&m_Lock, &OldLevel); + + // + // the list should not be empty + // + PC_ASSERT(!IsListEmpty(&m_CompletedRequestAsyncList)); + + while(!IsListEmpty(&m_CompletedRequestAsyncList)) + { + // + // remove first entry + // + Entry = RemoveHeadList(&m_CompletedRequestAsyncList); + + // + // get queue head structure + // + CurrentQH = (PQUEUE_HEAD)CONTAINING_RECORD(Entry, QUEUE_HEAD, LinkedQueueHeads); + + // + // complete request now + // + QueueHeadCleanup(CurrentQH); + } + + // + // release lock + // + KeReleaseSpinLock(&m_Lock, OldLevel); } 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] Wed Apr 27 16:23:42 2011 @@ -47,6 +47,9 @@ virtual BOOLEAN IsRequestInitialized(); virtual BOOLEAN ShouldReleaseRequestAfterCompletion(); virtual VOID FreeQueueHead(struct _QUEUE_HEAD * QueueHead); + virtual VOID GetTransferBuffer(OUT PMDL * OutMDL, OUT PULONG TransferLength); + virtual BOOLEAN IsQueueHeadComplete(struct _QUEUE_HEAD * QueueHead); + // local functions ULONG InternalGetTransferType(); @@ -641,12 +644,6 @@ } // - // Control Transfers have only one in or out buffer if one at all. Put in the QueueHead the - // same as BulkTransfers. USBQueue will use the Mdl to fill in the BufferPointers - // - QueueHead->Mdl = m_TransferBufferMDL; - - // // link setup packet into buffer - Physical Address!!! // m_TransferDescriptors[0]->BufferPointer[0] = (ULONG)PtrToUlong(m_DescriptorSetupPacket.LowPart); @@ -1149,6 +1146,64 @@ } } +//----------------------------------------------------------------------------------------- +BOOLEAN +CUSBRequest::IsQueueHeadComplete( + struct _QUEUE_HEAD * QueueHead) +{ + ULONG Index; + + // + // first check - is the queue head currently active + // + if (QueueHead->Token.Bits.Active) + { + // + // queue head is active (currently processed) + // + return FALSE; + } + + // + // FIXME: support chained queue heads + // + for(Index = 0; Index < 3; Index++) + { + // + // check transfer descriptors for completion + // + if (m_TransferDescriptors[Index]) + { + // + // check for serious error + // + PC_ASSERT(m_TransferDescriptors[Index]->Token.Bits.Halted == 0); + + // + // the transfer descriptor should be in the same state as the queue head + // + PC_ASSERT(m_TransferDescriptors[Index]->Token.Bits.Active == 0); + } + } + + return TRUE; +} + +//----------------------------------------------------------------------------------------- +VOID +CUSBRequest::GetTransferBuffer( + OUT PMDL * OutMDL, + OUT PULONG TransferLength) +{ + // sanity checks + PC_ASSERT(OutMDL); + PC_ASSERT(TransferLength); + + *OutMDL = m_TransferBufferMDL; + *TransferLength = m_TransferBufferLength; +} + +//----------------------------------------------------------------------------------------- NTSTATUS InternalCreateUSBRequest( PUSBREQUEST *OutRequest)

1 0

[rharabien] 51465: [CMAKE] Add idndl to build
by rharabien＠svn.reactos.org 27 Apr '11

27 Apr '11

Author: rharabien Date: Wed Apr 27 14:05:18 2011 New Revision: 51465 URL: http://svn.reactos.org/svn/reactos?rev=51465&view=rev Log: [CMAKE] Add idndl to build Modified: branches/cmake-bringup/base/applications/cmdutils/CMakeLists.txt branches/cmake-bringup/dll/nls/CMakeLists.txt branches/cmake-bringup/dll/nls/idndl/CMakeLists.txt Modified: branches/cmake-bringup/base/applications/cmdutils/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… ============================================================================== --- branches/cmake-bringup/base/applications/cmdutils/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/base/applications/cmdutils/CMakeLists.txt [iso-8859-1] Wed Apr 27 14:05:18 2011 @@ -1,6 +1,6 @@ add_subdirectory(dbgprint) add_subdirectory(doskey) -add_subdirectory(find) # FIXME : lang/pt-BR.rc:6: use "" to put " in a string +add_subdirectory(find) add_subdirectory(hostname) add_subdirectory(lodctr) add_subdirectory(more) Modified: branches/cmake-bringup/dll/nls/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/nls/CMakeList… ============================================================================== --- branches/cmake-bringup/dll/nls/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/nls/CMakeLists.txt [iso-8859-1] Wed Apr 27 14:05:18 2011 @@ -1,3 +1,3 @@ -#add_subdirectory(idndl)#FIXME: idndl.cpp:20: error: 'GetLocaleInfoEx' was not declared in this scope +add_subdirectory(idndl) add_subdirectory(normaliz) Modified: branches/cmake-bringup/dll/nls/idndl/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/nls/idndl/CMa… ============================================================================== --- branches/cmake-bringup/dll/nls/idndl/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/nls/idndl/CMakeLists.txt [iso-8859-1] Wed Apr 27 14:05:18 2011 @@ -1,6 +1,6 @@ -remove_definitions(-D_WIN32_WINNT=0x502) -add_definitions(-D_WIN32_WINNT=0x600) +remove_definitions(-DWINVER=0x502) +add_definitions(-DWINVER=0x600) spec2def(idndl.dll idndl.spec)

1 0

[gadamopoulos] 51464: [win32k] -Fix a case when a window is created and we don't have a monitor created yet. (This can happen when we may attempt to use gui on demand)
by gadamopoulos＠svn.reactos.org 27 Apr '11

27 Apr '11

Author: gadamopoulos Date: Wed Apr 27 12:33:16 2011 New Revision: 51464 URL: http://svn.reactos.org/svn/reactos?rev=51464&view=rev Log: [win32k] -Fix a case when a window is created and we don't have a monitor created yet. (This can happen when we may attempt to use gui on demand) Modified: trunk/reactos/subsystems/win32/win32k/ntuser/window.c 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 [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/window.c [iso-8859-1] Wed Apr 27 12:33:16 2011 @@ -1555,7 +1555,15 @@ PRTL_USER_PROCESS_PARAMETERS ProcessParams; pMonitor = IntGetPrimaryMonitor(); - ASSERT(pMonitor); + + /* Check if we don't have a monitor attached yet */ + if(pMonitor == NULL) + { + Cs->x = Cs->y = 0; + Cs->cx = 800; + Cs->cy = 600; + return; + } ProcessParams = PsGetCurrentProcess()->Peb->ProcessParameters;

1 0

[ilardig] 51463: [SUBST] Add Italian and Spanish translations.
by ilardig＠svn.reactos.org 27 Apr '11

27 Apr '11

Author: ilardig Date: Wed Apr 27 07:09:47 2011 New Revision: 51463 URL: http://svn.reactos.org/svn/reactos?rev=51463&view=rev Log: [SUBST] Add Italian and Spanish translations. Added: trunk/reactos/base/system/subst/lang/es-ES.rc (with props) trunk/reactos/base/system/subst/lang/it-IT.rc (with props) Modified: trunk/reactos/base/system/subst/rsrc.rc Added: trunk/reactos/base/system/subst/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/subst/lang/es-… ============================================================================== --- trunk/reactos/base/system/subst/lang/es-ES.rc (added) +++ trunk/reactos/base/system/subst/lang/es-ES.rc [iso-8859-1] Wed Apr 27 07:09:47 2011 @@ -1,0 +1,16 @@ +#include "resource.h" +LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL + +STRINGTABLE +BEGIN + IDS_INCORRECT_PARAMETER_COUNT "Cantidad de parámetros incorrecta - %s\n" + IDS_INVALID_PARAMETER "Cantidad de parámetros incorrecta - %s\n" + IDS_INVALID_PARAMETER2 "Parámetro incorrecto - %s\n" + IDS_DRIVE_ALREAD_SUBSTED "Unidad ya sustituida\n" + IDS_FAILED_WITH_ERROCODE "Falla con código de error 0x%x: %s\n" + IDS_USAGE "Asocia una ruta con una letra de unidad.\n\nSUBST [unidad1: [unidad2:]ruta]\nSUBST unidad1: /D\n\n unidad1: \ + Especifica una unidad virtual a la cual se quiere asignar una ruta.\n \ + [unidad2:]ruta Especifica una unidad física y una ruta a la cual asignar\n \ + una unidad virtual.\n /D \ + Elimina una unidad (virtual) substituida.\n\nEscribir SUBST sin parámetros para mostrar una lista de las unidades virtuales actuales.\n" +END Propchange: trunk/reactos/base/system/subst/lang/es-ES.rc ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/base/system/subst/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/subst/lang/it-… ============================================================================== --- trunk/reactos/base/system/subst/lang/it-IT.rc (added) +++ trunk/reactos/base/system/subst/lang/it-IT.rc [iso-8859-1] Wed Apr 27 07:09:47 2011 @@ -1,0 +1,16 @@ +#include "resource.h" +LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL + +STRINGTABLE +BEGIN + IDS_INCORRECT_PARAMETER_COUNT "Numero di parametri invalido - %s\n" + IDS_INVALID_PARAMETER "Incorrect number of parameters - %s\n" + IDS_INVALID_PARAMETER2 "Parametro invalido - %s\n" + IDS_DRIVE_ALREAD_SUBSTED "Unità già sostituita\n" + IDS_FAILED_WITH_ERROCODE "Interruzione con codice di errore 0x%x: %s\n" + IDS_USAGE "Associa un percorso ad una lettera di unità.\n\nSUBST [unità1: [unità2:]percorso]\nSUBST unità1: /D\n\n unità1: \ + Specifica un'unità virtuale alla quale assegnare un percorso.\n \ + [unità2:]percorso Specifica un'unità fisica e un percorso da assegnare ad una\n \ + unità virtuale.\n /D \ + Elimina un'unità (virtuale) sostituita.\n\nDigitare SUBST senza parametri per mostrare un elenco delle unità virtuali attuali.\n" +END Propchange: trunk/reactos/base/system/subst/lang/it-IT.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/base/system/subst/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/subst/rsrc.rc?… ============================================================================== --- trunk/reactos/base/system/subst/rsrc.rc [iso-8859-1] (original) +++ trunk/reactos/base/system/subst/rsrc.rc [iso-8859-1] Wed Apr 27 07:09:47 2011 @@ -4,3 +4,5 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL #include "lang/en-US.rc" +#include "lang/es-ES.rc" +#include "lang/it-IT.rc"

1 0

[akhaldi] 51462: [CMAKE] * uncomment the NDEBUG define.
by akhaldi＠svn.reactos.org 26 Apr '11

26 Apr '11

Author: akhaldi Date: Tue Apr 26 22:54:53 2011 New Revision: 51462 URL: http://svn.reactos.org/svn/reactos?rev=51462&view=rev Log: [CMAKE] * uncomment the NDEBUG define. Modified: branches/cmake-bringup/ntoskrnl/kdbg/kdb_symbols.c Modified: branches/cmake-bringup/ntoskrnl/kdbg/kdb_symbols.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/ntoskrnl/kdbg/kdb… ============================================================================== --- branches/cmake-bringup/ntoskrnl/kdbg/kdb_symbols.c [iso-8859-1] (original) +++ branches/cmake-bringup/ntoskrnl/kdbg/kdb_symbols.c [iso-8859-1] Tue Apr 26 22:54:53 2011 @@ -12,7 +12,7 @@ #include <ntoskrnl.h> -//#define NDEBUG +#define NDEBUG #include "../cache/section/newmm.h" #include <debug.h>

1 0

[jimtabor] 51461: [User32] - Sync up menu without the Right to Left support. Still missing needed changes for adding it. - Patches by Alexandre Julliard and Dmitry Timoshkov.
by jimtabor＠svn.reactos.org 26 Apr '11

26 Apr '11

Author: jimtabor Date: Tue Apr 26 03:31:15 2011 New Revision: 51461 URL: http://svn.reactos.org/svn/reactos?rev=51461&view=rev Log: [User32] - Sync up menu without the Right to Left support. Still missing needed changes for adding it. - Patches by Alexandre Julliard and Dmitry Timoshkov. Modified: trunk/reactos/dll/win32/user32/windows/menu.c Modified: trunk/reactos/dll/win32/user32/windows/menu.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/m… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/menu.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/windows/menu.c [iso-8859-1] Tue Apr 26 03:31:15 2011 @@ -511,57 +511,46 @@ TRACE("\tlooking for '%c' (0x%02x) in [%p]\n", (char) Key, Key, MenuInfo); if (NULL == MenuInfo || ! IsMenu(MenuInfo->Self)) - { + { if (MenuGetRosMenuInfo(&SysMenuInfo, GetSystemMenu(WndOwner, FALSE))) - { + { MenuInfo = &SysMenuInfo; - } + } else - { + { MenuInfo = NULL; - } - } + } + } if (NULL != MenuInfo) - { + { if (MenuGetAllRosMenuItemInfo(MenuInfo->Self, &Items) <= 0) - { + { return -1; - } - if (! ForceMenuChar) - { - Key = toupperW(Key); + } + if ( !ForceMenuChar ) + { ItemInfo = Items; for (i = 0; i < MenuInfo->MenuItemCount; i++, ItemInfo++) - { + { if ((ItemInfo->lpstr) && NULL != ItemInfo->dwTypeData) - { + { WCHAR *p = (WCHAR *) ItemInfo->dwTypeData - 2; do - { - p = strchrW(p + 2, '&'); - } - while (NULL != p && L'&' == p[1]); - if (NULL != p && (toupperW(p[1]) == Key)) - { - return i; - } - } - } - } + { + p = strchrW (p + 2, '&'); + } + while (p != NULL && p [1] == '&'); + if (p && (toupperW(p[1]) == toupperW(Key))) return i; + } + } + } MenuChar = SendMessageW(WndOwner, WM_MENUCHAR, MAKEWPARAM(Key, MenuInfo->Flags), (LPARAM) MenuInfo->Self); - if (2 == HIWORD(MenuChar)) - { - return LOWORD(MenuChar); - } - if (1 == HIWORD(MenuChar)) - { - return (UINT) (-2); - } - } - + if (HIWORD(MenuChar) == MNC_EXECUTE) return LOWORD(MenuChar); + if (HIWORD(MenuChar) == MNC_CLOSE) return (UINT)(-2); + } return (UINT)(-1); } @@ -1576,12 +1565,12 @@ MenuInfo.FocusedItem = NO_SELECTED_ITEM; } - /* ReactOS Check */ - if (!ValidateHwnd(hwndOwner)) - { // This window maybe already DEAD!!! + /* store the owner for DrawItem */ + if (!IsWindow(hwndOwner)) + { + SetLastError( ERROR_INVALID_WINDOW_HANDLE ); return FALSE; } - /* store the owner for DrawItem */ MenuInfo.WndOwner = hwndOwner; MenuSetRosMenuInfo(&MenuInfo); @@ -3673,7 +3662,7 @@ if( uItem == NO_SELECTED_ITEM ) MenuMoveSelection( hwnd, &MenuInfo, ITEM_NEXT ); else - PostMessageW( hwnd, WM_KEYDOWN, VK_DOWN, 0L ); + PostMessageW( hwnd, WM_KEYDOWN, VK_RETURN, 0 ); } track_menu:

1 0

[jimtabor] 51460: [Win32Csr] - Hack ReactOS to boot again! See bug 5655.
by jimtabor＠svn.reactos.org 26 Apr '11

26 Apr '11

Author: jimtabor Date: Tue Apr 26 00:01:03 2011 New Revision: 51460 URL: http://svn.reactos.org/svn/reactos?rev=51460&view=rev Log: [Win32Csr] - Hack ReactOS to boot again! See bug 5655. Modified: trunk/reactos/subsystems/win32/csrss/win32csr/dllmain.c Modified: trunk/reactos/subsystems/win32/csrss/win32csr/dllmain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/win… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/win32csr/dllmain.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrss/win32csr/dllmain.c [iso-8859-1] Tue Apr 26 00:01:03 2011 @@ -94,7 +94,19 @@ { 0, 0, NULL } }; +static HHOOK hhk = NULL; + /* FUNCTIONS *****************************************************************/ + +LRESULT +CALLBACK +KeyboardHookProc( + int nCode, + WPARAM wParam, + LPARAM lParam) +{ + return CallNextHookEx(hhk, nCode, wParam, lParam); +} BOOL WINAPI DllMain(HANDLE hDll, @@ -104,6 +116,13 @@ if (DLL_PROCESS_ATTACH == dwReason) { Win32CsrDllHandle = hDll; +// +// HACK HACK HACK ReactOS to BOOT! Initialization BUG ALERT! See bug 5655. +// + hhk = SetWindowsHookEx(WH_KEYBOARD_LL, KeyboardHookProc, NULL, 0); +// BUG ALERT! BUG ALERT! BUG ALERT! BUG ALERT! BUG ALERT! BUG ALERT! BUG ALERT! +// BUG ALERT! BUG ALERT! BUG ALERT! BUG ALERT! BUG ALERT! BUG ALERT! BUG ALERT! +// BUG ALERT! BUG ALERT! BUG ALERT! BUG ALERT! BUG ALERT! BUG ALERT! BUG ALERT! } if (DLL_PROCESS_DETACH == dwReason)

1 0

[jimtabor] 51459: [User32|Win32csr] - Move AppSwitch to User32.
by jimtabor＠svn.reactos.org 25 Apr '11

25 Apr '11

Author: jimtabor Date: Mon Apr 25 23:14:06 2011 New Revision: 51459 URL: http://svn.reactos.org/svn/reactos?rev=51459&view=rev Log: [User32|Win32csr] - Move AppSwitch to User32. Added: trunk/reactos/dll/win32/user32/controls/appswitch.c - copied, changed from r51458, trunk/reactos/subsystems/win32/csrss/win32csr/appswitch.c Removed: trunk/reactos/subsystems/win32/csrss/win32csr/appswitch.c Modified: trunk/reactos/dll/win32/user32/user32.rbuild trunk/reactos/subsystems/win32/csrss/win32csr/dllmain.c trunk/reactos/subsystems/win32/csrss/win32csr/win32csr.rbuild Copied: trunk/reactos/dll/win32/user32/controls/appswitch.c (from r51458, trunk/reactos/subsystems/win32/csrss/win32csr/appswitch.c) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/controls/… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/win32csr/appswitch.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/controls/appswitch.c [iso-8859-1] Mon Apr 25 23:14:06 2011 @@ -2,14 +2,15 @@ /* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS system libraries - * FILE: subsys/csrss/win32csr/appswitch.c + * FILE: dll/win32/user32/controls/appswitch.c * PURPOSE: app switching functionality * PROGRAMMERS: Johannes Anderwald (janderwald(a)reactos.org) */ -#define NDEBUG -#include "w32csr.h" -#include <debug.h> +#include <user32.h> + +#include <wine/debug.h> +WINE_DEFAULT_DEBUG_CHANNEL(user32); typedef struct APPSWITCH_ITEM { @@ -55,7 +56,7 @@ hProcess = OpenProcess(PROCESS_QUERY_INFORMATION|PROCESS_VM_READ, FALSE, dwPid); if (hProcess) { - if (GetModuleFileNameExW(hProcess, NULL, szFileName, MAX_PATH)) +// if (GetModuleFileNameExW(hProcess, NULL, szFileName, MAX_PATH)) { szFileName[MAX_PATH-1] = L'\0'; PrivateExtractIconExW(szFileName, 0, &hIcon, NULL, 1); @@ -70,7 +71,7 @@ /* get the text length */ Length = SendMessageW(hwnd, WM_GETTEXTLENGTH, 0, 0); /* allocate item structure for it */ - pItem = (PAPPSWITCH_ITEM)HeapAlloc(Win32CsrApiHeap, HEAP_ZERO_MEMORY, sizeof(APPSWITCH_ITEM) + Length * sizeof(WCHAR)); +// pItem = (PAPPSWITCH_ITEM)HeapAlloc(Win32CsrApiHeap, HEAP_ZERO_MEMORY, sizeof(APPSWITCH_ITEM) + Length * sizeof(WCHAR)); if (!pItem) return TRUE; if (Length) @@ -165,7 +166,7 @@ /* FIXME * launch window */ - DPRINT1("launch alt-tab window\n"); + FIXME("launch alt-tab window\n"); } else { @@ -205,7 +206,7 @@ SetRect(&Rect, X-5, Y-5, X + XSize + 5, Y + YSize + 5); FillRect(hDc, &Rect, hBrush); DeleteObject((HGDIOBJ)hBrush); - SendDlgItemMessageW(hwndDlg, IDC_STATIC_CUR_APP, WM_SETTEXT, 0, (LPARAM)pCurItem->szText); +// SendDlgItemMessageW(hwndDlg, IDC_STATIC_CUR_APP, WM_SETTEXT, 0, (LPARAM)pCurItem->szText); } DrawIcon(hDc, X, Y, pCurItem->hIcon); @@ -223,7 +224,7 @@ { pNextItem = pCurItem->Next; DestroyIcon(pCurItem->hIcon); - HeapFree(Win32CsrApiHeap, 0, pCurItem); +// HeapFree(Win32CsrApiHeap, 0, pCurItem); pCurItem = pNextItem; } pRoot = NULL; @@ -265,5 +266,5 @@ InitializeAppSwitchHook() { hhk = SetWindowsHookEx(WH_KEYBOARD_LL, KeyboardHookProc, NULL, 0); - DPRINT("InitializeAppSwitchHook hhk %p\n", hhk); -} + TRACE("InitializeAppSwitchHook hhk %p\n", hhk); +} Modified: trunk/reactos/dll/win32/user32/user32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/user32.rb… ============================================================================== --- trunk/reactos/dll/win32/user32/user32.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/user32.rbuild [iso-8859-1] Mon Apr 25 23:14:06 2011 @@ -16,6 +16,7 @@ <pch>user32.h</pch> </directory> <directory name="controls"> + <file>appswitch.c</file> <file>button.c</file> <file>combo.c</file> <file>edit.c</file> Removed: trunk/reactos/subsystems/win32/csrss/win32csr/appswitch.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/win… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/win32csr/appswitch.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrss/win32csr/appswitch.c (removed) @@ -1,269 +1,0 @@ - -/* - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS system libraries - * FILE: subsys/csrss/win32csr/appswitch.c - * PURPOSE: app switching functionality - * PROGRAMMERS: Johannes Anderwald (janderwald(a)reactos.org) - */ - -#define NDEBUG -#include "w32csr.h" -#include <debug.h> - -typedef struct APPSWITCH_ITEM -{ - HWND hwndDlg; - DWORD zPos; - HICON hIcon; - BOOL bFocus; - struct APPSWITCH_ITEM * Next; - WCHAR szText[1]; -} APPSWITCH_ITEM, *PAPPSWITCH_ITEM; - -static PAPPSWITCH_ITEM pRoot = NULL; -static DWORD NumOfWindows = 0; -static HWND hAppWindowDlg = NULL; -static HHOOK hhk = NULL; - -UINT WINAPI PrivateExtractIconExW(LPCWSTR,int,HICON*,HICON*,UINT); - - -BOOL -CALLBACK -EnumWindowEnumProc( - HWND hwnd, - LPARAM lParam -) -{ - PAPPSWITCH_ITEM pItem; - UINT Length; - HICON hIcon; - PAPPSWITCH_ITEM pCurItem; - DWORD dwPid; - HANDLE hProcess; - WCHAR szFileName[MAX_PATH] = {0}; - - /* check if the enumerated window is visible */ - if (!IsWindowVisible(hwnd)) - return TRUE; - /* get window icon */ - hIcon = (HICON)SendMessage(hwnd, WM_GETICON, ICON_BIG, 0); - if (!hIcon) - { - GetWindowThreadProcessId(hwnd, &dwPid); - hProcess = OpenProcess(PROCESS_QUERY_INFORMATION|PROCESS_VM_READ, FALSE, dwPid); - if (hProcess) - { - if (GetModuleFileNameExW(hProcess, NULL, szFileName, MAX_PATH)) - { - szFileName[MAX_PATH-1] = L'\0'; - PrivateExtractIconExW(szFileName, 0, &hIcon, NULL, 1); - } - } - } - else - { - /* icons from WM_GETICON need to be copied */ - hIcon = CopyIcon(hIcon); - } - /* get the text length */ - Length = SendMessageW(hwnd, WM_GETTEXTLENGTH, 0, 0); - /* allocate item structure for it */ - pItem = (PAPPSWITCH_ITEM)HeapAlloc(Win32CsrApiHeap, HEAP_ZERO_MEMORY, sizeof(APPSWITCH_ITEM) + Length * sizeof(WCHAR)); - if (!pItem) - return TRUE; - if (Length) - { - /* retrieve the window text when available */ - SendMessageW(hwnd, WM_GETTEXT, Length+1, (LPARAM)pItem->szText); - } - /* copy the window icon */ - pItem->hIcon = hIcon; - /* store window handle */ - pItem->hwndDlg = hwnd; - /* is the window the active window */ - if (GetActiveWindow() == hwnd) - pItem->bFocus = TRUE; - - if (!pRoot) - { - /* first item */ - pRoot = pItem; - return TRUE; - } - - /* enumerate the last item */ - pCurItem = pRoot; - while(pCurItem->Next) - pCurItem = pCurItem->Next; - - /* insert it into the list */ - pCurItem->Next = pItem; - NumOfWindows++; - return TRUE; -} - -VOID -EnumerateAppWindows(HDESK hDesk, HWND hwndDlg) -{ - /* initialize defaults */ - pRoot = NULL; - NumOfWindows = 0; - hAppWindowDlg = hwndDlg; - /* enumerate all windows */ - EnumDesktopWindows(hDesk, EnumWindowEnumProc, (LPARAM)NULL); - if (NumOfWindows > 7) - { - /* FIXME resize window */ - } -} - -VOID -MarkNextEntryAsActive() -{ - PAPPSWITCH_ITEM pItem; - - pItem = pRoot; - if (!pRoot) - return; - - while(pItem) - { - if (pItem->bFocus) - { - pItem->bFocus = FALSE; - if (pItem->Next) - pItem->Next->bFocus = TRUE; - else - pRoot->bFocus = TRUE; - } - pItem = pItem->Next; - } - - InvalidateRgn(hAppWindowDlg, NULL, TRUE); -} - - -LRESULT -CALLBACK -KeyboardHookProc( - int nCode, - WPARAM wParam, - LPARAM lParam -) -{ - PKBDLLHOOKSTRUCT hk = (PKBDLLHOOKSTRUCT) lParam; - - if (wParam == WM_SYSKEYUP) - { - /* is tab key pressed */ - if (hk->vkCode == VK_TAB) - { - if (hAppWindowDlg == NULL) - { - /* FIXME - * launch window - */ - DPRINT1("launch alt-tab window\n"); - } - else - { - MarkNextEntryAsActive(); - } - } - } - return CallNextHookEx(hhk, nCode, wParam, lParam); -} - -VOID -PaintAppWindows(HWND hwndDlg, HDC hDc) -{ - DWORD dwIndex, X, Y; - PAPPSWITCH_ITEM pCurItem; - RECT Rect; - DWORD XSize, YSize, XMax; - HBRUSH hBrush; - - X = 10; - Y = 10; - XSize = GetSystemMetrics(SM_CXICON); - YSize = GetSystemMetrics(SM_CYICON); - XMax = (XSize+(XSize/2)) * 7 + X; - pCurItem = pRoot; - - for (dwIndex = 0; dwIndex < NumOfWindows; dwIndex++) - { - if (X >= XMax) - { - X = 10; - Y += YSize + (YSize/2); - } - if (pCurItem->bFocus) - { - hBrush = CreateSolidBrush(RGB(30, 30, 255)); - SetRect(&Rect, X-5, Y-5, X + XSize + 5, Y + YSize + 5); - FillRect(hDc, &Rect, hBrush); - DeleteObject((HGDIOBJ)hBrush); - SendDlgItemMessageW(hwndDlg, IDC_STATIC_CUR_APP, WM_SETTEXT, 0, (LPARAM)pCurItem->szText); - } - - DrawIcon(hDc, X, Y, pCurItem->hIcon); - pCurItem = pCurItem->Next; - X += XSize +(XSize/2); - } -} -VOID -DestroyAppWindows() -{ - PAPPSWITCH_ITEM pCurItem, pNextItem; - - pCurItem = pRoot; - while(pCurItem) - { - pNextItem = pCurItem->Next; - DestroyIcon(pCurItem->hIcon); - HeapFree(Win32CsrApiHeap, 0, pCurItem); - pCurItem = pNextItem; - } - pRoot = NULL; - hAppWindowDlg = NULL; - NumOfWindows = 0; -} - -INT_PTR -CALLBACK -SwitchWindowDlgProc(HWND hwndDlg, UINT message, WPARAM wParam, LPARAM lParam) -{ - PAINTSTRUCT Paint; - HDESK hInput; - - switch (message) - { - case WM_INITDIALOG: - hInput = OpenInputDesktop(0,0, GENERIC_ALL); - if (hInput) - { - EnumerateAppWindows(hInput, hwndDlg); - CloseDesktop(hInput); - } - return TRUE; - case WM_PAINT: - BeginPaint(hwndDlg, &Paint); - PaintAppWindows(hwndDlg, Paint.hdc); - EndPaint(hwndDlg, &Paint); - break; - case WM_DESTROY: - DestroyAppWindows(); - break; - } - return FALSE; -} - -VOID -WINAPI -InitializeAppSwitchHook() -{ - hhk = SetWindowsHookEx(WH_KEYBOARD_LL, KeyboardHookProc, NULL, 0); - DPRINT("InitializeAppSwitchHook hhk %p\n", hhk); -} Modified: trunk/reactos/subsystems/win32/csrss/win32csr/dllmain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/win… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/win32csr/dllmain.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrss/win32csr/dllmain.c [iso-8859-1] Mon Apr 25 23:14:06 2011 @@ -14,7 +14,6 @@ /* Not defined in any header file */ extern VOID WINAPI PrivateCsrssManualGuiCheck(LONG Check); -extern VOID WINAPI InitializeAppSwitchHook(); extern LIST_ENTRY DosDeviceHistory; extern RTL_CRITICAL_SECTION Win32CsrDefineDosDeviceCritSec; @@ -105,7 +104,6 @@ if (DLL_PROCESS_ATTACH == dwReason) { Win32CsrDllHandle = hDll; - InitializeAppSwitchHook(); } if (DLL_PROCESS_DETACH == dwReason) Modified: trunk/reactos/subsystems/win32/csrss/win32csr/win32csr.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/win… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/win32csr/win32csr.rbuild [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrss/win32csr/win32csr.rbuild [iso-8859-1] Mon Apr 25 23:14:06 2011 @@ -29,6 +29,5 @@ <file>harderror.c</file> <file>lineinput.c</file> <file>tuiconsole.c</file> - <file>appswitch.c</file> <file>win32csr.rc</file> </module>

1 0

[akhaldi] 51458: [CRT/MINGW-W64] * Call pei and __main before possible invocation of DllEntryPoint. By Kai Tietz.
by akhaldi＠svn.reactos.org 25 Apr '11

25 Apr '11

Author: akhaldi Date: Mon Apr 25 21:55:41 2011 New Revision: 51458 URL: http://svn.reactos.org/svn/reactos?rev=51458&view=rev Log: [CRT/MINGW-W64] * Call pei and __main before possible invocation of DllEntryPoint. By Kai Tietz. Modified: trunk/reactos/lib/3rdparty/mingw/crtdll.c Modified: trunk/reactos/lib/3rdparty/mingw/crtdll.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/mingw/crtdll.… ============================================================================== --- trunk/reactos/lib/3rdparty/mingw/crtdll.c [iso-8859-1] (original) +++ trunk/reactos/lib/3rdparty/mingw/crtdll.c [iso-8859-1] Mon Apr 25 21:55:41 2011 @@ -179,6 +179,9 @@ retcode = FALSE; goto i__leave; } + _pei386_runtime_relocator (); + if (retcode && dwReason == DLL_PROCESS_ATTACH) + __main (); if (dwReason == DLL_PROCESS_ATTACH || dwReason == DLL_THREAD_ATTACH) { retcode = DllEntryPoint (hDllHandle, dwReason, lpreserved); @@ -187,9 +190,6 @@ if (! retcode) goto i__leave; } - _pei386_runtime_relocator (); - if (retcode && dwReason == DLL_PROCESS_ATTACH) - __main (); retcode = DllMain(hDllHandle,dwReason,lpreserved); if ((dwReason == DLL_PROCESS_ATTACH) && ! retcode) {

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs