Ros-diffs

ros-diffs@reactos.org

81390 discussions

[janderwald] 51337: [USBEHCI_NEW] - Implement stubs for classes CHCDController and CUSBHardwareDevice - Implement CreateHCDController, CreateUSBHardware - Implement CUSBHardwareDevice::QueryInterfa...
by janderwald＠svn.reactos.org 14 Apr '11

14 Apr '11

Author: janderwald Date: Thu Apr 14 11:58:07 2011 New Revision: 51337 URL: http://svn.reactos.org/svn/reactos?rev=51337&view=rev Log: [USBEHCI_NEW] - Implement stubs for classes CHCDController and CUSBHardwareDevice - Implement CreateHCDController, CreateUSBHardware - Implement CUSBHardwareDevice::QueryInterface, CUSBHardwareDevice::AddRef, CUSBHardwareDevice::Release - Implement CHCDController::AddRef, CHCDController::Release, CHCDController::QueryInterface Modified: branches/usb-bringup/drivers/usb/usbehci_new/hardware.cpp branches/usb-bringup/drivers/usb/usbehci_new/hcd_controller.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] Thu Apr 14 11:58:07 2011 @@ -10,9 +10,193 @@ #include "usbehci.h" +class CUSBHardwareDevice : public IUSBHardwareDevice +{ +public: + STDMETHODIMP QueryInterface( REFIID InterfaceId, PVOID* Interface); + + STDMETHODIMP_(ULONG) AddRef() + { + InterlockedIncrement(&m_Ref); + return m_Ref; + } + STDMETHODIMP_(ULONG) Release() + { + InterlockedDecrement(&m_Ref); + + if (!m_Ref) + { + delete this; + return 0; + } + return m_Ref; + } + // com + NTSTATUS Initialize(PDRIVER_OBJECT DriverObject, PDEVICE_OBJECT FunctionalDeviceObject, PDEVICE_OBJECT PhysicalDeviceObject, PDEVICE_OBJECT LowerDeviceObject); + NTSTATUS PnpStart(PCM_RESOURCE_LIST RawResources, PCM_RESOURCE_LIST TranslatedResources); + NTSTATUS PnpStop(void); + NTSTATUS HandlePower(PIRP Irp); + NTSTATUS GetDeviceDetails(PULONG VendorId, PULONG DeviceId, PULONG NumberOfPorts, PULONG Speed); + NTSTATUS GetDmaMemoryManager(OUT struct IDMAMemoryManager **OutMemoryManager); + NTSTATUS GetUSBQueue(OUT struct IUSBQueue **OutUsbQueue); + NTSTATUS ResetController(); + NTSTATUS ResetPort(ULONG PortIndex); + KIRQL AcquireDeviceLock(void); + VOID ReleaseDeviceLock(KIRQL OldLevel); + + // constructor / destructor + CUSBHardwareDevice(IUnknown *OuterUnknown){} + virtual ~CUSBHardwareDevice(){} + +protected: + LONG m_Ref; + KSPIN_LOCK m_Lock; + +}; + +//================================================================================================= +// COM +// +NTSTATUS +STDMETHODCALLTYPE +CUSBHardwareDevice::QueryInterface( + IN REFIID refiid, + OUT PVOID* Output) +{ + UNICODE_STRING GuidString; + + if (IsEqualGUIDAligned(refiid, IID_IUnknown)) + { + *Output = PVOID(PUNKNOWN(this)); + PUNKNOWN(*Output)->AddRef(); + return STATUS_SUCCESS; + } + + return STATUS_UNSUCCESSFUL; +} + +NTSTATUS +CUSBHardwareDevice::Initialize( + PDRIVER_OBJECT DriverObject, + PDEVICE_OBJECT FunctionalDeviceObject, + PDEVICE_OBJECT PhysicalDeviceObject, + PDEVICE_OBJECT LowerDeviceObject) +{ + UNIMPLEMENTED + return STATUS_NOT_IMPLEMENTED; +} + + +NTSTATUS +CUSBHardwareDevice::PnpStart( + PCM_RESOURCE_LIST RawResources, + PCM_RESOURCE_LIST TranslatedResources) +{ + UNIMPLEMENTED + return STATUS_NOT_IMPLEMENTED; +} + +NTSTATUS +CUSBHardwareDevice::PnpStop(void) +{ + UNIMPLEMENTED + return STATUS_NOT_IMPLEMENTED; +} + +NTSTATUS +CUSBHardwareDevice::HandlePower( + PIRP Irp) +{ + UNIMPLEMENTED + return STATUS_NOT_IMPLEMENTED; +} + +NTSTATUS +CUSBHardwareDevice::GetDeviceDetails( + OUT OPTIONAL PULONG VendorId, + OUT OPTIONAL PULONG DeviceId, + OUT OPTIONAL PULONG NumberOfPorts, + OUT OPTIONAL PULONG Speed) +{ + UNIMPLEMENTED + return STATUS_NOT_IMPLEMENTED; +} + + +NTSTATUS +CUSBHardwareDevice::GetDmaMemoryManager( + OUT struct IDMAMemoryManager **OutMemoryManager) +{ + UNIMPLEMENTED + return STATUS_NOT_IMPLEMENTED; +} + + +NTSTATUS +CUSBHardwareDevice::GetUSBQueue( + OUT struct IUSBQueue **OutUsbQueue) +{ + UNIMPLEMENTED + return STATUS_NOT_IMPLEMENTED; +} + + +NTSTATUS +CUSBHardwareDevice::ResetController(void) +{ + UNIMPLEMENTED + return STATUS_NOT_IMPLEMENTED; +} + +NTSTATUS +CUSBHardwareDevice::ResetPort( + IN ULONG PortIndex) +{ + UNIMPLEMENTED + return STATUS_NOT_IMPLEMENTED; +} + +KIRQL +CUSBHardwareDevice::AcquireDeviceLock(void) +{ + KIRQL OldLevel = 0; + + UNIMPLEMENTED + return OldLevel; +} + +BOOLEAN +NTAPI +InterruptServiceRoutine( + IN PKINTERRUPT Interrupt, + IN PVOID ServiceContext) +{ + UNIMPLEMENTED + return FALSE; +} + +VOID +CUSBHardwareDevice::ReleaseDeviceLock( + KIRQL OldLevel) +{ + UNIMPLEMENTED +} + + NTSTATUS CreateUSBHardware( PUSBHARDWAREDEVICE *OutHardware) { - return STATUS_NOT_IMPLEMENTED; -} + PUSBHARDWAREDEVICE This; + + This = new(NonPagedPool, 0) CUSBHardwareDevice(0); + if (!This) + return STATUS_INSUFFICIENT_RESOURCES; + + This->AddRef(); + + // return result + *OutHardware = (PUSBHARDWAREDEVICE)This; + + return STATUS_SUCCESS; +} Modified: branches/usb-bringup/drivers/usb/usbehci_new/hcd_controller.cpp URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup/drivers/usb/usbehci… ============================================================================== --- branches/usb-bringup/drivers/usb/usbehci_new/hcd_controller.cpp [iso-8859-1] (original) +++ branches/usb-bringup/drivers/usb/usbehci_new/hcd_controller.cpp [iso-8859-1] Thu Apr 14 11:58:07 2011 @@ -10,9 +10,125 @@ #include "usbehci.h" +class CHCDController : public IHCDController +{ +public: + STDMETHODIMP QueryInterface( REFIID InterfaceId, PVOID* Interface); + + STDMETHODIMP_(ULONG) AddRef() + { + InterlockedIncrement(&m_Ref); + return m_Ref; + } + STDMETHODIMP_(ULONG) Release() + { + InterlockedDecrement(&m_Ref); + + if (!m_Ref) + { + delete this; + return 0; + } + return m_Ref; + } + + // interface functions + NTSTATUS Initialize(IN PROOTHDCCONTROLLER RootHCDController, IN PDRIVER_OBJECT DriverObject, IN PDEVICE_OBJECT PhysicalDeviceObject); + NTSTATUS HandlePnp(IN PDEVICE_OBJECT DeviceObject, IN OUT PIRP Irp); + NTSTATUS HandlePower(IN PDEVICE_OBJECT DeviceObject, IN OUT PIRP Irp); + NTSTATUS HandleDeviceControl(IN PDEVICE_OBJECT DeviceObject, IN OUT PIRP Irp); + + // constructor / destructor + CHCDController(IUnknown *OuterUnknown){} + virtual ~CHCDController(){} + +protected: + LONG m_Ref; +}; + +//================================================================================================= +// COM +// +NTSTATUS +STDMETHODCALLTYPE +CHCDController::QueryInterface( + IN REFIID refiid, + OUT PVOID* Output) +{ + UNICODE_STRING GuidString; + + if (IsEqualGUIDAligned(refiid, IID_IUnknown)) + { + *Output = PVOID(PUNKNOWN(this)); + PUNKNOWN(*Output)->AddRef(); + return STATUS_SUCCESS; + } + + return STATUS_UNSUCCESSFUL; +} + +NTSTATUS +CHCDController::Initialize( + IN PROOTHDCCONTROLLER RootHCDController, + IN PDRIVER_OBJECT DriverObject, + IN PDEVICE_OBJECT PhysicalDeviceObject) +{ + UNIMPLEMENTED + return STATUS_NOT_IMPLEMENTED; +} + +NTSTATUS +CHCDController::HandleDeviceControl( + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp) +{ + UNIMPLEMENTED + return STATUS_NOT_IMPLEMENTED; +} + +NTSTATUS +CHCDController::HandlePnp( + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp) +{ + UNIMPLEMENTED + + Irp->IoStatus.Status = STATUS_NOT_IMPLEMENTED; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + + return STATUS_NOT_IMPLEMENTED; +} + +NTSTATUS +CHCDController::HandlePower( + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp) +{ + UNIMPLEMENTED + + Irp->IoStatus.Status = STATUS_NOT_IMPLEMENTED; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + + return STATUS_NOT_IMPLEMENTED; +} + + + + NTSTATUS CreateHCDController( PHCDCONTROLLER *OutHcdController) { - return STATUS_NOT_IMPLEMENTED; + PHCDCONTROLLER This; + + This = new(NonPagedPool, 0) CHCDController(0); + if (!This) + return STATUS_INSUFFICIENT_RESOURCES; + + This->AddRef(); + + // return result + *OutHcdController = (PHCDCONTROLLER)This; + + return STATUS_SUCCESS; }

1 0

[akhaldi] 51336: [CMAKE] - Reflect the recent user32_apitest changes. Please consider updating the cmake files when you alter the rbuild files in the future.
by akhaldi＠svn.reactos.org 14 Apr '11

14 Apr '11

Author: akhaldi Date: Thu Apr 14 11:55:40 2011 New Revision: 51336 URL: http://svn.reactos.org/svn/reactos?rev=51336&view=rev Log: [CMAKE] - Reflect the recent user32_apitest changes. Please consider updating the cmake files when you alter the rbuild files in the future. Modified: trunk/rostests/apitests/user32/CMakeLists.txt Modified: trunk/rostests/apitests/user32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/user32/CMakeList… ============================================================================== --- trunk/rostests/apitests/user32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/apitests/user32/CMakeLists.txt [iso-8859-1] Thu Apr 14 11:55:40 2011 @@ -2,14 +2,16 @@ add_definitions(-D_DLL -D__USE_CRTIMP) list(APPEND SOURCE + DeferWindowPos.c + GetIconInfo.c + GetKeyState.c + GetPeekMessage.c + GetSystemMetrics.c InitializeLpkHooks.c RealGetWindowClass.c ScrollDC.c ScrollWindowEx.c - GetSystemMetrics.c - GetIconInfo.c - GetPeekMessage.c - DeferWindowPos.c + SetCursorPos.c testlist.c user32_apitest.rc)

