Ros-diffs

ros-diffs@reactos.org

81390 discussions

[janderwald] 51387: [USBEHCI_NEW] - Add interface function GetHubControllerSymbolicLink - Implement IOCTL_USB_GET_ROOT_HUB_NAME for usbview
by janderwald＠svn.reactos.org 17 Apr '11

17 Apr '11

Author: janderwald Date: Sun Apr 17 22:38:32 2011 New Revision: 51387 URL: http://svn.reactos.org/svn/reactos?rev=51387&view=rev Log: [USBEHCI_NEW] - Add interface function GetHubControllerSymbolicLink - Implement IOCTL_USB_GET_ROOT_HUB_NAME for usbview Modified: branches/usb-bringup/drivers/usb/usbehci_new/hcd_controller.cpp branches/usb-bringup/drivers/usb/usbehci_new/hub_controller.cpp branches/usb-bringup/drivers/usb/usbehci_new/interfaces.h 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] Sun Apr 17 22:38:32 2011 @@ -230,87 +230,123 @@ // DeviceExtension = (PCOMMON_DEVICE_EXTENSION)DeviceObject->DeviceExtension; - - DPRINT1("HandleDeviceControl>Type: FDO %u IoCtl %x InputBufferLength %lu OutputBufferLength %lu\n", - DeviceExtension->IsFDO, + // + // sanity check + // + PC_ASSERT(DeviceExtension->IsFDO); + + DPRINT1("HandleDeviceControl>Type: IoCtl %x InputBufferLength %lu OutputBufferLength %lu\n", IoStack->Parameters.DeviceIoControl.IoControlCode, IoStack->Parameters.DeviceIoControl.InputBufferLength, IoStack->Parameters.DeviceIoControl.OutputBufferLength); // - // get device type - // - if (DeviceExtension->IsFDO) - { - // - // perform ioctl for FDO - // - if (IoStack->Parameters.DeviceIoControl.IoControlCode == IOCTL_GET_HCD_DRIVERKEY_NAME) - { - // - // check if sizee is at least >= USB_HCD_DRIVERKEY_NAME - // - if(IoStack->Parameters.DeviceIoControl.OutputBufferLength >= sizeof(USB_HCD_DRIVERKEY_NAME)) - { - // - // get device property size - // - Status = IoGetDeviceProperty(m_PhysicalDeviceObject, DevicePropertyDriverKeyName, 0, NULL, &ResultLength); - - DriverKey = (PUSB_HCD_DRIVERKEY_NAME)Irp->AssociatedIrp.SystemBuffer; - - // - // check result - // - if (Status == STATUS_BUFFER_TOO_SMALL) + // perform ioctl for FDO + // + if (IoStack->Parameters.DeviceIoControl.IoControlCode == IOCTL_GET_HCD_DRIVERKEY_NAME) + { + // + // check if sizee is at least >= USB_HCD_DRIVERKEY_NAME + // + if(IoStack->Parameters.DeviceIoControl.OutputBufferLength >= sizeof(USB_HCD_DRIVERKEY_NAME)) + { + // + // get device property size + // + Status = IoGetDeviceProperty(m_PhysicalDeviceObject, DevicePropertyDriverKeyName, 0, NULL, &ResultLength); + + // + // get input buffer + // + DriverKey = (PUSB_HCD_DRIVERKEY_NAME)Irp->AssociatedIrp.SystemBuffer; + + // + // check result + // + if (Status == STATUS_BUFFER_TOO_SMALL) + { + // + // does the caller provide enough buffer space + // + if (IoStack->Parameters.DeviceIoControl.OutputBufferLength >= ResultLength) { // - // does the caller provide enough buffer space - // - if (IoStack->Parameters.DeviceIoControl.OutputBufferLength >= ResultLength) + // it does + // + Status = IoGetDeviceProperty(m_PhysicalDeviceObject, DevicePropertyDriverKeyName, IoStack->Parameters.DeviceIoControl.OutputBufferLength - sizeof(ULONG), DriverKey->DriverKeyName, &ResultLength); + + if (NT_SUCCESS(Status)) { // - // it does + // informal debug print // - Status = IoGetDeviceProperty(m_PhysicalDeviceObject, DevicePropertyDriverKeyName, IoStack->Parameters.DeviceIoControl.OutputBufferLength - sizeof(ULONG), DriverKey->DriverKeyName, &ResultLength); - - if (NT_SUCCESS(Status)) - { - // - // informal debug print - // - DPRINT1("Result %S\n", DriverKey->DriverKeyName); - } + DPRINT1("Result %S\n", DriverKey->DriverKeyName); } - - // - // store result - // - DriverKey->ActualLength = ResultLength + FIELD_OFFSET(USB_HCD_DRIVERKEY_NAME, DriverKeyName) + sizeof(WCHAR); - Irp->IoStatus.Information = IoStack->Parameters.DeviceIoControl.OutputBufferLength; - Status = STATUS_SUCCESS; } - } - else - { - // - // buffer is certainly too small - // - Status = STATUS_BUFFER_OVERFLOW; - Irp->IoStatus.Information = sizeof(USB_HCD_DRIVERKEY_NAME); - } - } - else if (IoStack->Parameters.DeviceIoControl.IoControlCode == IOCTL_USB_GET_ROOT_HUB_NAME) - { - DPRINT1("IOCTL_USB_GET_ROOT_HUB_NAME is not implemented yet\n"); - } - } - else - { - // - // the PDO does not support any device IOCTLs - // - Status = STATUS_SUCCESS; + + // + // store result + // + DriverKey->ActualLength = ResultLength + FIELD_OFFSET(USB_HCD_DRIVERKEY_NAME, DriverKeyName) + sizeof(WCHAR); + Irp->IoStatus.Information = IoStack->Parameters.DeviceIoControl.OutputBufferLength; + Status = STATUS_SUCCESS; + } + } + else + { + // + // buffer is certainly too small + // + Status = STATUS_BUFFER_OVERFLOW; + Irp->IoStatus.Information = sizeof(USB_HCD_DRIVERKEY_NAME); + } + } + else if (IoStack->Parameters.DeviceIoControl.IoControlCode == IOCTL_USB_GET_ROOT_HUB_NAME) + { + // + // check if sizee is at least >= USB_HCD_DRIVERKEY_NAME + // + if(IoStack->Parameters.DeviceIoControl.OutputBufferLength >= sizeof(USB_HCD_DRIVERKEY_NAME)) + { + // + // sanity check + // + PC_ASSERT(m_HubController); + + // + // get input buffer + // + DriverKey = (PUSB_HCD_DRIVERKEY_NAME)Irp->AssociatedIrp.SystemBuffer; + + // + // get symbolic link + // + Status = m_HubController->GetHubControllerSymbolicLink(IoStack->Parameters.DeviceIoControl.OutputBufferLength - sizeof(ULONG), DriverKey->DriverKeyName, &ResultLength); + + + if (NT_SUCCESS(Status)) + { + // + // informal debug print + // + DPRINT1("Result %S\n", DriverKey->DriverKeyName); + } + + // + // store result + // + DriverKey->ActualLength = ResultLength + FIELD_OFFSET(USB_HCD_DRIVERKEY_NAME, DriverKeyName) + sizeof(WCHAR); + Irp->IoStatus.Information = IoStack->Parameters.DeviceIoControl.OutputBufferLength; + Status = STATUS_SUCCESS; + } + else + { + // + // buffer is certainly too small + // + Status = STATUS_BUFFER_OVERFLOW; + Irp->IoStatus.Information = sizeof(USB_HCD_DRIVERKEY_NAME); + } } // Modified: branches/usb-bringup/drivers/usb/usbehci_new/hub_controller.cpp URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup/drivers/usb/usbehci… ============================================================================== --- branches/usb-bringup/drivers/usb/usbehci_new/hub_controller.cpp [iso-8859-1] (original) +++ branches/usb-bringup/drivers/usb/usbehci_new/hub_controller.cpp [iso-8859-1] Sun Apr 17 22:38:32 2011 @@ -36,6 +36,8 @@ // IHubController interface functions virtual NTSTATUS Initialize(IN PDRIVER_OBJECT DriverObject, IN PHCDCONTROLLER Controller, IN PUSBHARDWAREDEVICE Device, IN BOOLEAN IsRootHubDevice, IN ULONG DeviceAddress); + virtual NTSTATUS GetHubControllerDeviceObject(PDEVICE_OBJECT * HubDeviceObject); + virtual NTSTATUS GetHubControllerSymbolicLink(ULONG BufferLength, PVOID Buffer, PULONG RequiredLength); // IDispatchIrp interface functions virtual NTSTATUS HandlePnp(IN PDEVICE_OBJECT DeviceObject, IN OUT PIRP Irp); @@ -46,7 +48,6 @@ NTSTATUS HandleQueryInterface(PIO_STACK_LOCATION IoStack); NTSTATUS SetDeviceInterface(BOOLEAN bEnable); NTSTATUS CreatePDO(PDRIVER_OBJECT DriverObject, PDEVICE_OBJECT * OutDeviceObject); - NTSTATUS GetHubControllerDeviceObject(PDEVICE_OBJECT * HubDeviceObject); PUSBHARDWAREDEVICE GetUsbHardware(); ULONG AcquireDeviceAddress(); VOID ReleaseDeviceAddress(ULONG DeviceAddress); @@ -71,8 +72,10 @@ PUSBHARDWAREDEVICE m_Hardware; BOOLEAN m_IsRootHubDevice; ULONG m_DeviceAddress; + BOOLEAN m_InterfaceEnabled; UNICODE_STRING m_HubDeviceInterfaceString; + PDEVICE_OBJECT m_HubControllerDeviceObject; PDRIVER_OBJECT m_DriverObject; @@ -267,6 +270,51 @@ return STATUS_SUCCESS; } +//----------------------------------------------------------------------------------------- +NTSTATUS +CHubController::GetHubControllerSymbolicLink( + ULONG BufferLength, + PVOID Buffer, + PULONG RequiredLength) +{ + if (!m_InterfaceEnabled) + { + // + // device interface not yet enabled + // + return STATUS_UNSUCCESSFUL; + } + + if (BufferLength < m_HubDeviceInterfaceString.Length - 8) + { + // + // buffer too small + // length is without '\??\' + // + *RequiredLength = m_HubDeviceInterfaceString.Length- 8; + + // + // done + // + return STATUS_BUFFER_OVERFLOW; + } + + // + // copy symbolic link + // + RtlCopyMemory(Buffer, &m_HubDeviceInterfaceString.Buffer[4], m_HubDeviceInterfaceString.Length - 8); + + // + // store length, length is without '\??\' + // + *RequiredLength = m_HubDeviceInterfaceString.Length - 8; + + // + // done + // + return STATUS_SUCCESS; +} + //----------------------------------------------------------------------------------------- NTSTATUS CHubController::HandlePnp( Modified: branches/usb-bringup/drivers/usb/usbehci_new/interfaces.h URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup/drivers/usb/usbehci… ============================================================================== --- branches/usb-bringup/drivers/usb/usbehci_new/interfaces.h [iso-8859-1] (original) +++ branches/usb-bringup/drivers/usb/usbehci_new/interfaces.h [iso-8859-1] Sun Apr 17 22:38:32 2011 @@ -444,6 +444,15 @@ virtual NTSTATUS GetHubControllerDeviceObject(PDEVICE_OBJECT * HubDeviceObject) = 0; +//---------------------------------------------------------------------------------------- +// +// GetHubControllerSymbolicLink +// +// Description: Returns the symbolic link of the root hub + + virtual NTSTATUS GetHubControllerSymbolicLink(ULONG BufferLength, PVOID Buffer, PULONG RequiredLength) = 0; + + }; typedef IHubController *PHUBCONTROLLER;

1 0

[mjmartin] 51386: [USBEHCI_NEW] - Update interfaces with new methods needed for UsbHardWare class. - Remove GetDmaMemoryManager as the DmaMemory will only be needed by UsbQueue class. - GetDeviceDe...
by mjmartin＠svn.reactos.org 17 Apr '11

17 Apr '11

Author: mjmartin Date: Sun Apr 17 22:06:20 2011 New Revision: 51386 URL: http://svn.reactos.org/svn/reactos?rev=51386&view=rev Log: [USBEHCI_NEW] - Update interfaces with new methods needed for UsbHardWare class. - Remove GetDmaMemoryManager as the DmaMemory will only be needed by UsbQueue class. - GetDeviceDetails: Only fill in a parameter if its not null. - Start implementing UsbQueue class. Added: branches/usb-bringup/drivers/usb/usbehci_new/usb_queue.cpp (with props) Modified: branches/usb-bringup/drivers/usb/usbehci_new/CMakeLists.txt branches/usb-bringup/drivers/usb/usbehci_new/hardware.cpp branches/usb-bringup/drivers/usb/usbehci_new/interfaces.h branches/usb-bringup/drivers/usb/usbehci_new/usbehci.h Modified: 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 [iso-8859-1] (original) +++ branches/usb-bringup/drivers/usb/usbehci_new/CMakeLists.txt [iso-8859-1] Sun Apr 17 22:06:20 2011 @@ -7,6 +7,7 @@ add_library(usbehci SHARED usbehci.cpp usb_device.cpp + usb_queue.cpp hcd_controller.cpp hardware.cpp misc.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] Sun Apr 17 22:06:20 2011 @@ -52,12 +52,17 @@ NTSTATUS PnpStop(void); NTSTATUS HandlePower(PIRP Irp); NTSTATUS GetDeviceDetails(PUSHORT VendorId, PUSHORT DeviceId, PULONG NumberOfPorts, PULONG Speed); - NTSTATUS GetDmaMemoryManager(OUT struct IDMAMemoryManager **OutMemoryManager); + NTSTATUS GetDmaAdapter(OUT PDMA_ADAPTER AdapterObject); NTSTATUS GetUSBQueue(OUT struct IUSBQueue **OutUsbQueue); + NTSTATUS StartController(); NTSTATUS StopController(); NTSTATUS ResetController(); NTSTATUS ResetPort(ULONG PortIndex); + + VOID SetAsyncListAddressRegister(ULONG PhysicalAddress); + VOID SetPeriodicListRegister(ULONG PhysicalAddress); + KIRQL AcquireDeviceLock(void); VOID ReleaseDeviceLock(KIRQL OldLevel); // local @@ -83,10 +88,10 @@ PULONG m_Base; PDMA_ADAPTER m_Adapter; ULONG m_MapRegisters; - PQUEUE_HEAD m_AsyncListQueueHead; EHCI_CAPS m_Capabilities; USHORT m_VendorID; USHORT m_DeviceID; + PUSBQUEUE m_UsbQueue; VOID SetCommandRegister(PEHCI_USBCMD_CONTENT UsbCmd); VOID GetCommandRegister(PEHCI_USBCMD_CONTENT UsbCmd); @@ -127,6 +132,12 @@ DPRINT1("CUSBHardwareDevice::Initialize\n"); + Status = CreateUSBQueue(&m_UsbQueue); + if (!NT_SUCCESS(Status)) + { + DPRINT1("Failed to create UsbQueue!\n"); + return Status; + } // // store device objects // @@ -322,11 +333,6 @@ } // - // FIXME: Create a QueueHead that will always be the address of the AsyncList - // - m_AsyncListQueueHead = NULL; - - // // Start the controller // DPRINT1("Starting Controller\n"); @@ -355,20 +361,16 @@ OUT OPTIONAL PULONG NumberOfPorts, OUT OPTIONAL PULONG Speed) { - *VendorId = m_VendorID; - *DeviceId = m_DeviceID; - *NumberOfPorts = m_Capabilities.HCSParams.PortCount; + if (VendorId) + *VendorId = m_VendorID; + if (DeviceId) + *DeviceId = m_DeviceID; + if (NumberOfPorts) + *NumberOfPorts = m_Capabilities.HCSParams.PortCount; //FIXME: What to returned here? - *Speed = 0; + if (Speed) + *Speed = 0; return STATUS_SUCCESS; -} - -NTSTATUS -CUSBHardwareDevice::GetDmaMemoryManager( - OUT struct IDMAMemoryManager **OutMemoryManager) -{ - UNIMPLEMENTED - return STATUS_NOT_IMPLEMENTED; } NTSTATUS @@ -563,6 +565,30 @@ return STATUS_SUCCESS; } +//----------------------------------------------------------------------------------------- +// +// SetAsyncListAddressRegister +// +// Description: this functions sets the register to a address that is the physical address of a QueueHead. +// This is the location at which the controller will start executing the Asynchronous Schedule. +// +VOID CUSBHardwareDevice::SetAsyncListAddressRegister(ULONG PhysicalAddress) +{ + EHCI_WRITE_REGISTER_ULONG(EHCI_ASYNCLISTBASE, PhysicalAddress); +} + +//----------------------------------------------------------------------------------------- +// +// SetPeriodicListRegister +// +// Description: this functions sets the register to a address that is the physical address of a ???. +// This is the location at which the controller will start executing the Periodic Schedule. +// +VOID CUSBHardwareDevice::SetPeriodicListRegister(ULONG PhysicalAddress) +{ + EHCI_WRITE_REGISTER_ULONG(EHCI_PERIODICLISTBASE, PhysicalAddress); +} + KIRQL CUSBHardwareDevice::AcquireDeviceLock(void) { @@ -642,14 +668,15 @@ IN PVOID SystemArgument2) { CUSBHardwareDevice *This; - ULONG CStatus, PortStatus, i; + ULONG CStatus, PortStatus, PortCount, i; This = (CUSBHardwareDevice*) SystemArgument1; CStatus = (ULONG) SystemArgument2; + This->GetDeviceDetails(NULL, NULL, &PortCount, NULL); if (CStatus & EHCI_STS_PCD) { - for (i = 0; i < This->m_Capabilities.HCSParams.PortCount; i++) + for (i = 0; i < PortCount; i++) { PortStatus = This->EHCI_READ_REGISTER_ULONG(EHCI_PORTSC + (4 * i)); Modified: branches/usb-bringup/drivers/usb/usbehci_new/interfaces.h URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup/drivers/usb/usbehci… ============================================================================== --- branches/usb-bringup/drivers/usb/usbehci_new/interfaces.h [iso-8859-1] (original) +++ branches/usb-bringup/drivers/usb/usbehci_new/interfaces.h [iso-8859-1] Sun Apr 17 22:06:20 2011 @@ -164,16 +164,6 @@ //----------------------------------------------------------------------------------------- // -// 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 @@ -190,6 +180,26 @@ // Returns STATUS_SUCCESS when the controller was successfully reset virtual NTSTATUS ResetController() = 0; + +//----------------------------------------------------------------------------------------- +// +// StartController +// +// Description: this functions starts controller allowing interrupts for device connects/removal, and execution of +// Periodic and Asynchronous Schedules. +// + + virtual NTSTATUS StartController() = 0; + +//----------------------------------------------------------------------------------------- +// +// StopController +// +// Description: this functions stops controller disabling interrupts for device connects/removal, and execution of +// Periodic and Asynchronous Schedules. +// + + virtual NTSTATUS StopController() = 0; //----------------------------------------------------------------------------------------- // @@ -364,8 +374,8 @@ // Description: initializes the object virtual NTSTATUS Initialize(IN PUSBHARDWAREDEVICE Hardware, - IN OPTIONAL PKSPIN_LOCK Lock, - IN PDMAMEMORYMANAGER MemoryManager) = 0; + PADAPTER_OBJECT AdapterObject, + IN OPTIONAL PKSPIN_LOCK Lock) = 0; //----------------------------------------------------------------------------------------- // @@ -383,7 +393,7 @@ // Returns status success when successful virtual NTSTATUS AddUSBRequest(IUSBRequest * Request) = 0; - + virtual NTSTATUS AddUSBRequest(PURB Urb) = 0; //----------------------------------------------------------------------------------------- // // CancelRequests() Added: 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 (added) +++ branches/usb-bringup/drivers/usb/usbehci_new/usb_queue.cpp [iso-8859-1] Sun Apr 17 22:06:20 2011 @@ -1,0 +1,165 @@ +/* + * PROJECT: ReactOS Universal Serial Bus Bulk Enhanced Host Controller Interface + * LICENSE: GPL - See COPYING in the top level directory + * FILE: drivers/usb/usbehci/usb_queue.cpp + * PURPOSE: USB EHCI device driver. + * PROGRAMMERS: + * Michael Martin (michael.martin(a)reactos.org) + * Johannes Anderwald (johannes.anderwald(a)reactos.org) + */ + +#include "usbehci.h" +#include "hardware.h" + +class CUSBQueue : public IUSBQueue +{ +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; + } + + NTSTATUS Initialize(IN PUSBHARDWAREDEVICE Hardware, PADAPTER_OBJECT AdapterObject, IN OPTIONAL PKSPIN_LOCK Lock); + ULONG GetPendingRequestCount(); + NTSTATUS AddUSBRequest(PURB Urb); + NTSTATUS AddUSBRequest(IUSBRequest * Request); + NTSTATUS CancelRequests(); + NTSTATUS CreateUSBRequest(IUSBRequest **OutRequest); + + // constructor / destructor + CUSBQueue(IUnknown *OuterUnknown){} + virtual ~CUSBQueue(){} + +protected: + LONG m_Ref; + PDMA_ADAPTER m_Adapter; + PQUEUE_HEAD ExecutingList; + PQUEUE_HEAD PendingList; + IDMAMemoryManager *m_MemoryManager; +}; + +//================================================================================================= +// COM +// +NTSTATUS +STDMETHODCALLTYPE +CUSBQueue::QueryInterface( + IN REFIID refiid, + OUT PVOID* Output) +{ + if (IsEqualGUIDAligned(refiid, IID_IUnknown)) + { + *Output = PVOID(PUNKNOWN(this)); + PUNKNOWN(*Output)->AddRef(); + return STATUS_SUCCESS; + } + + return STATUS_UNSUCCESSFUL; +} + +NTSTATUS +CUSBQueue::Initialize( + IN PUSBHARDWAREDEVICE Hardware, + PADAPTER_OBJECT AdapterObject, + IN OPTIONAL PKSPIN_LOCK Lock) +{ + NTSTATUS Status; + + ASSERT(Hardware); + ASSERT(AdapterObject); + + Status = CreateDMAMemoryManager(&m_MemoryManager); + if (!NT_SUCCESS(Status)) + { + DPRINT1("Failed to create DMAMemoryManager Object\n"); + return Status; + } + + return STATUS_SUCCESS; +} + +ULONG +CUSBQueue::GetPendingRequestCount() +{ + UNIMPLEMENTED + return 0; +} + +NTSTATUS +CUSBQueue::AddUSBRequest( + IUSBRequest * Request) +{ + UNIMPLEMENTED + return STATUS_NOT_IMPLEMENTED; +} + +NTSTATUS +CUSBQueue::AddUSBRequest( + PURB Urb) +{ + UNIMPLEMENTED + return STATUS_NOT_IMPLEMENTED; +} + +NTSTATUS +CUSBQueue::CancelRequests() +{ + UNIMPLEMENTED + return STATUS_NOT_IMPLEMENTED; +} + +NTSTATUS +CUSBQueue::CreateUSBRequest( + IUSBRequest **OutRequest) +{ + UNIMPLEMENTED + return STATUS_NOT_IMPLEMENTED; +} + +NTSTATUS +CreateUSBQueue( + PUSBQUEUE *OutUsbQueue) +{ + PUSBQUEUE This; + + // + // allocate controller + // + This = new(NonPagedPool, TAG_USBEHCI) CUSBQueue(0); + if (!This) + { + // + // failed to allocate + // + return STATUS_INSUFFICIENT_RESOURCES; + } + + // + // add reference count + // + This->AddRef(); + + // + // return result + // + *OutUsbQueue = (PUSBQUEUE)This; + + // + // done + // + return STATUS_SUCCESS; +} Propchange: branches/usb-bringup/drivers/usb/usbehci_new/usb_queue.cpp ------------------------------------------------------------------------------ svn:eol-style = native Modified: 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 [iso-8859-1] (original) +++ branches/usb-bringup/drivers/usb/usbehci_new/usbehci.h [iso-8859-1] Sun Apr 17 22:06:20 2011 @@ -72,4 +72,9 @@ // NTSTATUS CreateUSBDevice(PUSBDEVICE *OutDevice); +// +// usb_queue.cpp +// +NTSTATUS CreateUSBQueue(PUSBQUEUE *OutUsbQueue); + #endif

1 0

[janderwald] 51385: [USBEHCI_NEW] - Implement IRP_MN_QUERY_DEVICE_RELATIONS for hub controller object - Implement stub handler for URB_FUNCTION_CLASS_OTHER, URB_FUNCTION_SELECT_CONFIGURATION - Part...
by janderwald＠svn.reactos.org 17 Apr '11

17 Apr '11

Author: janderwald Date: Sun Apr 17 21:35:25 2011 New Revision: 51385 URL: http://svn.reactos.org/svn/reactos?rev=51385&view=rev Log: [USBEHCI_NEW] - Implement IRP_MN_QUERY_DEVICE_RELATIONS for hub controller object - Implement stub handler for URB_FUNCTION_CLASS_OTHER, URB_FUNCTION_SELECT_CONFIGURATION - Partly implement URB_FUNCTION_GET_STATUS_FROM_DEVICE - Return success from unimplemented USBHI_Initialize20Hub routine - based on mjmartin usbehci driver - Tested in Windows XP SP2 Modified: branches/usb-bringup/drivers/usb/usbehci_new/hub_controller.cpp Modified: branches/usb-bringup/drivers/usb/usbehci_new/hub_controller.cpp URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup/drivers/usb/usbehci… ============================================================================== --- branches/usb-bringup/drivers/usb/usbehci_new/hub_controller.cpp [iso-8859-1] (original) +++ branches/usb-bringup/drivers/usb/usbehci_new/hub_controller.cpp [iso-8859-1] Sun Apr 17 21:35:25 2011 @@ -54,8 +54,12 @@ NTSTATUS AddUsbDevice(PUSBDEVICE UsbDevice); NTSTATUS RemoveUsbDevice(PUSBDEVICE UsbDevice); VOID SetNotification(PVOID CallbackContext, PRH_INIT_CALLBACK CallbackRoutine); + // internal ioctl routines NTSTATUS HandleGetDescriptor(IN OUT PIRP Irp, PURB Urb); NTSTATUS HandleClassDevice(IN OUT PIRP Irp, PURB Urb); + NTSTATUS HandleGetStatusFromDevice(IN OUT PIRP Irp, PURB Urb); + NTSTATUS HandleSelectConfiguration(IN OUT PIRP Irp, PURB Urb); + NTSTATUS HandleClassOther(IN OUT PIRP Irp, PURB Urb); // constructor / destructor CHubController(IUnknown *OuterUnknown){} @@ -273,6 +277,7 @@ PCOMMON_DEVICE_EXTENSION DeviceExtension; PDEVICE_CAPABILITIES DeviceCapabilities; PPNP_BUS_INFORMATION BusInformation; + PDEVICE_RELATIONS DeviceRelations; NTSTATUS Status; ULONG Index = 0, Length; USHORT VendorID, DeviceID; @@ -515,6 +520,47 @@ // return STATUS_SUCCESS; } + case IRP_MN_QUERY_DEVICE_RELATIONS: + { + DPRINT1("CHubController::HandlePnp IRP_MN_QUERY_DEVICE_RELATIONS Type %x\n", IoStack->Parameters.QueryDeviceRelations.Type); + + if (IoStack->Parameters.QueryDeviceRelations.Type == TargetDeviceRelation) + { + // + // allocate device relations + // + DeviceRelations = (PDEVICE_RELATIONS)ExAllocatePoolWithTag(PagedPool, sizeof(DEVICE_RELATIONS), TAG_USBEHCI); + if (!DeviceRelations) + { + // + // no memory + // + Status = STATUS_INSUFFICIENT_RESOURCES; + break; + } + + // + // initialize device relations + // + DeviceRelations->Count = 1; + DeviceRelations->Objects[0] = DeviceObject; + ObReferenceObject(DeviceObject); + + // + // done + // + Status = STATUS_SUCCESS; + Irp->IoStatus.Information = (ULONG_PTR)DeviceRelations; + } + else + { + // + // not handled + // + Status = Irp->IoStatus.Status; + } + break; + } case IRP_MN_QUERY_BUS_INFORMATION: { DPRINT1("CHubController::HandlePnp IRP_MN_QUERY_BUS_INFORMATION\n"); @@ -591,6 +637,84 @@ //----------------------------------------------------------------------------------------- NTSTATUS +CHubController::HandleClassOther( + IN OUT PIRP Irp, + PURB Urb) +{ + DPRINT1("CHubController::HandleClassOther> Request %x Value %x not implemented\n", Urb->UrbControlVendorClassRequest.Request, Urb->UrbControlVendorClassRequest.Value); + + // + // FIXME implement me + // + + return STATUS_SUCCESS; +} + +//----------------------------------------------------------------------------------------- +NTSTATUS +CHubController::HandleSelectConfiguration( + IN OUT PIRP Irp, + PURB Urb) +{ + // + // sanity checks + // + + // + // FIXME: support devices + // + PC_ASSERT(Urb->UrbHeader.UsbdDeviceHandle == NULL); + + // + // FIXME: support setting device to unconfigured state + // + PC_ASSERT(Urb->UrbSelectConfiguration.ConfigurationDescriptor); + + // + // set device handle + // + Urb->UrbSelectConfiguration.ConfigurationHandle = (PVOID)ROOTHUB2_CONFIGURATION_DESCRIPTOR; + + // + // TODO: copy interface info + // + return STATUS_SUCCESS; +} + +//----------------------------------------------------------------------------------------- +NTSTATUS +CHubController::HandleGetStatusFromDevice( + IN OUT PIRP Irp, + PURB Urb) +{ + PUSHORT Status; + + // + // sanity checks + // + PC_ASSERT(Urb->UrbControlGetStatusRequest.Index == 0); + PC_ASSERT(Urb->UrbControlGetStatusRequest.TransferBufferLength >= sizeof(USHORT)); + PC_ASSERT(Urb->UrbControlGetStatusRequest.TransferBuffer); + PC_ASSERT(Urb->UrbHeader.UsbdDeviceHandle == NULL); + + // + // get status buffer + // + Status = (PUSHORT)Urb->UrbControlGetStatusRequest.TransferBuffer; + + // + // FIXME need more flags ? + // + *Status = USB_PORT_STATUS_CONNECT; + + // + // done + // + return STATUS_SUCCESS; +} + +//----------------------------------------------------------------------------------------- +NTSTATUS CHubController::HandleClassDevice( IN OUT PIRP Irp, IN OUT PURB Urb) @@ -605,53 +729,63 @@ // switch(Urb->UrbControlVendorClassRequest.Request) { - case USB_DEVICE_CLASS_HUB: - { - // - // sanity checks - // - PC_ASSERT(Urb->UrbControlVendorClassRequest.TransferBuffer); - PC_ASSERT(Urb->UrbControlVendorClassRequest.TransferBufferLength >= sizeof(USB_HUB_DESCRIPTOR)); - - // - // get hub descriptor - // - UsbHubDescriptor = (PUSB_HUB_DESCRIPTOR)Urb->UrbControlVendorClassRequest.TransferBuffer; - - // - // one hub is handled - // - UsbHubDescriptor->bDescriptorLength = sizeof(USB_HUB_DESCRIPTOR); - Urb->UrbControlVendorClassRequest.TransferBufferLength = sizeof(USB_HUB_DESCRIPTOR); - - // - // type should 0x29 according to msdn - // - UsbHubDescriptor->bDescriptorType = 0x29; - - // - // get port count - // - Status = m_Hardware->GetDeviceDetails(&Dummy1, &Dummy1, &PortCount, &Dummy2); - PC_ASSERT(Status == STATUS_SUCCESS); - - // - // FIXME: retrieve values - // - UsbHubDescriptor->bNumberOfPorts = PortCount; - UsbHubDescriptor->wHubCharacteristics = 0x0012; - UsbHubDescriptor->bPowerOnToPowerGood = 0x01; - UsbHubDescriptor->bHubControlCurrent = 0x00; - - // - // done - // - Status = STATUS_SUCCESS; + case USB_REQUEST_GET_DESCRIPTOR: + { + switch (Urb->UrbControlVendorClassRequest.Value >> 8) + { + case USB_DEVICE_CLASS_RESERVED: // FALL THROUGH + case USB_DEVICE_CLASS_HUB: + { + // + // sanity checks + // + PC_ASSERT(Urb->UrbControlVendorClassRequest.TransferBuffer); + PC_ASSERT(Urb->UrbControlVendorClassRequest.TransferBufferLength >= sizeof(USB_HUB_DESCRIPTOR)); + + // + // get hub descriptor + // + UsbHubDescriptor = (PUSB_HUB_DESCRIPTOR)Urb->UrbControlVendorClassRequest.TransferBuffer; + + // + // one hub is handled + // + UsbHubDescriptor->bDescriptorLength = sizeof(USB_HUB_DESCRIPTOR); + Urb->UrbControlVendorClassRequest.TransferBufferLength = sizeof(USB_HUB_DESCRIPTOR); + + // + // type should 0x29 according to msdn + // + UsbHubDescriptor->bDescriptorType = 0x29; + + // + // get port count + // + Status = m_Hardware->GetDeviceDetails(&Dummy1, &Dummy1, &PortCount, &Dummy2); + PC_ASSERT(Status == STATUS_SUCCESS); + + // + // FIXME: retrieve values + // + UsbHubDescriptor->bNumberOfPorts = PortCount; + UsbHubDescriptor->wHubCharacteristics = 0x0012; + UsbHubDescriptor->bPowerOnToPowerGood = 0x01; + UsbHubDescriptor->bHubControlCurrent = 0x00; + + // + // done + // + Status = STATUS_SUCCESS; + break; + } + default: + DPRINT1("CHubController::HandleClassDevice Class %x not implemented\n", Urb->UrbControlVendorClassRequest.Value >> 8); + break; + } break; } default: - DPRINT1("CHubController::HandleClassDevice Class %x not implemented\n", Urb->UrbControlVendorClassRequest.Request); - break; + DPRINT1("CHubController::HandleClassDevice Type %x not implemented\n", Urb->UrbControlVendorClassRequest.Request); } return Status; @@ -807,6 +941,16 @@ break; case URB_FUNCTION_CLASS_DEVICE: Status = HandleClassDevice(Irp, Urb); + break; + case URB_FUNCTION_GET_STATUS_FROM_DEVICE: + Status = HandleGetStatusFromDevice(Irp, Urb); + break; + case URB_FUNCTION_SELECT_CONFIGURATION: + Status = HandleSelectConfiguration(Irp, Urb); + break; + case URB_FUNCTION_CLASS_OTHER: + Status = HandleClassOther(Irp, Urb); + break; } // // request completed @@ -1865,7 +2009,7 @@ ULONG TtCount) { UNIMPLEMENTED - return STATUS_NOT_IMPLEMENTED; + return STATUS_SUCCESS; } NTSTATUS @@ -1889,6 +2033,11 @@ // set notification routine // Controller->SetNotification(CallbackContext, CallbackRoutine); + + // + // FIXME: determine when to perform callback + // + CallbackRoutine(CallbackContext); // // done

1 0

[janderwald] 51384: [USBEHCI_NEW] - Setup a default device descriptor for the root hub and initialize it with vendor & product id - Partly implement URB_FUNCTION_GET_DESCRIPTOR_FROM_DEVICE, URB_FUN...
by janderwald＠svn.reactos.org 17 Apr '11

17 Apr '11