1 0

[janderwald] 51335: [USBEHCI_NEW] - Create empty USB EHCI driver in c++ - Design & review the interfaces with mjmartin - Create stubs for creating IUSBHardwareDevice / IHCDController classes - Impl...
by janderwald＠svn.reactos.org 14 Apr '11

14 Apr '11

Author: janderwald Date: Thu Apr 14 11:35:16 2011 New Revision: 51335 URL: http://svn.reactos.org/svn/reactos?rev=51335&view=rev Log: [USBEHCI_NEW] - Create empty USB EHCI driver in c++ - Design & review the interfaces with mjmartin - Create stubs for creating IUSBHardwareDevice / IHCDController classes - Implement DriverEntry, EHCI_AddDevice and EHCI_Dispatch Added: branches/usb-bringup/drivers/usb/usbehci_new/ (with props) branches/usb-bringup/drivers/usb/usbehci_new/CMakeLists.txt (with props) branches/usb-bringup/drivers/usb/usbehci_new/hardware.cpp (with props) branches/usb-bringup/drivers/usb/usbehci_new/hcd_controller.cpp (with props) branches/usb-bringup/drivers/usb/usbehci_new/interfaces.h (with props) branches/usb-bringup/drivers/usb/usbehci_new/usbehci.cpp (with props) branches/usb-bringup/drivers/usb/usbehci_new/usbehci.h (with props) branches/usb-bringup/drivers/usb/usbehci_new/usbehci.rc (with props) Modified: branches/usb-bringup/drivers/usb/CMakeLists.txt Modified: branches/usb-bringup/drivers/usb/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup/drivers/usb/CMakeLi… ============================================================================== --- branches/usb-bringup/drivers/usb/CMakeLists.txt [iso-8859-1] (original) +++ branches/usb-bringup/drivers/usb/CMakeLists.txt [iso-8859-1] Thu Apr 14 11:35:16 2011 @@ -1,6 +1,6 @@ add_subdirectory(nt4compat) add_subdirectory(usbd) -add_subdirectory(usbehci) +add_subdirectory(usbehci_new) #add_subdirectory(usbhub) Compiles, just skipped in trunk #add_subdirectory(usbstor) Compiles, just skipped in trunk Propchange: branches/usb-bringup/drivers/usb/usbehci_new/ ------------------------------------------------------------------------------ --- bugtraq:logregex (added) +++ bugtraq:logregex Thu Apr 14 11:35:16 2011 @@ -1,0 +1,2 @@ +([Ii]ssue|[Bb]ug)s? #?(\d+)(,? ?#?(\d+))*(,? ?(and |or )?#?(\d+))? +(\d+) Propchange: branches/usb-bringup/drivers/usb/usbehci_new/ ------------------------------------------------------------------------------ bugtraq:message = See issue #%BUGID% for more details. Propchange: branches/usb-bringup/drivers/usb/usbehci_new/ ------------------------------------------------------------------------------ bugtraq:url = http://www.reactos.org/bugzilla/show_bug.cgi?id=%BUGID% Propchange: branches/usb-bringup/drivers/usb/usbehci_new/ ------------------------------------------------------------------------------ tsvn:logminsize = 10 Added: branches/usb-bringup/drivers/usb/usbehci_new/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup/drivers/usb/usbehci… ============================================================================== --- branches/usb-bringup/drivers/usb/usbehci_new/CMakeLists.txt (added) +++ branches/usb-bringup/drivers/usb/usbehci_new/CMakeLists.txt [iso-8859-1] Thu Apr 14 11:35:16 2011 @@ -1,0 +1,28 @@ + +set_cpp() + +remove_definitions(-D_WIN32_WINNT=0x502) +add_definitions(-D_WIN32_WINNT=0x600) + +add_library(usbehci SHARED + usbehci.cpp + hcd_controller.cpp + hardware.cpp + usbehci.rc) + +target_link_libraries(usbehci + libcntpr + stlport + ${PSEH_LIB}) + +if(MSVC) + set_target_properties(usbehci PROPERTIES COMPILE_FLAGS "/GR-") +else() + target_link_libraries(usbehci -lgcc) + set_target_properties(usbehci PROPERTIES COMPILE_FLAGS "-fno-exceptions -fno-rtti") +endif(MSVC) + +set_module_type(usbehci kernelmodedriver) +add_importlibs(usbehci ntoskrnl ks drmk hal) + +add_cab_target(usbehci 2) Propchange: branches/usb-bringup/drivers/usb/usbehci_new/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: 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 (added) +++ branches/usb-bringup/drivers/usb/usbehci_new/hardware.cpp [iso-8859-1] Thu Apr 14 11:35:16 2011 @@ -1,0 +1,18 @@ +/* + * PROJECT: ReactOS Universal Serial Bus Bulk Enhanced Host Controller Interface + * LICENSE: GPL - See COPYING in the top level directory + * FILE: drivers/usb/usbehci_new/hcd_controller.cpp + * PURPOSE: USB EHCI device driver. + * PROGRAMMERS: + * Michael Martin (michael.martin(a)reactos.org) + * Johannes Anderwald (johannes.anderwald(a)reactos.org) + */ + +#include "usbehci.h" + +NTSTATUS +CreateUSBHardware( + PUSBHARDWAREDEVICE *OutHardware) +{ + return STATUS_NOT_IMPLEMENTED; +} Propchange: branches/usb-bringup/drivers/usb/usbehci_new/hardware.cpp ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/usb-bringup/drivers/usb/usbehci_new/hcd_controller.cpp URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup/drivers/usb/usbehci… ============================================================================== --- branches/usb-bringup/drivers/usb/usbehci_new/hcd_controller.cpp (added) +++ branches/usb-bringup/drivers/usb/usbehci_new/hcd_controller.cpp [iso-8859-1] Thu Apr 14 11:35:16 2011 @@ -1,0 +1,18 @@ +/* + * PROJECT: ReactOS Universal Serial Bus Bulk Enhanced Host Controller Interface + * LICENSE: GPL - See COPYING in the top level directory + * FILE: drivers/usb/usbehci_new/hcd_controller.cpp + * PURPOSE: USB EHCI device driver. + * PROGRAMMERS: + * Michael Martin (michael.martin(a)reactos.org) + * Johannes Anderwald (johannes.anderwald(a)reactos.org) + */ + +#include "usbehci.h" + +NTSTATUS +CreateHCDController( + PHCDCONTROLLER *OutHcdController) +{ + return STATUS_NOT_IMPLEMENTED; +} Propchange: branches/usb-bringup/drivers/usb/usbehci_new/hcd_controller.cpp ------------------------------------------------------------------------------ svn:eol-style = native Added: 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 (added) +++ branches/usb-bringup/drivers/usb/usbehci_new/interfaces.h [iso-8859-1] Thu Apr 14 11:35:16 2011 @@ -1,0 +1,490 @@ + +#ifndef INTERFACES_HPP +#define INTERFACES_HPP + +//--------------------------------------------------------------------------- +// +// Object Hierachy +// -------------------------------------------------------------------- +// | IRootHCDController | +// | IHCDController Intel USB Universal Host Controller - 3A37 | +// | IHCDController - Intel USB Universal HostController - 3A38 | +// | IHCDController - Intel USB Universal HostController - 3A38 | +// |------------------------------------------------------------------| +// +// +// IHCDController Intel USB Universal Host Controller - 3A37 +// IHubController +// IUSBHardwareDevice +// IDMAMemoryManager +// IUSBQueue <- interacts with -> IUSBRequest +// +// +// Each IHCDController creates an IUSBHardwareDevice class upon initialization. The +// IUSBHardwardeDevice class is used to abstract usb controller specifics. The IHubController +// manages all attached devices and handles hub control ioctl requests. +// +// Each IUSBHardwareDevice has one IDMAMemoryManager and one IUSBQueue. The IDMAMemoryManager +// is used to handle dma memory allocations. The IUSBQueue manages requests which are send to the +// usb hardware. See IUSBRequest class for details. +// + + +//========================================================================================= +// +// class IRootHCDController +// +// Description: This class serves as the root host controller. The host controller mantains +// a list of registered controllers and provides support functions for the host controllers + +struct IHCDController; + +DECLARE_INTERFACE_(IRootHCDController, IUnknown) +{ + DEFINE_ABSTRACT_UNKNOWN() + +//----------------------------------------------------------------------------------------- +// +// Initialize +// +// Description: This function initializes the root host controller. It allocates the resources +// required to manage the registered controllers + + virtual NTSTATUS Initialize() = 0; + +//----------------------------------------------------------------------------------------- +// +// RegisterHCD +// +// Description: this function registers a host controller with the root host controller + + virtual NTSTATUS RegisterHCD(struct IHCDController * Controller) = 0; + +//----------------------------------------------------------------------------------------- +// +// UnregisterHCD +// +// Description: this function unregistes a host controller + + virtual NTSTATUS UnregisterHCD(struct IHCDController * Controller) = 0; + +//----------------------------------------------------------------------------------------- +// +// GetControllerCount +// +// Description: returns the number of host controllers registered + + virtual ULONG GetControllerCount() = 0; + +}; + +typedef IRootHCDController *PROOTHDCCONTROLLER; + +//========================================================================================= +// +// class IHCDController +// +// Description: This class is used to manage a single USB host controller +// + +DECLARE_INTERFACE_(IHCDController, IUnknown) +{ + DEFINE_ABSTRACT_UNKNOWN() + +//----------------------------------------------------------------------------------------- +// +// Initialize +// +// Description: This function initializes the IHCDController implementation. +// It creates an IUSBHardwareDevice object and initializes it. It also registeres itself with +// the IRootHCDController +// + virtual NTSTATUS Initialize(IN PROOTHDCCONTROLLER RootHCDController, + IN PDRIVER_OBJECT DriverObject, + IN PDEVICE_OBJECT PhysicalDeviceObject) = 0; + +//----------------------------------------------------------------------------------------- +// +// HandlePnp +// +// Description: This function handles all pnp requests + + virtual NTSTATUS HandlePnp(IN PDEVICE_OBJECT DeviceObject, + IN OUT PIRP Irp) = 0; + +//----------------------------------------------------------------------------------------- +// +// HandlePower +// +// Description: This function handles all power pnp requests +// + virtual NTSTATUS HandlePower(IN PDEVICE_OBJECT DeviceObject, + IN OUT PIRP Irp) = 0; + +//----------------------------------------------------------------------------------------- +// +// HandleDeviceControl +// +// Description: handles device io control requests + + virtual NTSTATUS HandleDeviceControl(IN PDEVICE_OBJECT DeviceObject, + IN OUT PIRP Irp) = 0; + +}; + +typedef IHCDController *PHCDCONTROLLER; + + +//========================================================================================= +// +// class IUSBHardwareDevice +// +// Description: This class provides access to the usb hardware controller +// + +struct IDMAMemoryManager; +struct IUSBQueue; + +DECLARE_INTERFACE_(IUSBHardwareDevice, IUnknown) +{ + DEFINE_ABSTRACT_UNKNOWN() + +//----------------------------------------------------------------------------------------- +// +// Initialize +// +// Description: Initializes the usb device controller + + virtual NTSTATUS Initialize(PDRIVER_OBJECT DriverObject, + PDEVICE_OBJECT FunctionalDeviceObject, + PDEVICE_OBJECT PhysicalDeviceObject, + PDEVICE_OBJECT LowerDeviceObject) = 0; + +//----------------------------------------------------------------------------------------- +// +// PnpStart +// +// Description: handles pnp start request from device. It registeres the interrupt, +// sets up the ports and prepares the device. It then starts the controller + + virtual NTSTATUS PnpStart(PCM_RESOURCE_LIST RawResources, + PCM_RESOURCE_LIST TranslatedResources) = 0; + +//----------------------------------------------------------------------------------------- +// +// PnpStop +// +// Description: handles pnp stop request from device. It unregisteres the interrupt, releases ports and dma object. + + virtual NTSTATUS PnpStop(void) = 0; + +//----------------------------------------------------------------------------------------- +// +// HandlePower +// +// Description: handles power requests + + virtual NTSTATUS HandlePower(PIRP Irp) = 0; + +//----------------------------------------------------------------------------------------- +// +// GetDeviceDetails +// +// Description: returns the device details such as vendor id, device id, number of ports and speed + + virtual NTSTATUS GetDeviceDetails(OUT OPTIONAL PULONG VendorId, + OUT OPTIONAL PULONG DeviceId, + OUT OPTIONAL PULONG NumberOfPorts, + OUT OPTIONAL PULONG Speed) = 0; + +//----------------------------------------------------------------------------------------- +// +// GetDmaMemoryManager +// +// Description: returns interface to DMAMemoryManager +// Interface is reference counted, you need to call Release method when you are done with it +// Do not call Initialize on IDMAMemoryManager, the object is already initialized + + virtual NTSTATUS GetDmaMemoryManager(OUT struct IDMAMemoryManager **OutMemoryManager) = 0; + +//----------------------------------------------------------------------------------------- +// +// GetUSBQueue +// +// Description: returns interface to internal IUSBQueue +// Interface is reference counted, you need to call release method when you are done with it +// Do not call Initialize on IUSBQueue, the object is already initialized + + virtual NTSTATUS GetUSBQueue(OUT struct IUSBQueue **OutUsbQueue) = 0; + +//----------------------------------------------------------------------------------------- +// +// ResetController() +// +// Description: this function resets the controller +// Returns STATUS_SUCCESS when the controller was successfully reset + + virtual NTSTATUS ResetController() = 0; + +//----------------------------------------------------------------------------------------- +// +// ResetPort +// +// Description: this functions resets the port on the controller +// + + virtual NTSTATUS ResetPort(ULONG PortNumber) = 0; + +//----------------------------------------------------------------------------------------- +// +// AcquireDeviceLock +// +// Description: acquires the device lock + + virtual KIRQL AcquireDeviceLock(void) = 0; + +//----------------------------------------------------------------------------------------- +// +// ReleaseLock +// +// Description: releases the device lock + + virtual void ReleaseDeviceLock(KIRQL OldLevel) = 0; +}; + +typedef IUSBHardwareDevice *PUSBHARDWAREDEVICE; + + +//========================================================================================= +// +// class IDMAMemoryManager +// +// Description: This class provides access to the dma buffer. It provides methods to +// allocate and free from the dma buffer +// + +DECLARE_INTERFACE_(IDMAMemoryManager, IUnknown) +{ + DEFINE_ABSTRACT_UNKNOWN() + +//----------------------------------------------------------------------------------------- +// +// Initialize +// +// Description: initializes the memory manager + + virtual NTSTATUS Initialize(IN PUSBHARDWAREDEVICE Device, + IN PKSPIN_LOCK Lock, + IN ULONG DmaBufferSize, + IN PVOID VirtualBase, + IN PHYSICAL_ADDRESS PhysicalAddress, + IN ULONG DefaultBlockSize) = 0; + +//----------------------------------------------------------------------------------------- +// +// Allocate +// +// Description: allocates block of memory from allocator + + virtual NTSTATUS Allocate(IN ULONG Size, + OUT PVOID *OutVirtualBase, + OUT PPHYSICAL_ADDRESS *OutPhysicalAddress) = 0; + + +//----------------------------------------------------------------------------------------- +// +// Free +// +// Description: releases memory block + + virtual NTSTATUS Release(IN PVOID VirtualBase, + IN ULONG Size) = 0; + +}; + +typedef IDMAMemoryManager *PDMAMEMORYMANAGER; + + +//========================================================================================= +// +// class IUSBRequest +// +// Description: This class is used to issue request to usb controller. The class is +// initialized using InitializeXXX methods. You also need to call SetEndpoint to define the endpoint +// In addition you can call SetCompletionDetails if you need to wait for the end of +// the request or want to complete an irp. You call AddUSBRequest to add the request to the queue. +// Once the request is completed the CompletionCallback is invoked. The CompletionCallback +// will take care of any completion details which have been set. If the request is cancelled, the +// CancelCallback routine is invoked. +// + +DECLARE_INTERFACE_(IUSBRequest, IUnknown) +{ + DEFINE_ABSTRACT_UNKNOWN() + +//----------------------------------------------------------------------------------------- +// +// InitializeWithSetupPacket +// +// Description: initializes the request packet with an setup packet +// If there is a TransferBuffer, the TransferBufferLength contains the length of the buffer + + + virtual NTSTATUS InitializeWithSetupPacket(IN PUSB_DEFAULT_PIPE_SETUP_PACKET SetupPacket, + IN ULONG TransferBufferLength, + IN PVOID TransferBuffer) = 0; + +// +//TODO: find required parameters for different packet types +// + + +//----------------------------------------------------------------------------------------- +// +// SetEndPoint +// +// Description: sets the endpoint of the request. + + virtual NTSTATUS SetEndPoint(PUSB_ENDPOINT_DESCRIPTOR EndPoint); + +//----------------------------------------------------------------------------------------- +// +// SetCompletionDetails +// +// Description: sets up how the request should be completed +// If an irp is passed, then it is completed with status code of the +// CompletionCallback or CancelCallback +// If an event is passed, then the event is signaled + + virtual NTSTATUS SetCompletionDetails(IN OPTIONAL PIRP Irp, + IN OPTIONAL PKEVENT Event) = 0; + +//----------------------------------------------------------------------------------------- +// +// CompletionCallback +// +// Description: called when request has been completed. It is called when +// IUSBQueue completes the request + + virtual VOID CompletionCallback(IN NTSTATUS NtStatusCode, + IN ULONG UrbStatusCode) = 0; + +//----------------------------------------------------------------------------------------- +// +// CancelCallback +// +// Description: called when request is cancelled. Called by IUSBQueue + + virtual VOID CancelCallback(IN NTSTATUS NtStatusCode) = 0; + +}; + +//========================================================================================= +// +// class IUSBQueue +// +// Description: This class manages pending requests +// + +DECLARE_INTERFACE_(IUSBQueue, IUnknown) +{ + DEFINE_ABSTRACT_UNKNOWN() + +//----------------------------------------------------------------------------------------- +// +// Initialize +// +// Description: initializes the object + + virtual NTSTATUS Initialize(IN PUSBHARDWAREDEVICE Hardware, + IN OPTIONAL PKSPIN_LOCK Lock, + IN PDMAMEMORYMANAGER MemoryManager) = 0; + +//----------------------------------------------------------------------------------------- +// +// GetPendingRequestCount +// +// Description: returns the number of pending requests + + virtual ULONG GetPendingRequestCount() = 0; + +//----------------------------------------------------------------------------------------- +// +// AddUSBRequest +// +// Description: adds an usb request to the queue. +// Returns status success when successful + + virtual NTSTATUS AddUSBRequest(IUSBRequest * Request) = 0; + +//----------------------------------------------------------------------------------------- +// +// CancelRequests() +// +// Description: cancels all requests + + virtual NTSTATUS CancelRequests() = 0; + +//----------------------------------------------------------------------------------------- +// +// CreateUSBRequest +// +// Description: creates an usb request + + virtual NTSTATUS CreateUSBRequest(IUSBRequest **OutRequest) = 0; +}; + +//========================================================================================= +// +// class IHubController +// +// Description: This class implements a hub controller +// + +DECLARE_INTERFACE_(IHubController, IUnknown) +{ + DEFINE_ABSTRACT_UNKNOWN() + +//---------------------------------------------------------------------------------------- +// +// Initialize +// +// Description: Initializes the hub controller + + virtual NTSTATUS Initialize(IN PHCDCONTROLLER Controller, + IN PUSBHARDWAREDEVICE Device, + IN BOOLEAN IsRootHubDevice, + IN ULONG DeviceAddress); + +//----------------------------------------------------------------------------------------- +// +// HandlePnp +// +// Description: This function handles all pnp requests + + virtual NTSTATUS HandlePnp(IN PDEVICE_OBJECT DeviceObject, + IN OUT PIRP Irp) = 0; + +//----------------------------------------------------------------------------------------- +// +// HandlePower +// +// Description: This function handles all power pnp requests +// + virtual NTSTATUS HandlePower(IN PDEVICE_OBJECT DeviceObject, + IN OUT PIRP Irp) = 0; + +//----------------------------------------------------------------------------------------- +// +// HandleDeviceControl +// +// Description: handles device io control requests + + virtual NTSTATUS HandleDeviceControl(IN PDEVICE_OBJECT DeviceObject, + IN OUT PIRP Irp) = 0; +}; + +typedef IHubController *PHUBCONTROLLER; + + +#endif Propchange: branches/usb-bringup/drivers/usb/usbehci_new/interfaces.h ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/usb-bringup/drivers/usb/usbehci_new/usbehci.cpp URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup/drivers/usb/usbehci… ============================================================================== --- branches/usb-bringup/drivers/usb/usbehci_new/usbehci.cpp (added) +++ branches/usb-bringup/drivers/usb/usbehci_new/usbehci.cpp [iso-8859-1] Thu Apr 14 11:35:16 2011 @@ -1,0 +1,161 @@ +/* + * PROJECT: ReactOS Universal Serial Bus Bulk Enhanced Host Controller Interface + * LICENSE: GPL - See COPYING in the top level directory + * FILE: drivers/usb/usbehci/usbehci.cpp + * PURPOSE: USB EHCI device driver. + * PROGRAMMERS: + * Michael Martin (michael.martin(a)reactos.org) + * Johannes Anderwald (johannes.anderwald(a)reactos.org) + */ + +#include "usbehci.h" + +// +// driver verifier +// +DRIVER_ADD_DEVICE EHCI_AddDevice; + +NTSTATUS +NTAPI +EHCI_AddDevice( + PDRIVER_OBJECT DriverObject, + PDEVICE_OBJECT PhysicalDeviceObject) +{ + NTSTATUS Status; + PHCDCONTROLLER HcdController; + + DPRINT1("EHCI_AddDevice\n"); + + /* first create the controller object */ + Status = CreateHCDController(&HcdController); + if (!NT_SUCCESS(Status)) + { + /* failed to create hcd */ + DPRINT1("AddDevice: Failed to create hcd with %x\n", Status); + return Status; + } + + /* initialize the hcd */ + Status = HcdController->Initialize(NULL, // FIXME + DriverObject, + PhysicalDeviceObject); + + /* check for success */ + if (!NT_SUCCESS(Status)) + { + /* failed to initialize device */ + DPRINT1("AddDevice: failed to initialize\n"); + + /* release object */ + HcdController->Release(); + } + + return Status; + +} + +NTSTATUS +NTAPI +EHCI_Dispatch( + PDEVICE_OBJECT DeviceObject, + PIRP Irp) +{ + PCOMMON_DEVICE_EXTENSION DeviceExtension; + PIO_STACK_LOCATION IoStack; + NTSTATUS Status; + + DPRINT1("EHCI_Dispatch\n"); + + // + // get common device extension + // + DeviceExtension = (PCOMMON_DEVICE_EXTENSION)DeviceObject->DeviceExtension; + + // + // get current stack location + // + IoStack = IoGetCurrentIrpStackLocation(Irp); + + // + // sanity checks + // + PC_ASSERT(DeviceExtension->HcdController); + + // + // FIXME: support bus device + // + PC_ASSERT(DeviceExtension->IsHub == FALSE); + + switch(IoStack->MajorFunction) + { + case IRP_MJ_PNP: + { + // + // dispatch pnp + // + return DeviceExtension->HcdController->HandlePnp(DeviceObject, Irp); + } + + case IRP_MJ_POWER: + { + // + // dispatch pnp + // + return DeviceExtension->HcdController->HandlePower(DeviceObject, Irp); + } + case IRP_MJ_SYSTEM_CONTROL: + case IRP_MJ_DEVICE_CONTROL: + { + // + // dispatch pnp + // + return DeviceExtension->HcdController->HandleDeviceControl(DeviceObject, Irp); + } + case IRP_MJ_CREATE: + { + // + // dispatch create request + // + Status = STATUS_SUCCESS; + + break; + } + default: + { + DPRINT1("EHCI_Dispatch> Major %lu Minor %lu not supported\n", IoStack->MajorFunction, IoStack->MinorFunction); + Status = STATUS_NOT_SUPPORTED; + } + } + + // + // complete request + // + Irp->IoStatus.Information = 0; + Irp->IoStatus.Status = Status; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + + + return Status; +} + +extern +"C" +NTSTATUS +NTAPI +DriverEntry( + PDRIVER_OBJECT DriverObject, + PUNICODE_STRING RegistryPath) +{ + + /* initialize driver object*/ + DriverObject->DriverExtension->AddDevice = EHCI_AddDevice; + + DriverObject->MajorFunction[IRP_MJ_CREATE] = EHCI_Dispatch; + DriverObject->MajorFunction[IRP_MJ_CLOSE] = EHCI_Dispatch; + DriverObject->MajorFunction[IRP_MJ_CLEANUP] = EHCI_Dispatch; + DriverObject->MajorFunction[IRP_MJ_DEVICE_CONTROL] = EHCI_Dispatch; + DriverObject->MajorFunction[IRP_MJ_INTERNAL_DEVICE_CONTROL] = EHCI_Dispatch; + DriverObject->MajorFunction[IRP_MJ_PNP] = EHCI_Dispatch; + + return STATUS_SUCCESS; +} Propchange: branches/usb-bringup/drivers/usb/usbehci_new/usbehci.cpp ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/usb-bringup/drivers/usb/usbehci_new/usbehci.h URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup/drivers/usb/usbehci… ============================================================================== --- branches/usb-bringup/drivers/usb/usbehci_new/usbehci.h (added) +++ branches/usb-bringup/drivers/usb/usbehci_new/usbehci.h [iso-8859-1] Thu Apr 14 11:35:16 2011 @@ -1,0 +1,53 @@ +#ifndef USBEHCI_H__ +#define USBEHCI_H__ + +#include <ntddk.h> +#define YDEBUG +#include <debug.h> +#include <hubbusif.h> +#include <usbbusif.h> +#include <usbioctl.h> +#include <usb.h> +#include <stdio.h> +#include <wdmguid.h> + +// +// FIXME: +// the following includes are required to get kcom to compile +// +#include <portcls.h> +#include <dmusicks.h> +#include <kcom.h> + +#include "interfaces.h" + +typedef struct +{ + BOOLEAN IsFDO; // is device a FDO or PDO + BOOLEAN IsHub; // is device a hub / child - not yet used + union + { + PHCDCONTROLLER HcdController; // hcd controller + PHUBCONTROLLER HubController; // hub controller + }; +}COMMON_DEVICE_EXTENSION, *PCOMMON_DEVICE_EXTENSION; + + +// +// assert for c++ - taken from portcls +// +#define PC_ASSERT(exp) \ + (VOID)((!(exp)) ? \ + RtlAssert((PVOID) #exp, (PVOID)__FILE__, __LINE__, NULL ), FALSE : TRUE) + +// +// hcd_controller.cpp +// +NTSTATUS CreateHCDController(PHCDCONTROLLER *HcdController); + +// +// hardware.cpp +// +NTSTATUS CreateUSBHardware(PUSBHARDWAREDEVICE *OutHardware); + +#endif Propchange: branches/usb-bringup/drivers/usb/usbehci_new/usbehci.h ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/usb-bringup/drivers/usb/usbehci_new/usbehci.rc URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup/drivers/usb/usbehci… ============================================================================== --- branches/usb-bringup/drivers/usb/usbehci_new/usbehci.rc (added) +++ branches/usb-bringup/drivers/usb/usbehci_new/usbehci.rc [iso-8859-1] Thu Apr 14 11:35:16 2011 @@ -1,0 +1,5 @@ +#define REACTOS_VERSION_DLL +#define REACTOS_STR_FILE_DESCRIPTION "USBEHCI Driver API\0" +#define REACTOS_STR_INTERNAL_NAME "usbehci\0" +#define REACTOS_STR_ORIGINAL_FILENAME "usbehci.sys\0" +#include <reactos/version.rc> Propchange: branches/usb-bringup/drivers/usb/usbehci_new/usbehci.rc ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[janderwald] 51334: [USB-BRINGUP] - Create branch for usb work
by janderwald＠svn.reactos.org 14 Apr '11