Author: janderwald Date: Sun Apr 17 19:23:13 2011 New Revision: 51384 URL: http://svn.reactos.org/svn/reactos?rev=51384&view=rev Log: [USBEHCI_NEW] - Setup a default device descriptor for the root hub and initialize it with vendor & product id - Partly implement URB_FUNCTION_GET_DESCRIPTOR_FROM_DEVICE, URB_FUNCTION_CLASS_DEVICE - based on mjmartin usbehci Modified: branches/usb-bringup/drivers/usb/usbehci_new/hub_controller.cpp branches/usb-bringup/drivers/usb/usbehci_new/interfaces.h branches/usb-bringup/drivers/usb/usbehci_new/usb_device.cpp Modified: branches/usb-bringup/drivers/usb/usbehci_new/hub_controller.cpp URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup/drivers/usb/usbehci… ============================================================================== --- branches/usb-bringup/drivers/usb/usbehci_new/hub_controller.cpp [iso-8859-1] (original) +++ branches/usb-bringup/drivers/usb/usbehci_new/hub_controller.cpp [iso-8859-1] Sun Apr 17 19:23:13 2011 @@ -54,6 +54,8 @@ NTSTATUS AddUsbDevice(PUSBDEVICE UsbDevice); NTSTATUS RemoveUsbDevice(PUSBDEVICE UsbDevice); VOID SetNotification(PVOID CallbackContext, PRH_INIT_CALLBACK CallbackRoutine); + NTSTATUS HandleGetDescriptor(IN OUT PIRP Irp, PURB Urb); + NTSTATUS HandleClassDevice(IN OUT PIRP Irp, PURB Urb); // constructor / destructor CHubController(IUnknown *OuterUnknown){} @@ -65,7 +67,6 @@ PUSBHARDWAREDEVICE m_Hardware; BOOLEAN m_IsRootHubDevice; ULONG m_DeviceAddress; - ULONG m_PDODeviceNumber; BOOLEAN m_InterfaceEnabled; UNICODE_STRING m_HubDeviceInterfaceString; PDEVICE_OBJECT m_HubControllerDeviceObject; @@ -74,6 +75,7 @@ PVOID m_HubCallbackContext; PRH_INIT_CALLBACK m_HubCallbackRoutine; + USB_DEVICE_DESCRIPTOR m_DeviceDescriptor; KSPIN_LOCK m_Lock; RTL_BITMAP m_DeviceAddressBitmap; @@ -87,6 +89,64 @@ PUSBDEVICE Device; }USBDEVICE_ENTRY, *PUSBDEVICE_ENTRY; +/* Lifted from Linux with slight changes */ +const UCHAR ROOTHUB2_DEVICE_DESCRIPTOR [] = +{ + 0x12, /* bLength; */ + USB_DEVICE_DESCRIPTOR_TYPE, /* bDescriptorType; Device */ + 0x00, 0x20, /* bcdUSB; v1.1 */ + USB_DEVICE_CLASS_HUB, /* bDeviceClass; HUB_CLASSCODE */ + 0x01, /* bDeviceSubClass; */ + 0x00, /* bDeviceProtocol; [ low/full speeds only ] */ + 0x08, /* bMaxPacketSize0; 8 Bytes */ + /* Fill Vendor and Product in when init root hub */ + 0x00, 0x00, /* idVendor; */ + 0x00, 0x00, /* idProduct; */ + 0x00, 0x00, /* bcdDevice */ + 0x00, /* iManufacturer; */ + 0x00, /* iProduct; */ + 0x00, /* iSerialNumber; */ + 0x01 /* bNumConfigurations; */ + +}; + +const UCHAR ROOTHUB2_CONFIGURATION_DESCRIPTOR [] = +{ + /* one configuration */ + 0x09, /* bLength; */ + 0x02, /* bDescriptorType; Configuration */ + 0x19, 0x00, /* wTotalLength; */ + 0x01, /* bNumInterfaces; (1) */ + 0x23, /* bConfigurationValue; */ + 0x00, /* iConfiguration; */ + 0x40, /* bmAttributes; */ + 0x00 /* MaxPower; */ +}; + +const UCHAR ROOTHUB2_INTERFACE_DESCRIPTOR [] = +{ + /* one interface */ + 0x09, /* bLength: Interface; */ + 0x04, /* bDescriptorType; Interface */ + 0x00, /* bInterfaceNumber; */ + 0x00, /* bAlternateSetting; */ + 0x01, /* bNumEndpoints; */ + 0x09, /* bInterfaceClass; HUB_CLASSCODE */ + 0x01, /* bInterfaceSubClass; */ + 0x00, /* bInterfaceProtocol: */ + 0x00 /* iInterface; */ +}; + +const UCHAR ROOTHUB2_ENDPOINT_DESCRIPTOR [] = +{ + /* one endpoint (status change endpoint) */ + 0x07, /* bLength; */ + 0x05, /* bDescriptorType; Endpoint */ + 0x81, /* bEndpointAddress; IN Endpoint 1 */ + 0x03, /* bmAttributes; Interrupt */ + 0x08, 0x00, /* wMaxPacketSize; 1 + (MAX_ROOT_PORTS / 8) */ + 0xFF /* bInterval; (255ms -- usb 2.0 spec) */ +}; //---------------------------------------------------------------------------------------- NTSTATUS @@ -108,6 +168,8 @@ { NTSTATUS Status; PCOMMON_DEVICE_EXTENSION DeviceExtension; + USHORT VendorID, DeviceID; + ULONG Dummy1; DPRINT1("CHubController::Initialize\n"); @@ -120,6 +182,7 @@ m_DeviceAddress = DeviceAddress; m_DriverObject = DriverObject; KeInitializeSpinLock(&m_Lock); + InitializeListHead(&m_UsbDeviceList); // // allocate device address bitmap buffer @@ -163,6 +226,22 @@ DeviceExtension->IsFDO = FALSE; DeviceExtension->IsHub = TRUE; //FIXME DeviceExtension->Dispatcher = PDISPATCHIRP(this); + + // + // intialize device descriptor + // + C_ASSERT(sizeof(USB_DEVICE_DESCRIPTOR) == sizeof(ROOTHUB2_DEVICE_DESCRIPTOR)); + RtlMoveMemory(&m_DeviceDescriptor, ROOTHUB2_DEVICE_DESCRIPTOR, sizeof(USB_DEVICE_DESCRIPTOR)); + + if (NT_SUCCESS(m_Hardware->GetDeviceDetails(&VendorID, &DeviceID, &Dummy1, &Dummy1))) + { + // + // update device descriptor + // + m_DeviceDescriptor.idVendor = VendorID; + m_DeviceDescriptor.idProduct = DeviceID; + m_DeviceDescriptor.bcdUSB = 0x200; //FIXME + } // // clear init flag @@ -512,6 +591,174 @@ //----------------------------------------------------------------------------------------- NTSTATUS +CHubController::HandleClassDevice( + IN OUT PIRP Irp, + IN OUT PURB Urb) +{ + NTSTATUS Status = STATUS_NOT_IMPLEMENTED; + PUSB_HUB_DESCRIPTOR UsbHubDescriptor; + ULONG PortCount, Dummy2; + USHORT Dummy1; + + // + // check class request type + // + switch(Urb->UrbControlVendorClassRequest.Request) + { + case USB_DEVICE_CLASS_HUB: + { + // + // sanity checks + // + PC_ASSERT(Urb->UrbControlVendorClassRequest.TransferBuffer); + PC_ASSERT(Urb->UrbControlVendorClassRequest.TransferBufferLength >= sizeof(USB_HUB_DESCRIPTOR)); + + // + // get hub descriptor + // + UsbHubDescriptor = (PUSB_HUB_DESCRIPTOR)Urb->UrbControlVendorClassRequest.TransferBuffer; + + // + // one hub is handled + // + UsbHubDescriptor->bDescriptorLength = sizeof(USB_HUB_DESCRIPTOR); + Urb->UrbControlVendorClassRequest.TransferBufferLength = sizeof(USB_HUB_DESCRIPTOR); + + // + // type should 0x29 according to msdn + // + UsbHubDescriptor->bDescriptorType = 0x29; + + // + // get port count + // + Status = m_Hardware->GetDeviceDetails(&Dummy1, &Dummy1, &PortCount, &Dummy2); + PC_ASSERT(Status == STATUS_SUCCESS); + + // + // FIXME: retrieve values + // + UsbHubDescriptor->bNumberOfPorts = PortCount; + UsbHubDescriptor->wHubCharacteristics = 0x0012; + UsbHubDescriptor->bPowerOnToPowerGood = 0x01; + UsbHubDescriptor->bHubControlCurrent = 0x00; + + // + // done + // + Status = STATUS_SUCCESS; + break; + } + default: + DPRINT1("CHubController::HandleClassDevice Class %x not implemented\n", Urb->UrbControlVendorClassRequest.Request); + break; + } + + return Status; +} +//----------------------------------------------------------------------------------------- +NTSTATUS +CHubController::HandleGetDescriptor( + IN OUT PIRP Irp, + IN OUT PURB Urb) +{ + NTSTATUS Status = STATUS_NOT_IMPLEMENTED; + PUSB_CONFIGURATION_DESCRIPTOR ConfigurationDescriptor; + PUCHAR Buffer; + + // + // check descriptor type + // + switch(Urb->UrbControlDescriptorRequest.DescriptorType) + { + case USB_DEVICE_DESCRIPTOR_TYPE: + { + // + // sanity check + // + PC_ASSERT(Urb->UrbControlDescriptorRequest.TransferBufferLength >= sizeof(USB_DEVICE_DESCRIPTOR)); + + if (Urb->UrbHeader.UsbdDeviceHandle == NULL) + { + DPRINT1("Root Hub descriptor\n"); + // + // copy root hub device descriptor + // + RtlCopyMemory((PUCHAR)Urb->UrbControlDescriptorRequest.TransferBuffer, &m_DeviceDescriptor, sizeof(USB_DEVICE_DESCRIPTOR)); + Status = STATUS_SUCCESS; + break; + } + break; + } + case USB_CONFIGURATION_DESCRIPTOR_TYPE: + { + // + // sanity checks + // + PC_ASSERT(Urb->UrbControlDescriptorRequest.TransferBuffer); + PC_ASSERT(Urb->UrbControlDescriptorRequest.TransferBufferLength >= sizeof(USB_CONFIGURATION_DESCRIPTOR)); + + // + // FIXME: support devices + // + PC_ASSERT(Urb->UrbHeader.UsbdDeviceHandle == NULL); + + // + // copy configuration descriptor template + // + C_ASSERT(sizeof(ROOTHUB2_CONFIGURATION_DESCRIPTOR) == sizeof(USB_CONFIGURATION_DESCRIPTOR)); + RtlCopyMemory(Urb->UrbControlDescriptorRequest.TransferBuffer, ROOTHUB2_CONFIGURATION_DESCRIPTOR, sizeof(USB_CONFIGURATION_DESCRIPTOR)); + + // + // get configuration descriptor, very retarded! + // + ConfigurationDescriptor = (PUSB_CONFIGURATION_DESCRIPTOR)Urb->UrbControlDescriptorRequest.TransferBuffer; + + // + // check if buffer can hold interface and endpoint descriptor + // + if (ConfigurationDescriptor->wTotalLength > Urb->UrbControlDescriptorRequest.TransferBufferLength) + { + // + // buffer too small + // + Status = STATUS_SUCCESS; + break; + } + + // + // copy interface descriptor template + // + Buffer = (PUCHAR)(ConfigurationDescriptor + 1); + C_ASSERT(sizeof(ROOTHUB2_INTERFACE_DESCRIPTOR) == sizeof(USB_INTERFACE_DESCRIPTOR)); + RtlCopyMemory(Buffer, ROOTHUB2_INTERFACE_DESCRIPTOR, sizeof(USB_INTERFACE_DESCRIPTOR)); + + // + // copy end point descriptor template + // + Buffer += sizeof(USB_INTERFACE_DESCRIPTOR); + C_ASSERT(sizeof(ROOTHUB2_ENDPOINT_DESCRIPTOR) == sizeof(USB_ENDPOINT_DESCRIPTOR)); + RtlCopyMemory(Buffer, ROOTHUB2_ENDPOINT_DESCRIPTOR, sizeof(USB_ENDPOINT_DESCRIPTOR)); + + // + // done + // + Status = STATUS_SUCCESS; + break; + } + default: + DPRINT1("CHubController::HandleGetDescriptor DescriptorType %x unimplemented\n", Urb->UrbControlDescriptorRequest.DescriptorType); + break; + } + + // + // done + // + return Status; +} + +//----------------------------------------------------------------------------------------- +NTSTATUS CHubController::HandleDeviceControl( IN PDEVICE_OBJECT DeviceObject, IN OUT PIRP Irp) @@ -553,10 +800,17 @@ DPRINT1("IOCTL_INTERNAL_USB_SUBMIT_URB Function %x Length %lu Status %x Handle %p Flags %x UNIMPLEMENTED\n", Urb->UrbHeader.Function, Urb->UrbHeader.Length, Urb->UrbHeader.Status, Urb->UrbHeader.UsbdDeviceHandle, Urb->UrbHeader.UsbdFlags); + switch (Urb->UrbHeader.Function) + { + case URB_FUNCTION_GET_DESCRIPTOR_FROM_DEVICE: + Status = HandleGetDescriptor(Irp, Urb); + break; + case URB_FUNCTION_CLASS_DEVICE: + Status = HandleClassDevice(Irp, Urb); + } // // request completed // - Status = STATUS_NOT_IMPLEMENTED; break; } case IOCTL_INTERNAL_USB_GET_DEVICE_HANDLE: @@ -854,7 +1108,6 @@ PUSBDEVICE UsbDevice) { PUSBDEVICE_ENTRY DeviceEntry; - NTSTATUS Status; KIRQL OldLevel; // @@ -1004,7 +1257,7 @@ // // now initialize device // - Status = NewUsbDevice->Initialize(PHUBCONTROLLER(Controller), Controller->GetUsbHardware(),PVOID(Controller), PortNumber); + Status = NewUsbDevice->Initialize(PHUBCONTROLLER(Controller), Controller->GetUsbHardware(),PVOID(Controller), PortNumber, PortStatus); // // check for success @@ -1359,9 +1612,8 @@ PUSB_DEVICE_INFORMATION_0 DeviceInfo; PUSBDEVICE UsbDevice; CHubController * Controller; - NTSTATUS Status; - - DPRINT1("USBHI_QueryDeviceInformation\n"); + + DPRINT1("USBHI_QueryDeviceInformation %p\n", BusContext); // // sanity check @@ -1382,17 +1634,54 @@ UsbDevice = (PUSBDEVICE)DeviceHandle; PC_ASSERT(UsbDevice); - // - // validate device handle - // - if (!Controller->ValidateUsbDevice(UsbDevice)) - { - DPRINT1("USBHI_QueryDeviceInformation invalid device handle %p\n", DeviceHandle); - - // - // invalid device handle - // - return STATUS_DEVICE_NOT_CONNECTED; + if (BusContext != DeviceHandle) + { + // + // validate device handle + // + if (!Controller->ValidateUsbDevice(UsbDevice)) + { + DPRINT1("USBHI_QueryDeviceInformation invalid device handle %p\n", DeviceHandle); + + // + // invalid device handle + // + return STATUS_DEVICE_NOT_CONNECTED; + } + + // + // access information buffer + // + DeviceInfo = (PUSB_DEVICE_INFORMATION_0)DeviceInformationBuffer; + + // + // initialize with default values + // + DeviceInfo->InformationLevel = 0; + DeviceInfo->ActualLength = sizeof(USB_DEVICE_INFORMATION_0); + DeviceInfo->PortNumber = UsbDevice->GetPort(); + DeviceInfo->CurrentConfigurationValue = UsbDevice->GetConfigurationValue(); + DeviceInfo->DeviceAddress = UsbDevice->GetDeviceAddress(); + DeviceInfo->HubAddress = 0; //FIXME + DeviceInfo->DeviceSpeed = UsbDevice->GetSpeed(); + DeviceInfo->DeviceType = UsbDevice->GetType(); + DeviceInfo->NumberOfOpenPipes = 0; //FIXME + + // + // get device descriptor + // + UsbDevice->GetDeviceDescriptor(&DeviceInfo->DeviceDescriptor); + + // + // FIXME return pipe information + // + + // + // store result length + // + *LengthReturned = sizeof(USB_DEVICE_INFORMATION_0); + + return STATUS_SUCCESS; } // @@ -1405,18 +1694,17 @@ // DeviceInfo->InformationLevel = 0; DeviceInfo->ActualLength = sizeof(USB_DEVICE_INFORMATION_0); - DeviceInfo->PortNumber = UsbDevice->GetPort(); - DeviceInfo->CurrentConfigurationValue = UsbDevice->GetConfigurationValue(); - DeviceInfo->DeviceAddress = 0; UsbDevice->GetDeviceAddress(); + DeviceInfo->PortNumber = 0; + DeviceInfo->CurrentConfigurationValue = 0; //FIXME; + DeviceInfo->DeviceAddress = 0; DeviceInfo->HubAddress = 0; //FIXME - DeviceInfo->DeviceSpeed = UsbDevice->GetSpeed(); - DeviceInfo->DeviceType = UsbDevice->GetType(); + DeviceInfo->DeviceSpeed = UsbHighSpeed; //FIXME + DeviceInfo->DeviceType = Usb20Device; //FIXME DeviceInfo->NumberOfOpenPipes = 0; //FIXME // - // get device descriptor - // - UsbDevice->GetDeviceDescriptor(&DeviceInfo->DeviceDescriptor); + // FIXME get device descriptor + // // // FIXME return pipe information @@ -1427,6 +1715,9 @@ // *LengthReturned = sizeof(USB_DEVICE_INFORMATION_0); + // + // done + // return STATUS_SUCCESS; } @@ -2077,12 +2368,7 @@ } } - // - // store PDO number - // - //m_PDODeviceNumber = UsbDeviceNumber; - - DPRINT1("CreateFDO: DeviceName %wZ\n", &DeviceName); + DPRINT1("CHubController::CreatePDO: DeviceName %wZ\n", &DeviceName); /* done */ return Status; Modified: branches/usb-bringup/drivers/usb/usbehci_new/interfaces.h URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup/drivers/usb/usbehci… ============================================================================== --- branches/usb-bringup/drivers/usb/usbehci_new/interfaces.h [iso-8859-1] (original) +++ branches/usb-bringup/drivers/usb/usbehci_new/interfaces.h [iso-8859-1] Sun Apr 17 19:23:13 2011 @@ -344,6 +344,8 @@ }; +typedef IUSBRequest *PUSBREQUEST; + //========================================================================================= // // class IUSBQueue @@ -398,6 +400,8 @@ virtual NTSTATUS CreateUSBRequest(IUSBRequest **OutRequest) = 0; }; + +typedef IUSBQueue *PUSBQUEUE; //========================================================================================= // @@ -495,7 +499,8 @@ virtual NTSTATUS Initialize(IN PHUBCONTROLLER HubController, IN PUSBHARDWAREDEVICE Device, IN PVOID Parent, - IN ULONG Port) = 0; + IN ULONG Port, + IN ULONG PortStatus) = 0; //----------------------------------------------------------------------------------------- // @@ -584,7 +589,7 @@ // // Description: gets current selected configuration index - virtual UCHAR GetConfigurationValue(); + virtual UCHAR GetConfigurationValue() = 0; //----------------------------------------------------------------------------------------- // Modified: branches/usb-bringup/drivers/usb/usbehci_new/usb_device.cpp URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup/drivers/usb/usbehci… ============================================================================== --- branches/usb-bringup/drivers/usb/usbehci_new/usb_device.cpp [iso-8859-1] (original) +++ branches/usb-bringup/drivers/usb/usbehci_new/usb_device.cpp [iso-8859-1] Sun Apr 17 19:23:13 2011 @@ -11,12 +11,518 @@ #define INITGUID #include "usbehci.h" - +class CUSBDevice : public IUSBDevice +{ +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; + } + + // IUSBDevice interface functions + virtual NTSTATUS Initialize(IN PHUBCONTROLLER HubController, IN PUSBHARDWAREDEVICE Device, IN PVOID Parent, IN ULONG Port, IN ULONG PortStatus); + virtual BOOLEAN IsHub(); + virtual NTSTATUS GetParent(PVOID * Parent); + virtual ULONG GetDeviceAddress(); + virtual ULONG GetPort(); + virtual USB_DEVICE_SPEED GetSpeed(); + virtual USB_DEVICE_TYPE GetType(); + virtual ULONG GetState(); + virtual void SetDeviceHandleData(PVOID Data); + virtual NTSTATUS SetDeviceAddress(ULONG DeviceAddress); + virtual void GetDeviceDescriptor(PUSB_DEVICE_DESCRIPTOR DeviceDescriptor); + virtual UCHAR GetConfigurationValue(); + virtual NTSTATUS SubmitUrb(PURB Urb); + + // local function + virtual NTSTATUS CommitUrb(PURB Urb); + virtual NTSTATUS CommitSetupPacket(PUSB_DEFAULT_PIPE_SETUP_PACKET Packet, IN ULONG BufferLength, IN OUT PVOID Buffer, IN OPTIONAL PIRP Irp, IN OPTIONAL PKEVENT pEvent); + + // constructor / destructor + CUSBDevice(IUnknown *OuterUnknown){} + virtual ~CUSBDevice(){} + +protected: + LONG m_Ref; + PHUBCONTROLLER m_HubController; + PUSBHARDWAREDEVICE m_Device; + PVOID m_Parent; + ULONG m_Port; + ULONG m_DeviceAddress; + PVOID m_Data; + KSPIN_LOCK m_Lock; + USB_DEVICE_DESCRIPTOR m_DeviceDescriptor; + ULONG m_PortStatus; + PUSBQUEUE m_Queue; +}; + +//---------------------------------------------------------------------------------------- +NTSTATUS +STDMETHODCALLTYPE +CUSBDevice::QueryInterface( + IN REFIID refiid, + OUT PVOID* Output) +{ + return STATUS_UNSUCCESSFUL; +} + +//---------------------------------------------------------------------------------------- +NTSTATUS +CUSBDevice::Initialize( + IN PHUBCONTROLLER HubController, + IN PUSBHARDWAREDEVICE Device, + IN PVOID Parent, + IN ULONG Port, + IN ULONG PortStatus) +{ + NTSTATUS Status; + USB_DEFAULT_PIPE_SETUP_PACKET CtrlSetup; + + // + // initialize members + // + m_HubController = HubController; + m_Device = Device; + m_Parent = Parent; + m_Port = Port; + m_PortStatus = PortStatus; + + // + // initialize device lock + // + KeInitializeSpinLock(&m_Lock); + + // + // no device address has been set yet + // + m_DeviceAddress = 0; + + // + // get usb request queue + // + Status = m_Device->GetUSBQueue(&m_Queue); + if (!NT_SUCCESS(Status)) + { + // + // failed to get usb queue + // + DPRINT1("CUSBDevice::Initialize GetUsbQueue failed with %x\n", Status); + return Status; + } + + // + // zero descriptor + // + RtlZeroMemory(&m_DeviceDescriptor, sizeof(USB_DEVICE_DESCRIPTOR)); + RtlZeroMemory(&CtrlSetup, sizeof(USB_DEFAULT_PIPE_SETUP_PACKET)); + + // + // setup request + // + CtrlSetup.bRequest = USB_REQUEST_GET_DESCRIPTOR; + CtrlSetup.wValue.HiByte = USB_DEVICE_DESCRIPTOR_TYPE; + CtrlSetup.wLength = sizeof(USB_DEVICE_DESCRIPTOR); + CtrlSetup.bmRequestType.B = 0x80; + + // + // commit setup packet + // + Status = CommitSetupPacket(&CtrlSetup, sizeof(USB_DEVICE_DESCRIPTOR), &m_DeviceDescriptor, 0, 0); + + // + // check for success + // + if (!NT_SUCCESS(Status)) + { + DPRINT1("CUSBDevice::Initialize CommitSetupPacket failed with %x\n", Status); + } + + // + // done + // + return Status; +} + +//---------------------------------------------------------------------------------------- +BOOLEAN +CUSBDevice::IsHub() +{ + // + // USB Standard Device Class see http://www.usb.org/developers/defined_class/#BaseClass09h + // for details + // + return (m_DeviceDescriptor.bDeviceClass == 0x09 && m_DeviceDescriptor.bDeviceSubClass == 0x00); +} + +//---------------------------------------------------------------------------------------- +NTSTATUS +CUSBDevice::GetParent( + PVOID * Parent) +{ + // + // returns parent + // + *Parent = m_Parent; + + // + // done + // + return STATUS_SUCCESS; +} + +//---------------------------------------------------------------------------------------- +ULONG +CUSBDevice::GetDeviceAddress() +{ + // + // get device address + // + return m_DeviceAddress; +} + +//---------------------------------------------------------------------------------------- +ULONG +CUSBDevice::GetPort() +{ + // + // get port to which this device is connected to + // + return m_Port; +} + +//---------------------------------------------------------------------------------------- +USB_DEVICE_SPEED +CUSBDevice::GetSpeed() +{ + if (m_PortStatus & USB_PORT_STATUS_LOW_SPEED) + { + // + // low speed device + // + return UsbLowSpeed; + } + else if (m_PortStatus & USB_PORT_STATUS_HIGH_SPEED) + { + // + // high speed device + // + return UsbHighSpeed; + } + + // + // default to full speed + // + return UsbFullSpeed; +} + +//---------------------------------------------------------------------------------------- +USB_DEVICE_TYPE +CUSBDevice::GetType() +{ + // + // device is encoded into bcdUSB + // + if (m_DeviceDescriptor.bcdUSB == 0x110) + { + // + // USB 1.1 device + // + return Usb11Device; + } + else if (m_DeviceDescriptor.bcdUSB == 0x200) + { + // + // USB 2.0 device + // + return Usb20Device; + } + + DPRINT1("CUSBDevice::GetType Unknown bcdUSB Type %x\n", m_DeviceDescriptor.bcdUSB); + PC_ASSERT(FALSE); + + return Usb11Device; +} + +//---------------------------------------------------------------------------------------- +ULONG +CUSBDevice::GetState() +{ + UNIMPLEMENTED + return FALSE; +} + +//---------------------------------------------------------------------------------------- +void +CUSBDevice::SetDeviceHandleData( + PVOID Data) +{ + // + // set device data, for debugging issues + // + m_Data = Data; +} + +//---------------------------------------------------------------------------------------- +NTSTATUS +CUSBDevice::SetDeviceAddress( + ULONG DeviceAddress) +{ + USB_DEFAULT_PIPE_SETUP_PACKET CtrlSetup; + NTSTATUS Status; + + // + // zero request + // + RtlZeroMemory(&CtrlSetup, sizeof(USB_DEFAULT_PIPE_SETUP_PACKET)); + + // + // initialize request + // + CtrlSetup.bRequest = USB_REQUEST_SET_ADDRESS; + CtrlSetup.wValue.W = DeviceAddress; + + // + // set device address + // + Status = CommitSetupPacket(&CtrlSetup, 0, 0, 0, 0); + + // + // check for success + // + if (!NT_SUCCESS(Status)) + { + // + // failed to set device address + // + DPRINT1("CUSBDevice::SetDeviceAddress> failed to set device address with %x Address %x\n", Status, DeviceAddress); + return Status; + } + + // + // store device address + // + m_DeviceAddress = DeviceAddress; + + // + // done + // + return STATUS_SUCCESS; +} + +//---------------------------------------------------------------------------------------- +void +CUSBDevice::GetDeviceDescriptor( + PUSB_DEVICE_DESCRIPTOR DeviceDescriptor) +{ + RtlMoveMemory(DeviceDescriptor, &m_DeviceDescriptor, sizeof(USB_DEVICE_DESCRIPTOR)); +} + +//---------------------------------------------------------------------------------------- +UCHAR +CUSBDevice::GetConfigurationValue() +{ + UNIMPLEMENTED + return 0x1; +} + +//---------------------------------------------------------------------------------------- +NTSTATUS +CUSBDevice::CommitUrb( + PURB Urb) +{ + UNIMPLEMENTED + return STATUS_NOT_IMPLEMENTED; +} + +//---------------------------------------------------------------------------------------- +NTSTATUS +CUSBDevice::SubmitUrb( + PURB Urb) +{ + KIRQL OldLevel; + NTSTATUS Status; + + // + // acquire device lock + // + KeAcquireSpinLock(&m_Lock, &OldLevel); + + // + // commit urb + // + Status = CommitUrb(Urb); + + // + // release lock + // + KeReleaseSpinLock(&m_Lock, OldLevel); + + return Status; +} +//---------------------------------------------------------------------------------------- +NTSTATUS +CUSBDevice::CommitSetupPacket( + PUSB_DEFAULT_PIPE_SETUP_PACKET Packet, + IN ULONG BufferLength, + IN OUT PVOID Buffer, + IN PIRP Irp, + IN PKEVENT pEvent) +{ + NTSTATUS Status; + PUSBREQUEST Request; + KEVENT Event; + BOOLEAN Wait = FALSE; + + if (!m_Queue) + { + // + // no queue, wtf? + // + DPRINT1("CUSBDevice::CommitSetupPacket> no queue!!!\n"); + return STATUS_UNSUCCESSFUL; + } + + // + // build usb request + // + Status = m_Queue->CreateUSBRequest(&Request); + if (!NT_SUCCESS(Status)) + { + // + // failed to build request + // + DPRINT1("CUSBDevice::CommitSetupPacket> CreateUSBRequest failed with %x\n", Status); + return Status; + } + + // + // initialize request + // + Status = Request->InitializeWithSetupPacket(Packet, BufferLength, Buffer); + if (!NT_SUCCESS(Status)) + { + // + // failed to initialize request + // + DPRINT1("CUSBDevice::CommitSetupPacket> failed to initialize usb request with %x\n", Status); + Request->Release(); + return Status; + } + + // + // is a irp or event provided ? + // + if (Irp == NULL && pEvent == NULL) + { + // + // no completion details provided, requestor wants synchronized + // + KeInitializeEvent(&Event, NotificationEvent, FALSE); + pEvent = &Event; + Wait = TRUE; + } + + // + // set completion details + // + Status = Request->SetCompletionDetails(Irp, pEvent); + if (!NT_SUCCESS(Status)) + { + // + // failed to set completion details + // + DPRINT1("CUSBDevice::CommitSetupPacket> failed to set completion details with %x\n", Status); + Request->Release(); + return Status; + } + + // + // now add the request + // + Status = m_Queue->AddUSBRequest(Request); + if (!NT_SUCCESS(Status)) + { + // + // failed to add request + // + DPRINT1("CUSBDevice::CommitSetupPacket> failed add request to queue with %x\n", Status); + Request->Release(); + return Status; + } + + if (Wait) + { + // + // wait for the operation to complete + // + KeWaitForSingleObject(pEvent, Executive, KernelMode, FALSE, NULL); + } + + //TODO: + // Get result code from operation + // + + // + // returns the result code when the operation has been finished + // + //Status = Request->GetResultCode(); + + // + // release request + // + Request->Release(); + + // + // done + // + return Status; +} +//---------------------------------------------------------------------------------------- NTSTATUS CreateUSBDevice( PUSBDEVICE *OutDevice) { - UNIMPLEMENTED - return STATUS_NOT_IMPLEMENTED; -} - + CUSBDevice * This; + + // + // allocate controller + // + This = new(NonPagedPool, TAG_USBEHCI) CUSBDevice(0); + if (!This) + { + // + // failed to allocate + // + return STATUS_INSUFFICIENT_RESOURCES; + } + + // + // add reference count + // + This->AddRef(); + + // + // return result + // + *OutDevice = (PUSBDEVICE)This; + + // + // done + // + return STATUS_SUCCESS; +} +