14 Apr '11

Author: janderwald Date: Thu Apr 14 10:52:43 2011 New Revision: 51334 URL: http://svn.reactos.org/svn/reactos?rev=51334&view=rev Log: [USB-BRINGUP] - Create branch for usb work Added: branches/usb-bringup/ (props changed) - copied from r51333, branches/cmake-bringup/ Propchange: branches/usb-bringup/ ------------------------------------------------------------------------------ --- bugtraq:logregex (added) +++ bugtraq:logregex Thu Apr 14 10:52:43 2011 @@ -1,0 +1,2 @@ +([Ii]ssue|[Bb]ug)s? #?(\d+)(,? ?#?(\d+))*(,? ?(and |or )?#?(\d+))? +(\d+) Propchange: branches/usb-bringup/ ------------------------------------------------------------------------------ bugtraq:message = See issue #%BUGID% for more details. Propchange: branches/usb-bringup/ ------------------------------------------------------------------------------ bugtraq:url = http://www.reactos.org/bugzilla/show_bug.cgi?id=%BUGID% Propchange: branches/usb-bringup/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Thu Apr 14 10:52:43 2011 @@ -1,0 +1,16 @@ +*.iso +makefile.auto +makefile-*.auto +config-*.rbuild +obj-* +output-* +reactos +build* +*.patch +reactos.* +RosBE-Logs +*.sln +*.ncb +*.suo +versionreport.xml +config.rbuild Propchange: branches/usb-bringup/ ------------------------------------------------------------------------------ --- svn:mergeinfo (added) +++ svn:mergeinfo Thu Apr 14 10:52:43 2011 @@ -1,0 +1,6 @@ +/branches/header-work:45691-47721 +/branches/reactos-yarotows:45219-46371,46373-48025,48027-49273 +/branches/reactx/reactos:49994-49995 +/branches/ros-amd64-bringup:36852 +/branches/ros-amd64-bringup/reactos:34711-34712,34741,34743,34770,34780-34782,34803,34812,34839,34842,34864,34870,34874,34877,34908-34909,34917,34965,35323-35324,35347-35348,35361,35436,35509,35515,35588,35655,35683,35739,35746,35762,35771,35777,35781,35789,35805,35823,35827,35902,35904-35906,35942,35947-35949,35952-35953,35966,36011-36013,36172,36360,36380,36388-36389,36393,36397,36443,36445,36475,36502-36503,36505,36570,36614,36852,36898-36899,36930,36936,36949,36951,36958,36961,36964,36969,36972,36987-36988,36990,36992,37019,37322-37323,37333-37334,37434,37472,37475,37536,37820-37821,37868-37869,37873,37990-37991,38013-38014,38092,38100,38148-38151,38264-38265,38268,38355,39151,39333,39335,39345,39639,40120,40122-40123,40125,40127-40128,40155,40247,40324,40608,40753,40926-40928,40986-40987,40989,40991,40993,40995-40996,41000-41001,41027-41030,41044-41045,41047-41050,41052,41070,41082-41086,41097-41098,41101,41449,41479-41480,41483-41485,41499-41500,41502,41531,41536,41540,41546-41547,41549,43080,43426,43451,43454,43506,43566,43574,43598,43600-43602,43604-43605,43677,43682,43757,43775,43836,43838-43840,43852,43857-43858,43860,43905-43907,43952,43954,43965,43969,43979,43981,43992,44002,44036-44037,44039-44040,44044-44045,44053,44065,44095,44123,44143-44144,44205,44238,44257,44259,44294,44338-44339,44385,44389,44391,44426,44460,44467-44468,44470-44471,44499,44501,44503-44504,44506,44510-44512,44521,44523-44526,44530,44540,44601,44634,44639,44772,44818,45124,45126-45127,45430,46394,46404,46478,46511,46523-46524,46526,46534-46535,46537-46539,46589,46805,46868,47472,47846-47847,47878,47882 +/trunk/reactos:48236-51323 Propchange: branches/usb-bringup/ ------------------------------------------------------------------------------ tsvn:logminsize = 10