1 0

[akhaldi] 51383: [CMAKE] * Remove duplicate set_rc_compiler calls.
by akhaldi＠svn.reactos.org 17 Apr '11

17 Apr '11

Author: akhaldi Date: Sun Apr 17 17:10:37 2011 New Revision: 51383 URL: http://svn.reactos.org/svn/reactos?rev=51383&view=rev Log: [CMAKE] * Remove duplicate set_rc_compiler calls. Modified: branches/cmake-bringup/dll/win32/kernel32/CMakeLists.txt branches/cmake-bringup/dll/win32/shdoclc/CMakeLists.txt branches/cmake-bringup/dll/win32/tapiui/CMakeLists.txt Modified: branches/cmake-bringup/dll/win32/kernel32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/kernel3… ============================================================================== --- branches/cmake-bringup/dll/win32/kernel32/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/kernel32/CMakeLists.txt [iso-8859-1] Sun Apr 17 17:10:37 2011 @@ -5,8 +5,6 @@ add_definitions(-D_WIN32_WINNT=0x600) include_directories(${REACTOS_SOURCE_DIR}/include/reactos/subsys) - -set_rc_compiler() set_rc_compiler() Modified: branches/cmake-bringup/dll/win32/shdoclc/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/shdoclc… ============================================================================== --- branches/cmake-bringup/dll/win32/shdoclc/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/shdoclc/CMakeLists.txt [iso-8859-1] Sun Apr 17 17:10:37 2011 @@ -3,8 +3,6 @@ set_rc_compiler() spec2def(shdoclc.dll shdoclc.spec) - -set_rc_compiler() add_library(shdoclc SHARED rsrc.rc ${CMAKE_CURRENT_BINARY_DIR}/shdoclc.def) Modified: branches/cmake-bringup/dll/win32/tapiui/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/tapiui/… ============================================================================== --- branches/cmake-bringup/dll/win32/tapiui/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/tapiui/CMakeLists.txt [iso-8859-1] Sun Apr 17 17:10:37 2011 @@ -1,5 +1,3 @@ - -set_rc_compiler() set_rc_compiler()

1 0

[akhaldi] 51382: [CMAKE] * Addendum to the previous commit.
by akhaldi＠svn.reactos.org 17 Apr '11

17 Apr '11

Author: akhaldi Date: Sun Apr 17 16:55:24 2011 New Revision: 51382 URL: http://svn.reactos.org/svn/reactos?rev=51382&view=rev Log: [CMAKE] * Addendum to the previous commit. Modified: trunk/rostests/apitests/user32/CMakeLists.txt trunk/rostests/apitests/w32knapi/CMakeLists.txt trunk/rostests/winetests/comctl32/CMakeLists.txt trunk/rostests/winetests/itss/CMakeLists.txt trunk/rostests/winetests/jscript/CMakeLists.txt trunk/rostests/winetests/kernel32/CMakeLists.txt trunk/rostests/winetests/mshtml/CMakeLists.txt trunk/rostests/winetests/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] Sun Apr 17 16:55:24 2011 @@ -1,5 +1,7 @@ add_definitions(-D_DLL -D__USE_CRTIMP) + +set_rc_compiler() list(APPEND SOURCE DeferWindowPos.c Modified: trunk/rostests/apitests/w32knapi/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/w32knapi/CMakeLi… ============================================================================== --- trunk/rostests/apitests/w32knapi/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/apitests/w32knapi/CMakeLists.txt [iso-8859-1] Sun Apr 17 16:55:24 2011 @@ -1,5 +1,7 @@ add_definitions(-D_DLL -D__USE_CRTIMP) + +set_rc_compiler() list(APPEND SOURCE osver.c Modified: trunk/rostests/winetests/comctl32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/comctl32/CMakeL… ============================================================================== --- trunk/rostests/winetests/comctl32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/winetests/comctl32/CMakeLists.txt [iso-8859-1] Sun Apr 17 16:55:24 2011 @@ -8,6 +8,8 @@ remove_definitions(-D_WIN32_IE=0x600) add_definitions(-D_WIN32_IE=0x500) + +set_rc_compiler() list(APPEND SOURCE comboex.c Modified: trunk/rostests/winetests/itss/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/itss/CMakeLists… ============================================================================== --- trunk/rostests/winetests/itss/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/winetests/itss/CMakeLists.txt [iso-8859-1] Sun Apr 17 16:55:24 2011 @@ -2,6 +2,8 @@ add_definitions( -D__ROS_LONG64__ -D_DLL -D__USE_CRTIMP) + +set_rc_compiler() add_executable(itss_winetest protocol.c testlist.c rsrc.rc) target_link_libraries(itss_winetest wine) Modified: trunk/rostests/winetests/jscript/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/jscript/CMakeLi… ============================================================================== --- trunk/rostests/winetests/jscript/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/winetests/jscript/CMakeLists.txt [iso-8859-1] Sun Apr 17 16:55:24 2011 @@ -2,6 +2,8 @@ add_definitions( -D__ROS_LONG64__ -D_DLL -D__USE_CRTIMP) + +set_rc_compiler() list(APPEND SOURCE activex.c Modified: trunk/rostests/winetests/kernel32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/kernel32/CMakeL… ============================================================================== --- trunk/rostests/winetests/kernel32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/winetests/kernel32/CMakeLists.txt [iso-8859-1] Sun Apr 17 16:55:24 2011 @@ -2,6 +2,8 @@ add_definitions( -D__ROS_LONG64__ -D_DLL -D__USE_CRTIMP) + +set_rc_compiler() list(APPEND SOURCE actctx.c Modified: trunk/rostests/winetests/mshtml/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/mshtml/CMakeLis… ============================================================================== --- trunk/rostests/winetests/mshtml/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/winetests/mshtml/CMakeLists.txt [iso-8859-1] Sun Apr 17 16:55:24 2011 @@ -1,3 +1,5 @@ + +set_rc_compiler() add_definitions( -D__ROS_LONG64__ Modified: trunk/rostests/winetests/user32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/user32/CMakeLis… ============================================================================== --- trunk/rostests/winetests/user32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/winetests/user32/CMakeLists.txt [iso-8859-1] Sun Apr 17 16:55:24 2011 @@ -2,6 +2,8 @@ add_definitions( -D__ROS_LONG64__ -D_DLL -D__USE_CRTIMP) + +set_rc_compiler() list(APPEND SOURCE broadcast.c

1 0

[akhaldi] 51381: [CMAKE] * Adopt the retar, I mean, actual way of handling resource files. This is a temporary measure until a windres issue is fixed.
by akhaldi＠svn.reactos.org 17 Apr '11

17 Apr '11