1 0

[fireball] 51333: [RTL] - Properly check parameters in RtlFindActivationContextSectionString. Almost the same as Wine did, but factored out into a standalone function, improved undocumented flags c...
by fireball＠svn.reactos.org 14 Apr '11

14 Apr '11

Author: fireball Date: Thu Apr 14 09:57:08 2011 New Revision: 51333 URL: http://svn.reactos.org/svn/reactos?rev=51333&view=rev Log: [RTL] - Properly check parameters in RtlFindActivationContextSectionString. Almost the same as Wine did, but factored out into a standalone function, improved undocumented flags checks and allowing null data pointer in certain cases. Modified: trunk/reactos/lib/rtl/actctx.c Modified: trunk/reactos/lib/rtl/actctx.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/actctx.c?rev=51333… ============================================================================== --- trunk/reactos/lib/rtl/actctx.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/actctx.c [iso-8859-1] Thu Apr 14 09:57:08 2011 @@ -2667,30 +2667,48 @@ return STATUS_SUCCESS; } +#define FIND_ACTCTX_RETURN_FLAGS 0x00000002 +#define FIND_ACTCTX_RETURN_ASSEMBLY_METADATA 0x00000004 +#define FIND_ACTCTX_VALID_MASK (FIND_ACTCTX_SECTION_KEY_RETURN_HACTCTX | FIND_ACTCTX_RETURN_FLAGS | FIND_ACTCTX_RETURN_ASSEMBLY_METADATA) + +NTSTATUS +NTAPI +RtlpFindActivationContextSection_CheckParameters( ULONG flags, const GUID *guid, ULONG section_kind, + UNICODE_STRING *section_name, PACTCTX_SECTION_KEYED_DATA data ) +{ + /* Check general parameter combinations */ + if (!section_name || + (flags & ~FIND_ACTCTX_VALID_MASK) || + ((flags & FIND_ACTCTX_VALID_MASK) && !data) || + (data && data->cbSize < offsetof(ACTCTX_SECTION_KEYED_DATA, ulAssemblyRosterIndex))) + { + DPRINT1("invalid parameter\n"); + return STATUS_INVALID_PARAMETER; + } + + /* TODO */ + if (flags & FIND_ACTCTX_RETURN_FLAGS || + flags & FIND_ACTCTX_RETURN_ASSEMBLY_METADATA) + { + DPRINT1("unknown flags %08x\n", flags); + return STATUS_INVALID_PARAMETER; + } + + return STATUS_SUCCESS; +} + NTSTATUS NTAPI RtlFindActivationContextSectionString( ULONG flags, const GUID *guid, ULONG section_kind, UNICODE_STRING *section_name, PVOID ptr ) { PACTCTX_SECTION_KEYED_DATA data = ptr; - NTSTATUS status = STATUS_SXS_KEY_NOT_FOUND; - - if (guid) - { - DPRINT1("expected guid == NULL\n"); - return STATUS_INVALID_PARAMETER; - } - if (flags & ~FIND_ACTCTX_SECTION_KEY_RETURN_HACTCTX) - { - DPRINT1("unknown flags %08x\n", flags); - return STATUS_INVALID_PARAMETER; - } - if (!data || data->cbSize < offsetof(ACTCTX_SECTION_KEYED_DATA, ulAssemblyRosterIndex) || - !section_name || !section_name->Buffer) - { - DPRINT1("invalid parameter\n"); - return STATUS_INVALID_PARAMETER; - } + NTSTATUS status; + + status = RtlpFindActivationContextSection_CheckParameters(flags, guid, section_kind, section_name, data); + if (!NT_SUCCESS(status)) return status; + + status = STATUS_SXS_KEY_NOT_FOUND; ASSERT(NtCurrentTeb()); ASSERT(NtCurrentTeb()->ActivationContextStackPointer);

1 0

[mjmartin] 51332: [Win32k] - Fix implementation of message callbacks, now callbacks can be called across processes. - Fix some comments.
by mjmartin＠svn.reactos.org 14 Apr '11

14 Apr '11

Author: mjmartin Date: Thu Apr 14 01:21:38 2011 New Revision: 51332 URL: http://svn.reactos.org/svn/reactos?rev=51332&view=rev Log: [Win32k] - Fix implementation of message callbacks, now callbacks can be called across processes. - Fix some comments. Modified: trunk/reactos/subsystems/win32/win32k/ntuser/message.c trunk/reactos/subsystems/win32/win32k/ntuser/msgqueue.c Modified: trunk/reactos/subsystems/win32/win32k/ntuser/message.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/message.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/message.c [iso-8859-1] Thu Apr 14 01:21:38 2011 @@ -1425,8 +1425,8 @@ RETURN( FALSE); } - /* If this is not a callback and it can be sent now, then send it. */ - if ((Window->head.pti->MessageQueue == Win32Thread->MessageQueue) && (CompletionCallback == NULL)) + /* If it can be sent now, then send it. */ + if (Window->head.pti->MessageQueue == Win32Thread->MessageQueue) { if (Win32Thread->TIF_flags & TIF_INCLEANUP) { @@ -1452,11 +1452,20 @@ ObDereferenceObject(Win32Thread->pEThread); IntCallWndProcRet( Window, hWnd, Msg, wParam, lParam, (LRESULT *)uResult); - } - - - - if ((Window->head.pti->MessageQueue == Win32Thread->MessageQueue) && (CompletionCallback == NULL)) + + if (CompletionCallback) + { + co_IntCallSentMessageCallback(CompletionCallback, + hWnd, + Msg, + CompletionCallbackContext, + Result); + } + } + + + + if (Window->head.pti->MessageQueue == Win32Thread->MessageQueue) { if (! NT_SUCCESS(UnpackParam(lParamPacked, Msg, wParam, lParam, FALSE))) { @@ -1470,6 +1479,12 @@ DPRINT1("MsqSendMessage(): Not enough memory to allocate a message"); RETURN( FALSE); } + + IntReferenceMessageQueue(Window->head.pti->MessageQueue); + /* Take reference on this MessageQueue if its a callback. It will be released + when message is processed or removed from target hwnd MessageQueue */ + if (CompletionCallback) + IntReferenceMessageQueue(Win32Thread->MessageQueue); Message->Msg.hwnd = hWnd; Message->Msg.message = Msg; @@ -1482,8 +1497,6 @@ Message->SenderQueue = NULL; // mjmartin, you are right! This is null. Message->CallBackSenderQueue = Win32Thread->MessageQueue; Message->DispatchingListEntry.Flink = NULL; - - IntReferenceMessageQueue(Window->head.pti->MessageQueue); Message->CompletionCallback = CompletionCallback; Message->CompletionCallbackContext = CompletionCallbackContext; Message->HookMessage = MSQ_NORMAL; @@ -1492,7 +1505,6 @@ InsertTailList(&Window->head.pti->MessageQueue->SentMessagesListHead, &Message->ListEntry); MsqWakeQueue(Window->head.pti->MessageQueue, QS_SENDMESSAGE, TRUE); - IntDereferenceMessageQueue(Window->head.pti->MessageQueue); RETURN(TRUE); 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 [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/msgqueue.c [iso-8859-1] Thu Apr 14 01:21:38 2011 @@ -588,6 +588,28 @@ Message->Msg.wParam, Message->Msg.lParam); } + else if ((Message->CompletionCallback) + && (Message->CallBackSenderQueue == MessageQueue)) + { /* Call the callback routine */ + if (Message->QS_Flags & QS_SMRESULT) + { + co_IntCallSentMessageCallback(Message->CompletionCallback, + Message->Msg.hwnd, + Message->Msg.message, + Message->CompletionCallbackContext, + Message->lResult); + /* Set callback to NULL to prevent reentry */ + Message->CompletionCallback = NULL; + } + else + { + /* The message has not been processed yet, reinsert it. */ + RemoveEntryList(&Message->ListEntry); + InsertTailList(&Message->CallBackSenderQueue->SentMessagesListHead, &Message->ListEntry); + DPRINT("Callback Message not processed yet. Requeuing the message\n"); + return (FALSE); + } + } else { /* Call the window procedure. */ Result = co_IntSendMessage( Message->Msg.hwnd, @@ -600,6 +622,22 @@ to be cleaned up on thread termination anymore */ RemoveEntryList(&Message->ListEntry); + /* If the message is a callback, insert it in the callback senders MessageQueue */ + if (Message->CompletionCallback) + { + if (Message->CallBackSenderQueue) + { + Message->lResult = Result; + Message->QS_Flags |= QS_SMRESULT; + + /* insert it in the callers message queue */ + InsertTailList(&Message->CallBackSenderQueue->SentMessagesListHead, &Message->ListEntry); + MsqWakeQueue(Message->CallBackSenderQueue, QS_SENDMESSAGE, TRUE); + IntDereferenceMessageQueue(Message->CallBackSenderQueue); + } + return (TRUE); + } + /* remove the message from the dispatching list if needed, so lock the sender's message queue */ if (Message->SenderQueue) { @@ -635,19 +673,10 @@ KeSetEvent(Message->CompletionEvent, IO_NO_INCREMENT, FALSE); } - /* Call the callback if the message was sent with SendMessageCallback */ - if (Message->CompletionCallback != NULL) - { - co_IntCallSentMessageCallback(Message->CompletionCallback, - Message->Msg.hwnd, - Message->Msg.message, - Message->CompletionCallbackContext, - Result); - } - - /* Only if the message has a sender was the queue referenced */ + /* if the message has a sender */ if (Message->SenderQueue) { + /* dereference our and the sender's message queue */ IntDereferenceMessageQueue(Message->SenderQueue); IntDereferenceMessageQueue(MessageQueue); } @@ -710,6 +739,11 @@ RemoveEntryList(&SentMessage->ListEntry); ClearMsgBitsMask(MessageQueue, SentMessage->QS_Flags); + /* if it is a callback and this queue is not the sender queue, dereference queue */ + if ((SentMessage->CompletionCallback) && (SentMessage->CallBackSenderQueue != MessageQueue)) + { + IntDereferenceMessageQueue(SentMessage->CallBackSenderQueue); + } /* Only if the message has a sender was the queue referenced */ if ((SentMessage->SenderQueue) && (SentMessage->DispatchingListEntry.Flink != NULL)) @@ -729,7 +763,7 @@ ExFreePool((PVOID)SentMessage->Msg.lParam); } - /* Only if the message has a sender was the queue referenced */ + /* if the message has a sender */ if (SentMessage->SenderQueue) { /* dereference our and the sender's message queue */ @@ -1573,8 +1607,14 @@ CurrentSentMessage = CONTAINING_RECORD(CurrentEntry, USER_SENT_MESSAGE, ListEntry); + /* if it is a callback and this queue is not the sender queue, dereference queue */ + if ((CurrentSentMessage->CompletionCallback) && (CurrentSentMessage->CallBackSenderQueue != MessageQueue)) + { + IntDereferenceMessageQueue(CurrentSentMessage->CallBackSenderQueue); + } + DPRINT("Notify the sender and remove a message from the queue that had not been dispatched\n"); - /* Only if the message has a sender was the queue referenced */ + /* Only if the message has a sender was the message in the DispatchingList */ if ((CurrentSentMessage->SenderQueue) && (CurrentSentMessage->DispatchingListEntry.Flink != NULL)) { @@ -1593,7 +1633,7 @@ ExFreePool((PVOID)CurrentSentMessage->Msg.lParam); } - /* Only if the message has a sender was the queue referenced */ + /* if the message has a sender */ if (CurrentSentMessage->SenderQueue) { /* dereference our and the sender's message queue */ @@ -1613,6 +1653,12 @@ CurrentSentMessage = CONTAINING_RECORD(CurrentEntry, USER_SENT_MESSAGE, ListEntry); + /* if it is a callback and this queue is not the sender queue, dereference queue */ + if ((CurrentSentMessage->CompletionCallback) && (CurrentSentMessage->CallBackSenderQueue != MessageQueue)) + { + IntDereferenceMessageQueue(CurrentSentMessage->CallBackSenderQueue); + } + /* remove the message from the dispatching list */ if(CurrentSentMessage->DispatchingListEntry.Flink != NULL) { @@ -1633,7 +1679,7 @@ ExFreePool((PVOID)CurrentSentMessage->Msg.lParam); } - /* Only if the message has a sender was the queue referenced */ + /* if the message has a sender */ if (CurrentSentMessage->SenderQueue) { /* dereference our and the sender's message queue */