Author: akhaldi Date: Sun Apr 17 16:54:57 2011 New Revision: 51381 URL: http://svn.reactos.org/svn/reactos?rev=51381&view=rev Log: [CMAKE] * Adopt the retar, I mean, actual way of handling resource files. This is a temporary measure until a windres issue is fixed. Modified: branches/cmake-bringup/CMakeLists.txt branches/cmake-bringup/base/applications/cacls/CMakeLists.txt branches/cmake-bringup/base/applications/calc/CMakeLists.txt branches/cmake-bringup/base/applications/charmap/CMakeLists.txt branches/cmake-bringup/base/applications/cmdutils/doskey/CMakeLists.txt branches/cmake-bringup/base/applications/control/CMakeLists.txt branches/cmake-bringup/base/applications/dxdiag/CMakeLists.txt branches/cmake-bringup/base/applications/fontview/CMakeLists.txt branches/cmake-bringup/base/applications/games/solitaire/CMakeLists.txt branches/cmake-bringup/base/applications/hh/CMakeLists.txt branches/cmake-bringup/base/applications/iexplore/CMakeLists.txt branches/cmake-bringup/base/applications/kbswitch/CMakeLists.txt branches/cmake-bringup/base/applications/magnify/CMakeLists.txt branches/cmake-bringup/base/applications/mmc/CMakeLists.txt branches/cmake-bringup/base/applications/mplay32/CMakeLists.txt branches/cmake-bringup/base/applications/msconfig/CMakeLists.txt branches/cmake-bringup/base/applications/mscutils/servman/CMakeLists.txt branches/cmake-bringup/base/applications/regedit/CMakeLists.txt branches/cmake-bringup/base/applications/regedt32/CMakeLists.txt branches/cmake-bringup/base/applications/taskmgr/CMakeLists.txt branches/cmake-bringup/base/applications/taskmgr/rsrc.rc branches/cmake-bringup/base/applications/winhlp32/CMakeLists.txt branches/cmake-bringup/base/setup/reactos/CMakeLists.txt branches/cmake-bringup/base/shell/cmd/CMakeLists.txt branches/cmake-bringup/base/shell/explorer-new/CMakeLists.txt branches/cmake-bringup/base/system/msiexec/CMakeLists.txt branches/cmake-bringup/base/system/runonce/CMakeLists.txt branches/cmake-bringup/dll/cpl/access/CMakeLists.txt branches/cmake-bringup/dll/cpl/appwiz/CMakeLists.txt branches/cmake-bringup/dll/cpl/desk/CMakeLists.txt branches/cmake-bringup/dll/cpl/hdwwiz/CMakeLists.txt branches/cmake-bringup/dll/cpl/input/CMakeLists.txt branches/cmake-bringup/dll/cpl/intl/CMakeLists.txt branches/cmake-bringup/dll/cpl/joy/CMakeLists.txt branches/cmake-bringup/dll/cpl/main/CMakeLists.txt branches/cmake-bringup/dll/cpl/mmsys/CMakeLists.txt branches/cmake-bringup/dll/cpl/powercfg/CMakeLists.txt branches/cmake-bringup/dll/cpl/sysdm/CMakeLists.txt branches/cmake-bringup/dll/cpl/telephon/CMakeLists.txt branches/cmake-bringup/dll/cpl/timedate/CMakeLists.txt branches/cmake-bringup/dll/cpl/usrmgr/CMakeLists.txt branches/cmake-bringup/dll/shellext/deskadp/CMakeLists.txt branches/cmake-bringup/dll/shellext/deskmon/CMakeLists.txt branches/cmake-bringup/dll/shellext/devcpux/CMakeLists.txt branches/cmake-bringup/dll/shellext/fontext/CMakeLists.txt branches/cmake-bringup/dll/shellext/slayer/CMakeLists.txt branches/cmake-bringup/dll/win32/acledit/CMakeLists.txt branches/cmake-bringup/dll/win32/aclui/CMakeLists.txt branches/cmake-bringup/dll/win32/avifil32/CMakeLists.txt branches/cmake-bringup/dll/win32/batt/CMakeLists.txt branches/cmake-bringup/dll/win32/cards/CMakeLists.txt branches/cmake-bringup/dll/win32/comctl32/CMakeLists.txt branches/cmake-bringup/dll/win32/devmgr/CMakeLists.txt branches/cmake-bringup/dll/win32/hhctrl.ocx/CMakeLists.txt branches/cmake-bringup/dll/win32/iccvid/CMakeLists.txt branches/cmake-bringup/dll/win32/jscript/CMakeLists.txt branches/cmake-bringup/dll/win32/kernel32/CMakeLists.txt branches/cmake-bringup/dll/win32/localui/CMakeLists.txt branches/cmake-bringup/dll/win32/modemui/CMakeLists.txt branches/cmake-bringup/dll/win32/msi/CMakeLists.txt branches/cmake-bringup/dll/win32/msrle32/CMakeLists.txt branches/cmake-bringup/dll/win32/mstask/CMakeLists.txt branches/cmake-bringup/dll/win32/netid/CMakeLists.txt branches/cmake-bringup/dll/win32/ole32/CMakeLists.txt branches/cmake-bringup/dll/win32/qmgr/CMakeLists.txt branches/cmake-bringup/dll/win32/rasdlg/CMakeLists.txt branches/cmake-bringup/dll/win32/riched20/CMakeLists.txt branches/cmake-bringup/dll/win32/serialui/CMakeLists.txt branches/cmake-bringup/dll/win32/shdoclc/CMakeLists.txt branches/cmake-bringup/dll/win32/shdocvw/CMakeLists.txt branches/cmake-bringup/dll/win32/shimgvw/CMakeLists.txt branches/cmake-bringup/dll/win32/shlwapi/shlwapi_Hu.rc branches/cmake-bringup/dll/win32/shlwapi/shlwapi_Pt.rc branches/cmake-bringup/dll/win32/tapiui/CMakeLists.txt branches/cmake-bringup/dll/win32/urlmon/CMakeLists.txt branches/cmake-bringup/dll/win32/userenv/CMakeLists.txt branches/cmake-bringup/drivers/storage/ide/uniata/CMakeLists.txt branches/cmake-bringup/drivers/storage/port/buslogic/CMakeLists.txt branches/cmake-bringup/gcc.cmake branches/cmake-bringup/tools/CMakeLists.txt Modified: branches/cmake-bringup/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/CMakeLists.txt?re… ============================================================================== --- branches/cmake-bringup/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/CMakeLists.txt [iso-8859-1] Sun Apr 17 16:54:57 2011 @@ -58,7 +58,7 @@ add_subdirectory(lib) if(NOT MSVC) - export(TARGETS widl gendib cabman cdmake mkhive spec2def geninc FILE ${CMAKE_BINARY_DIR}/ImportExecutables.cmake NAMESPACE native- ) + export(TARGETS widl wrc gendib cabman cdmake mkhive spec2def geninc FILE ${CMAKE_BINARY_DIR}/ImportExecutables.cmake NAMESPACE native- ) else() export(TARGETS gendib cabman cdmake mkhive spec2def geninc FILE ${CMAKE_BINARY_DIR}/ImportExecutables.cmake NAMESPACE native- ) endif() Modified: branches/cmake-bringup/base/applications/cacls/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… ============================================================================== --- branches/cmake-bringup/base/applications/cacls/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/base/applications/cacls/CMakeLists.txt [iso-8859-1] Sun Apr 17 16:54:57 2011 @@ -1,5 +1,6 @@ set_unicode() +set_rc_compiler() list(APPEND SOURCE cacls.c cacls.rc) Modified: branches/cmake-bringup/base/applications/calc/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… ============================================================================== --- branches/cmake-bringup/base/applications/calc/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/base/applications/calc/CMakeLists.txt [iso-8859-1] Sun Apr 17 16:54:57 2011 @@ -1,5 +1,6 @@ set_unicode() +set_rc_compiler() add_definitions(-DDISABLE_HTMLHELP_SUPPORT=1) Modified: branches/cmake-bringup/base/applications/charmap/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… ============================================================================== --- branches/cmake-bringup/base/applications/charmap/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/base/applications/charmap/CMakeLists.txt [iso-8859-1] Sun Apr 17 16:54:57 2011 @@ -1,5 +1,6 @@ set_unicode() +set_rc_compiler() list(APPEND SOURCE about.c Modified: branches/cmake-bringup/base/applications/cmdutils/doskey/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… ============================================================================== --- branches/cmake-bringup/base/applications/cmdutils/doskey/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/base/applications/cmdutils/doskey/CMakeLists.txt [iso-8859-1] Sun Apr 17 16:54:57 2011 @@ -1,5 +1,6 @@ set_unicode() +set_rc_compiler() add_executable(doskey doskey.c doskey.rc) Modified: branches/cmake-bringup/base/applications/control/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… ============================================================================== --- branches/cmake-bringup/base/applications/control/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/base/applications/control/CMakeLists.txt [iso-8859-1] Sun Apr 17 16:54:57 2011 @@ -1,5 +1,6 @@ set_unicode() +set_rc_compiler() add_executable(control control.c control.rc) Modified: branches/cmake-bringup/base/applications/dxdiag/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… ============================================================================== --- branches/cmake-bringup/base/applications/dxdiag/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/base/applications/dxdiag/CMakeLists.txt [iso-8859-1] Sun Apr 17 16:54:57 2011 @@ -1,5 +1,6 @@ set_unicode() +set_rc_compiler() list(APPEND SOURCE system.c Modified: branches/cmake-bringup/base/applications/fontview/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… ============================================================================== --- branches/cmake-bringup/base/applications/fontview/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/base/applications/fontview/CMakeLists.txt [iso-8859-1] Sun Apr 17 16:54:57 2011 @@ -1,4 +1,5 @@ +set_rc_compiler() add_executable(fontview display.c fontview.c Modified: branches/cmake-bringup/base/applications/games/solitaire/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… ============================================================================== --- branches/cmake-bringup/base/applications/games/solitaire/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/base/applications/games/solitaire/CMakeLists.txt [iso-8859-1] Sun Apr 17 16:54:57 2011 @@ -1,6 +1,7 @@ set_unicode() set_cpp() +set_rc_compiler() include_directories(${REACTOS_SOURCE_DIR}/lib/3rdparty/cardlib) Modified: branches/cmake-bringup/base/applications/hh/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… ============================================================================== --- branches/cmake-bringup/base/applications/hh/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/base/applications/hh/CMakeLists.txt [iso-8859-1] Sun Apr 17 16:54:57 2011 @@ -1,4 +1,5 @@ +set_rc_compiler() add_executable(hh main.c hh.rc) set_module_type(hh win32gui) add_importlibs(hh gdi32 user32 msvcrt kernel32) Modified: branches/cmake-bringup/base/applications/iexplore/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… ============================================================================== --- branches/cmake-bringup/base/applications/iexplore/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/base/applications/iexplore/CMakeLists.txt [iso-8859-1] Sun Apr 17 16:54:57 2011 @@ -1,4 +1,5 @@ +set_rc_compiler() add_executable(iexplore main.c iexplore.rc) set_module_type(iexplore win32gui) add_importlibs(iexplore shdocvw msvcrt kernel32) Modified: branches/cmake-bringup/base/applications/kbswitch/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… ============================================================================== --- branches/cmake-bringup/base/applications/kbswitch/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/base/applications/kbswitch/CMakeLists.txt [iso-8859-1] Sun Apr 17 16:54:57 2011 @@ -1,5 +1,6 @@ set_unicode() +set_rc_compiler() add_executable(kbswitch kbswitch.c kbswitch.rc) Modified: branches/cmake-bringup/base/applications/magnify/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… ============================================================================== --- branches/cmake-bringup/base/applications/magnify/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/base/applications/magnify/CMakeLists.txt [iso-8859-1] Sun Apr 17 16:54:57 2011 @@ -1,3 +1,5 @@ + +set_rc_compiler() add_executable(magnify magnifier.c Modified: branches/cmake-bringup/base/applications/mmc/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… ============================================================================== --- branches/cmake-bringup/base/applications/mmc/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/base/applications/mmc/CMakeLists.txt [iso-8859-1] Sun Apr 17 16:54:57 2011 @@ -1,4 +1,5 @@ +set_rc_compiler() set_unicode() list(APPEND SOURCE Modified: branches/cmake-bringup/base/applications/mplay32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… ============================================================================== --- branches/cmake-bringup/base/applications/mplay32/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/base/applications/mplay32/CMakeLists.txt [iso-8859-1] Sun Apr 17 16:54:57 2011 @@ -1,5 +1,6 @@ set_unicode() +set_rc_compiler() add_executable(mplay32 mplay32.c mplay32.rc) Modified: branches/cmake-bringup/base/applications/msconfig/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… ============================================================================== --- branches/cmake-bringup/base/applications/msconfig/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/base/applications/msconfig/CMakeLists.txt [iso-8859-1] Sun Apr 17 16:54:57 2011 @@ -1,5 +1,6 @@ set_unicode() +set_rc_compiler() list(APPEND SOURCE toolspage.c Modified: branches/cmake-bringup/base/applications/mscutils/servman/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… ============================================================================== --- branches/cmake-bringup/base/applications/mscutils/servman/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/base/applications/mscutils/servman/CMakeLists.txt [iso-8859-1] Sun Apr 17 16:54:57 2011 @@ -1,5 +1,6 @@ set_unicode() +set_rc_compiler() list(APPEND SOURCE about.c Modified: branches/cmake-bringup/base/applications/regedit/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… ============================================================================== --- branches/cmake-bringup/base/applications/regedit/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/base/applications/regedit/CMakeLists.txt [iso-8859-1] Sun Apr 17 16:54:57 2011 @@ -2,6 +2,7 @@ add_definitions(-D_DLL -D__USE_CRTIMP) set_unicode() +set_rc_compiler() include_directories(BEFORE .) Modified: branches/cmake-bringup/base/applications/regedt32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… ============================================================================== --- branches/cmake-bringup/base/applications/regedt32/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/base/applications/regedt32/CMakeLists.txt [iso-8859-1] Sun Apr 17 16:54:57 2011 @@ -1,5 +1,6 @@ set_unicode() +set_rc_compiler() add_executable(regedt32 regedt32.c resource.rc) Modified: branches/cmake-bringup/base/applications/taskmgr/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… ============================================================================== --- branches/cmake-bringup/base/applications/taskmgr/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/base/applications/taskmgr/CMakeLists.txt [iso-8859-1] Sun Apr 17 16:54:57 2011 @@ -1,5 +1,6 @@ set_unicode() +set_rc_compiler() list(APPEND SOURCE about.c Modified: branches/cmake-bringup/base/applications/taskmgr/rsrc.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… ============================================================================== --- branches/cmake-bringup/base/applications/taskmgr/rsrc.rc [iso-8859-1] (original) +++ branches/cmake-bringup/base/applications/taskmgr/rsrc.rc [iso-8859-1] Sun Apr 17 16:54:57 2011 @@ -10,7 +10,7 @@ #include "lang/hu-HU.rc" #include "lang/id-ID.rc" #include "lang/it-IT.rc" -#include "lang/ja-JP.rc" +// #include "lang/ja-JP.rc" Error: Invalid character in string 'ÃåIÃåvÃåVÃåÔÇíÃåÔÇ(&O)' for codepage 932 #include "lang/ko-KR.rc" #include "lang/no-NO.rc" #include "lang/nl-NL.rc" Modified: branches/cmake-bringup/base/applications/winhlp32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… ============================================================================== --- branches/cmake-bringup/base/applications/winhlp32/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/base/applications/winhlp32/CMakeLists.txt [iso-8859-1] Sun Apr 17 16:54:57 2011 @@ -1,3 +1,5 @@ + +set_rc_compiler() include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) Modified: branches/cmake-bringup/base/setup/reactos/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/setup/reacto… ============================================================================== --- branches/cmake-bringup/base/setup/reactos/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/base/setup/reactos/CMakeLists.txt [iso-8859-1] Sun Apr 17 16:54:57 2011 @@ -1,5 +1,6 @@ set_unicode() +set_rc_compiler() add_executable(reactos reactos.c reactos.rc) Modified: branches/cmake-bringup/base/shell/cmd/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/shell/cmd/CM… ============================================================================== --- branches/cmake-bringup/base/shell/cmd/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/base/shell/cmd/CMakeLists.txt [iso-8859-1] Sun Apr 17 16:54:57 2011 @@ -6,6 +6,8 @@ -D_DEBUG_MEM) include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) + +set_rc_compiler() list(APPEND SOURCE main.c cmd.rc) Modified: branches/cmake-bringup/base/shell/explorer-new/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/shell/explor… ============================================================================== --- branches/cmake-bringup/base/shell/explorer-new/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/base/shell/explorer-new/CMakeLists.txt [iso-8859-1] Sun Apr 17 16:54:57 2011 @@ -2,6 +2,8 @@ set_unicode() add_definitions(-DWIN32) + +set_rc_compiler() list(APPEND SOURCE desktop.c Modified: branches/cmake-bringup/base/system/msiexec/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/system/msiex… ============================================================================== --- branches/cmake-bringup/base/system/msiexec/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/base/system/msiexec/CMakeLists.txt [iso-8859-1] Sun Apr 17 16:54:57 2011 @@ -4,6 +4,8 @@ -D__WINESRC__) include_directories(${REACTOS_SOURCE_DIR}/include/wine) + +set_rc_compiler() add_executable(msiexec msiexec.c Modified: branches/cmake-bringup/base/system/runonce/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/system/runon… ============================================================================== --- branches/cmake-bringup/base/system/runonce/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/base/system/runonce/CMakeLists.txt [iso-8859-1] Sun Apr 17 16:54:57 2011 @@ -1,5 +1,6 @@ set_unicode() +set_rc_compiler() add_executable(runonce runonce.c runonce.rc) Modified: branches/cmake-bringup/dll/cpl/access/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/cpl/access/CM… ============================================================================== --- branches/cmake-bringup/dll/cpl/access/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/cpl/access/CMakeLists.txt [iso-8859-1] Sun Apr 17 16:54:57 2011 @@ -1,5 +1,6 @@ set_unicode() +set_rc_compiler() spec2def(access.cpl access.spec) Modified: branches/cmake-bringup/dll/cpl/appwiz/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/cpl/appwiz/CM… ============================================================================== --- branches/cmake-bringup/dll/cpl/appwiz/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/cpl/appwiz/CMakeLists.txt [iso-8859-1] Sun Apr 17 16:54:57 2011 @@ -1,5 +1,6 @@ set_unicode() +set_rc_compiler() spec2def(appwiz.cpl appwiz.spec) Modified: branches/cmake-bringup/dll/cpl/desk/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/cpl/desk/CMak… ============================================================================== --- branches/cmake-bringup/dll/cpl/desk/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/cpl/desk/CMakeLists.txt [iso-8859-1] Sun Apr 17 16:54:57 2011 @@ -5,6 +5,7 @@ -D_WIN32 -D_DLL -D__USE_CRTIMP) +set_rc_compiler() spec2def(desk.cpl desk.spec) add_library(desk SHARED Modified: branches/cmake-bringup/dll/cpl/hdwwiz/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/cpl/hdwwiz/CM… ============================================================================== --- branches/cmake-bringup/dll/cpl/hdwwiz/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/cpl/hdwwiz/CMakeLists.txt [iso-8859-1] Sun Apr 17 16:54:57 2011 @@ -1,5 +1,6 @@ set_unicode() +set_rc_compiler() spec2def(hdwwiz.cpl hdwwiz.spec) Modified: branches/cmake-bringup/dll/cpl/input/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/cpl/input/CMa… ============================================================================== --- branches/cmake-bringup/dll/cpl/input/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/cpl/input/CMakeLists.txt [iso-8859-1] Sun Apr 17 16:54:57 2011 @@ -1,5 +1,6 @@ set_unicode() +set_rc_compiler() spec2def(input.dll input.spec) Modified: branches/cmake-bringup/dll/cpl/intl/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/cpl/intl/CMak… ============================================================================== --- branches/cmake-bringup/dll/cpl/intl/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/cpl/intl/CMakeLists.txt [iso-8859-1] Sun Apr 17 16:54:57 2011 @@ -1,5 +1,6 @@ set_unicode() +set_rc_compiler() add_definitions(-D_DLL -D__USE_CRTIMP) Modified: branches/cmake-bringup/dll/cpl/joy/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/cpl/joy/CMake… ============================================================================== --- branches/cmake-bringup/dll/cpl/joy/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/cpl/joy/CMakeLists.txt [iso-8859-1] Sun Apr 17 16:54:57 2011 @@ -1,5 +1,6 @@ set_unicode() +set_rc_compiler() spec2def(joy.cpl joy.spec) Modified: branches/cmake-bringup/dll/cpl/main/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/cpl/main/CMak… ============================================================================== --- branches/cmake-bringup/dll/cpl/main/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/cpl/main/CMakeLists.txt [iso-8859-1] Sun Apr 17 16:54:57 2011 @@ -1,5 +1,6 @@ set_unicode() +set_rc_compiler() add_definitions(-D_DLL -D__USE_CRTIMP) Modified: branches/cmake-bringup/dll/cpl/mmsys/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/cpl/mmsys/CMa… ============================================================================== --- branches/cmake-bringup/dll/cpl/mmsys/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/cpl/mmsys/CMakeLists.txt [iso-8859-1] Sun Apr 17 16:54:57 2011 @@ -1,5 +1,6 @@ set_unicode() +set_rc_compiler() add_definitions(-D_DLL -D__USE_CRTIMP) Modified: branches/cmake-bringup/dll/cpl/powercfg/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/cpl/powercfg/… ============================================================================== --- branches/cmake-bringup/dll/cpl/powercfg/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/cpl/powercfg/CMakeLists.txt [iso-8859-1] Sun Apr 17 16:54:57 2011 @@ -1,5 +1,6 @@ set_unicode() +set_rc_compiler() spec2def(powercfg.cpl powercfg.spec) Modified: branches/cmake-bringup/dll/cpl/sysdm/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/cpl/sysdm/CMa… ============================================================================== --- branches/cmake-bringup/dll/cpl/sysdm/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/cpl/sysdm/CMakeLists.txt [iso-8859-1] Sun Apr 17 16:54:57 2011 @@ -1,5 +1,6 @@ set_unicode() +set_rc_compiler() spec2def(sysdm.cpl sysdm.spec) Modified: branches/cmake-bringup/dll/cpl/telephon/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/cpl/telephon/… ============================================================================== --- branches/cmake-bringup/dll/cpl/telephon/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/cpl/telephon/CMakeLists.txt [iso-8859-1] Sun Apr 17 16:54:57 2011 @@ -1,5 +1,6 @@ set_unicode() +set_rc_compiler() spec2def(telephon.cpl telephon.spec) Modified: branches/cmake-bringup/dll/cpl/timedate/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/cpl/timedate/… ============================================================================== --- branches/cmake-bringup/dll/cpl/timedate/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/cpl/timedate/CMakeLists.txt [iso-8859-1] Sun Apr 17 16:54:57 2011 @@ -1,5 +1,6 @@ set_unicode() +set_rc_compiler() spec2def(timedate.cpl timedate.spec) Modified: branches/cmake-bringup/dll/cpl/usrmgr/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/cpl/usrmgr/CM… ============================================================================== --- branches/cmake-bringup/dll/cpl/usrmgr/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/cpl/usrmgr/CMakeLists.txt [iso-8859-1] Sun Apr 17 16:54:57 2011 @@ -2,6 +2,8 @@ set_unicode() include_directories(BEFORE ${REACTOS_SOURCE_DIR}/include/reactos/wine) + +set_rc_compiler() spec2def(usrmgr.cpl usrmgr.spec) Modified: branches/cmake-bringup/dll/shellext/deskadp/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/shellext/desk… ============================================================================== --- branches/cmake-bringup/dll/shellext/deskadp/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/shellext/deskadp/CMakeLists.txt [iso-8859-1] Sun Apr 17 16:54:57 2011 @@ -1,6 +1,6 @@ set_unicode() - +set_rc_compiler() spec2def(deskadp.dll deskadp.spec) list(APPEND SOURCE Modified: branches/cmake-bringup/dll/shellext/deskmon/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/shellext/desk… ============================================================================== --- branches/cmake-bringup/dll/shellext/deskmon/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/shellext/deskmon/CMakeLists.txt [iso-8859-1] Sun Apr 17 16:54:57 2011 @@ -1,5 +1,6 @@ set_unicode() +set_rc_compiler() spec2def(deskmon.dll deskmon.spec) Modified: branches/cmake-bringup/dll/shellext/devcpux/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/shellext/devc… ============================================================================== --- branches/cmake-bringup/dll/shellext/devcpux/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/shellext/devcpux/CMakeLists.txt [iso-8859-1] Sun Apr 17 16:54:57 2011 @@ -1,5 +1,6 @@ set_unicode() +set_rc_compiler() spec2def(devcpux.dll devcpux.spec) Modified: branches/cmake-bringup/dll/shellext/fontext/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/shellext/font… ============================================================================== --- branches/cmake-bringup/dll/shellext/fontext/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/shellext/fontext/CMakeLists.txt [iso-8859-1] Sun Apr 17 16:54:57 2011 @@ -1,6 +1,6 @@ set_unicode() - +set_rc_compiler() spec2def(fontext.dll fontext.spec) add_library(fontext SHARED Modified: branches/cmake-bringup/dll/shellext/slayer/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/shellext/slay… ============================================================================== --- branches/cmake-bringup/dll/shellext/slayer/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/shellext/slayer/CMakeLists.txt [iso-8859-1] Sun Apr 17 16:54:57 2011 @@ -1,5 +1,6 @@ set_unicode() +set_rc_compiler() spec2def(slayer.dll slayer.spec) Modified: branches/cmake-bringup/dll/win32/acledit/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/acledit… ============================================================================== --- branches/cmake-bringup/dll/win32/acledit/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/acledit/CMakeLists.txt [iso-8859-1] Sun Apr 17 16:54:57 2011 @@ -1,6 +1,6 @@ set_unicode() - +set_rc_compiler() spec2def(acledit.dll acledit.spec) list(APPEND SOURCE Modified: branches/cmake-bringup/dll/win32/aclui/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/aclui/C… ============================================================================== --- branches/cmake-bringup/dll/win32/aclui/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/aclui/CMakeLists.txt [iso-8859-1] Sun Apr 17 16:54:57 2011 @@ -1,6 +1,6 @@ spec2def(aclui.dll aclui.spec) - +set_rc_compiler() set_unicode() add_definitions(-DSUPPORT_UXTHEME) Modified: branches/cmake-bringup/dll/win32/avifil32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/avifil3… ============================================================================== --- branches/cmake-bringup/dll/win32/avifil32/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/avifil32/CMakeLists.txt [iso-8859-1] Sun Apr 17 16:54:57 2011 @@ -7,6 +7,8 @@ add_definitions(-D_WIN32_WINNT=0x600) include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) + +set_rc_compiler() spec2def(avifil32.dll avifil32.spec) Modified: branches/cmake-bringup/dll/win32/batt/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/batt/CM… ============================================================================== --- branches/cmake-bringup/dll/win32/batt/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/batt/CMakeLists.txt [iso-8859-1] Sun Apr 17 16:54:57 2011 @@ -2,6 +2,7 @@ spec2def(batt.dll batt.spec) set_unicode() +set_rc_compiler() add_library(batt SHARED batt.c Modified: branches/cmake-bringup/dll/win32/cards/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/cards/C… ============================================================================== --- branches/cmake-bringup/dll/win32/cards/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/cards/CMakeLists.txt [iso-8859-1] Sun Apr 17 16:54:57 2011 @@ -3,6 +3,8 @@ # Possible definitions: CARDSTYLE_DEFAULT or CARDSTYLE_BAVARIAN add_definitions(-DCARDSTYLE_DEFAULT) + +set_rc_compiler() spec2def(cards.dll cards.spec) Modified: branches/cmake-bringup/dll/win32/comctl32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/comctl3… ============================================================================== --- branches/cmake-bringup/dll/win32/comctl32/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/comctl32/CMakeLists.txt [iso-8859-1] Sun Apr 17 16:54:57 2011 @@ -1,5 +1,6 @@ set_unicode() +set_rc_compiler() add_definitions( -D__WINESRC__ Modified: branches/cmake-bringup/dll/win32/devmgr/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/devmgr/… ============================================================================== --- branches/cmake-bringup/dll/win32/devmgr/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/devmgr/CMakeLists.txt [iso-8859-1] Sun Apr 17 16:54:57 2011 @@ -1,5 +1,6 @@ set_unicode() +set_rc_compiler() spec2def(devmgr.dll devmgr.spec) Modified: branches/cmake-bringup/dll/win32/hhctrl.ocx/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/hhctrl.… ============================================================================== --- branches/cmake-bringup/dll/win32/hhctrl.ocx/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/hhctrl.ocx/CMakeLists.txt [iso-8859-1] Sun Apr 17 16:54:57 2011 @@ -6,6 +6,7 @@ include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) +set_rc_compiler() spec2def(hhctrl.ocx hhctrl.ocx.spec) add_library(hhctrl SHARED Modified: branches/cmake-bringup/dll/win32/iccvid/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/iccvid/… ============================================================================== --- branches/cmake-bringup/dll/win32/iccvid/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/iccvid/CMakeLists.txt [iso-8859-1] Sun Apr 17 16:54:57 2011 @@ -2,6 +2,8 @@ add_definitions(-D__WINESRC__) include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) + +set_rc_compiler() spec2def(iccvid.dll iccvid.spec) Modified: branches/cmake-bringup/dll/win32/jscript/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/jscript… ============================================================================== --- branches/cmake-bringup/dll/win32/jscript/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/jscript/CMakeLists.txt [iso-8859-1] Sun Apr 17 16:54:57 2011 @@ -14,6 +14,8 @@ -Disnan=_isnan) include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) + +set_rc_compiler() spec2def(jscript.dll jscript.spec) Modified: branches/cmake-bringup/dll/win32/kernel32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/kernel3… ============================================================================== --- branches/cmake-bringup/dll/win32/kernel32/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/kernel32/CMakeLists.txt [iso-8859-1] Sun Apr 17 16:54:57 2011 @@ -5,6 +5,10 @@ add_definitions(-D_WIN32_WINNT=0x600) include_directories(${REACTOS_SOURCE_DIR}/include/reactos/subsys) + +set_rc_compiler() + +set_rc_compiler() spec2def(kernel32.dll kernel32.spec) Modified: branches/cmake-bringup/dll/win32/localui/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/localui… ============================================================================== --- branches/cmake-bringup/dll/win32/localui/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/localui/CMakeLists.txt [iso-8859-1] Sun Apr 17 16:54:57 2011 @@ -1,6 +1,8 @@ add_definitions(-D__WINESRC__) include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) + +set_rc_compiler() spec2def(localui.dll localui.spec) Modified: branches/cmake-bringup/dll/win32/modemui/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/modemui… ============================================================================== --- branches/cmake-bringup/dll/win32/modemui/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/modemui/CMakeLists.txt [iso-8859-1] Sun Apr 17 16:54:57 2011 @@ -1,5 +1,6 @@ set_unicode() +set_rc_compiler() spec2def(modemui.dll modemui.spec) Modified: branches/cmake-bringup/dll/win32/msi/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/msi/CMa… ============================================================================== --- branches/cmake-bringup/dll/win32/msi/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/msi/CMakeLists.txt [iso-8859-1] Sun Apr 17 16:54:57 2011 @@ -5,6 +5,7 @@ remove_definitions(-D_WIN32_WINNT=0x502) add_definitions(-D_WIN32_WINNT=0x600) +set_rc_compiler() spec2def(msi.dll msi.spec) generate_idl_iids(msiserver.idl) Modified: branches/cmake-bringup/dll/win32/msrle32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/msrle32… ============================================================================== --- branches/cmake-bringup/dll/win32/msrle32/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/msrle32/CMakeLists.txt [iso-8859-1] Sun Apr 17 16:54:57 2011 @@ -4,6 +4,8 @@ -D_DLL -D__USE_CRTIMP) include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) + +set_rc_compiler() spec2def(msrle32.dll msrle32.spec) Modified: branches/cmake-bringup/dll/win32/mstask/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/mstask/… ============================================================================== --- branches/cmake-bringup/dll/win32/mstask/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/mstask/CMakeLists.txt [iso-8859-1] Sun Apr 17 16:54:57 2011 @@ -8,6 +8,8 @@ add_definitions(-D_WIN32_WINNT=0x600) include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) + +set_rc_compiler() generate_idl_iids(mstask_local.idl) Modified: branches/cmake-bringup/dll/win32/netid/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/netid/C… ============================================================================== --- branches/cmake-bringup/dll/win32/netid/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/netid/CMakeLists.txt [iso-8859-1] Sun Apr 17 16:54:57 2011 @@ -1,5 +1,6 @@ spec2def(netid.dll netid.spec) +set_rc_compiler() list(APPEND SOURCE netid.c Modified: branches/cmake-bringup/dll/win32/ole32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/ole32/C… ============================================================================== --- branches/cmake-bringup/dll/win32/ole32/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/ole32/CMakeLists.txt [iso-8859-1] Sun Apr 17 16:54:57 2011 @@ -1,3 +1,5 @@ + +set_rc_compiler() spec2def(ole32.dll ole32.spec) generate_idl_iids(dcom.idl) Modified: branches/cmake-bringup/dll/win32/qmgr/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/qmgr/CM… ============================================================================== --- branches/cmake-bringup/dll/win32/qmgr/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/qmgr/CMakeLists.txt [iso-8859-1] Sun Apr 17 16:54:57 2011 @@ -1,6 +1,8 @@ add_definitions(-D__WINESRC__) include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) + +set_rc_compiler() generate_idl_iids(qmgr_local.idl) Modified: branches/cmake-bringup/dll/win32/rasdlg/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/rasdlg/… ============================================================================== --- branches/cmake-bringup/dll/win32/rasdlg/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/rasdlg/CMakeLists.txt [iso-8859-1] Sun Apr 17 16:54:57 2011 @@ -1,4 +1,5 @@ +set_rc_compiler() spec2def(rasdlg.dll rasdlg.spec) list(APPEND SOURCE Modified: branches/cmake-bringup/dll/win32/riched20/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/riched2… ============================================================================== --- branches/cmake-bringup/dll/win32/riched20/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/riched20/CMakeLists.txt [iso-8859-1] Sun Apr 17 16:54:57 2011 @@ -6,6 +6,7 @@ include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) spec2def(riched20.dll riched20.spec) +set_rc_compiler() list(APPEND SOURCE caret.c Modified: branches/cmake-bringup/dll/win32/serialui/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/serialu… ============================================================================== --- branches/cmake-bringup/dll/win32/serialui/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/serialui/CMakeLists.txt [iso-8859-1] Sun Apr 17 16:54:57 2011 @@ -1,6 +1,6 @@ set_unicode() - +set_rc_compiler() spec2def(serialui.dll serialui.spec) list(APPEND SOURCE Modified: branches/cmake-bringup/dll/win32/shdoclc/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/shdoclc… ============================================================================== --- branches/cmake-bringup/dll/win32/shdoclc/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/shdoclc/CMakeLists.txt [iso-8859-1] Sun Apr 17 16:54:57 2011 @@ -1,7 +1,10 @@ include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) +set_rc_compiler() spec2def(shdoclc.dll shdoclc.spec) + +set_rc_compiler() add_library(shdoclc SHARED rsrc.rc ${CMAKE_CURRENT_BINARY_DIR}/shdoclc.def) Modified: branches/cmake-bringup/dll/win32/shdocvw/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/shdocvw… ============================================================================== --- branches/cmake-bringup/dll/win32/shdocvw/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/shdocvw/CMakeLists.txt [iso-8859-1] Sun Apr 17 16:54:57 2011 @@ -4,6 +4,8 @@ add_definitions(-D_SHDOCVW_) include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) + +set_rc_compiler() spec2def(shdocvw.dll shdocvw.spec) Modified: branches/cmake-bringup/dll/win32/shimgvw/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/shimgvw… ============================================================================== --- branches/cmake-bringup/dll/win32/shimgvw/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/shimgvw/CMakeLists.txt [iso-8859-1] Sun Apr 17 16:54:57 2011 @@ -1,4 +1,5 @@ +set_rc_compiler() spec2def(shimgvw.dll shimgvw.spec) list(APPEND SOURCE Modified: branches/cmake-bringup/dll/win32/shlwapi/shlwapi_Hu.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/shlwapi… ============================================================================== --- branches/cmake-bringup/dll/win32/shlwapi/shlwapi_Hu.rc [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/shlwapi/shlwapi_Hu.rc [iso-8859-1] Sun Apr 17 16:54:57 2011 @@ -32,17 +32,17 @@ { LTEXT "", IDS_ERR_USER_MSG2, 15, 5, 28, 20 LTEXT "", IDS_ERR_USER_MSG, 15, 5, 210, 8 - CHECKBOX "Ne jelení&tse meg ezt az üzenetet mégegyszer", IDC_ERR_DONT_SHOW, 5, 20, 210, 10, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP + CHECKBOX "Ne jelenÃ&tse meg ezt az Ã¼zenetet mÃ©gegyszer", IDC_ERR_DONT_SHOW, 5, 20, 210, 10, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP PUSHBUTTON L"&OK", IDOK, 105, 40, 50, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON L"&Mégse", IDCANCEL, 160, 40, 50, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON L"&MÃ©gse", IDCANCEL, 160, 40, 50, 14, WS_GROUP | WS_TABSTOP PUSHBUTTON L"&Igen", IDYES, 105, 40, 50, 14, WS_GROUP | WS_TABSTOP PUSHBUTTON L"&Nem", IDNO, 160, 40, 50, 14, WS_GROUP | WS_TABSTOP } STRINGTABLE { - IDS_BYTES_FORMAT "%ld bájt" - IDS_TIME_INTERVAL_HOURS " óra" + IDS_BYTES_FORMAT "%ld bÃ¡jt" + IDS_TIME_INTERVAL_HOURS " Ã³ra" IDS_TIME_INTERVAL_MINUTES " perc" IDS_TIME_INTERVAL_SECONDS " mp" } Modified: branches/cmake-bringup/dll/win32/shlwapi/shlwapi_Pt.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/shlwapi… ============================================================================== --- branches/cmake-bringup/dll/win32/shlwapi/shlwapi_Pt.rc [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/shlwapi/shlwapi_Pt.rc [iso-8859-1] Sun Apr 17 16:54:57 2011 @@ -2,8 +2,8 @@ * Portuguese resources for shlwapi * * Copyright 2004 Marcelo Duarte - * Copyright 2006 Américo José Melo - * Copyright 2010 Gustavo Henrique Milaré + * Copyright 2006 AmÃ©rico JosÃ© Melo + * Copyright 2010 Gustavo Henrique MilarÃ© * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -33,11 +33,11 @@ { LTEXT "", IDS_ERR_USER_MSG2, 15, 5, 28, 20 LTEXT "", IDS_ERR_USER_MSG, 15, 5, 210, 8 - CHECKBOX "Não &mostrar esta mensagem novamente", IDC_ERR_DONT_SHOW, 5, 20, 210, 10, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP + CHECKBOX "NÃ£o &mostrar esta mensagem novamente", IDC_ERR_DONT_SHOW, 5, 20, 210, 10, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP PUSHBUTTON L"&OK", IDOK, 105, 40, 50, 14, WS_GROUP | WS_TABSTOP PUSHBUTTON L"&Cancelar", IDCANCEL, 160, 40, 50, 14, WS_GROUP | WS_TABSTOP PUSHBUTTON L"&Sim", IDYES, 105, 40, 50, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON L"&Não", IDNO, 160, 40, 50, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON L"&NÃ£o", IDNO, 160, 40, 50, 14, WS_GROUP | WS_TABSTOP } STRINGTABLE Modified: branches/cmake-bringup/dll/win32/tapiui/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/tapiui/… ============================================================================== --- branches/cmake-bringup/dll/win32/tapiui/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/tapiui/CMakeLists.txt [iso-8859-1] Sun Apr 17 16:54:57 2011 @@ -1,6 +1,9 @@ + +set_rc_compiler() + +set_rc_compiler() add_library(tapiui SHARED tapiui.rc) set_entrypoint(tapiui 0) add_dependencies(tapiui psdk) - add_cab_target(tapiui 1) Modified: branches/cmake-bringup/dll/win32/urlmon/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/urlmon/… ============================================================================== --- branches/cmake-bringup/dll/win32/urlmon/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/urlmon/CMakeLists.txt [iso-8859-1] Sun Apr 17 16:54:57 2011 @@ -5,6 +5,8 @@ add_definitions(-D_WIN32_WINNT=0x600) include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) + +set_rc_compiler() spec2def(urlmon.dll urlmon.spec) Modified: branches/cmake-bringup/dll/win32/userenv/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/userenv… ============================================================================== --- branches/cmake-bringup/dll/win32/userenv/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/userenv/CMakeLists.txt [iso-8859-1] Sun Apr 17 16:54:57 2011 @@ -1,5 +1,7 @@ spec2def(userenv.dll userenv.spec) + +set_rc_compiler() list(APPEND SOURCE desktop.c Modified: branches/cmake-bringup/drivers/storage/ide/uniata/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/storage/i… ============================================================================== --- branches/cmake-bringup/drivers/storage/ide/uniata/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/drivers/storage/ide/uniata/CMakeLists.txt [iso-8859-1] Sun Apr 17 16:54:57 2011 @@ -2,6 +2,7 @@ include_directories(inc) set_cpp() +set_rc_compiler() add_library(uniata SHARED id_ata.cpp Modified: branches/cmake-bringup/drivers/storage/port/buslogic/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/storage/p… ============================================================================== --- branches/cmake-bringup/drivers/storage/port/buslogic/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/drivers/storage/port/buslogic/CMakeLists.txt [iso-8859-1] Sun Apr 17 16:54:57 2011 @@ -1,3 +1,5 @@ + +set_rc_compiler() add_library(buslogic SHARED BusLogic958.c BusLogic958.rc) Modified: branches/cmake-bringup/gcc.cmake URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/gcc.cmake?rev=513… ============================================================================== --- branches/cmake-bringup/gcc.cmake [iso-8859-1] (original) +++ branches/cmake-bringup/gcc.cmake [iso-8859-1] Sun Apr 17 16:54:57 2011 @@ -10,7 +10,14 @@ # -Wl,-T,${REACTOS_SOURCE_DIR}/global.lds set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS_INIT} -Wl,--disable-stdcall-fixup") -set(CMAKE_RC_COMPILE_OBJECT "<CMAKE_RC_COMPILER> -i <SOURCE> <CMAKE_C_LINK_FLAGS> <DEFINES> -I${REACTOS_SOURCE_DIR}/include/psdk -I${REACTOS_BINARY_DIR}/include/psdk -I${REACTOS_SOURCE_DIR}/include/ -I${REACTOS_SOURCE_DIR}/include/reactos -I${REACTOS_BINARY_DIR}/include/reactos -I${REACTOS_SOURCE_DIR}/include/reactos/wine -I${REACTOS_SOURCE_DIR}/include/crt -I${REACTOS_SOURCE_DIR}/include/crt/mingw32 -O coff -o <OBJECT>") +#set(CMAKE_RC_COMPILE_OBJECT "<CMAKE_RC_COMPILER> -i <SOURCE> <CMAKE_C_LINK_FLAGS> <DEFINES> -I${REACTOS_SOURCE_DIR}/include/psdk -I${REACTOS_BINARY_DIR}/include/psdk -I${REACTOS_SOURCE_DIR}/include/ -I${REACTOS_SOURCE_DIR}/include/reactos -I${REACTOS_BINARY_DIR}/include/reactos -I${REACTOS_SOURCE_DIR}/include/reactos/wine -I${REACTOS_SOURCE_DIR}/include/crt -I${REACTOS_SOURCE_DIR}/include/crt/mingw32 -O coff -o <OBJECT>") + +# Temporary, until windres issues are fixed +get_target_property(WRC native-wrc IMPORTED_LOCATION_NOCONFIG) +set(CMAKE_RC_COMPILE_OBJECT + "<CMAKE_C_COMPILER> -DRC_INVOKED -D__WIN32__=1 -D__FLAT__=1 <DEFINES> -I${REACTOS_SOURCE_DIR}/include/psdk -I${REACTOS_BINARY_DIR}/include/psdk -I${REACTOS_SOURCE_DIR}/include/ -I${REACTOS_SOURCE_DIR}/include/reactos -I${REACTOS_BINARY_DIR}/include/reactos -I${REACTOS_SOURCE_DIR}/include/reactos/wine -I${REACTOS_SOURCE_DIR}/include/crt -I${REACTOS_SOURCE_DIR}/include/crt/mingw32 -xc -E <SOURCE> -o <OBJECT>" + "${WRC} -i <OBJECT> -o <OBJECT>" + "<CMAKE_RC_COMPILER> -i <OBJECT> -J res -O coff -o <OBJECT>") if(NOT CMAKE_HOST_SYSTEM_NAME MATCHES Windows) set(CMAKE_C_CREATE_STATIC_LIBRARY "<CMAKE_AR> crs <TARGET> <LINK_FLAGS> <OBJECTS>") @@ -190,7 +197,7 @@ endif(NOT IS_UNICODE) target_link_libraries(${MODULE} mingw_common) elseif(${TYPE} MATCHES win32dll) - set_entrypoint(${MODULE} DllMain 12) + set_entrypoint(${MODULE} DllMain 12) target_link_libraries(${MODULE} mingw_dllmain mingw_common) if(DEFINED baseaddress_${MODULE}) set_image_base(${MODULE} ${baseaddress_${MODULE}}) @@ -236,7 +243,11 @@ set(rc_result_incs "-I${arg} ${rc_result_incs}") endforeach() - set(CMAKE_RC_COMPILE_OBJECT "<CMAKE_RC_COMPILER> ${rc_result_defs} ${rc_result_incs} -i <SOURCE> -O coff -o <OBJECT>") + #set(CMAKE_RC_COMPILE_OBJECT "<CMAKE_RC_COMPILER> ${rc_result_defs} ${rc_result_incs} -i <SOURCE> -O coff -o <OBJECT>") + set(CMAKE_RC_COMPILE_OBJECT + "<CMAKE_C_COMPILER> -DRC_INVOKED -D__WIN32__=1 -D__FLAT__=1 ${rc_result_defs} -I${CMAKE_CURRENT_SOURCE_DIR} ${rc_result_incs} -xc -E <SOURCE> -o <OBJECT>" + "${WRC} -I${CMAKE_CURRENT_SOURCE_DIR} -i <OBJECT> -o <OBJECT>" + "<CMAKE_RC_COMPILER> -i <OBJECT> -J res -O coff -o <OBJECT>") endmacro() #idl files support Modified: branches/cmake-bringup/tools/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/tools/CMakeLists.… ============================================================================== --- branches/cmake-bringup/tools/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/tools/CMakeLists.txt [iso-8859-1] Sun Apr 17 16:54:57 2011 @@ -10,6 +10,7 @@ add_subdirectory(unicode) if(NOT MSVC) +add_subdirectory(widl) add_subdirectory(wpp) -add_subdirectory(widl) +add_subdirectory(wrc) endif()