1 0

[mkupfer] 51331: remove obsolete object handling
by mkupfer＠svn.reactos.org 13 Apr '11

13 Apr '11

Author: mkupfer Date: Wed Apr 13 20:20:16 2011 New Revision: 51331 URL: http://svn.reactos.org/svn/reactos?rev=51331&view=rev Log: remove obsolete object handling Modified: trunk/reactos/base/applications/taskmgr/trayicon.c Modified: trunk/reactos/base/applications/taskmgr/trayicon.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… ============================================================================== --- trunk/reactos/base/applications/taskmgr/trayicon.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/taskmgr/trayicon.c [iso-8859-1] Wed Apr 13 20:20:16 2011 @@ -113,8 +113,6 @@ */ if (hScreenDC) ReleaseDC(NULL, hScreenDC); - if (hOldBitmap) - hBitmap = SelectObject(hDC, hOldBitmap); if (hDC) DeleteDC(hDC); if (hBitmapBrush)

1 0

[gadamopoulos] 51330: [explorer] - Use the shell default auto-arrangement positioning. Aloow using custom positioning when configured. This fixes the positioning of icons of the desktop to look lik...
by gadamopoulos＠svn.reactos.org 13 Apr '11

13 Apr '11

Author: gadamopoulos Date: Wed Apr 13 18:25:58 2011 New Revision: 51330 URL: http://svn.reactos.org/svn/reactos?rev=51330&view=rev Log: [explorer] - Use the shell default auto-arrangement positioning. Aloow using custom positioning when configured. This fixes the positioning of icons of the desktop to look like windows Modified: trunk/reactos/base/shell/explorer/desktop/desktop.cpp Modified: trunk/reactos/base/shell/explorer/desktop/desktop.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/deskto… ============================================================================== --- trunk/reactos/base/shell/explorer/desktop/desktop.cpp [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer/desktop/desktop.cpp [iso-8859-1] Wed Apr 13 18:25:58 2011 @@ -496,8 +496,6 @@ { _hwndListView = GetNextWindow(hwnd, GW_CHILD); - SetWindowStyle(_hwndListView, GetWindowStyle(_hwndListView)&~LVS_ALIGNMASK);//|LVS_ALIGNTOP|LVS_AUTOARRANGE); - // work around for Windows NT, Win 98, ... // Without this the desktop has mysteriously only a size of 800x600 pixels. ClientRect rect(hwnd); @@ -506,9 +504,8 @@ // subclass background window new BackgroundWindow(_hwndListView); - _icon_algo = 1; // default icon arrangement - - PositionIcons(); + _icon_algo = 0; // default icon arrangement + InitDragDrop(); } @@ -736,6 +733,9 @@ RECT work_area; SystemParametersInfo(SPI_GETWORKAREA, 0, &work_area, 0); + + /* disable default allignment */ + SetWindowStyle(_hwndListView, GetWindowStyle(_hwndListView)&~LVS_ALIGNMASK);//|LVS_ALIGNTOP|LVS_AUTOARRANGE); const POINTS& dir1 = s_align_dir1[_icon_algo]; const POINTS& dir2 = s_align_dir2[_icon_algo];

1 0

[akhaldi] 51329: [CMAKE] * Sync with trunk r51323.
by akhaldi＠svn.reactos.org 13 Apr '11

13 Apr '11