1 0

[ekohl] 51380: [ADVAPI32] Implement EnumServiceGroupW.
by ekohl＠svn.reactos.org 17 Apr '11

17 Apr '11

Author: ekohl Date: Sun Apr 17 14:43:32 2011 New Revision: 51380 URL: http://svn.reactos.org/svn/reactos?rev=51380&view=rev Log: [ADVAPI32] Implement EnumServiceGroupW. Modified: trunk/reactos/dll/win32/advapi32/service/scm.c Modified: trunk/reactos/dll/win32/advapi32/service/scm.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/service… ============================================================================== --- trunk/reactos/dll/win32/advapi32/service/scm.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/advapi32/service/scm.c [iso-8859-1] Sun Apr 17 14:43:32 2011 @@ -862,24 +862,90 @@ /********************************************************************** * EnumServiceGroupW * - * @unimplemented - */ -BOOL -WINAPI -EnumServiceGroupW( - SC_HANDLE hSCManager, - DWORD dwServiceType, - DWORD dwServiceState, - LPENUM_SERVICE_STATUSW lpServices, - DWORD cbBufSize, - LPDWORD pcbBytesNeeded, - LPDWORD lpServicesReturned, - LPDWORD lpResumeHandle, - LPCWSTR lpGroup) -{ - FIXME("EnumServiceGroupW is unimplemented\n"); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return FALSE; + * @implemented + */ +BOOL WINAPI +EnumServiceGroupW(SC_HANDLE hSCManager, + DWORD dwServiceType, + DWORD dwServiceState, + LPENUM_SERVICE_STATUSW lpServices, + DWORD cbBufSize, + LPDWORD pcbBytesNeeded, + LPDWORD lpServicesReturned, + LPDWORD lpResumeHandle, + LPCWSTR lpGroup) +{ + LPENUM_SERVICE_STATUSW lpStatusPtr; + DWORD dwError; + DWORD dwCount; + + TRACE("EnumServiceGroupW() called\n"); + + if (!hSCManager) + { + SetLastError(ERROR_INVALID_HANDLE); + return FALSE; + } + + RpcTryExcept + { + if (lpGroup == NULL) + { + dwError = REnumServicesStatusW((SC_RPC_HANDLE)hSCManager, + dwServiceType, + dwServiceState, + (LPBYTE)lpServices, + cbBufSize, + pcbBytesNeeded, + lpServicesReturned, + lpResumeHandle); + } + else + { + dwError = REnumServiceGroupW((SC_RPC_HANDLE)hSCManager, + dwServiceType, + dwServiceState, + (LPBYTE)lpServices, + cbBufSize, + pcbBytesNeeded, + lpServicesReturned, + lpResumeHandle, + lpGroup); + } + } + RpcExcept(EXCEPTION_EXECUTE_HANDLER) + { + dwError = ScmRpcStatusToWinError(RpcExceptionCode()); + } + RpcEndExcept; + + if (dwError == ERROR_SUCCESS || dwError == ERROR_MORE_DATA) + { + lpStatusPtr = (LPENUM_SERVICE_STATUSW)lpServices; + for (dwCount = 0; dwCount < *lpServicesReturned; dwCount++) + { + if (lpStatusPtr->lpServiceName) + lpStatusPtr->lpServiceName = + (LPWSTR)((ULONG_PTR)lpServices + (ULONG_PTR)lpStatusPtr->lpServiceName); + + if (lpStatusPtr->lpDisplayName) + lpStatusPtr->lpDisplayName = + (LPWSTR)((ULONG_PTR)lpServices + (ULONG_PTR)lpStatusPtr->lpDisplayName); + + lpStatusPtr++; + } + } + + if (dwError != ERROR_SUCCESS) + { + TRACE("REnumServiceGroupW() failed (Error %lu)\n", dwError); + SetLastError(dwError); + return FALSE; + } + + TRACE("EnumServiceGroupW() done\n"); + + return TRUE; }

1 0

[gadamopoulos] 51379: [win32k] - Improve IS_KBD_MESSAGE macro. Should fix some more tests
by gadamopoulos＠svn.reactos.org 17 Apr '11

17 Apr '11

Author: gadamopoulos Date: Sun Apr 17 12:33:29 2011 New Revision: 51379 URL: http://svn.reactos.org/svn/reactos?rev=51379&view=rev Log: [win32k] - Improve IS_KBD_MESSAGE macro. Should fix some more tests Modified: trunk/reactos/subsystems/win32/win32k/include/msgqueue.h Modified: trunk/reactos/subsystems/win32/win32k/include/msgqueue.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/msgqueue.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/include/msgqueue.h [iso-8859-1] Sun Apr 17 12:33:29 2011 @@ -301,7 +301,7 @@ (message >= WM_MOUSEFIRST && message <= WM_MOUSELAST)) #define IS_KBD_MESSAGE(message) \ - (message == WM_KEYDOWN || message == WM_KEYUP) + (message >= WM_KEYFIRST && message <= WM_KEYLAST) HANDLE FASTCALL IntMsqSetWakeMask(DWORD WakeMask);

1 0

[ekohl] 51378: [EVENTVWR] - Change string resource id prefix from IDC to IDS. - Add missing string resources.
by ekohl＠svn.reactos.org 17 Apr '11

17 Apr '11