Author: akhaldi Date: Wed Apr 13 08:39:17 2011 New Revision: 51329 URL: http://svn.reactos.org/svn/reactos?rev=51329&view=rev Log: [CMAKE] * Sync with trunk r51323. Added: branches/cmake-bringup/base/applications/cmdutils/doskey/lang/pl-PL.rc - copied unchanged from r51323, trunk/reactos/base/applications/cmdutils/doskey/lang/pl-PL.rc branches/cmake-bringup/base/applications/network/ping/lang/cs-CZ.rc - copied unchanged from r51323, trunk/reactos/base/applications/network/ping/lang/cs-CZ.rc branches/cmake-bringup/base/applications/rapps/lang/sv-SE.rc - copied unchanged from r51323, trunk/reactos/base/applications/rapps/lang/sv-SE.rc branches/cmake-bringup/base/applications/sndrec32/lang/cs-CZ.rc - copied unchanged from r51323, trunk/reactos/base/applications/sndrec32/lang/cs-CZ.rc branches/cmake-bringup/base/applications/sndrec32/lang/pl-PL.rc - copied unchanged from r51323, trunk/reactos/base/applications/sndrec32/lang/pl-PL.rc branches/cmake-bringup/base/applications/sndvol32/dialog.c - copied unchanged from r51323, trunk/reactos/base/applications/sndvol32/dialog.c branches/cmake-bringup/subsystems/win32/csrss/win32csr/lang/sv-SE.rc - copied unchanged from r51323, trunk/reactos/subsystems/win32/csrss/win32csr/lang/sv-SE.rc Modified: branches/cmake-bringup/ (props changed) branches/cmake-bringup/base/applications/cacls/lang/pl-PL.rc branches/cmake-bringup/base/applications/calc/lang/pl-PL.rc branches/cmake-bringup/base/applications/charmap/lang/cs-CZ.rc branches/cmake-bringup/base/applications/cmdutils/doskey/doskey.rc branches/cmake-bringup/base/applications/cmdutils/find/lang/pl-PL.rc branches/cmake-bringup/base/applications/cmdutils/more/lang/pl-PL.rc branches/cmake-bringup/base/applications/cmdutils/xcopy/Pl.rc branches/cmake-bringup/base/applications/dxdiag/lang/pl-PL.rc branches/cmake-bringup/base/applications/findstr/lang/pl-PL.rc branches/cmake-bringup/base/applications/games/solitaire/lang/pl-PL.rc branches/cmake-bringup/base/applications/logoff/lang/pl-PL.rc branches/cmake-bringup/base/applications/mmc/lang/pl-PL.rc branches/cmake-bringup/base/applications/mscutils/eventvwr/lang/pl-PL.rc branches/cmake-bringup/base/applications/mscutils/servman/lang/bg-BG.rc branches/cmake-bringup/base/applications/mscutils/servman/lang/pl-PL.rc branches/cmake-bringup/base/applications/mstsc/lang/pl-PL.rc branches/cmake-bringup/base/applications/network/ipconfig/lang/pl-PL.rc branches/cmake-bringup/base/applications/network/ping/ping.rc branches/cmake-bringup/base/applications/notepad/lang/pl-PL.rc branches/cmake-bringup/base/applications/rapps/lang/pl-PL.rc branches/cmake-bringup/base/applications/rapps/rsrc.rc branches/cmake-bringup/base/applications/regedit/lang/pl-PL.rc branches/cmake-bringup/base/applications/sndrec32/rsrc.rc branches/cmake-bringup/base/applications/sndvol32/CMakeLists.txt branches/cmake-bringup/base/applications/sndvol32/lang/bg-BG.rc branches/cmake-bringup/base/applications/sndvol32/lang/cs-CZ.rc branches/cmake-bringup/base/applications/sndvol32/lang/de-DE.rc branches/cmake-bringup/base/applications/sndvol32/lang/el-GR.rc branches/cmake-bringup/base/applications/sndvol32/lang/en-US.rc branches/cmake-bringup/base/applications/sndvol32/lang/es-ES.rc branches/cmake-bringup/base/applications/sndvol32/lang/fr-FR.rc branches/cmake-bringup/base/applications/sndvol32/lang/hu-HU.rc branches/cmake-bringup/base/applications/sndvol32/lang/id-ID.rc branches/cmake-bringup/base/applications/sndvol32/lang/it-IT.rc branches/cmake-bringup/base/applications/sndvol32/lang/ja-JP.rc branches/cmake-bringup/base/applications/sndvol32/lang/ko-KR.rc branches/cmake-bringup/base/applications/sndvol32/lang/lt-LT.rc branches/cmake-bringup/base/applications/sndvol32/lang/nl-NL.rc branches/cmake-bringup/base/applications/sndvol32/lang/no-NO.rc branches/cmake-bringup/base/applications/sndvol32/lang/pl-PL.rc branches/cmake-bringup/base/applications/sndvol32/lang/pt-BR.rc branches/cmake-bringup/base/applications/sndvol32/lang/ru-RU.rc branches/cmake-bringup/base/applications/sndvol32/lang/sk-SK.rc branches/cmake-bringup/base/applications/sndvol32/lang/sv-SE.rc branches/cmake-bringup/base/applications/sndvol32/lang/th-TH.rc branches/cmake-bringup/base/applications/sndvol32/lang/uk-UA.rc branches/cmake-bringup/base/applications/sndvol32/misc.c branches/cmake-bringup/base/applications/sndvol32/mixer.c branches/cmake-bringup/base/applications/sndvol32/resources.h branches/cmake-bringup/base/applications/sndvol32/sndvol32.c branches/cmake-bringup/base/applications/sndvol32/sndvol32.h branches/cmake-bringup/base/setup/reactos/lang/cs-CZ.rc branches/cmake-bringup/base/setup/usetup/lang/cs-CZ.h branches/cmake-bringup/base/shell/explorer-new/lang/pl-PL.rc branches/cmake-bringup/base/shell/explorer-new/trayntfy.c branches/cmake-bringup/base/shell/explorer/explorer-pl.rc branches/cmake-bringup/dll/cpl/console/lang/cs-CZ.rc branches/cmake-bringup/dll/cpl/desk/lang/cs-CZ.rc branches/cmake-bringup/dll/cpl/desk/lang/pl-PL.rc branches/cmake-bringup/dll/ntdll/def/ntdll.spec branches/cmake-bringup/dll/ntdll/ldr/ldrinit.c branches/cmake-bringup/dll/ntdll/ldr/ldrpe.c branches/cmake-bringup/dll/win32/advapi32/reg/reg.c branches/cmake-bringup/dll/win32/comctl32/comctl32_ros.diff branches/cmake-bringup/dll/win32/comctl32/listview.c branches/cmake-bringup/dll/win32/kernel32/include/kernel32.h branches/cmake-bringup/dll/win32/kernel32/misc/ldr.c branches/cmake-bringup/dll/win32/netapi32/access.c branches/cmake-bringup/dll/win32/shell32/desktop.c branches/cmake-bringup/dll/win32/shell32/lang/bg-BG.rc branches/cmake-bringup/dll/win32/shell32/lang/ca-ES.rc branches/cmake-bringup/dll/win32/shell32/lang/cs-CZ.rc branches/cmake-bringup/dll/win32/shell32/lang/da-DK.rc branches/cmake-bringup/dll/win32/shell32/lang/de-DE.rc branches/cmake-bringup/dll/win32/shell32/lang/el-GR.rc branches/cmake-bringup/dll/win32/shell32/lang/en-GB.rc branches/cmake-bringup/dll/win32/shell32/lang/en-US.rc branches/cmake-bringup/dll/win32/shell32/lang/es-ES.rc branches/cmake-bringup/dll/win32/shell32/lang/fi-FI.rc branches/cmake-bringup/dll/win32/shell32/lang/fr-FR.rc branches/cmake-bringup/dll/win32/shell32/lang/hu-HU.rc branches/cmake-bringup/dll/win32/shell32/lang/it-IT.rc branches/cmake-bringup/dll/win32/shell32/lang/ja-JP.rc branches/cmake-bringup/dll/win32/shell32/lang/ko-KR.rc branches/cmake-bringup/dll/win32/shell32/lang/nl-NL.rc branches/cmake-bringup/dll/win32/shell32/lang/no-NO.rc branches/cmake-bringup/dll/win32/shell32/lang/pl-PL.rc branches/cmake-bringup/dll/win32/shell32/lang/pt-BR.rc branches/cmake-bringup/dll/win32/shell32/lang/pt-PT.rc branches/cmake-bringup/dll/win32/shell32/lang/ro-RO.rc branches/cmake-bringup/dll/win32/shell32/lang/ru-RU.rc branches/cmake-bringup/dll/win32/shell32/lang/sk-SK.rc branches/cmake-bringup/dll/win32/shell32/lang/sl-SI.rc branches/cmake-bringup/dll/win32/shell32/lang/sv-SE.rc branches/cmake-bringup/dll/win32/shell32/lang/tr-TR.rc branches/cmake-bringup/dll/win32/shell32/lang/uk-UA.rc branches/cmake-bringup/dll/win32/shell32/lang/zh-CN.rc branches/cmake-bringup/dll/win32/shell32/lang/zh-TW.rc branches/cmake-bringup/dll/win32/shell32/shlview.c branches/cmake-bringup/dll/win32/user32/include/user32p.h branches/cmake-bringup/dll/win32/user32/misc/dllmain.c branches/cmake-bringup/dll/win32/user32/user32.spec branches/cmake-bringup/dll/win32/user32/windows/input.c branches/cmake-bringup/drivers/filesystems/npfs/create.c branches/cmake-bringup/include/ndk/rtlfuncs.h branches/cmake-bringup/lib/rtl/actctx.c branches/cmake-bringup/ntoskrnl/cc/view.c branches/cmake-bringup/ntoskrnl/config/cminit.c branches/cmake-bringup/ntoskrnl/config/cmkcbncb.c branches/cmake-bringup/ntoskrnl/config/cmsysini.c branches/cmake-bringup/ntoskrnl/ex/handle.c branches/cmake-bringup/ntoskrnl/include/internal/ex.h branches/cmake-bringup/ntoskrnl/mm/ARM3/mminit.c branches/cmake-bringup/ntoskrnl/ob/obdir.c branches/cmake-bringup/ntoskrnl/ob/obsdcach.c branches/cmake-bringup/subsystems/win32/csrss/win32csr/console.c branches/cmake-bringup/subsystems/win32/csrss/win32csr/lang/bg-BG.rc branches/cmake-bringup/subsystems/win32/csrss/win32csr/lang/de-DE.rc branches/cmake-bringup/subsystems/win32/csrss/win32csr/lang/el-GR.rc branches/cmake-bringup/subsystems/win32/csrss/win32csr/lang/en-US.rc branches/cmake-bringup/subsystems/win32/csrss/win32csr/lang/es-ES.rc branches/cmake-bringup/subsystems/win32/csrss/win32csr/lang/fr-FR.rc branches/cmake-bringup/subsystems/win32/csrss/win32csr/lang/id-ID.rc branches/cmake-bringup/subsystems/win32/csrss/win32csr/lang/it-IT.rc branches/cmake-bringup/subsystems/win32/csrss/win32csr/lang/ja-JP.rc branches/cmake-bringup/subsystems/win32/csrss/win32csr/lang/no-NO.rc branches/cmake-bringup/subsystems/win32/csrss/win32csr/lang/pl-PL.rc branches/cmake-bringup/subsystems/win32/csrss/win32csr/lang/ru-RU.rc branches/cmake-bringup/subsystems/win32/csrss/win32csr/lang/sk-SK.rc branches/cmake-bringup/subsystems/win32/csrss/win32csr/lang/uk-UA.rc branches/cmake-bringup/subsystems/win32/csrss/win32csr/lang/zh-CN.rc branches/cmake-bringup/subsystems/win32/csrss/win32csr/lang/zh-TW.rc branches/cmake-bringup/subsystems/win32/csrss/win32csr/resource.h branches/cmake-bringup/subsystems/win32/csrss/win32csr/rsrc.rc branches/cmake-bringup/subsystems/win32/win32k/include/cursoricon.h branches/cmake-bringup/subsystems/win32/win32k/include/desktop.h branches/cmake-bringup/subsystems/win32/win32k/include/input.h branches/cmake-bringup/subsystems/win32/win32k/include/msgqueue.h branches/cmake-bringup/subsystems/win32/win32k/include/timer.h branches/cmake-bringup/subsystems/win32/win32k/ntuser/accelerator.c branches/cmake-bringup/subsystems/win32/win32k/ntuser/callback.c branches/cmake-bringup/subsystems/win32/win32k/ntuser/cursoricon.c branches/cmake-bringup/subsystems/win32/win32k/ntuser/focus.c branches/cmake-bringup/subsystems/win32/win32k/ntuser/hook.c branches/cmake-bringup/subsystems/win32/win32k/ntuser/input.c branches/cmake-bringup/subsystems/win32/win32k/ntuser/keyboard.c branches/cmake-bringup/subsystems/win32/win32k/ntuser/menu.c branches/cmake-bringup/subsystems/win32/win32k/ntuser/message.c branches/cmake-bringup/subsystems/win32/win32k/ntuser/msgqueue.c branches/cmake-bringup/subsystems/win32/win32k/ntuser/ntstubs.c branches/cmake-bringup/subsystems/win32/win32k/ntuser/object.c branches/cmake-bringup/subsystems/win32/win32k/ntuser/simplecall.c branches/cmake-bringup/subsystems/win32/win32k/ntuser/timer.c branches/cmake-bringup/subsystems/win32/win32k/ntuser/window.c [This mail would be too long, it was shortened to contain the URLs only.] Modified: branches/cmake-bringup/base/applications/cacls/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… Modified: branches/cmake-bringup/base/applications/calc/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… Modified: branches/cmake-bringup/base/applications/charmap/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… Modified: branches/cmake-bringup/base/applications/cmdutils/doskey/doskey.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… Modified: branches/cmake-bringup/base/applications/cmdutils/find/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… Modified: branches/cmake-bringup/base/applications/cmdutils/more/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… Modified: branches/cmake-bringup/base/applications/cmdutils/xcopy/Pl.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… Modified: branches/cmake-bringup/base/applications/dxdiag/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… Modified: branches/cmake-bringup/base/applications/findstr/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… Modified: branches/cmake-bringup/base/applications/games/solitaire/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… Modified: branches/cmake-bringup/base/applications/logoff/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… Modified: branches/cmake-bringup/base/applications/mmc/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… Modified: branches/cmake-bringup/base/applications/mscutils/eventvwr/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… Modified: branches/cmake-bringup/base/applications/mscutils/servman/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… Modified: branches/cmake-bringup/base/applications/mscutils/servman/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… Modified: branches/cmake-bringup/base/applications/mstsc/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… Modified: branches/cmake-bringup/base/applications/network/ipconfig/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… Modified: branches/cmake-bringup/base/applications/network/ping/ping.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… Modified: branches/cmake-bringup/base/applications/notepad/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… Modified: branches/cmake-bringup/base/applications/rapps/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… Modified: branches/cmake-bringup/base/applications/rapps/rsrc.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… Modified: branches/cmake-bringup/base/applications/regedit/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… Modified: branches/cmake-bringup/base/applications/sndrec32/rsrc.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… Modified: branches/cmake-bringup/base/applications/sndvol32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… Modified: branches/cmake-bringup/base/applications/sndvol32/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… Modified: branches/cmake-bringup/base/applications/sndvol32/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… Modified: branches/cmake-bringup/base/applications/sndvol32/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… Modified: branches/cmake-bringup/base/applications/sndvol32/lang/el-GR.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… Modified: branches/cmake-bringup/base/applications/sndvol32/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… Modified: branches/cmake-bringup/base/applications/sndvol32/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… Modified: branches/cmake-bringup/base/applications/sndvol32/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… Modified: branches/cmake-bringup/base/applications/sndvol32/lang/hu-HU.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… Modified: branches/cmake-bringup/base/applications/sndvol32/lang/id-ID.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… Modified: branches/cmake-bringup/base/applications/sndvol32/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… Modified: branches/cmake-bringup/base/applications/sndvol32/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… Modified: branches/cmake-bringup/base/applications/sndvol32/lang/ko-KR.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… Modified: branches/cmake-bringup/base/applications/sndvol32/lang/lt-LT.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… Modified: branches/cmake-bringup/base/applications/sndvol32/lang/nl-NL.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… Modified: branches/cmake-bringup/base/applications/sndvol32/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… Modified: branches/cmake-bringup/base/applications/sndvol32/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… Modified: branches/cmake-bringup/base/applications/sndvol32/lang/pt-BR.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… Modified: branches/cmake-bringup/base/applications/sndvol32/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… Modified: branches/cmake-bringup/base/applications/sndvol32/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… Modified: branches/cmake-bringup/base/applications/sndvol32/lang/sv-SE.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… Modified: branches/cmake-bringup/base/applications/sndvol32/lang/th-TH.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… Modified: branches/cmake-bringup/base/applications/sndvol32/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… Modified: branches/cmake-bringup/base/applications/sndvol32/misc.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… Modified: branches/cmake-bringup/base/applications/sndvol32/mixer.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… Modified: branches/cmake-bringup/base/applications/sndvol32/resources.h URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… Modified: branches/cmake-bringup/base/applications/sndvol32/sndvol32.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… Modified: branches/cmake-bringup/base/applications/sndvol32/sndvol32.h URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… Modified: branches/cmake-bringup/base/setup/reactos/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/setup/reacto… Modified: branches/cmake-bringup/base/setup/usetup/lang/cs-CZ.h URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/setup/usetup… Modified: branches/cmake-bringup/base/shell/explorer-new/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/shell/explor… Modified: branches/cmake-bringup/base/shell/explorer-new/trayntfy.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/shell/explor… Modified: branches/cmake-bringup/base/shell/explorer/explorer-pl.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/shell/explor… Modified: branches/cmake-bringup/dll/cpl/console/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/cpl/console/l… Modified: branches/cmake-bringup/dll/cpl/desk/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/cpl/desk/lang… Modified: branches/cmake-bringup/dll/cpl/desk/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/cpl/desk/lang… Modified: branches/cmake-bringup/dll/ntdll/def/ntdll.spec URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/ntdll/def/ntd… Modified: branches/cmake-bringup/dll/ntdll/ldr/ldrinit.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/ntdll/ldr/ldr… Modified: branches/cmake-bringup/dll/ntdll/ldr/ldrpe.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/ntdll/ldr/ldr… Modified: branches/cmake-bringup/dll/win32/advapi32/reg/reg.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/advapi3… Modified: branches/cmake-bringup/dll/win32/comctl32/comctl32_ros.diff URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/comctl3… Modified: branches/cmake-bringup/dll/win32/comctl32/listview.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/comctl3… Modified: branches/cmake-bringup/dll/win32/kernel32/include/kernel32.h URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/kernel3… Modified: branches/cmake-bringup/dll/win32/kernel32/misc/ldr.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/kernel3… Modified: branches/cmake-bringup/dll/win32/netapi32/access.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/netapi3… Modified: branches/cmake-bringup/dll/win32/shell32/desktop.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/shell32… Modified: branches/cmake-bringup/dll/win32/shell32/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/shell32… Modified: branches/cmake-bringup/dll/win32/shell32/lang/ca-ES.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/shell32… Modified: branches/cmake-bringup/dll/win32/shell32/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/shell32… Modified: branches/cmake-bringup/dll/win32/shell32/lang/da-DK.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/shell32… Modified: branches/cmake-bringup/dll/win32/shell32/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/shell32… Modified: branches/cmake-bringup/dll/win32/shell32/lang/el-GR.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/shell32… Modified: branches/cmake-bringup/dll/win32/shell32/lang/en-GB.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/shell32… Modified: branches/cmake-bringup/dll/win32/shell32/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/shell32… Modified: branches/cmake-bringup/dll/win32/shell32/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/shell32… Modified: branches/cmake-bringup/dll/win32/shell32/lang/fi-FI.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/shell32… Modified: branches/cmake-bringup/dll/win32/shell32/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/shell32… Modified: branches/cmake-bringup/dll/win32/shell32/lang/hu-HU.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/shell32… Modified: branches/cmake-bringup/dll/win32/shell32/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/shell32… Modified: branches/cmake-bringup/dll/win32/shell32/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/shell32… Modified: branches/cmake-bringup/dll/win32/shell32/lang/ko-KR.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/shell32… Modified: branches/cmake-bringup/dll/win32/shell32/lang/nl-NL.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/shell32… Modified: branches/cmake-bringup/dll/win32/shell32/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/shell32… Modified: branches/cmake-bringup/dll/win32/shell32/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/shell32… Modified: branches/cmake-bringup/dll/win32/shell32/lang/pt-BR.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/shell32… Modified: branches/cmake-bringup/dll/win32/shell32/lang/pt-PT.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/shell32… Modified: branches/cmake-bringup/dll/win32/shell32/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/shell32… Modified: branches/cmake-bringup/dll/win32/shell32/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/shell32… Modified: branches/cmake-bringup/dll/win32/shell32/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/shell32… Modified: branches/cmake-bringup/dll/win32/shell32/lang/sl-SI.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/shell32… Modified: branches/cmake-bringup/dll/win32/shell32/lang/sv-SE.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/shell32… Modified: branches/cmake-bringup/dll/win32/shell32/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/shell32… Modified: branches/cmake-bringup/dll/win32/shell32/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/shell32… Modified: branches/cmake-bringup/dll/win32/shell32/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/shell32… Modified: branches/cmake-bringup/dll/win32/shell32/lang/zh-TW.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/shell32… Modified: branches/cmake-bringup/dll/win32/shell32/shlview.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/shell32… Modified: branches/cmake-bringup/dll/win32/user32/include/user32p.h URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/user32/… Modified: branches/cmake-bringup/dll/win32/user32/misc/dllmain.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/user32/… Modified: branches/cmake-bringup/dll/win32/user32/user32.spec URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/user32/… Modified: branches/cmake-bringup/dll/win32/user32/windows/input.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/user32/… Modified: branches/cmake-bringup/drivers/filesystems/npfs/create.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/filesyste… Modified: branches/cmake-bringup/include/ndk/rtlfuncs.h URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/include/ndk/rtlfu… Modified: branches/cmake-bringup/lib/rtl/actctx.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/rtl/actctx.c?… Modified: branches/cmake-bringup/ntoskrnl/cc/view.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/ntoskrnl/cc/view.… Modified: branches/cmake-bringup/ntoskrnl/config/cminit.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/ntoskrnl/config/c… Modified: branches/cmake-bringup/ntoskrnl/config/cmkcbncb.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/ntoskrnl/config/c… Modified: branches/cmake-bringup/ntoskrnl/config/cmsysini.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/ntoskrnl/config/c… Modified: branches/cmake-bringup/ntoskrnl/ex/handle.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/ntoskrnl/ex/handl… Modified: branches/cmake-bringup/ntoskrnl/include/internal/ex.h URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/ntoskrnl/include/… Modified: branches/cmake-bringup/ntoskrnl/mm/ARM3/mminit.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/ntoskrnl/mm/ARM3/… Modified: branches/cmake-bringup/ntoskrnl/ob/obdir.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/ntoskrnl/ob/obdir… Modified: branches/cmake-bringup/ntoskrnl/ob/obsdcach.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/ntoskrnl/ob/obsdc… Modified: branches/cmake-bringup/subsystems/win32/csrss/win32csr/console.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/subsystems/win32/… Modified: branches/cmake-bringup/subsystems/win32/csrss/win32csr/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/subsystems/win32/… Modified: branches/cmake-bringup/subsystems/win32/csrss/win32csr/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/subsystems/win32/… Modified: branches/cmake-bringup/subsystems/win32/csrss/win32csr/lang/el-GR.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/subsystems/win32/… Modified: branches/cmake-bringup/subsystems/win32/csrss/win32csr/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/subsystems/win32/… Modified: branches/cmake-bringup/subsystems/win32/csrss/win32csr/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/subsystems/win32/… Modified: branches/cmake-bringup/subsystems/win32/csrss/win32csr/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/subsystems/win32/… Modified: branches/cmake-bringup/subsystems/win32/csrss/win32csr/lang/id-ID.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/subsystems/win32/… Modified: branches/cmake-bringup/subsystems/win32/csrss/win32csr/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/subsystems/win32/… Modified: branches/cmake-bringup/subsystems/win32/csrss/win32csr/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/subsystems/win32/… Modified: branches/cmake-bringup/subsystems/win32/csrss/win32csr/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/subsystems/win32/… Modified: branches/cmake-bringup/subsystems/win32/csrss/win32csr/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/subsystems/win32/… Modified: branches/cmake-bringup/subsystems/win32/csrss/win32csr/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/subsystems/win32/… Modified: branches/cmake-bringup/subsystems/win32/csrss/win32csr/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/subsystems/win32/… Modified: branches/cmake-bringup/subsystems/win32/csrss/win32csr/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/subsystems/win32/… Modified: branches/cmake-bringup/subsystems/win32/csrss/win32csr/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/subsystems/win32/… Modified: branches/cmake-bringup/subsystems/win32/csrss/win32csr/lang/zh-TW.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/subsystems/win32/… Modified: branches/cmake-bringup/subsystems/win32/csrss/win32csr/resource.h URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/subsystems/win32/… Modified: branches/cmake-bringup/subsystems/win32/csrss/win32csr/rsrc.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/subsystems/win32/… Modified: branches/cmake-bringup/subsystems/win32/win32k/include/cursoricon.h URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/subsystems/win32/… Modified: branches/cmake-bringup/subsystems/win32/win32k/include/desktop.h URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/subsystems/win32/… Modified: branches/cmake-bringup/subsystems/win32/win32k/include/input.h URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/subsystems/win32/… Modified: branches/cmake-bringup/subsystems/win32/win32k/include/msgqueue.h URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/subsystems/win32/… Modified: branches/cmake-bringup/subsystems/win32/win32k/include/timer.h URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/subsystems/win32/… Modified: branches/cmake-bringup/subsystems/win32/win32k/ntuser/accelerator.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/subsystems/win32/… Modified: branches/cmake-bringup/subsystems/win32/win32k/ntuser/callback.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/subsystems/win32/… Modified: branches/cmake-bringup/subsystems/win32/win32k/ntuser/cursoricon.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/subsystems/win32/… Modified: branches/cmake-bringup/subsystems/win32/win32k/ntuser/focus.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/subsystems/win32/… Modified: branches/cmake-bringup/subsystems/win32/win32k/ntuser/hook.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/subsystems/win32/… Modified: branches/cmake-bringup/subsystems/win32/win32k/ntuser/input.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/subsystems/win32/… Modified: branches/cmake-bringup/subsystems/win32/win32k/ntuser/keyboard.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/subsystems/win32/… Modified: branches/cmake-bringup/subsystems/win32/win32k/ntuser/menu.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/subsystems/win32/… Modified: branches/cmake-bringup/subsystems/win32/win32k/ntuser/message.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/subsystems/win32/… Modified: branches/cmake-bringup/subsystems/win32/win32k/ntuser/msgqueue.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/subsystems/win32/… Modified: branches/cmake-bringup/subsystems/win32/win32k/ntuser/ntstubs.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/subsystems/win32/… Modified: branches/cmake-bringup/subsystems/win32/win32k/ntuser/object.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/subsystems/win32/… Modified: branches/cmake-bringup/subsystems/win32/win32k/ntuser/simplecall.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/subsystems/win32/… Modified: branches/cmake-bringup/subsystems/win32/win32k/ntuser/timer.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/subsystems/win32/… Modified: branches/cmake-bringup/subsystems/win32/win32k/ntuser/window.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/subsystems/win32/…