Author: ekohl Date: Sun Apr 17 11:58:26 2011 New Revision: 51378 URL: http://svn.reactos.org/svn/reactos?rev=51378&view=rev Log: [EVENTVWR] - Change string resource id prefix from IDC to IDS. - Add missing string resources. Modified: trunk/reactos/base/applications/mscutils/eventvwr/eventvwr.c trunk/reactos/base/applications/mscutils/eventvwr/lang/bg-BG.rc trunk/reactos/base/applications/mscutils/eventvwr/lang/de-DE.rc trunk/reactos/base/applications/mscutils/eventvwr/lang/el-GR.rc trunk/reactos/base/applications/mscutils/eventvwr/lang/en-US.rc trunk/reactos/base/applications/mscutils/eventvwr/lang/es-ES.rc trunk/reactos/base/applications/mscutils/eventvwr/lang/fr-FR.rc trunk/reactos/base/applications/mscutils/eventvwr/lang/it-IT.rc trunk/reactos/base/applications/mscutils/eventvwr/lang/ja-JP.rc trunk/reactos/base/applications/mscutils/eventvwr/lang/ko-KR.rc trunk/reactos/base/applications/mscutils/eventvwr/lang/no-NO.rc trunk/reactos/base/applications/mscutils/eventvwr/lang/pl-PL.rc trunk/reactos/base/applications/mscutils/eventvwr/lang/ro-RO.rc trunk/reactos/base/applications/mscutils/eventvwr/lang/ru-RU.rc trunk/reactos/base/applications/mscutils/eventvwr/lang/sk-SK.rc trunk/reactos/base/applications/mscutils/eventvwr/lang/uk-UA.rc trunk/reactos/base/applications/mscutils/eventvwr/resource.h Modified: trunk/reactos/base/applications/mscutils/eventvwr/eventvwr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/eventvwr/eventvwr.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/eventvwr/eventvwr.c [iso-8859-1] Sun Apr 17 11:58:26 2011 @@ -385,7 +385,7 @@ if (!bDone) { - LoadStringW(hInst, IDC_EVENTSTRINGIDNOTFOUND, szStringIDNotFound, MAX_LOADSTRING); + LoadStringW(hInst, IDS_EVENTSTRINGIDNOTFOUND, szStringIDNotFound, MAX_LOADSTRING); swprintf(EventText, szStringIDNotFound, (DWORD)(pevlr->EventID & 0xFFFF), SourceName); } @@ -395,7 +395,7 @@ return bDone; } - LoadStringW(hInst, IDC_EVENTSTRINGIDNOTFOUND, szStringIDNotFound, MAX_LOADSTRING); + LoadStringW(hInst, IDS_EVENTSTRINGIDNOTFOUND, szStringIDNotFound, MAX_LOADSTRING); swprintf(EventText, szStringIDNotFound, (DWORD)(pevlr->EventID & 0xFFFF), SourceName); return FALSE; @@ -409,25 +409,25 @@ switch (dwEventType) { case EVENTLOG_ERROR_TYPE: - LoadStringW(hInst, IDC_EVENTLOG_ERROR_TYPE, eventTypeText, MAX_LOADSTRING); + LoadStringW(hInst, IDS_EVENTLOG_ERROR_TYPE, eventTypeText, MAX_LOADSTRING); break; case EVENTLOG_WARNING_TYPE: - LoadStringW(hInst, IDC_EVENTLOG_WARNING_TYPE, eventTypeText, MAX_LOADSTRING); + LoadStringW(hInst, IDS_EVENTLOG_WARNING_TYPE, eventTypeText, MAX_LOADSTRING); break; case EVENTLOG_INFORMATION_TYPE: - LoadStringW(hInst, IDC_EVENTLOG_INFORMATION_TYPE, eventTypeText, MAX_LOADSTRING); + LoadStringW(hInst, IDS_EVENTLOG_INFORMATION_TYPE, eventTypeText, MAX_LOADSTRING); break; case EVENTLOG_AUDIT_SUCCESS: - LoadStringW(hInst, IDC_EVENTLOG_AUDIT_SUCCESS, eventTypeText, MAX_LOADSTRING); + LoadStringW(hInst, IDS_EVENTLOG_AUDIT_SUCCESS, eventTypeText, MAX_LOADSTRING); break; case EVENTLOG_AUDIT_FAILURE: - LoadStringW(hInst, IDC_EVENTLOG_AUDIT_FAILURE, eventTypeText, MAX_LOADSTRING); + LoadStringW(hInst, IDS_EVENTLOG_AUDIT_FAILURE, eventTypeText, MAX_LOADSTRING); break; case EVENTLOG_SUCCESS: - LoadStringW(hInst, IDC_EVENTLOG_SUCCESS, eventTypeText, MAX_LOADSTRING); + LoadStringW(hInst, IDS_EVENTLOG_SUCCESS, eventTypeText, MAX_LOADSTRING); break; default: - LoadStringW(hInst, IDC_EVENTLOG_UNKNOWN_TYPE, eventTypeText, MAX_LOADSTRING); + LoadStringW(hInst, IDS_EVENTLOG_UNKNOWN_TYPE, eventTypeText, MAX_LOADSTRING); break; } } Modified: trunk/reactos/base/applications/mscutils/eventvwr/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/eventvwr/lang/bg-BG.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/eventvwr/lang/bg-BG.rc [iso-8859-1] Sun Apr 17 11:58:26 2011 @@ -85,8 +85,15 @@ STRINGTABLE BEGIN - IDS_APP_TITLE "Ïðåãëåä íà ñúáèòèÿ" - IDC_EVENTSTRINGIDNOTFOUND "Íå å íàìåðåíî îïèñàíèåòî íà ñúáèòèå ( %lu ) â èçòî÷íèê ( %s ). Âúçìîæíî å ìåñòèÿò êîìïþòúð äà íÿìà íóæíèòå ñâåäåíèÿ â ðåãèñòúðà èëè DLL ôàéëîâåò, íóæíè çà ïîêàçâàíå íà ñúîáùåíèÿ îò îòäàëå÷åí êîìïþòúð." + IDS_APP_TITLE "Ïðåãëåä íà ñúáèòèÿ" + IDS_EVENTSTRINGIDNOTFOUND "Íå å íàìåðåíî îïèñàíèåòî íà ñúáèòèå ( %lu ) â èçòî÷íèê ( %s ). Âúçìîæíî å ìåñòèÿò êîìïþòúð äà íÿìà íóæíèòå ñâåäåíèÿ â ðåãèñòúðà èëè DLL ôàéëîâåò, íóæíè çà ïîêàçâàíå íà ñúîáùåíèÿ îò îòäàëå÷åí êîìïþòúð." + IDS_EVENTLOG_ERROR_TYPE "Error" + IDS_EVENTLOG_WARNING_TYPE "Warning" + IDS_EVENTLOG_INFORMATION_TYPE "Information" + IDS_EVENTLOG_AUDIT_SUCCESS "Audit Success" + IDS_EVENTLOG_AUDIT_FAILURE "Audit Failure" + IDS_EVENTLOG_SUCCESS "Success" + IDS_EVENTLOG_UNKNOWN_TYPE "Unknown Event" END STRINGTABLE Modified: trunk/reactos/base/applications/mscutils/eventvwr/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/eventvwr/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/eventvwr/lang/de-DE.rc [iso-8859-1] Sun Apr 17 11:58:26 2011 @@ -93,14 +93,14 @@ STRINGTABLE BEGIN IDS_APP_TITLE "Ereignisanzeige" - IDC_EVENTSTRINGIDNOTFOUND "Die Bezeichnung für die Ereignis-ID ( %lu ) in der Quelle ( %s ) kann nicht gefunden werden. Es könnte sein, dass der Lokale Computer die notwendigen Registry Einträge oder Nachrichten DLLs, um Nachrichten von Remoten Computern anzuzeigen, nicht besitzt." - IDC_EVENTLOG_ERROR_TYPE "Fehler" - IDC_EVENTLOG_WARNING_TYPE "Warnung" - IDC_EVENTLOG_INFORMATION_TYPE "Informationen" - IDC_EVENTLOG_AUDIT_SUCCESS "Audit Erfolgreich" - IDC_EVENTLOG_AUDIT_FAILURE "Audit Fehlgeschlagen" - IDC_EVENTLOG_SUCCESS "Erfolgreich" - IDC_EVENTLOG_UNKNOWN_TYPE "Unbekanntes Ereignis" + IDS_EVENTSTRINGIDNOTFOUND "Die Bezeichnung für die Ereignis-ID ( %lu ) in der Quelle ( %s ) kann nicht gefunden werden. Es könnte sein, dass der Lokale Computer die notwendigen Registry Einträge oder Nachrichten DLLs, um Nachrichten von Remoten Computern anzuzeigen, nicht besitzt." + IDS_EVENTLOG_ERROR_TYPE "Fehler" + IDS_EVENTLOG_WARNING_TYPE "Warnung" + IDS_EVENTLOG_INFORMATION_TYPE "Informationen" + IDS_EVENTLOG_AUDIT_SUCCESS "Audit Erfolgreich" + IDS_EVENTLOG_AUDIT_FAILURE "Audit Fehlgeschlagen" + IDS_EVENTLOG_SUCCESS "Erfolgreich" + IDS_EVENTLOG_UNKNOWN_TYPE "Unbekanntes Ereignis" END STRINGTABLE Modified: trunk/reactos/base/applications/mscutils/eventvwr/lang/el-GR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/eventvwr/lang/el-GR.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/eventvwr/lang/el-GR.rc [iso-8859-1] Sun Apr 17 11:58:26 2011 @@ -93,14 +93,14 @@ STRINGTABLE BEGIN IDS_APP_TITLE "Event Viewer" - IDC_EVENTSTRINGIDNOTFOUND "The description for Event ID ( %lu ) in Source ( %s ) cannot be found. The local computer may not have the necessary registry information or message DLL files to display messages from a remote computer." - IDC_EVENTLOG_ERROR_TYPE "ÁöÜëìá" - IDC_EVENTLOG_WARNING_TYPE "Ðñïåéäïðïßçóç" - IDC_EVENTLOG_INFORMATION_TYPE "Ðëçñïöïñßá" - IDC_EVENTLOG_AUDIT_SUCCESS "Audit Success" - IDC_EVENTLOG_AUDIT_FAILURE "Audit Failure" - IDC_EVENTLOG_SUCCESS "Åðéôõ÷ßá" - IDC_EVENTLOG_UNKNOWN_TYPE "¢ãíùóôï óõìâÜí" + IDS_EVENTSTRINGIDNOTFOUND "The description for Event ID ( %lu ) in Source ( %s ) cannot be found. The local computer may not have the necessary registry information or message DLL files to display messages from a remote computer." + IDS_EVENTLOG_ERROR_TYPE "ÁöÜëìá" + IDS_EVENTLOG_WARNING_TYPE "Ðñïåéäïðïßçóç" + IDS_EVENTLOG_INFORMATION_TYPE "Ðëçñïöïñßá" + IDS_EVENTLOG_AUDIT_SUCCESS "Audit Success" + IDS_EVENTLOG_AUDIT_FAILURE "Audit Failure" + IDS_EVENTLOG_SUCCESS "Åðéôõ÷ßá" + IDS_EVENTLOG_UNKNOWN_TYPE "¢ãíùóôï óõìâÜí" END STRINGTABLE Modified: trunk/reactos/base/applications/mscutils/eventvwr/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/eventvwr/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/eventvwr/lang/en-US.rc [iso-8859-1] Sun Apr 17 11:58:26 2011 @@ -92,15 +92,15 @@ STRINGTABLE BEGIN - IDS_APP_TITLE "Event Viewer" - IDC_EVENTSTRINGIDNOTFOUND "The description for Event ID ( %lu ) in Source ( %s ) cannot be found. The local computer may not have the necessary registry information or message DLL files to display messages from a remote computer." - IDC_EVENTLOG_ERROR_TYPE "Error" - IDC_EVENTLOG_WARNING_TYPE "Warning" - IDC_EVENTLOG_INFORMATION_TYPE "Information" - IDC_EVENTLOG_AUDIT_SUCCESS "Audit Success" - IDC_EVENTLOG_AUDIT_FAILURE "Audit Failure" - IDC_EVENTLOG_SUCCESS "Success" - IDC_EVENTLOG_UNKNOWN_TYPE "Unknown Event" + IDS_APP_TITLE "Event Viewer" + IDS_EVENTSTRINGIDNOTFOUND "The description for Event ID ( %lu ) in Source ( %s ) cannot be found. The local computer may not have the necessary registry information or message DLL files to display messages from a remote computer." + IDS_EVENTLOG_ERROR_TYPE "Error" + IDS_EVENTLOG_WARNING_TYPE "Warning" + IDS_EVENTLOG_INFORMATION_TYPE "Information" + IDS_EVENTLOG_AUDIT_SUCCESS "Audit Success" + IDS_EVENTLOG_AUDIT_FAILURE "Audit Failure" + IDS_EVENTLOG_SUCCESS "Success" + IDS_EVENTLOG_UNKNOWN_TYPE "Unknown Event" END STRINGTABLE Modified: trunk/reactos/base/applications/mscutils/eventvwr/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/eventvwr/lang/es-ES.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/eventvwr/lang/es-ES.rc [iso-8859-1] Sun Apr 17 11:58:26 2011 @@ -93,14 +93,14 @@ STRINGTABLE BEGIN IDS_APP_TITLE "Visor de sucesos" - IDC_EVENTSTRINGIDNOTFOUND "La descripción para el evento con ID ( %lu ) y origen ( %s ) no pudo ser recuperada.El equipo local puede no tener la información necesaria en el registro o las DLLs requeridas para mostrar los mensajes de un equipo remoto." - IDC_EVENTLOG_ERROR_TYPE "Error" - IDC_EVENTLOG_WARNING_TYPE "Advertencia" - IDC_EVENTLOG_INFORMATION_TYPE "Información" - IDC_EVENTLOG_AUDIT_SUCCESS "Auditoria Satisfactoria" - IDC_EVENTLOG_AUDIT_FAILURE "Auditoria Fallida" - IDC_EVENTLOG_SUCCESS "Acierto" - IDC_EVENTLOG_UNKNOWN_TYPE "Evento Desconocido" + IDS_EVENTSTRINGIDNOTFOUND "La descripción para el evento con ID ( %lu ) y origen ( %s ) no pudo ser recuperada.El equipo local puede no tener la información necesaria en el registro o las DLLs requeridas para mostrar los mensajes de un equipo remoto." + IDS_EVENTLOG_ERROR_TYPE "Error" + IDS_EVENTLOG_WARNING_TYPE "Advertencia" + IDS_EVENTLOG_INFORMATION_TYPE "Información" + IDS_EVENTLOG_AUDIT_SUCCESS "Auditoria Satisfactoria" + IDS_EVENTLOG_AUDIT_FAILURE "Auditoria Fallida" + IDS_EVENTLOG_SUCCESS "Acierto" + IDS_EVENTLOG_UNKNOWN_TYPE "Evento Desconocido" END STRINGTABLE Modified: trunk/reactos/base/applications/mscutils/eventvwr/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/eventvwr/lang/fr-FR.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/eventvwr/lang/fr-FR.rc [iso-8859-1] Sun Apr 17 11:58:26 2011 @@ -93,14 +93,14 @@ STRINGTABLE BEGIN IDS_APP_TITLE "Visionneuse d'événements" - IDC_EVENTSTRINGIDNOTFOUND "La description pour l'événement d'ID ( %lu ) dans la source ( %s ) ne peut être trouvée. L'ordinateur local pourrait ne pas avoir les informations registres nécéssaires ou les fichiers DLL de message pour afficher les messages depuis un ordinateur distant." - IDC_EVENTLOG_ERROR_TYPE "Erreur" - IDC_EVENTLOG_WARNING_TYPE "Avertissement" - IDC_EVENTLOG_INFORMATION_TYPE "Informations" - IDC_EVENTLOG_AUDIT_SUCCESS "Succès de l'audit" - IDC_EVENTLOG_AUDIT_FAILURE "Échec de l'audit" - IDC_EVENTLOG_SUCCESS "Succès" - IDC_EVENTLOG_UNKNOWN_TYPE "Événement Inconnu" + IDS_EVENTSTRINGIDNOTFOUND "La description pour l'événement d'ID ( %lu ) dans la source ( %s ) ne peut être trouvée. L'ordinateur local pourrait ne pas avoir les informations registres nécéssaires ou les fichiers DLL de message pour afficher les messages depuis un ordinateur distant." + IDS_EVENTLOG_ERROR_TYPE "Erreur" + IDS_EVENTLOG_WARNING_TYPE "Avertissement" + IDS_EVENTLOG_INFORMATION_TYPE "Informations" + IDS_EVENTLOG_AUDIT_SUCCESS "Succès de l'audit" + IDS_EVENTLOG_AUDIT_FAILURE "Échec de l'audit" + IDS_EVENTLOG_SUCCESS "Succès" + IDS_EVENTLOG_UNKNOWN_TYPE "Événement Inconnu" END STRINGTABLE Modified: trunk/reactos/base/applications/mscutils/eventvwr/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/eventvwr/lang/it-IT.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/eventvwr/lang/it-IT.rc [iso-8859-1] Sun Apr 17 11:58:26 2011 @@ -93,14 +93,14 @@ STRINGTABLE BEGIN IDS_APP_TITLE "Visualizzatore eventi" - IDC_EVENTSTRINGIDNOTFOUND "La descrizione per l'ID evento ( %lu ) proveniente da ( %s ) non può essere trovata. Il computer locale potrebbe non avere le informazioni sul registry necessarie o i file DLL con i messaggi necessari per la visualizzazione da un computer remoto." - IDC_EVENTLOG_ERROR_TYPE "Errore" - IDC_EVENTLOG_WARNING_TYPE "Avviso" - IDC_EVENTLOG_INFORMATION_TYPE "Informazione" - IDC_EVENTLOG_AUDIT_SUCCESS "Audit riuscita" - IDC_EVENTLOG_AUDIT_FAILURE "Audit fallita" - IDC_EVENTLOG_SUCCESS "Successo" - IDC_EVENTLOG_UNKNOWN_TYPE "Evento sconosciuto" + IDS_EVENTSTRINGIDNOTFOUND "La descrizione per l'ID evento ( %lu ) proveniente da ( %s ) non può essere trovata. Il computer locale potrebbe non avere le informazioni sul registry necessarie o i file DLL con i messaggi necessari per la visualizzazione da un computer remoto." + IDS_EVENTLOG_ERROR_TYPE "Errore" + IDS_EVENTLOG_WARNING_TYPE "Avviso" + IDS_EVENTLOG_INFORMATION_TYPE "Informazione" + IDS_EVENTLOG_AUDIT_SUCCESS "Audit riuscita" + IDS_EVENTLOG_AUDIT_FAILURE "Audit fallita" + IDS_EVENTLOG_SUCCESS "Successo" + IDS_EVENTLOG_UNKNOWN_TYPE "Evento sconosciuto" END STRINGTABLE Modified: trunk/reactos/base/applications/mscutils/eventvwr/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/eventvwr/lang/ja-JP.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/eventvwr/lang/ja-JP.rc [iso-8859-1] Sun Apr 17 11:58:26 2011 @@ -93,14 +93,14 @@ STRINGTABLE BEGIN IDS_APP_TITLE "Cxg r[A" - IDC_EVENTSTRINGIDNOTFOUND "Cxg ID (%lu) (\\[X %s à) ÉÖ·éà¾ª©Â©èÜ¹ñÅµ½B [g Rs[^©çbZ[Wð\\¦·é½ßÉKvÈWXgîñÜ½ÍbZ[W DLL t@Cª[J Rs[^ÉÈ¢Â\\«ª èÜ·B" - IDC_EVENTLOG_ERROR_TYPE "G[" - IDC_EVENTLOG_WARNING_TYPE "x" - IDC_EVENTLOG_INFORMATION_TYPE "îñ" - IDC_EVENTLOG_AUDIT_SUCCESS "¬÷ÌÄ¸" - IDC_EVENTLOG_AUDIT_FAILURE "¸sÌÄ¸" - IDC_EVENTLOG_SUCCESS "¬÷" - IDC_EVENTLOG_UNKNOWN_TYPE "s¾ÈCxg" + IDS_EVENTSTRINGIDNOTFOUND "Cxg ID (%lu) (\\[X %s à) ÉÖ·éà¾ª©Â©èÜ¹ñÅµ½B [g Rs[^©çbZ[Wð\\¦·é½ßÉKvÈWXgîñÜ½ÍbZ[W DLL t@Cª[J Rs[^ÉÈ¢Â\\«ª èÜ·B" + IDS_EVENTLOG_ERROR_TYPE "G[" + IDS_EVENTLOG_WARNING_TYPE "x" + IDS_EVENTLOG_INFORMATION_TYPE "îñ" + IDS_EVENTLOG_AUDIT_SUCCESS "¬÷ÌÄ¸" + IDS_EVENTLOG_AUDIT_FAILURE "¸sÌÄ¸" + IDS_EVENTLOG_SUCCESS "¬÷" + IDS_EVENTLOG_UNKNOWN_TYPE "s¾ÈCxg" END STRINGTABLE Modified: trunk/reactos/base/applications/mscutils/eventvwr/lang/ko-KR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/eventvwr/lang/ko-KR.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/eventvwr/lang/ko-KR.rc [iso-8859-1] Sun Apr 17 11:58:26 2011 @@ -89,14 +89,14 @@ STRINGTABLE BEGIN IDS_APP_TITLE "ÀÌº¥Æ® ºä¾î" - IDC_EVENTSTRINGIDNOTFOUND "( %s ) ÀÇ ÀÌº¥Æ®ID ( %lu ) ¿¡ ´ëÇÑ ¼³¸íÀ» Ã£À» ¼ö ¾ø½À´Ï´Ù. ·ÎÄÃ ÄÄÇ»ÅÍ°¡ ¿ø°Ý ÄÄÇ»ÅÍÀÇ ¸Þ¼¼Áö¸¦ Ç¥½ÃÇÏ´Âµ¥ ÇÊ¿äÇÑ ·¹Áö½ºÆ®¸®³ª DLL ÆÄÀÏÀ» °¡ÁöÁö ¾Ê°í ÀÖÀ»¼ö ÀÖ½À´Ï´Ù." - IDC_EVENTLOG_ERROR_TYPE "¿¡·¯" - IDC_EVENTLOG_WARNING_TYPE "°æ°í" - IDC_EVENTLOG_INFORMATION_TYPE "Á¤º¸" - IDC_EVENTLOG_AUDIT_SUCCESS "°¨»ç ¼º°ø" - IDC_EVENTLOG_AUDIT_FAILURE "°¨»ç ½ÇÆÐ" - IDC_EVENTLOG_SUCCESS "¼º°ø" - IDC_EVENTLOG_UNKNOWN_TYPE "¾Ë·ÁÁöÁö ¾ÊÀº ÀÌº¥Æ®" + IDS_EVENTSTRINGIDNOTFOUND "( %s ) ÀÇ ÀÌº¥Æ®ID ( %lu ) ¿¡ ´ëÇÑ ¼³¸íÀ» Ã£À» ¼ö ¾ø½À´Ï´Ù. ·ÎÄÃ ÄÄÇ»ÅÍ°¡ ¿ø°Ý ÄÄÇ»ÅÍÀÇ ¸Þ¼¼Áö¸¦ Ç¥½ÃÇÏ´Âµ¥ ÇÊ¿äÇÑ ·¹Áö½ºÆ®¸®³ª DLL ÆÄÀÏÀ» °¡ÁöÁö ¾Ê°í ÀÖÀ»¼ö ÀÖ½À´Ï´Ù." + IDS_EVENTLOG_ERROR_TYPE "¿¡·¯" + IDS_EVENTLOG_WARNING_TYPE "°æ°í" + IDS_EVENTLOG_INFORMATION_TYPE "Á¤º¸" + IDS_EVENTLOG_AUDIT_SUCCESS "°¨»ç ¼º°ø" + IDS_EVENTLOG_AUDIT_FAILURE "°¨»ç ½ÇÆÐ" + IDS_EVENTLOG_SUCCESS "¼º°ø" + IDS_EVENTLOG_UNKNOWN_TYPE "¾Ë·ÁÁöÁö ¾ÊÀº ÀÌº¥Æ®" END STRINGTABLE Modified: trunk/reactos/base/applications/mscutils/eventvwr/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/eventvwr/lang/no-NO.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/eventvwr/lang/no-NO.rc [iso-8859-1] Sun Apr 17 11:58:26 2011 @@ -93,14 +93,14 @@ STRINGTABLE BEGIN IDS_APP_TITLE "Hendelseliste" - IDC_EVENTSTRINGIDNOTFOUND "Beskrivelsen for Hendelse ID ( %lu ) i kilden ( %s ) kan ikke bli finnet. Lokale datamaskinen har ikke nødvendige register informasjon eller melding DLL filer for å vise melding fra en fjern datamaskin." - IDC_EVENTLOG_ERROR_TYPE "Feil" - IDC_EVENTLOG_WARNING_TYPE "Advarseler" - IDC_EVENTLOG_INFORMATION_TYPE "Informasjon" - IDC_EVENTLOG_AUDIT_SUCCESS "Revisjon suksess" - IDC_EVENTLOG_AUDIT_FAILURE "Revisjon misslykkes" - IDC_EVENTLOG_SUCCESS "Suksess" - IDC_EVENTLOG_UNKNOWN_TYPE "Ukjent hendelse" + IDS_EVENTSTRINGIDNOTFOUND "Beskrivelsen for Hendelse ID ( %lu ) i kilden ( %s ) kan ikke bli finnet. Lokale datamaskinen har ikke nødvendige register informasjon eller melding DLL filer for å vise melding fra en fjern datamaskin." + IDS_EVENTLOG_ERROR_TYPE "Feil" + IDS_EVENTLOG_WARNING_TYPE "Advarseler" + IDS_EVENTLOG_INFORMATION_TYPE "Informasjon" + IDS_EVENTLOG_AUDIT_SUCCESS "Revisjon suksess" + IDS_EVENTLOG_AUDIT_FAILURE "Revisjon misslykkes" + IDS_EVENTLOG_SUCCESS "Suksess" + IDS_EVENTLOG_UNKNOWN_TYPE "Ukjent hendelse" END STRINGTABLE Modified: trunk/reactos/base/applications/mscutils/eventvwr/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/eventvwr/lang/pl-PL.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/eventvwr/lang/pl-PL.rc [iso-8859-1] Sun Apr 17 11:58:26 2011 @@ -97,14 +97,14 @@ STRINGTABLE BEGIN IDS_APP_TITLE "Podgl¹d zdarzeñ" - IDC_EVENTSTRINGIDNOTFOUND "Opis zdarzenia dla danego numeru ID: ( %lu ) nie zosta³ odnaleziony w ródle: ( %s ). Ten komputer mo¿e nie miec wystarczaj¹cych informacji w rejestrze albo bibliotek DLL, aby wywietliæ wiadomoci z komputera zdalnego." - IDC_EVENTLOG_ERROR_TYPE "B³¹d" - IDC_EVENTLOG_WARNING_TYPE "Ostrze¿enie" - IDC_EVENTLOG_INFORMATION_TYPE "Informacja" - IDC_EVENTLOG_AUDIT_SUCCESS "Udany Audyt" - IDC_EVENTLOG_AUDIT_FAILURE "Nieudany Audyt" - IDC_EVENTLOG_SUCCESS "Sukces" - IDC_EVENTLOG_UNKNOWN_TYPE "Zdarzenie nieznane" + IDS_EVENTSTRINGIDNOTFOUND "Opis zdarzenia dla danego numeru ID: ( %lu ) nie zosta³ odnaleziony w ródle: ( %s ). Ten komputer mo¿e nie miec wystarczaj¹cych informacji w rejestrze albo bibliotek DLL, aby wywietliæ wiadomoci z komputera zdalnego." + IDS_EVENTLOG_ERROR_TYPE "B³¹d" + IDS_EVENTLOG_WARNING_TYPE "Ostrze¿enie" + IDS_EVENTLOG_INFORMATION_TYPE "Informacja" + IDS_EVENTLOG_AUDIT_SUCCESS "Udany Audyt" + IDS_EVENTLOG_AUDIT_FAILURE "Nieudany Audyt" + IDS_EVENTLOG_SUCCESS "Sukces" + IDS_EVENTLOG_UNKNOWN_TYPE "Zdarzenie nieznane" END STRINGTABLE Modified: trunk/reactos/base/applications/mscutils/eventvwr/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/eventvwr/lang/ro-RO.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/eventvwr/lang/ro-RO.rc [iso-8859-1] Sun Apr 17 11:58:26 2011 @@ -93,14 +93,14 @@ STRINGTABLE BEGIN IDS_APP_TITLE "Vizualizator evenimente" - IDC_EVENTSTRINGIDNOTFOUND "Descrierea pentru ID-ul de eveniment ( %lu ) în sursa ( %s ) nu poate fi gãsitã. Computerul local este posibil sã nu aibã informaþiile sau fiºierele DLL pentru a afiºa mesajele de pe un computer la distanþã." - IDC_EVENTLOG_ERROR_TYPE "Eroare" - IDC_EVENTLOG_WARNING_TYPE "Avertisment" - IDC_EVENTLOG_INFORMATION_TYPE "Informaþie" - IDC_EVENTLOG_AUDIT_SUCCESS "Succes audit" - IDC_EVENTLOG_AUDIT_FAILURE "Eºec audit" - IDC_EVENTLOG_SUCCESS "Succes" - IDC_EVENTLOG_UNKNOWN_TYPE "Eveniment necunoscut" + IDS_EVENTSTRINGIDNOTFOUND "Descrierea pentru ID-ul de eveniment ( %lu ) în sursa ( %s ) nu poate fi gãsitã. Computerul local este posibil sã nu aibã informaþiile sau fiºierele DLL pentru a afiºa mesajele de pe un computer la distanþã." + IDS_EVENTLOG_ERROR_TYPE "Eroare" + IDS_EVENTLOG_WARNING_TYPE "Avertisment" + IDS_EVENTLOG_INFORMATION_TYPE "Informaþie" + IDS_EVENTLOG_AUDIT_SUCCESS "Succes audit" + IDS_EVENTLOG_AUDIT_FAILURE "Eºec audit" + IDS_EVENTLOG_SUCCESS "Succes" + IDS_EVENTLOG_UNKNOWN_TYPE "Eveniment necunoscut" END STRINGTABLE Modified: trunk/reactos/base/applications/mscutils/eventvwr/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/eventvwr/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/eventvwr/lang/ru-RU.rc [iso-8859-1] Sun Apr 17 11:58:26 2011 @@ -93,14 +93,14 @@ STRINGTABLE BEGIN IDS_APP_TITLE "Ïðîñìîòð ñîáûòèé" - IDC_EVENTSTRINGIDNOTFOUND "Íå íàéäåíî îïèñàíèå äëÿ ñîáûòèÿ ñ êîäîì ( %lu ) â èñòî÷íèêå ( %s ). Âîçìîæíî, íà ëîêàëüíîì êîìïüþòåðå íåò íóæíûõ äàííûõ â ðååñòðå èëè ôàéëîâ DLL ñîîáùåíèé äëÿ îòîáðàæåíèÿ ñîîáùåíèé óäàëåííîãî êîìïüþòåðà." - IDC_EVENTLOG_ERROR_TYPE "Îøèáêà" - IDC_EVENTLOG_WARNING_TYPE "Ïðåäóïðåæäåíèå" - IDC_EVENTLOG_INFORMATION_TYPE "Óâåäîìëåíèå" - IDC_EVENTLOG_AUDIT_SUCCESS "Àóäèò óñïåõîâ" - IDC_EVENTLOG_AUDIT_FAILURE "Àóäèò îòêàçîâ" - IDC_EVENTLOG_SUCCESS "Óñïåõ" - IDC_EVENTLOG_UNKNOWN_TYPE "Íåèçâåñòíîå ñîáûòèå" + IDS_EVENTSTRINGIDNOTFOUND "Íå íàéäåíî îïèñàíèå äëÿ ñîáûòèÿ ñ êîäîì ( %lu ) â èñòî÷íèêå ( %s ). Âîçìîæíî, íà ëîêàëüíîì êîìïüþòåðå íåò íóæíûõ äàííûõ â ðååñòðå èëè ôàéëîâ DLL ñîîáùåíèé äëÿ îòîáðàæåíèÿ ñîîáùåíèé óäàëåííîãî êîìïüþòåðà." + IDS_EVENTLOG_ERROR_TYPE "Îøèáêà" + IDS_EVENTLOG_WARNING_TYPE "Ïðåäóïðåæäåíèå" + IDS_EVENTLOG_INFORMATION_TYPE "Óâåäîìëåíèå" + IDS_EVENTLOG_AUDIT_SUCCESS "Àóäèò óñïåõîâ" + IDS_EVENTLOG_AUDIT_FAILURE "Àóäèò îòêàçîâ" + IDS_EVENTLOG_SUCCESS "Óñïåõ" + IDS_EVENTLOG_UNKNOWN_TYPE "Íåèçâåñòíîå ñîáûòèå" END STRINGTABLE Modified: trunk/reactos/base/applications/mscutils/eventvwr/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/eventvwr/lang/sk-SK.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/eventvwr/lang/sk-SK.rc [iso-8859-1] Sun Apr 17 11:58:26 2011 @@ -90,14 +90,14 @@ STRINGTABLE BEGIN IDS_APP_TITLE "Zobrazovaè udalostí" - IDC_EVENTSTRINGIDNOTFOUND "Popis pre udalos ID ( %lu ) zo zdroja ( %s ) nebol nájdený. The local computer may not have the necessary registry information or message DLL files to display messages from a remote computer." - IDC_EVENTLOG_ERROR_TYPE "Chyba" - IDC_EVENTLOG_WARNING_TYPE "Upozornenie" - IDC_EVENTLOG_INFORMATION_TYPE "Informácia" - IDC_EVENTLOG_AUDIT_SUCCESS "Kontrola uspená" - IDC_EVENTLOG_AUDIT_FAILURE "Kontrola zlyhala" - IDC_EVENTLOG_SUCCESS "Úspech" //Success - IDC_EVENTLOG_UNKNOWN_TYPE "Neznáma udalos" + IDS_EVENTSTRINGIDNOTFOUND "Popis pre udalos ID ( %lu ) zo zdroja ( %s ) nebol nájdený. The local computer may not have the necessary registry information or message DLL files to display messages from a remote computer." + IDS_EVENTLOG_ERROR_TYPE "Chyba" + IDS_EVENTLOG_WARNING_TYPE "Upozornenie" + IDS_EVENTLOG_INFORMATION_TYPE "Informácia" + IDS_EVENTLOG_AUDIT_SUCCESS "Kontrola uspená" + IDS_EVENTLOG_AUDIT_FAILURE "Kontrola zlyhala" + IDS_EVENTLOG_SUCCESS "Úspech" //Success + IDS_EVENTLOG_UNKNOWN_TYPE "Neznáma udalos" END STRINGTABLE Modified: trunk/reactos/base/applications/mscutils/eventvwr/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/eventvwr/lang/uk-UA.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/eventvwr/lang/uk-UA.rc [iso-8859-1] Sun Apr 17 11:58:26 2011 @@ -93,14 +93,14 @@ STRINGTABLE BEGIN IDS_APP_TITLE "Îãëÿäà÷ ïîä³é" - IDC_EVENTSTRINGIDNOTFOUND "Îïèñ äëÿ ²äåíòèô³êàòîðà ïîä³¿( %lu ) çà äæåðåëîì( %s ) íå çíàéäåíî. Ëîêàëüíèé êîìï'þòåð ìîæå íå ìàòè íåîáõ³äíî¿ ³íôîðìàö³¿ â ðåºñòð³ ÷è DLL ôàéë³â ïîâ³äîìëåíü äëÿ â³äîáðàæåííÿ ïîâ³äîìëåíü, ùî íàäõîäÿòü â³ä â³ääàëåíîãî êîìï'þòåðà." - IDC_EVENTLOG_ERROR_TYPE "Ïîìèëêà" - IDC_EVENTLOG_WARNING_TYPE "Ïîïåðåäæåííÿ" - IDC_EVENTLOG_INFORMATION_TYPE "Ïîâ³äîìëåííÿ" - IDC_EVENTLOG_AUDIT_SUCCESS "Àóäèò óñï³õ³â" - IDC_EVENTLOG_AUDIT_FAILURE "Àóäèò â³äìîâ" - IDC_EVENTLOG_SUCCESS "Óñï³õ" - IDC_EVENTLOG_UNKNOWN_TYPE "Íåâ³äîìà ïîä³ÿ" + IDS_EVENTSTRINGIDNOTFOUND "Îïèñ äëÿ ²äåíòèô³êàòîðà ïîä³¿( %lu ) çà äæåðåëîì( %s ) íå çíàéäåíî. Ëîêàëüíèé êîìï'þòåð ìîæå íå ìàòè íåîáõ³äíî¿ ³íôîðìàö³¿ â ðåºñòð³ ÷è DLL ôàéë³â ïîâ³äîìëåíü äëÿ â³äîáðàæåííÿ ïîâ³äîìëåíü, ùî íàäõîäÿòü â³ä â³ääàëåíîãî êîìï'þòåðà." + IDS_EVENTLOG_ERROR_TYPE "Ïîìèëêà" + IDS_EVENTLOG_WARNING_TYPE "Ïîïåðåäæåííÿ" + IDS_EVENTLOG_INFORMATION_TYPE "Ïîâ³äîìëåííÿ" + IDS_EVENTLOG_AUDIT_SUCCESS "Àóäèò óñï³õ³â" + IDS_EVENTLOG_AUDIT_FAILURE "Àóäèò â³äìîâ" + IDS_EVENTLOG_SUCCESS "Óñï³õ" + IDS_EVENTLOG_UNKNOWN_TYPE "Íåâ³äîìà ïîä³ÿ" END STRINGTABLE Modified: trunk/reactos/base/applications/mscutils/eventvwr/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/eventvwr/resource.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/eventvwr/resource.h [iso-8859-1] Sun Apr 17 11:58:26 2011 @@ -2,22 +2,13 @@ #define IDNEXT 3 #define IDD_EVENTVWR_DIALOG 102 #define IDD_PROGRESSBOX 150 -#define IDS_APP_TITLE 103 #define IDD_ABOUTBOX 103 #define IDM_ABOUT 104 #define IDM_EXIT 105 #define IDI_EVENTVWR 107 #define IDI_SMALL 108 #define IDC_EVENTVWR 109 -#define IDC_EVENTSTRINGIDNOTFOUND 209 #define IDC_PROCESSPROGRESS 250 -#define IDC_EVENTLOG_ERROR_TYPE 251 -#define IDC_EVENTLOG_WARNING_TYPE 252 -#define IDC_EVENTLOG_INFORMATION_TYPE 253 -#define IDC_EVENTLOG_AUDIT_SUCCESS 254 -#define IDC_EVENTLOG_AUDIT_FAILURE 255 -#define IDC_EVENTLOG_SUCCESS 256 -#define IDC_EVENTLOG_UNKNOWN_TYPE 257 #define IDR_MAINFRAME 128 #define IDI_WARNINGICON 129 #define IDI_INFORMATIONICON 130 @@ -51,6 +42,18 @@ #define IDC_STATIC -1 +/* String IDs */ +#define IDS_APP_TITLE 103 +#define IDS_EVENTSTRINGIDNOTFOUND 209 +#define IDS_EVENTLOG_ERROR_TYPE 251 +#define IDS_EVENTLOG_WARNING_TYPE 252 +#define IDS_EVENTLOG_INFORMATION_TYPE 253 +#define IDS_EVENTLOG_AUDIT_SUCCESS 254 +#define IDS_EVENTLOG_AUDIT_FAILURE 255 +#define IDS_EVENTLOG_SUCCESS 256 +#define IDS_EVENTLOG_UNKNOWN_TYPE 257 + + #define IDS_COLUMNTYPE 300 #define IDS_COLUMNDATE 301 #define IDS_COLUMNTIME 302

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