1 0

[rharabien] 51328: [GDI32] * DPtoLP/LPtoDP functions should return TRUE even if they get 0 or less points or if pointer to points is invalid. See gdi32:DPtoLP apitest. * Fixes 24 gdi32:DPtoLP apite...
by rharabien＠svn.reactos.org 13 Apr '11

13 Apr '11

Author: rharabien Date: Wed Apr 13 08:14:37 2011 New Revision: 51328 URL: http://svn.reactos.org/svn/reactos?rev=51328&view=rev Log: [GDI32] * DPtoLP/LPtoDP functions should return TRUE even if they get 0 or less points or if pointer to points is invalid. See gdi32:DPtoLP apitest. * Fixes 24 gdi32:DPtoLP apitests. Modified: trunk/reactos/subsystems/win32/win32k/objects/coord.c Modified: trunk/reactos/subsystems/win32/win32k/objects/coord.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/coord.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/coord.c [iso-8859-1] Wed Apr 13 08:14:37 2011 @@ -256,18 +256,14 @@ PDC pdc; LPPOINT Points; ULONG Size; - BOOL ret; + BOOL ret = TRUE; + + if (Count <= 0) + return TRUE; pdc = DC_LockDc(hDC); if (!pdc) { - EngSetLastError(ERROR_INVALID_HANDLE); - return FALSE; - } - - if (!UnsafePtsIn || !UnsafePtOut || Count <= 0) - { - DC_UnlockDc(pdc); EngSetLastError(ERROR_INVALID_PARAMETER); return FALSE; } @@ -291,8 +287,7 @@ } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { - SetLastNtError(_SEH2_GetExceptionCode()); - ret = FALSE; + /* Do not set last error */ _SEH2_YIELD(goto leave;) } _SEH2_END; @@ -323,8 +318,7 @@ } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { - SetLastNtError(_SEH2_GetExceptionCode()); - ret = FALSE; + /* Do not set last error */ } _SEH2_END;

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