Ros-diffs January 2011

ros-diffs@reactos.org

20 participants
336 discussions

[mjmartin] 50304: [usb/usbehci]: - EhciDefferedRoutine: Only free Mdl if one was created when the request was added to the queue. - Dont assume that three transfer descriptors need to be freed, use...

by mjmartin＠svn.reactos.org

Author: mjmartin Date: Thu Jan 6 18:45:18 2011 New Revision: 50304 URL: http://svn.reactos.org/svn/reactos?rev=50304&view=rev Log: [usb/usbehci]: - EhciDefferedRoutine: Only free Mdl if one was created when the request was added to the queue. - Dont assume that three transfer descriptors need to be freed, use a while moving to each linked and free instead. - Yabba Dabba Doo added to increase size of message. :) Modified: trunk/reactos/drivers/usb/usbehci/fdo.c Modified: trunk/reactos/drivers/usb/usbehci/fdo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbehci/fdo.c?… ============================================================================== --- trunk/reactos/drivers/usb/usbehci/fdo.c [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbehci/fdo.c [iso-8859-1] Thu Jan 6 18:45:18 2011 @@ -46,12 +46,12 @@ DPRINT("Asyn Complete!\n"); ULONG CurrentAddr, OffSet; PQUEUE_HEAD CompletedQH, NextQH; - PQUEUE_TRANSFER_DESCRIPTOR CompletedTD; + PQUEUE_TRANSFER_DESCRIPTOR CompletedTD, NextTD; - /* AsyncListAddr Register will have the next QueueHead to execute */ + /* AsyncListAddr Register will have the next QueueHead to execute */ CurrentAddr = GetAsyncListQueueRegister(hcd); - /* Calculate the VA for the next QueueHead */ + /* Calculate the VA for the next QueueHead */ OffSet = CurrentAddr - (ULONG)FdoDeviceExtension->hcd.CommonBufferPA.LowPart; NextQH = (PQUEUE_HEAD)((ULONG)FdoDeviceExtension->hcd.CommonBufferVA + OffSet); @@ -62,16 +62,15 @@ //DumpQueueHead(CompletedQH); - /* Free memory for the Descriptors */ + /* Free memory for the Descriptors */ CompletedTD = CompletedQH->TransferDescriptor; - //DumpTransferDescriptor(CompletedTD); - FreeDescriptor(CompletedTD); - CompletedTD = CompletedTD->NextDescriptor; - //DumpTransferDescriptor(CompletedTD); - FreeDescriptor(CompletedTD); - CompletedTD = CompletedTD->NextDescriptor; - //DumpTransferDescriptor(CompletedTD); - FreeDescriptor(CompletedTD); + NextTD = CompletedTD; + while (NextTD) + { + CompletedTD = NextTD; + NextTD = NextTD->NextDescriptor; + FreeDescriptor(CompletedTD); + } /* If the Event is set then release waiter */ if (CompletedQH->Event) @@ -79,27 +78,25 @@ KeSetEvent(CompletedQH->Event, IO_NO_INCREMENT, FALSE); } - /* Free the Mdl */ - ASSERT(CompletedQH->MdlToFree); - IoFreeMdl(CompletedQH->MdlToFree); + /* Free the Mdl if there was one */ + if(CompletedQH->MdlToFree) + IoFreeMdl(CompletedQH->MdlToFree); /* Is there an IRP that needs to be completed */ if (CompletedQH->IrpToComplete) { - PIRP Irp; - + PIRP Irp; + PIO_STACK_LOCATION Stack; + PURB Urb; + Irp = CompletedQH->IrpToComplete; + Stack = IoGetCurrentIrpStackLocation(Irp); + ASSERT(Stack); + Urb = (PURB) Stack->Parameters.Others.Argument1; /* Check for error */ if (CStatus & EHCI_ERROR_INT) { - PIO_STACK_LOCATION Stack; - PURB Urb; - - Stack = IoGetCurrentIrpStackLocation(Irp); - ASSERT(Stack); - Urb = (PURB) Stack->Parameters.Others.Argument1; - ASSERT(FALSE); /* Haled bit should be set */ if (CompletedQH->Token.Bits.Halted) {

13 years, 8 months

[mjmartin] 50303: [usb/usbehci]: - Implement URB_FUNCTION_SELECT_INTERFACE. - Add missing IoMarkIrpPending before calling SubmitControlRequest. - Now use BuildSetupPacketFromURB for creating the Ct...

by mjmartin＠svn.reactos.org

Author: mjmartin Date: Thu Jan 6 18:29:52 2011 New Revision: 50303 URL: http://svn.reactos.org/svn/reactos?rev=50303&view=rev Log: [usb/usbehci]: - Implement URB_FUNCTION_SELECT_INTERFACE. - Add missing IoMarkIrpPending before calling SubmitControlRequest. - Now use BuildSetupPacketFromURB for creating the CtrlSetup data structure. - When selecting configuration, make the ConfigurationHandle from the related UsbDevice instead of always the RootHub device. - Fix typo that caused all pipes to be marked as interrupt type. - Change CompletePendingURBRequest to only complete one SCE request Irp. Modified: trunk/reactos/drivers/usb/usbehci/irp.c Modified: trunk/reactos/drivers/usb/usbehci/irp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbehci/irp.c?… ============================================================================== --- trunk/reactos/drivers/usb/usbehci/irp.c [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbehci/irp.c [iso-8859-1] Thu Jan 6 18:29:52 2011 @@ -139,20 +139,21 @@ } } else - DPRINT("Interrupt Transfer not for hub\n"); + DPRINT1("Interrupt Transfer not for hub\n"); break; } case URB_FUNCTION_GET_STATUS_FROM_DEVICE: { DPRINT1("URB_FUNCTION_GET_STATUS_FROM_DEVICE\n"); - if (Urb->UrbControlGetStatusRequest.Index == 0) + /* If for the hub device */ + if ((Urb->UrbControlGetStatusRequest.Index == 0) && (UsbDevice == PdoDeviceExtension->UsbDevices[0])) { ASSERT(Urb->UrbBulkOrInterruptTransfer.TransferBuffer != NULL); - *(PUSHORT)Urb->UrbControlGetStatusRequest.TransferBuffer = USB_PORT_STATUS_CONNECT | USB_PORT_STATUS_ENABLE; + *(PUSHORT)Urb->UrbControlGetStatusRequest.TransferBuffer = USB_PORT_STATUS_CONNECT /*| USB_PORT_STATUS_ENABLE*/; } else { - DPRINT1("Uknown identifier\n"); + DPRINT1("UsbDeviceHandle %x, Index %x not implemented yet\n", UsbDevice, Urb->UrbControlGetStatusRequest.Index); Urb->UrbHeader.Status = USBD_STATUS_INVALID_URB_FUNCTION; Status = STATUS_UNSUCCESSFUL; } @@ -189,15 +190,14 @@ ASSERT(Urb->UrbControlDescriptorRequest.TransferBuffer != NULL); - DPRINT("Calling BuildSetUpPacketFromUrb\n"); BuildSetupPacketFromURB(&FdoDeviceExtension->hcd, Urb, &CtrlSetup); - DPRINT("SubmitControlTransfer\n"); + IoMarkIrpPending(Irp); + Status = STATUS_PENDING; SubmitControlTransfer(&FdoDeviceExtension->hcd, &CtrlSetup, Urb->UrbControlDescriptorRequest.TransferBuffer, Urb->UrbControlDescriptorRequest.TransferBufferLength, Irp); - break; } case USB_CONFIGURATION_DESCRIPTOR_TYPE: @@ -267,24 +267,15 @@ if (Urb->UrbControlDescriptorRequest.Index == 0) DPRINT1("Requesting LANGID's\n"); - CtrlSetup.bmRequestType._BM.Recipient = BMREQUEST_TO_DEVICE; - CtrlSetup.bmRequestType._BM.Type = BMREQUEST_STANDARD; - CtrlSetup.bmRequestType._BM.Reserved = 0; - CtrlSetup.bmRequestType._BM.Dir = BMREQUEST_DEVICE_TO_HOST; - CtrlSetup.bRequest = USB_REQUEST_GET_DESCRIPTOR; - CtrlSetup.wValue.LowByte = Urb->UrbControlDescriptorRequest.Index; - CtrlSetup.wValue.HiByte = Urb->UrbControlDescriptorRequest.DescriptorType; - CtrlSetup.wIndex.W = Urb->UrbControlDescriptorRequest.LanguageId; - CtrlSetup.wLength = Urb->UrbControlDescriptorRequest.TransferBufferLength; + BuildSetupPacketFromURB(&FdoDeviceExtension->hcd, Urb, &CtrlSetup); + IoMarkIrpPending(Irp); + Status = STATUS_PENDING; SubmitControlTransfer(&FdoDeviceExtension->hcd, &CtrlSetup, Urb->UrbControlDescriptorRequest.TransferBuffer, Urb->UrbControlDescriptorRequest.TransferBufferLength, Irp); - - IoMarkIrpPending(Irp); - Status = STATUS_PENDING; break; } default: @@ -301,11 +292,11 @@ DPRINT1("Selecting Configuration\n"); DPRINT1("ConfigurationHandle %x\n",Urb->UrbSelectConfiguration.ConfigurationHandle); - if (Urb->UrbSelectConfiguration.ConfigurationDescriptor) { - Urb->UrbSelectConfiguration.ConfigurationHandle = (PVOID)&PdoDeviceExtension->UsbDevices[0]->ActiveConfig->ConfigurationDescriptor; - DPRINT("ConfigHandle %x\n", Urb->UrbSelectConfiguration.ConfigurationHandle); + Urb->UrbSelectConfiguration.ConfigurationHandle = &UsbDevice->ActiveConfig->ConfigurationDescriptor; + DPRINT1("ConfigHandle %x\n", Urb->UrbSelectConfiguration.ConfigurationHandle); + ASSERT(FALSE); InterfaceInfo = &Urb->UrbSelectConfiguration.Interface; DPRINT1("Length %x\n", InterfaceInfo->Length); @@ -324,7 +315,7 @@ InterfaceInfo->Pipes[pCount].MaximumPacketSize = UsbDevice->ActiveInterface->EndPoints[pCount]->EndPointDescriptor.wMaxPacketSize; InterfaceInfo->Pipes[pCount].EndpointAddress = UsbDevice->ActiveInterface->EndPoints[pCount]->EndPointDescriptor.bEndpointAddress; InterfaceInfo->Pipes[pCount].Interval = UsbDevice->ActiveInterface->EndPoints[pCount]->EndPointDescriptor.bInterval; - InterfaceInfo->Pipes[pCount].PipeType = UsbdPipeTypeInterrupt; + InterfaceInfo->Pipes[pCount].PipeType = UsbDevice->ActiveInterface->EndPoints[pCount]->EndPointDescriptor.bmAttributes; InterfaceInfo->Pipes[pCount].PipeHandle = (PVOID)&UsbDevice->ActiveInterface->EndPoints[pCount]->EndPointDescriptor; if (InterfaceInfo->Pipes[pCount].MaximumTransferSize == 0) InterfaceInfo->Pipes[pCount].MaximumTransferSize = 4096; @@ -337,7 +328,37 @@ else { /* FIXME: Set device to unconfigured state */ - } + DPRINT1("Setting device to unconfigured state not implemented!\n"); + } + break; + } + case URB_FUNCTION_SELECT_INTERFACE: + { + USB_DEFAULT_PIPE_SETUP_PACKET CtrlSetup; + PUSBD_INTERFACE_INFORMATION InterfaceInfo; + int i; + + DPRINT1("Select Interface!\n"); + DPRINT1("Config Handle %x\n", Urb->UrbSelectInterface.ConfigurationHandle); + + InterfaceInfo = &Urb->UrbSelectInterface.Interface; + DPRINT1("InterfaceNumber %x\n", InterfaceInfo->InterfaceNumber); + DPRINT1("AlternateSetting %x\n", InterfaceInfo->AlternateSetting); + DPRINT1("NumPipes %x\n", InterfaceInfo->NumberOfPipes); + for (i=0;i<InterfaceInfo->NumberOfPipes;i++) + { + InterfaceInfo->Pipes[i].PipeHandle = (PVOID)&UsbDevice->ActiveInterface->EndPoints[i]->EndPointDescriptor; + } + + BuildSetupPacketFromURB(&FdoDeviceExtension->hcd, Urb, &CtrlSetup); + IoMarkIrpPending(Irp); + Status = STATUS_PENDING; + + SubmitControlTransfer(&FdoDeviceExtension->hcd, + &CtrlSetup, + NULL, + 0, + Irp); break; } case URB_FUNCTION_CLASS_DEVICE: @@ -456,7 +477,7 @@ { case USB_REQUEST_GET_STATUS: { - DPRINT1("USB_REQUEST_GET_STATUS Port %d\n", Urb->UrbControlVendorClassRequest.Index); + DPRINT("USB_REQUEST_GET_STATUS Port %d\n", Urb->UrbControlVendorClassRequest.Index); ASSERT(Urb->UrbControlVendorClassRequest.TransferBuffer != 0); DPRINT("PortStatus %x\n", PdoDeviceExtension->Ports[Urb->UrbControlVendorClassRequest.Index-1].PortStatus); @@ -467,23 +488,21 @@ } case USB_REQUEST_CLEAR_FEATURE: { - DPRINT1("USB_REQUEST_CLEAR_FEATURE Port %d, value %x\n", Urb->UrbControlVendorClassRequest.Index, - Urb->UrbControlVendorClassRequest.Value); switch (Urb->UrbControlVendorClassRequest.Value) { case C_PORT_CONNECTION: - DPRINT1("C_PORT_CONNECTION\n"); + DPRINT("C_PORT_CONNECTION\n"); PdoDeviceExtension->Ports[Urb->UrbControlVendorClassRequest.Index-1].PortChange &= ~USB_PORT_STATUS_CONNECT; break; case C_PORT_RESET: - DPRINT1("C_PORT_RESET\n"); + DPRINT("C_PORT_RESET\n"); PdoDeviceExtension->Ports[Urb->UrbControlVendorClassRequest.Index-1].PortChange &= ~USB_PORT_STATUS_RESET; + PdoDeviceExtension->Ports[Urb->UrbControlVendorClassRequest.Index-1].PortStatus |= USB_PORT_STATUS_ENABLE; break; default: - DPRINT1("Unknown Value for Clear Feature %x \n", Urb->UrbControlVendorClassRequest.Value); - break; - } - CompletePendingURBRequest(PdoDeviceExtension); + DPRINT("Unknown Value for Clear Feature %x \n", Urb->UrbControlVendorClassRequest.Value); + break; + } break; } case USB_REQUEST_SET_FEATURE: @@ -495,18 +514,10 @@ { case PORT_RESET: { - //PWORKITEMDATA WorkItemData; - - PdoDeviceExtension->Ports[Urb->UrbControlVendorClassRequest.Index-1].PortStatus |= USB_PORT_STATUS_ENABLE; + DPRINT("Port Reset %d\n", Urb->UrbControlVendorClassRequest.Index-1); PdoDeviceExtension->Ports[Urb->UrbControlVendorClassRequest.Index-1].PortChange |= USB_PORT_STATUS_RESET; - + PdoDeviceExtension->Ports[Urb->UrbControlVendorClassRequest.Index-1].PortStatus &= ~USB_PORT_STATUS_ENABLE; ResetPort(&FdoDeviceExtension->hcd, Urb->UrbControlVendorClassRequest.Index-1); - //WorkItemData = ExAllocatePool(NonPagedPool, sizeof(WORKITEMDATA)); - //WorkItemData->Context = PdoDeviceExtension; - //ExInitializeWorkItem(&WorkItemData->WorkItem, (PWORKER_THREAD_ROUTINE)WorkerThread, (PVOID) WorkItemData) - //ExQueueWorkItem(&WorkItemData->WorkItem, DelayedWorkQueue); - //IoMarkIrpPending(Irp); - //Status = STATUS_PENDING; break; } case PORT_ENABLE: @@ -525,7 +536,10 @@ break; } } - CompletePendingURBRequest(PdoDeviceExtension); + + if (!(PdoDeviceExtension->Ports[Urb->UrbControlVendorClassRequest.Index-1].PortStatus & 0x8000)) + CompletePendingURBRequest(PdoDeviceExtension); + break; } case USB_REQUEST_SET_ADDRESS: @@ -577,6 +591,23 @@ } break; } + case URB_FUNCTION_CONTROL_TRANSFER: + { + DPRINT1("URB_FUNCTION_CONTROL_TRANSFER\n"); + DPRINT1("PipeHandle %x\n", Urb->UrbControlTransfer.PipeHandle); + DPRINT1("TransferFlags %x\n", Urb->UrbControlTransfer.TransferFlags); + DPRINT1("TransferLength %x\n", Urb->UrbControlTransfer.TransferBufferLength); + DPRINT1("TransferBuffer %x\n", Urb->UrbControlTransfer.TransferBuffer); + DPRINT1("TransferMDL %x\n", Urb->UrbControlTransfer.TransferBufferMDL); + DPRINT1("SetupPacket %x\n", Urb->UrbControlTransfer.SetupPacket); + ASSERT(FALSE); + break; + } + case URB_FUNCTION_CLASS_INTERFACE: + { + DPRINT1("URB_FUNCTION_CLASS_INTERFACE\n"); + break; + } default: { DPRINT1("Unhandled URB %x\n", Urb->UrbHeader.Function); @@ -586,14 +617,6 @@ Irp->IoStatus.Status = Status; Irp->IoStatus.Information = Information; - - if (Urb->UrbHeader.Status == USBD_STATUS_SUCCESS) - { - /* Fake a successful Control Transfer */ - Urb->UrbHeader.Function = 0x08; - Urb->UrbHeader.UsbdFlags = 0; - } - return Status; } @@ -606,23 +629,25 @@ KeAcquireSpinLock(&DeviceExtension->IrpQueueLock, &oldIrql); - while (!IsListEmpty(&DeviceExtension->IrpQueue)) + if (IsListEmpty(&DeviceExtension->IrpQueue)) { - NextIrp = RemoveHeadList(&DeviceExtension->IrpQueue); - Irp = CONTAINING_RECORD(NextIrp, IRP, Tail.Overlay.ListEntry); - - if (!Irp) - { - DPRINT1("No IRP\n"); - break; - } - IoSetCancelRoutine(Irp, NULL); + DPRINT1("There should have been one SCE request pending\n"); KeReleaseSpinLock(&DeviceExtension->IrpQueueLock, oldIrql); - HandleUrbRequest(DeviceExtension, Irp); - IoCompleteRequest(Irp, IO_NO_INCREMENT); - KeAcquireSpinLock(&DeviceExtension->IrpQueueLock, &oldIrql); + return; } - + NextIrp = RemoveHeadList(&DeviceExtension->IrpQueue); + Irp = CONTAINING_RECORD(NextIrp, IRP, Tail.Overlay.ListEntry); + + if (!Irp) + { + DPRINT1("No Irp\n"); + return; + } + + IoSetCancelRoutine(Irp, NULL); KeReleaseSpinLock(&DeviceExtension->IrpQueueLock, oldIrql); + + HandleUrbRequest(DeviceExtension, Irp); + IoCompleteRequest(Irp, IO_NO_INCREMENT); }

13 years, 8 months

[mjmartin] 50302: [usb/usbehci]: - Fix bug in InitializeUsbDevice that caused endpoints to be duplicated in internal config structure. - Fix implementation of UsbRemoveDevice. - Implement SetDevice...

by mjmartin＠svn.reactos.org

Author: mjmartin Date: Thu Jan 6 17:46:59 2011 New Revision: 50302 URL: http://svn.reactos.org/svn/reactos?rev=50302&view=rev Log: [usb/usbehci]: - Fix bug in InitializeUsbDevice that caused endpoints to be duplicated in internal config structure. - Fix implementation of UsbRemoveDevice. - Implement SetDeviceHandleData and RestoreUsbDevice. - SubmitControlTransfer: Not all control request need data, in which case dont create a MDL and a PID_CODE_IN_TOKEN TD Descriptor. - Fix bug in ReleaseMemory that caused memory not to be marked as free. - Fix incorrect memory header size that resulted in memory corruption. Modified: trunk/reactos/drivers/usb/usbehci/physmem.c trunk/reactos/drivers/usb/usbehci/physmem.h trunk/reactos/drivers/usb/usbehci/transfer.c trunk/reactos/drivers/usb/usbehci/usbehci.h trunk/reactos/drivers/usb/usbehci/usbiffn.c Modified: trunk/reactos/drivers/usb/usbehci/physmem.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbehci/physme… ============================================================================== --- trunk/reactos/drivers/usb/usbehci/physmem.c [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbehci/physmem.c [iso-8859-1] Thu Jan 6 17:46:59 2011 @@ -31,7 +31,6 @@ Size = ((Size + SMALL_ALLOCATION_SIZE - 1) / SMALL_ALLOCATION_SIZE) * SMALL_ALLOCATION_SIZE; BlocksNeeded = Size / SMALL_ALLOCATION_SIZE; - do { if (MemoryPage->IsFull) @@ -52,6 +51,11 @@ freeCount = 0; } + if ((i-freeCount+1 + BlocksNeeded) > sizeof(MemoryPage->Entry)) + { + freeCount = 0; + continue; + } if (freeCount == BlocksNeeded) { for (j = 0; j < freeCount; j++) @@ -80,13 +84,13 @@ ReleaseMemory(ULONG Address) { PMEM_HEADER MemoryPage; - ULONG Index, i; + ULONG Index, i, BlockSize; MemoryPage = (PMEM_HEADER)(Address & ~(PAGE_SIZE - 1)); Index = (Address - ((ULONG)MemoryPage + sizeof(MEM_HEADER))) / SMALL_ALLOCATION_SIZE; - - for (i = 0; i < MemoryPage->Entry[Index].Blocks; i++) + BlockSize = MemoryPage->Entry[Index].Blocks; + for (i = 0; i < BlockSize; i++) { MemoryPage->Entry[Index + i].InUse = 0; MemoryPage->Entry[Index + i].Blocks = 0; Modified: trunk/reactos/drivers/usb/usbehci/physmem.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbehci/physme… ============================================================================== --- trunk/reactos/drivers/usb/usbehci/physmem.h [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbehci/physmem.h [iso-8859-1] Thu Jan 6 17:46:59 2011 @@ -11,7 +11,8 @@ typedef struct _MEM_HEADER { UCHAR IsFull; - MEM_ENTRY Entry[127]; + MEM_ENTRY Entry[124]; + UCHAR Reserved[3]; } MEM_HEADER, *PMEM_HEADER; VOID Modified: trunk/reactos/drivers/usb/usbehci/transfer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbehci/transf… ============================================================================== --- trunk/reactos/drivers/usb/usbehci/transfer.c [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbehci/transfer.c [iso-8859-1] Thu Jan 6 17:46:59 2011 @@ -77,6 +77,9 @@ /* SET CONFIG */ case URB_FUNCTION_SELECT_CONFIGURATION: CtrlSetup->bRequest = USB_REQUEST_SET_CONFIGURATION; + CtrlSetup->wValue.W = Urb->UrbSelectConfiguration.ConfigurationDescriptor->bConfigurationValue; + CtrlSetup->wIndex.W = 0; + CtrlSetup->wLength = 0; CtrlSetup->bmRequestType.B = 0x00; break; @@ -111,7 +114,11 @@ /* SET INTERFACE*/ case URB_FUNCTION_SELECT_INTERFACE: - DPRINT1("Not implemented\n"); + CtrlSetup->bRequest = USB_REQUEST_SET_INTERFACE; + CtrlSetup->wValue.W = Urb->UrbSelectInterface.Interface.AlternateSetting; + CtrlSetup->wIndex.W = Urb->UrbSelectInterface.Interface.InterfaceNumber; + CtrlSetup->wLength = 0; + CtrlSetup->bmRequestType.B = 0x01; break; /* SYNC FRAME */ @@ -150,18 +157,21 @@ KeInitializeEvent(Event, NotificationEvent, FALSE); } - /* Allocate Mdl for Buffer */ - pMdl = IoAllocateMdl(TransferBuffer, - TransferBufferLength, - FALSE, - FALSE, - NULL); - - /* Lock Physical Pages */ - MmBuildMdlForNonPagedPool(pMdl); - //MmProbeAndLockPages(pMdl, KernelMode, IoReadAccess); - - MdlPhysicalAddr = MmGetPhysicalAddress((PVOID)TransferBuffer).LowPart; + if (TransferBuffer) + { + /* Allocate Mdl for Buffer */ + pMdl = IoAllocateMdl(TransferBuffer, + TransferBufferLength, + FALSE, + FALSE, + NULL); + + /* Lock Physical Pages */ + MmBuildMdlForNonPagedPool(pMdl); + //MmProbeAndLockPages(pMdl, KernelMode, IoReadAccess); + + MdlPhysicalAddr = MmGetPhysicalAddress((PVOID)TransferBuffer).LowPart; + } QueueHead = CreateQueueHead(hcd); @@ -175,9 +185,12 @@ /* Save the first descriptor */ QueueHead->TransferDescriptor = Descriptor[0]; - Descriptor[1] = CreateDescriptor(hcd, - PID_CODE_IN_TOKEN, - TransferBufferLength); + if (TransferBuffer) + { + Descriptor[1] = CreateDescriptor(hcd, + PID_CODE_IN_TOKEN, + TransferBufferLength); + } Descriptor[2] = CreateDescriptor(hcd, PID_CODE_OUT_TOKEN, @@ -186,17 +199,34 @@ Descriptor[1]->Token.Bits.InterruptOnComplete = FALSE; /* Link the descriptors */ - Descriptor[0]->NextDescriptor = Descriptor[1]; - Descriptor[1]->NextDescriptor = Descriptor[2]; - Descriptor[1]->PreviousDescriptor = Descriptor[0]; - Descriptor[2]->PreviousDescriptor = Descriptor[1]; - + + if (TransferBuffer) + { + Descriptor[0]->NextDescriptor = Descriptor[1]; + Descriptor[1]->NextDescriptor = Descriptor[2]; + Descriptor[1]->PreviousDescriptor = Descriptor[0]; + Descriptor[2]->PreviousDescriptor = Descriptor[1]; + } + else + { + Descriptor[0]->NextDescriptor = Descriptor[2]; + Descriptor[2]->PreviousDescriptor = Descriptor[0]; + } + /* Assign the descritors buffers */ Descriptor[0]->BufferPointer[0] = (ULONG)CtrlPhysicalPA; - Descriptor[1]->BufferPointer[0] = MdlPhysicalAddr; - - Descriptor[0]->NextPointer = Descriptor[1]->PhysicalAddr; - Descriptor[1]->NextPointer = Descriptor[2]->PhysicalAddr; + + if (TransferBuffer) + { + Descriptor[1]->BufferPointer[0] = MdlPhysicalAddr; + Descriptor[0]->NextPointer = Descriptor[1]->PhysicalAddr; + Descriptor[1]->NextPointer = Descriptor[2]->PhysicalAddr; + } + else + { + Descriptor[0]->NextPointer = Descriptor[2]->PhysicalAddr; + } + QueueHead->NextPointer = Descriptor[0]->PhysicalAddr; QueueHead->IrpToComplete = IrpToComplete; Modified: trunk/reactos/drivers/usb/usbehci/usbehci.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbehci/usbehc… ============================================================================== --- trunk/reactos/drivers/usb/usbehci/usbehci.h [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbehci/usbehci.h [iso-8859-1] Thu Jan 6 17:46:59 2011 @@ -4,7 +4,7 @@ #include <ntifs.h> #include <ntddk.h> #include <stdio.h> -#define NDEBUG +#define NDEBUG #include <debug.h> #include <hubbusif.h> #include <usbioctl.h> @@ -12,15 +12,16 @@ #define USB_POOL_TAG (ULONG)'ebsu' -#define DEVICEINTIALIZED 0x01 -#define DEVICESTARTED 0x02 -#define DEVICEBUSY 0x04 -#define DEVICESTOPPED 0x08 -#define DEVICESTALLED 0x10 - - -#define MAX_USB_DEVICES 127 -#define EHCI_MAX_SIZE_TRANSFER 0x100000 +#define DEVICEINTIALIZED 0x01 +#define DEVICESTARTED 0x02 +#define DEVICEBUSY 0x04 +#define DEVICESTOPPED 0x08 +#define DEVICESTALLED 0x10 +#define DEVICEREMOVED 0x20 + + +#define MAX_USB_DEVICES 127 +#define EHCI_MAX_SIZE_TRANSFER 0x100000 #define C_HUB_LOCAL_POWER 0 #define C_HUB_OVER_CURRENT 1 @@ -71,6 +72,8 @@ BOOLEAN IsHub; USB_DEVICE_SPEED DeviceSpeed; USB_DEVICE_TYPE DeviceType; + ULONG DeviceState; + PDEVICE_OBJECT UsbDevicePdo; USB_DEVICE_DESCRIPTOR DeviceDescriptor; UNICODE_STRING LanguageIDs; UNICODE_STRING iManufacturer; Modified: trunk/reactos/drivers/usb/usbehci/usbiffn.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbehci/usbiff… ============================================================================== --- trunk/reactos/drivers/usb/usbehci/usbiffn.c [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbehci/usbiffn.c [iso-8859-1] Thu Jan 6 17:46:59 2011 @@ -132,21 +132,21 @@ CtrlSetup.wIndex.W = 0; CtrlSetup.wLength = sizeof(USB_DEVICE_DESCRIPTOR); CtrlSetup.bmRequestType.B = 0x80; - + SubmitControlTransfer(&FdoDeviceExtension->hcd, &CtrlSetup, &UsbDevice->DeviceDescriptor, sizeof(USB_DEVICE_DESCRIPTOR), NULL); - + //DumpDeviceDescriptor(&UsbDevice->DeviceDescriptor); - + if (UsbDevice->DeviceDescriptor.bLength != 0x12) { DPRINT1("Failed to get Device Descriptor from device connected on port %d\n", UsbDevice->Port); return STATUS_DEVICE_DATA_ERROR; } - + if (UsbDevice->DeviceDescriptor.bNumConfigurations == 0) { DPRINT1("Device on port %d has no configurations!\n", UsbDevice->Port); @@ -171,7 +171,7 @@ } Ptr = Buffer; - + for (i = 0; i < UsbDevice->DeviceDescriptor.bNumConfigurations; i++) { /* Get the Device Configuration Descriptor */ @@ -184,7 +184,7 @@ CtrlSetup.wValue.HiByte = USB_CONFIGURATION_DESCRIPTOR_TYPE; CtrlSetup.wIndex.W = 0; CtrlSetup.wLength = PAGE_SIZE; - + SubmitControlTransfer(&FdoDeviceExtension->hcd, &CtrlSetup, Buffer, @@ -223,14 +223,13 @@ UsbDevice->Configs[i]->Interfaces[j]->EndPoints[k] = ExAllocatePoolWithTag(NonPagedPool, sizeof(USB_ENDPOINT), USB_POOL_TAG); RtlCopyMemory(&UsbDevice->Configs[i]->Interfaces[j]->EndPoints[k]->EndPointDescriptor, EndpointDesc, sizeof(USB_ENDPOINT_DESCRIPTOR)); + Ptr += sizeof(USB_ENDPOINT_DESCRIPTOR); } - } } UsbDevice->ActiveConfig = UsbDevice->Configs[0]; UsbDevice->ActiveInterface = UsbDevice->Configs[0]->Interfaces[0]; - return STATUS_SUCCESS; /* Set the device address */ @@ -244,13 +243,14 @@ CtrlSetup.wLength = 0; DPRINT1("Setting Address to %x\n", UsbDevice->Address); - + SubmitControlTransfer(&FdoDeviceExtension->hcd, &CtrlSetup, NULL, 0, NULL); + PdoDeviceExtension->UsbDevices[i]->DeviceState = DEVICEINTIALIZED; return STATUS_SUCCESS; } @@ -334,15 +334,12 @@ } ExFreePool(UsbDevice); - - /* DeConfig Device */ break; - case USBD_KEEP_DEVICE_DATA: - DPRINT1("USBD_KEEP_DEVICE_DATA Not implemented!\n"); - break; - case USBD_MARK_DEVICE_BUSY: - DPRINT1("USBD_MARK_DEVICE_BUSY Not implemented!\n"); + UsbDevice->DeviceState |= DEVICEBUSY; + /* Fall through */ + case USBD_KEEP_DEVICE_DATA: + UsbDevice->DeviceState |= DEVICEREMOVED; break; default: DPRINT1("Unknown Remove Flags %x\n", Flags); @@ -354,8 +351,60 @@ USB_BUSIFFN RestoreUsbDevice(PVOID BusContext, PUSB_DEVICE_HANDLE OldDeviceHandle, PUSB_DEVICE_HANDLE NewDeviceHandle) { - DPRINT1("Ehci: RestoreUsbDevice not implemented! %x, %x, %x\n", BusContext, OldDeviceHandle, NewDeviceHandle); - return STATUS_NOT_SUPPORTED; + PUSB_DEVICE OldUsbDevice; + PUSB_DEVICE NewUsbDevice; + + DPRINT1("Ehci: RestoreUsbDevice %x, %x, %x\n", BusContext, OldDeviceHandle, NewDeviceHandle); + + OldUsbDevice = DeviceHandleToUsbDevice(BusContext, OldDeviceHandle); + NewUsbDevice = DeviceHandleToUsbDevice(BusContext, NewDeviceHandle); + + if (!OldUsbDevice) + { + DPRINT1("OldDeviceHandle is invalid\n"); + return STATUS_DEVICE_NOT_CONNECTED; + } + + if (!(OldUsbDevice->DeviceState & DEVICEREMOVED)) + { + DPRINT1("UsbDevice is not marked as Removed!\n"); + return STATUS_UNSUCCESSFUL; + } + + if (!NewUsbDevice) + { + DPRINT1("NewDeviceHandle is invalid\n"); + return STATUS_DEVICE_NOT_CONNECTED; + } + + if ((OldUsbDevice->DeviceDescriptor.idVendor == NewUsbDevice->DeviceDescriptor.idVendor) && + (OldUsbDevice->DeviceDescriptor.idProduct == NewUsbDevice->DeviceDescriptor.idProduct)) + { + PUSB_CONFIGURATION ConfigToDelete; + int i; + + NewUsbDevice->DeviceState &= ~DEVICEBUSY; + NewUsbDevice->DeviceState &= ~DEVICEREMOVED; + + NewUsbDevice->ActiveConfig = OldUsbDevice->ActiveConfig; + NewUsbDevice->ActiveInterface = OldUsbDevice->ActiveInterface; + + for (i = 0; i < NewUsbDevice->DeviceDescriptor.bNumConfigurations; i++) + { + ConfigToDelete = NewUsbDevice->Configs[i]; + ASSERT(OldUsbDevice->Configs[i]); + NewUsbDevice->Configs[i] = OldUsbDevice->Configs[i]; + OldUsbDevice->Configs[i] = ConfigToDelete; + } + + RemoveUsbDevice(BusContext, OldDeviceHandle, 0); + return STATUS_SUCCESS; + } + else + { + DPRINT1("VendorId or ProductId did not match!\n"); + return STATUS_DEVICE_NOT_CONNECTED; + } } NTSTATUS @@ -407,13 +456,24 @@ return STATUS_INVALID_PARAMETER; } - DeviceInfo->PortNumber = UsbDevice->Port; - DeviceInfo->HubAddress = 1; + DeviceInfo->HubAddress = 0; DeviceInfo->DeviceAddress = UsbDevice->Address; DeviceInfo->DeviceSpeed = UsbDevice->DeviceSpeed; DeviceInfo->DeviceType = UsbDevice->DeviceType; - DeviceInfo->CurrentConfigurationValue = UsbDevice->ActiveConfig->ConfigurationDescriptor.bConfigurationValue; - DeviceInfo->NumberOfOpenPipes = UsbDevice->ActiveInterface->InterfaceDescriptor.bNumEndpoints; + + if (!UsbDevice->DeviceState) + { + DeviceInfo->CurrentConfigurationValue = 0; + DeviceInfo->NumberOfOpenPipes = 0; + DeviceInfo->PortNumber = 0; + } + else + { + DeviceInfo->CurrentConfigurationValue = UsbDevice->ActiveConfig->ConfigurationDescriptor.bConfigurationValue; + /* FIXME: Use correct number of open pipes instead of all available */ + DeviceInfo->NumberOfOpenPipes = UsbDevice->ActiveInterface->InterfaceDescriptor.bNumEndpoints; + DeviceInfo->PortNumber = UsbDevice->Port; + } RtlCopyMemory(&DeviceInfo->DeviceDescriptor, &UsbDevice->DeviceDescriptor, sizeof(USB_DEVICE_DESCRIPTOR)); @@ -495,15 +555,15 @@ DPRINT1("InformationLevel should really be set to 0. Ignoring\n"); } - UsbExtHubInfo->NumberOfPorts = 8; + UsbExtHubInfo->NumberOfPorts = FdoDeviceExntension->hcd.ECHICaps.HCSParams.PortCount; for (i=0; i < UsbExtHubInfo->NumberOfPorts; i++) { UsbExtHubInfo->Port[i].PhysicalPortNumber = i + 1; - UsbExtHubInfo->Port[i].PortLabelNumber = FdoDeviceExntension->hcd.ECHICaps.HCSParams.PortCount; + UsbExtHubInfo->Port[i].PortLabelNumber = i + 1; UsbExtHubInfo->Port[i].VidOverride = 0; UsbExtHubInfo->Port[i].PidOverride = 0; - UsbExtHubInfo->Port[i].PortAttributes = USB_PORTATTR_SHARED_USB2; + UsbExtHubInfo->Port[i].PortAttributes = USB_PORTATTR_SHARED_USB2;// | USB_PORTATTR_OWNED_BY_CC; } *LengthReturned = FIELD_OFFSET(USB_EXTHUB_INFORMATION_0, Port[8]); @@ -600,7 +660,17 @@ USB_BUSIFFN SetDeviceHandleData(PVOID BusContext, PVOID DeviceHandle, PDEVICE_OBJECT UsbDevicePdo) { - DPRINT1("Ehci: SetDeviceHandleData not implemented %x, %x, %x\n", BusContext, DeviceHandle, UsbDevicePdo); + PUSB_DEVICE UsbDevice; + + DPRINT1("Ehci: SetDeviceHandleData %x, %x, %x\n", BusContext, DeviceHandle, UsbDevicePdo); + UsbDevice = DeviceHandleToUsbDevice(BusContext, DeviceHandle); + if (!UsbDevice) + { + DPRINT1("Invalid DeviceHandle or device not connected\n"); + return; + } + + UsbDevice->UsbDevicePdo = UsbDevicePdo; } @@ -654,6 +724,6 @@ USB_BUSIFFN EnumLogEntry(PVOID BusContext, ULONG DriverTag, ULONG EnumTag, ULONG P1, ULONG P2) { - DPRINT1("Ehci: EnumLogEntry called\n"); - return STATUS_SUCCESS; -} + DPRINT1("Ehci: EnumLogEntry called %x, %x, %x, %x\n", DriverTag, EnumTag, P1, P2); + return STATUS_SUCCESS; +}

13 years, 8 months

[akhaldi] 50301: [CMAKE] - Fix formatting.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Thu Jan 6 17:08:38 2011 New Revision: 50301 URL: http://svn.reactos.org/svn/reactos?rev=50301&view=rev Log: [CMAKE] - Fix formatting. Modified: branches/cmake-bringup/ntoskrnl/CMakeLists.txt Modified: branches/cmake-bringup/ntoskrnl/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/ntoskrnl/CMakeLis… ============================================================================== --- branches/cmake-bringup/ntoskrnl/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/ntoskrnl/CMakeLists.txt [iso-8859-1] Thu Jan 6 17:08:38 2011 @@ -21,29 +21,29 @@ set(NEWCC FALSE) if(NEWCC) -add_definitions(-DNEWCC) -list(APPEND SOURCE - cache/cachesub.c - cache/copysup.c - cache/fssup.c - cache/lazyrite.c - cache/logsup.c - cache/mdlsup.c - cache/pinsup.c - cache/section/data.c - cache/section/fault.c - cache/section/io.c - cache/section/reqtools.c - cache/section/sptab.c - cache/section/swapout.c) + add_definitions(-DNEWCC) + list(APPEND SOURCE + cache/cachesub.c + cache/copysup.c + cache/fssup.c + cache/lazyrite.c + cache/logsup.c + cache/mdlsup.c + cache/pinsup.c + cache/section/data.c + cache/section/fault.c + cache/section/io.c + cache/section/reqtools.c + cache/section/sptab.c + cache/section/swapout.c) else() -list(APPEND SOURCE - cc/cacheman.c - cc/copy.c - cc/fs.c - cc/mdl.c - cc/pin.c - cc/view.c) + list(APPEND SOURCE + cc/cacheman.c + cc/copy.c + cc/fs.c + cc/mdl.c + cc/pin.c + cc/view.c) endif() list(APPEND SOURCE @@ -271,171 +271,164 @@ ntoskrnl.rc ${REACTOS_BINARY_DIR}/ntoskrnl/ex/zw.S ${CMAKE_CURRENT_BINARY_DIR}/ntoskrnl.def) - -set_source_files_properties(ntoskrnl_${ARCH}.def PROPERTIES EXTERNAL_OBJECT TRUE) if(ARCH MATCHES i386) -list(APPEND SOURCE - config/i386/cmhardwr.c - ex/i386/interlck_asm.S - ex/i386/fastinterlck_asm.S - ex/i386/ioport.S - ke/freeldr.c - ke/i386/abios.c - ke/i386/cpu.c - ke/i386/context.c - ke/i386/ctxswitch.S - ke/i386/exp.c - ke/i386/irqobj.c - ke/i386/kiinit.c - ke/i386/ldt.c - ke/i386/mtrr.c - ke/i386/patpge.c - ke/i386/thrdini.c - ke/i386/trap.s - ke/i386/traphdlr.c - ke/i386/usercall_asm.S - ke/i386/usercall.c - ke/i386/v86vdm.c - mm/i386/page.c - mm/ARM3/i386/init.c - ps/i386/psctx.c - ps/i386/psldt.c - rtl/i386/stack.S - vdm/vdmmain.c - vdm/vdmexec.c) + list(APPEND SOURCE + config/i386/cmhardwr.c + ex/i386/interlck_asm.S + ex/i386/fastinterlck_asm.S + ex/i386/ioport.S + ke/freeldr.c + ke/i386/abios.c + ke/i386/cpu.c + ke/i386/context.c + ke/i386/ctxswitch.S + ke/i386/exp.c + ke/i386/irqobj.c + ke/i386/kiinit.c + ke/i386/ldt.c + ke/i386/mtrr.c + ke/i386/patpge.c + ke/i386/thrdini.c + ke/i386/trap.s + ke/i386/traphdlr.c + ke/i386/usercall_asm.S + ke/i386/usercall.c + ke/i386/v86vdm.c + mm/i386/page.c + mm/ARM3/i386/init.c + ps/i386/psctx.c + ps/i386/psldt.c + rtl/i386/stack.S + vdm/vdmmain.c + vdm/vdmexec.c) elseif(ARCH MATCHES amd64) -list(APPEND SOURCE - config/i386/cmhardwr.c - ex/amd64/fastinterlck.c - ke/amd64/boot.S - ke/amd64/context.c - ke/amd64/cpu.c - ke/amd64/ctxswitch.S - ke/amd64/except.c - ke/amd64/interrupt.c - ke/amd64/irql.c - ke/amd64/kiinit.c - ke/amd64/spinlock.c - ke/amd64/stubs.c - ke/amd64/thrdini.c - ke/amd64/trap.S - mm/amd64/init.c - mm/amd64/page.c - ps/amd64/psctx.c) + list(APPEND SOURCE + config/i386/cmhardwr.c + ex/amd64/fastinterlck.c + ke/amd64/boot.S + ke/amd64/context.c + ke/amd64/cpu.c + ke/amd64/ctxswitch.S + ke/amd64/except.c + ke/amd64/interrupt.c + ke/amd64/irql.c + ke/amd64/kiinit.c + ke/amd64/spinlock.c + ke/amd64/stubs.c + ke/amd64/thrdini.c + ke/amd64/trap.S + mm/amd64/init.c + mm/amd64/page.c + ps/amd64/psctx.c) elseif(ARCH MATCHES arm) -list(APPEND SOURCE - config/arm/cmhardwr.c - ke/arm/boot.s - ke/arm/cpu.c - ke/arm/ctxswtch.s - ke/arm/exp.c - ke/arm/kiinit.c - ke/arm/stubs_asm.s - ke/arm/thrdini.c - ke/arm/trap.s - ke/arm/trapc.c - ke/arm/usercall.c - mm/arm/page.c - mm/ARM3/arm/init.c - ps/arm/psctx.c - rtl/arm/rtlexcpt.c) + list(APPEND SOURCE + config/arm/cmhardwr.c + ke/arm/boot.s + ke/arm/cpu.c + ke/arm/ctxswtch.s + ke/arm/exp.c + ke/arm/kiinit.c + ke/arm/stubs_asm.s + ke/arm/thrdini.c + ke/arm/trap.s + ke/arm/trapc.c + ke/arm/usercall.c + mm/arm/page.c + mm/ARM3/arm/init.c + ps/arm/psctx.c + rtl/arm/rtlexcpt.c) elseif(ARCH MATCHES powerpc) -list(APPEND SOURCE - config/powerpc/cmhardwr.c - ke/powerpc/main_asm.S - ke/powerpc/cpu.c - ke/powerpc/exp.c - ke/powerpc/kiinit.c - ke/powerpc/ppc_irq.c - ke/powerpc/stubs.c - ke/powerpc/systimer.c - ke/powerpc/thrdini.c - ke/powerpc/ctxswitch.c - ke/powerpc/ctxhelp.S - mm/powerpc/pfault.c - mm/powerpc/page.c) -endif(ARCH MATCHES i386) + list(APPEND SOURCE + config/powerpc/cmhardwr.c + ke/powerpc/main_asm.S + ke/powerpc/cpu.c + ke/powerpc/exp.c + ke/powerpc/kiinit.c + ke/powerpc/ppc_irq.c + ke/powerpc/stubs.c + ke/powerpc/systimer.c + ke/powerpc/thrdini.c + ke/powerpc/ctxswitch.c + ke/powerpc/ctxhelp.S + mm/powerpc/pfault.c + mm/powerpc/page.c) +endif() if(NOT _WINKD_) - -if(ARCH MATCHES i386) -list(APPEND SOURCE - kd/i386/kdmemsup.c - kd/wrappers/gdbstub.c) - -if(KDBG) -list(APPEND SOURCE - kdbg/i386/i386-dis.c - kdbg/i386/kdb_help.S) -endif(KDBG) - -elseif(ARCH MATCHES amd64) -list(APPEND SOURCE - kd/amd64/kd.c - kd/amd64/kdmemsup.c) - -if(KDBG) -list(APPEND SOURCE - kdbg/amd64/i386-dis.c - kdbg/amd64/kdb_help.S - kdbg/amd64/kdb.c) -endif(KDBG) - -elseif(ARCH MATCHES powerpc) -list(APPEND SOURCE kd/wrappers/gdbstub_powerpc.c) - -endif(ARCH MATCHES i386) - -if(KDBG) -list(APPEND SOURCE - kdbg/kdb.c - kdbg/kdb_cli.c - kdbg/kdb_expr.c - kdbg/kdb_keyboard.c - kdbg/kdb_serial.c) -endif(KDBG) - -if(DBG OR KDBG) -list(APPEND SOURCE kdbg/kdb_symbols.c) -endif(DBG OR KDBG) - -list(APPEND SOURCE - kd/wrappers/bochs.c - kd/wrappers/kdbg.c - kd/kdinit.c - kd/kdio.c - kd/kdmain.c) + if(ARCH MATCHES i386) + list(APPEND SOURCE + kd/i386/kdmemsup.c + kd/wrappers/gdbstub.c) + if(KDBG) + list(APPEND SOURCE + kdbg/i386/i386-dis.c + kdbg/i386/kdb_help.S) + endif() + elseif(ARCH MATCHES amd64) + list(APPEND SOURCE + kd/amd64/kd.c + kd/amd64/kdmemsup.c) + if(KDBG) + list(APPEND SOURCE + kdbg/amd64/i386-dis.c + kdbg/amd64/kdb_help.S + kdbg/amd64/kdb.c) + endif() + elseif(ARCH MATCHES powerpc) + list(APPEND SOURCE kd/wrappers/gdbstub_powerpc.c) + endif() + + if(KDBG) + list(APPEND SOURCE + kdbg/kdb.c + kdbg/kdb_cli.c + kdbg/kdb_expr.c + kdbg/kdb_keyboard.c + kdbg/kdb_serial.c) + endif() + + if(DBG OR KDBG) + list(APPEND SOURCE kdbg/kdb_symbols.c) + endif() + + list(APPEND SOURCE + kd/wrappers/bochs.c + kd/wrappers/kdbg.c + kd/kdinit.c + kd/kdio.c + kd/kdmain.c) else() # _WINKD_ -list(APPEND SOURCE - kd64/kdapi.c - kd64/kdbreak.c - kd64/kddata.c - kd64/kdinit.c - kd64/kdlock.c - kd64/kdprint.c - kd64/kdtrap.c) - -if(ARCH MATCHES i386) -list(APPEND SOURCE kd64/i386/kdx86.c) -elseif(ARCH MATCHES amd64) -list(APPEND SOURCE kd64/amd64/kdx64.c) -elseif(ARCH MATCHES arm) -list(APPEND SOURCE kd64/arm/kdarm.c) -endif(ARCH MATCHES i386) - -endif(NOT _WINKD_) + list(APPEND SOURCE + kd64/kdapi.c + kd64/kdbreak.c + kd64/kddata.c + kd64/kdinit.c + kd64/kdlock.c + kd64/kdprint.c + kd64/kdtrap.c) + + if(ARCH MATCHES i386) + list(APPEND SOURCE kd64/i386/kdx86.c) + elseif(ARCH MATCHES amd64) + list(APPEND SOURCE kd64/amd64/kdx64.c) + elseif(ARCH MATCHES arm) + list(APPEND SOURCE kd64/arm/kdarm.c) + endif() + +endif() add_executable(ntoskrnl ${CMAKE_CURRENT_BINARY_DIR}/ntoskrnl_ntoskrnl.h.gch ${SOURCE}) set_entrypoint(ntoskrnl KiSystemStartup@4) set_subsystem(ntoskrnl native) + if(MSVC) - set_image_base(ntoskrnl 0x00400000) + set_image_base(ntoskrnl 0x00400000) else() - set_image_base(ntoskrnl 0x80800000) + set_image_base(ntoskrnl 0x80800000) endif() target_link_libraries(ntoskrnl

13 years, 8 months

[akhaldi] 50300: [CMAKE] - Initial support of the arm toolchain/build.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Thu Jan 6 16:57:56 2011 New Revision: 50300 URL: http://svn.reactos.org/svn/reactos?rev=50300&view=rev Log: [CMAKE] - Initial support of the arm toolchain/build. Added: branches/cmake-bringup/config-arm.cmake Modified: branches/cmake-bringup/CMakeLists.txt branches/cmake-bringup/gcc.cmake branches/cmake-bringup/lib/sdk/crt/CMakeLists.txt branches/cmake-bringup/toolchain-mingw32.cmake 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] Thu Jan 6 16:57:56 2011 @@ -11,17 +11,18 @@ include(config.cmake) elseif(ARCH MATCHES amd64) include(config-amd64.cmake) +elseif(ARCH MATCHES arm) + include(config-arm.cmake) endif() if(NOT CMAKE_CROSSCOMPILING) + add_definitions(-DTARGET_${ARCH}) + if(ARCH MATCHES i386) - add_definitions(-DTARGET_i386) if(MSVC) add_definitions(-Dinline=__inline) endif() - elseif(ARCH MATCHES amd64) - add_definitions(-DTARGET_amd64) endif() include_directories( @@ -117,6 +118,9 @@ add_definitions(-D_M_IX86 -D_X86_ -D__i386__) elseif(ARCH MATCHES amd64) add_definitions(-D_M_AMD64 -D_AMD64_ -D_M_AXP64 -D__x86_64__ -D_WIN64) + elseif(ARCH MATCHES arm) + # _M_ARM is already defined by toolchain + add_definitions(-D_ARM_ -D__arm__) endif() # Other @@ -124,6 +128,8 @@ add_definitions(-DUSE_COMPILER_EXCEPTIONS -D_USE_32BIT_TIME_T) elseif(ARCH MATCHES amd64) add_definitions(-DUSE_COMPILER_EXCEPTIONS -DNO_UNDERSCORE_PREFIX) + elseif(ARCH MATCHES arm) + add_definitions(-DUSE_COMPILER_EXCEPTIONS) endif() include_directories( @@ -140,6 +146,10 @@ include/reactos include/reactos/libs) + if(ARCH MATCHES arm) + include_directories(${REACTOS_SOURCE_DIR}/include/reactos/arm) + endif() + if(MSVC) include_directories(include/crt/msc) else() Added: branches/cmake-bringup/config-arm.cmake URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/config-arm.cmake?… ============================================================================== --- branches/cmake-bringup/config-arm.cmake (added) +++ branches/cmake-bringup/config-arm.cmake [iso-8859-1] Thu Jan 6 16:57:56 2011 @@ -1,0 +1,46 @@ + +set(SARCH "omap3-zoom2" CACHE STRING +"Sub-architecture (board) to build for. Specify one of: + kurobox versatile omap3-zoom2 omap3-beagle") + +set(OARCH "armv7-a" CACHE STRING +"Generate instructions for this CPU type. Specify one of: + armv5te armv7-a") + +set (OPTIMIZE "1" CACHE STRING +"What level of optimisation to use. + 0 = off + 1 = Default option, optimize for size (-Os) with some additional options + 2 = -Os + 3 = -O1 + 4 = -O2 + 5 = -O3") + +set(DBG TRUE CACHE BOOL +"Whether to compile for debugging.") + +set(KDBG FALSE CACHE BOOL +"Whether to compile in the integrated kernel debugger.") + +set(GDB FALSE CACHE BOOL +"Whether to compile for debugging with GDB. +If you don't use GDB, don't enable this.") + +set(_WINKD_ TRUE CACHE BOOL +"Whether to compile with the KD protocol.") + +set(_ELF_ FALSE CACHE BOOL +"Whether to compile support for ELF files. +Do not enable unless you know what you're doing.") + +set(NSWPAT FALSE CACHE BOOL +"Whether to compile apps/libs with features covered software patents or not. +If you live in a country where software patents are valid/apply, don't +enable this (except they/you purchased a license from the patent owner). +This settings is disabled (0) by default.") + +set(BUILD_MP TRUE CACHE BOOL +"Whether to compile the multi processor versions for ntoskrnl and hal.") + +set(NEWSPRINTF FALSE CACHE BOOL +"Whether to compile the new sprintf.") Modified: branches/cmake-bringup/gcc.cmake URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/gcc.cmake?rev=503… ============================================================================== --- branches/cmake-bringup/gcc.cmake [iso-8859-1] (original) +++ branches/cmake-bringup/gcc.cmake [iso-8859-1] Thu Jan 6 16:57:56 2011 @@ -26,7 +26,7 @@ # Tuning if(ARCH MATCHES i386) add_definitions(-march=${OARCH} -mtune=${TUNE}) -elseif(ARCH MATCHES amd64) +else() add_definitions(-march=${OARCH}) endif() Modified: branches/cmake-bringup/lib/sdk/crt/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/sdk/crt/CMake… ============================================================================== --- branches/cmake-bringup/lib/sdk/crt/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/lib/sdk/crt/CMakeLists.txt [iso-8859-1] Thu Jan 6 16:57:56 2011 @@ -31,7 +31,6 @@ except/cppexcept.c except/except.c except/matherr.c - except/${ARCH}/seh.s except/xcptfil.c float/chgsign.c float/copysign.c @@ -141,7 +140,6 @@ search/bsearch.c search/lfind.c search/lsearch.c - setjmp/${ARCH}/setjmp.s signal/signal.c signal/xcptinfo.c stdio/access.c @@ -281,6 +279,11 @@ wine/heap.c wine/undname.c) +if(NOT ARCH MATCHES arm) +list(APPEND CRT_SOURCE + except/${ARCH}/seh.s) +endif() + if(ARCH MATCHES i386) list(APPEND CRT_SOURCE except/i386/chkstk_asm.s @@ -290,7 +293,8 @@ float/i386/cntrlfp.c float/i386/fpreset.c float/i386/logb.c - float/i386/statfp.c) + float/i386/statfp.c + setjmp/i386/setjmp.s) elseif(ARCH MATCHES amd64) list(APPEND CRT_SOURCE except/amd64/chkstk_asm.s @@ -298,8 +302,9 @@ float/i386/cntrlfp.c float/i386/fpreset.c float/i386/logb.c - float/i386/statfp.c) -endif(ARCH MATCHES i386) + float/i386/statfp.c + setjmp/amd64/setjmp.s) +endif() if(ARCH MATCHES i386) list(APPEND CRT_SOURCE @@ -384,7 +389,7 @@ string/wcsncpy.c string/wcsnlen.c string/wcsrchr.c) -endif(ARCH MATCHES i386) +endif() if(ARCH MATCHES amd64) list(APPEND CRT_SOURCE @@ -408,7 +413,7 @@ math/amd64/sqrt.S math/amd64/sqrtf.S math/amd64/tan.S) -endif(ARCH MATCHES amd64) +endif() add_library(crt ${CMAKE_CURRENT_BINARY_DIR}/crt_precomp.h.gch ${CRT_SOURCE}) @@ -417,8 +422,6 @@ add_dependencies(crt psdk buildno_header asm) list(APPEND LIBCNTPR_SOURCE - except/${ARCH}/chkstk_asm.s - except/${ARCH}/seh.s math/abs.c math/div.c math/labs.c @@ -428,7 +431,6 @@ mem/memicmp.c search/bsearch.c search/lfind.c - setjmp/${ARCH}/setjmp.s stdlib/qsort.c string/ctype.c string/scanf.c @@ -467,6 +469,13 @@ wstring/wcscspn.c wstring/wcsspn.c wstring/wcsstr.c) + +if(NOT ARCH MATCHES arm) +list(APPEND LIBCNTPR_SOURCE + except/${ARCH}/chkstk_asm.s + except/${ARCH}/seh.s + setjmp/${ARCH}/setjmp.s) +endif() if(ARCH MATCHES i386) list(APPEND LIBCNTPR_SOURCE @@ -512,7 +521,7 @@ math/amd64/pow.S math/amd64/sqrt.S math/amd64/tan.S) -endif(ARCH MATCHES i386) +endif() if(ARCH MATCHES i386) list(APPEND LIBCNTPR_SOURCE @@ -565,7 +574,7 @@ string/wcsncpy.c string/wcsnlen.c string/wcsrchr.c) -endif(ARCH MATCHES i386) +endif() add_library(libcntpr ${LIBCNTPR_SOURCE}) set_property(TARGET libcntpr PROPERTY COMPILE_DEFINITIONS NO_RTL_INLINES _NTSYSTEM_ _NTDLLBUILD_ _LIBCNT_ __CRT__NO_INLINE) Modified: branches/cmake-bringup/toolchain-mingw32.cmake URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/toolchain-mingw32… ============================================================================== --- branches/cmake-bringup/toolchain-mingw32.cmake [iso-8859-1] (original) +++ branches/cmake-bringup/toolchain-mingw32.cmake [iso-8859-1] Thu Jan 6 16:57:56 2011 @@ -14,6 +14,8 @@ elseif(ARCH MATCHES amd64) set(MINGW_PREFIX "x86_64-w64-mingw32-" CACHE STRING "MinGW Prefix") +elseif(ARCH MATCHES arm) + set(MINGW_PREFIX "arm-mingw32ce-" CACHE STRING "MinGW Prefix") endif() if(ENABLE_CCACHE) @@ -38,6 +40,8 @@ set(CMAKE_IDL_COMPILE_OBJECT "<CMAKE_IDL_COMPILER> <FLAGS> <DEFINES> -m32 --win32 -h -o <OBJECT> <SOURCE>") elseif(ARCH MATCHES amd64) set(CMAKE_IDL_COMPILE_OBJECT "<CMAKE_IDL_COMPILER> <FLAGS> <DEFINES> -m64 --win64 -h -o <OBJECT> <SOURCE>") +elseif(ARCH MATCHES arm) +set(CMAKE_IDL_COMPILE_OBJECT "<CMAKE_IDL_COMPILER> <FLAGS> <DEFINES> -h -o <OBJECT> <SOURCE>") endif() 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> ")

13 years, 8 months

[fireball] 50299: - Get rid of rcDcRect, kernelmode DC shouldn't care because all coordinate transformation is done in usermode. rcViewPort remains, and will be changed soon.

by fireball＠svn.reactos.org

Author: fireball Date: Thu Jan 6 13:17:03 2011 New Revision: 50299 URL: http://svn.reactos.org/svn/reactos?rev=50299&view=rev Log: - Get rid of rcDcRect, kernelmode DC shouldn't care because all coordinate transformation is done in usermode. rcViewPort remains, and will be changed soon. Modified: branches/arwinss/reactos/subsystems/win32/win32k/eng/engsurf.c branches/arwinss/reactos/subsystems/win32/win32k/gdi/dc.c branches/arwinss/reactos/subsystems/win32/win32k/gdi/misc.c branches/arwinss/reactos/subsystems/win32/win32k/gre/bitblt.c branches/arwinss/reactos/subsystems/win32/win32k/gre/ellipse.c branches/arwinss/reactos/subsystems/win32/win32k/gre/font.c branches/arwinss/reactos/subsystems/win32/win32k/gre/lineto.c branches/arwinss/reactos/subsystems/win32/win32k/gre/rect.c branches/arwinss/reactos/subsystems/win32/win32k/gre/surfobj.c branches/arwinss/reactos/subsystems/win32/win32k/include/dc.h branches/arwinss/reactos/subsystems/win32/win32k/include/swm.h branches/arwinss/reactos/subsystems/win32/win32k/main/init.c branches/arwinss/reactos/subsystems/win32/win32k/wine/winesup.c Modified: branches/arwinss/reactos/subsystems/win32/win32k/eng/engsurf.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/eng/engsurf.c [iso-8859-1] (original) +++ branches/arwinss/reactos/subsystems/win32/win32k/eng/engsurf.c [iso-8859-1] Thu Jan 6 13:17:03 2011 @@ -335,6 +335,22 @@ DPRINT1("flHooks: 0x%x\n", flHooks); + /* 0x3a5fb for vmware + 0x10000 HOOK_ALPHABLEND + 0x20000 HOOK_GRADIENTFILL + 0x08000 HOOK_TRANSPARENTBLT + 0x02000 HOOK_STRETCHBLTROP + 0x00400 HOOK_COPYBITS + 0x00100 HOOK_LINETO + 0x00010 HOOK_PAINT + 0x00020 HOOK_STROKEPATH + 0x00040 HOOK_FILLPATH + 0x00080 HOOK_STROKEANDFILLPATH + 0x00001 HOOK_BITBLT + 0x00002 HOOK_STRETCHBLT + 0x00008 HOOK_TEXTOUT + */ + /* Release the pointer */ SURFACE_UnlockSurface(pSurface); Modified: branches/arwinss/reactos/subsystems/win32/win32k/gdi/dc.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/gdi/dc.c [iso-8859-1] (original) +++ branches/arwinss/reactos/subsystems/win32/win32k/gdi/dc.c [iso-8859-1] Thu Jan 6 13:17:03 2011 @@ -96,9 +96,8 @@ pNewDC->dclevel.pSurface = SURFACE_ShareLockSurface(hStockBmp); /* Set DC rectangles */ - pNewDC->rcDcRect.left = 0; pNewDC->rcDcRect.top = 0; - pNewDC->rcDcRect.right = 1; pNewDC->rcDcRect.bottom = 1; - pNewDC->rcVport = pNewDC->rcDcRect; + pNewDC->rcVport.left = 0; pNewDC->rcVport.top = 0; + pNewDC->rcVport.right = 1; pNewDC->rcVport.bottom = 1; } else { @@ -110,8 +109,6 @@ pNewDC->rcVport.top = 0; pNewDC->rcVport.right = PrimarySurface.gdiinfo.ulHorzRes; pNewDC->rcVport.bottom = PrimarySurface.gdiinfo.ulVertRes; - - pNewDC->rcDcRect = pNewDC->rcVport; } /* Create an empty combined clipping region */ @@ -194,7 +191,6 @@ pDC->rcVport.top = 0; pDC->rcVport.right = pSurface->SurfObj.sizlBitmap.cx; pDC->rcVport.bottom = pSurface->SurfObj.sizlBitmap.cy; - pDC->rcDcRect = pDC->rcVport; /* Release the DC object */ DC_UnlockDc(pDC); @@ -458,7 +454,7 @@ PDC pDC; RECTL pStackBuf[8]; RECTL *pSafeRects = pStackBuf; - RECTL rcSafeBounds, rcSurface; + RECTL rcSafeBounds; ULONG i; NTSTATUS Status = STATUS_SUCCESS; @@ -506,14 +502,14 @@ for (i=0; i<count; i++) { RECTL_vOffsetRect(&pSafeRects[i], - pDC->rcDcRect.left + pDC->rcVport.left, - pDC->rcDcRect.top + pDC->rcVport.top); + pDC->rcVport.left, + pDC->rcVport.top); } /* Offset bounding rect */ RECTL_vOffsetRect(&rcSafeBounds, - pDC->rcDcRect.left + pDC->rcVport.left, - pDC->rcDcRect.top + pDC->rcVport.top); + pDC->rcVport.left, + pDC->rcVport.top); /* Delete old clipping region */ if (pDC->Clipping) @@ -521,24 +517,13 @@ if (count == 0) { - /* Set unclipped mode (clip by dc rect) */ + /* Set unclipped mode (underlying surface rectangle) */ RECTL_vSetRect(&rcSafeBounds, - pDC->rcDcRect.left, - pDC->rcDcRect.top, - pDC->rcDcRect.right, - pDC->rcDcRect.bottom); - - RECTL_vOffsetRect(&rcSafeBounds, pDC->rcVport.left, pDC->rcVport.top); - - /* Intersect it with an underlying surface rectangle */ - RECTL_vSetRect(&rcSurface, 0, 0, pDC->dclevel.pSurface->SurfObj.sizlBitmap.cx, pDC->dclevel.pSurface->SurfObj.sizlBitmap.cy); - RECTL_bIntersectRect(&rcSafeBounds, &rcSafeBounds, &rcSurface); - /* Set the clipping object */ pDC->Clipping = create_region_from_rects(&rcSafeBounds, 1); } @@ -607,10 +592,6 @@ _SEH2_TRY { - /* Set DC rectangle */ - if (rcDcRect) - pDC->rcDcRect = *rcDcRect; - /* Set viewport rectangle */ if (rcVport) pDC->rcVport = *rcVport; Modified: branches/arwinss/reactos/subsystems/win32/win32k/gdi/misc.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/gdi/misc.c [iso-8859-1] (original) +++ branches/arwinss/reactos/subsystems/win32/win32k/gdi/misc.c [iso-8859-1] Thu Jan 6 13:17:03 2011 @@ -24,10 +24,10 @@ pDC = DC_LockDc(physDev); /* Add DC origin */ - left += pDC->rcVport.left + pDC->rcDcRect.left; - top += pDC->rcVport.top + pDC->rcDcRect.top; - right += pDC->rcVport.left + pDC->rcDcRect.left; - bottom += pDC->rcVport.top + pDC->rcDcRect.top; + left += pDC->rcVport.left; + top += pDC->rcVport.top; + right += pDC->rcVport.left; + bottom += pDC->rcVport.top; GreEllipse(pDC, left, top, right, bottom); @@ -60,8 +60,8 @@ } /* Add DC origin */ - Pt.x = XStart + dc->rcVport.left + dc->rcDcRect.left; - Pt.y = YStart + dc->rcVport.top + dc->rcDcRect.top; + Pt.x = XStart + dc->rcVport.left; + Pt.y = YStart + dc->rcVport.top; /* Call GRE routine */ Ret = GreFloodFill(dc, &Pt, Color, FillType); @@ -107,10 +107,10 @@ pt[1].x = x2; pt[1].y = y2; /* Add DC origin */ - pt[0].x += pDC->rcVport.left + pDC->rcDcRect.left; - pt[0].y += pDC->rcVport.top + pDC->rcDcRect.top; - pt[1].x += pDC->rcVport.left + pDC->rcDcRect.left; - pt[1].y += pDC->rcVport.top + pDC->rcDcRect.top; + pt[0].x += pDC->rcVport.left; + pt[0].y += pDC->rcVport.top; + pt[1].x += pDC->rcVport.left; + pt[1].y += pDC->rcVport.top; GreLineTo(&pDC->dclevel.pSurface->SurfObj, pDC->CombinedClip, @@ -135,14 +135,14 @@ pDC = DC_LockDc(physDev); /* Add DC origin */ - left += pDC->rcVport.left + pDC->rcDcRect.left; - top += pDC->rcVport.top + pDC->rcDcRect.top; - right += pDC->rcVport.left + pDC->rcDcRect.left; - bottom += pDC->rcVport.top + pDC->rcDcRect.top; - xstart += pDC->rcVport.left + pDC->rcDcRect.left; - ystart += pDC->rcVport.top + pDC->rcDcRect.top; - xend += pDC->rcVport.left + pDC->rcDcRect.left; - yend += pDC->rcVport.top + pDC->rcDcRect.top; + left += pDC->rcVport.left; + top += pDC->rcVport.top; + right += pDC->rcVport.left; + bottom += pDC->rcVport.top; + xstart += pDC->rcVport.left; + ystart += pDC->rcVport.top; + xend += pDC->rcVport.left; + yend += pDC->rcVport.top; GrepArc(pDC, left, top, right, bottom, xstart, ystart, xend, yend, arc); @@ -207,8 +207,8 @@ } /* Calculate bounding rect and offset points data */ - pPoints[0].x += pDC->rcDcRect.left + pDC->rcVport.left; - pPoints[0].y += pDC->rcDcRect.top + pDC->rcVport.top; + pPoints[0].x += pDC->rcVport.left; + pPoints[0].y += pDC->rcVport.top; rcBound.left = pPoints[0].x; rcBound.right = pPoints[0].x; @@ -217,8 +217,8 @@ for (i=1; i<count; i++) { - pPoints[i].x += pDC->rcDcRect.left + pDC->rcVport.left; - pPoints[i].y += pDC->rcDcRect.top + pDC->rcVport.top; + pPoints[i].x += pDC->rcVport.left; + pPoints[i].y += pDC->rcVport.top; rcBound.left = min(rcBound.left, pPoints[i].x); rcBound.right = max(rcBound.right, pPoints[i].x); Modified: branches/arwinss/reactos/subsystems/win32/win32k/gre/bitblt.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/gre/bitblt.c [iso-8859-1] (original) +++ branches/arwinss/reactos/subsystems/win32/win32k/gre/bitblt.c [iso-8859-1] Thu Jan 6 13:17:03 2011 @@ -274,20 +274,20 @@ DestRect.right = XDest+WidthDst; DestRect.bottom = YDest+HeightDst; - DestRect.left += pDest->rcVport.left + pDest->rcDcRect.left; - DestRect.top += pDest->rcVport.top + pDest->rcDcRect.top; - DestRect.right += pDest->rcVport.left + pDest->rcDcRect.left; - DestRect.bottom += pDest->rcVport.top + pDest->rcDcRect.top; + DestRect.left += pDest->rcVport.left; + DestRect.top += pDest->rcVport.top; + DestRect.right += pDest->rcVport.left; + DestRect.bottom += pDest->rcVport.top; SrcRect.left = XSrc; SrcRect.top = YSrc; SrcRect.right = XSrc+WidthSrc; SrcRect.bottom = YSrc+HeightSrc; - SrcRect.left += pSrc->rcVport.left + pSrc->rcDcRect.left; - SrcRect.top += pSrc->rcVport.top + pSrc->rcDcRect.top; - SrcRect.right += pSrc->rcVport.left + pSrc->rcDcRect.left; - SrcRect.bottom += pSrc->rcVport.top + pSrc->rcDcRect.top; + SrcRect.left += pSrc->rcVport.left; + SrcRect.top += pSrc->rcVport.top; + SrcRect.right += pSrc->rcVport.left; + SrcRect.bottom += pSrc->rcVport.top; /* Create the XLATEOBJ. */ EXLATEOBJ_vInitXlateFromDCs(&exlo, pSrc, pDest); @@ -324,18 +324,18 @@ DestRect.right = XDest+Width; DestRect.bottom = YDest+Height; - DestRect.left += pDest->rcVport.left + pDest->rcDcRect.left; - DestRect.top += pDest->rcVport.top + pDest->rcDcRect.top; - DestRect.right += pDest->rcVport.left + pDest->rcDcRect.left; - DestRect.bottom += pDest->rcVport.top + pDest->rcDcRect.top; + DestRect.left += pDest->rcVport.left; + DestRect.top += pDest->rcVport.top; + DestRect.right += pDest->rcVport.left; + DestRect.bottom += pDest->rcVport.top; SourcePoint.x = XSrc; SourcePoint.y = YSrc; if (pSrc) { - SourcePoint.x += pSrc->rcDcRect.left + pSrc->rcVport.left; - SourcePoint.y += pSrc->rcDcRect.top + pSrc->rcVport.top; + SourcePoint.x += pSrc->rcVport.left; + SourcePoint.y += pSrc->rcVport.top; } /* Create the XLATEOBJ. */ @@ -345,8 +345,8 @@ XlateObj = &exlo.xlo; } - BrushOrigin.x = pDest->dclevel.ptlBrushOrigin.x + pDest->rcDcRect.left; - BrushOrigin.y = pDest->dclevel.ptlBrushOrigin.y + pDest->rcDcRect.top; + BrushOrigin.x = pDest->dclevel.ptlBrushOrigin.x; + BrushOrigin.y = pDest->dclevel.ptlBrushOrigin.y; /* Perform the bitblt operation */ bRet = GrepBitBltEx( @@ -406,13 +406,13 @@ DestRect.bottom = YLeft + 1; } - DestRect.left += pDC->rcVport.left + pDC->rcDcRect.left; - DestRect.top += pDC->rcVport.top + pDC->rcDcRect.top; - DestRect.right += pDC->rcVport.left + pDC->rcDcRect.left; - DestRect.bottom += pDC->rcVport.top + pDC->rcDcRect.top; - - BrushOrigin.x = pDC->dclevel.ptlBrushOrigin.x + pDC->rcDcRect.left; - BrushOrigin.y = pDC->dclevel.ptlBrushOrigin.y + pDC->rcDcRect.top; + DestRect.left += pDC->rcVport.left; + DestRect.top += pDC->rcVport.top; + DestRect.right += pDC->rcVport.left; + DestRect.bottom += pDC->rcVport.top; + + BrushOrigin.x = pDC->dclevel.ptlBrushOrigin.x; + BrushOrigin.y = pDC->dclevel.ptlBrushOrigin.y; bRet = GrepBitBltEx( &pDC->dclevel.pSurface->SurfObj, @@ -469,10 +469,10 @@ DestRect.right = XOriginDest+WidthDest; DestRect.bottom = YOriginDest+HeightDest; - DestRect.left += DCDest->rcVport.left + DCDest->rcDcRect.left; - DestRect.top += DCDest->rcVport.top + DCDest->rcDcRect.top; - DestRect.right += DCDest->rcVport.left + DCDest->rcDcRect.left; - DestRect.bottom += DCDest->rcVport.top + DCDest->rcDcRect.top; + DestRect.left += DCDest->rcVport.left; + DestRect.top += DCDest->rcVport.top; + DestRect.right += DCDest->rcVport.left; + DestRect.bottom += DCDest->rcVport.top; SourceRect.left = XOriginSrc; SourceRect.top = YOriginSrc; @@ -481,14 +481,14 @@ if (UsesSource) { - SourceRect.left += DCSrc->rcVport.left + DCSrc->rcDcRect.left; - SourceRect.top += DCSrc->rcVport.top + DCSrc->rcDcRect.top; - SourceRect.right += DCSrc->rcVport.left + DCSrc->rcDcRect.left; - SourceRect.bottom += DCSrc->rcVport.top + DCSrc->rcDcRect.top; - } - - BrushOrigin.x = DCDest->dclevel.ptlBrushOrigin.x + DCDest->rcDcRect.left; - BrushOrigin.y = DCDest->dclevel.ptlBrushOrigin.y + DCDest->rcDcRect.top; + SourceRect.left += DCSrc->rcVport.left; + SourceRect.top += DCSrc->rcVport.top; + SourceRect.right += DCSrc->rcVport.left; + SourceRect.bottom += DCSrc->rcVport.top; + } + + BrushOrigin.x = DCDest->dclevel.ptlBrushOrigin.x; + BrushOrigin.y = DCDest->dclevel.ptlBrushOrigin.y; /* Determine surfaces to be used in the bitblt */ BitmapDest = DCDest->dclevel.pSurface; @@ -1125,8 +1125,8 @@ rcDest.left = XDest; rcDest.top = YDest; - rcDest.left += pDC->rcVport.left + pDC->rcDcRect.left; - rcDest.top += pDC->rcVport.top + pDC->rcDcRect.top; + rcDest.left += pDC->rcVport.left; + rcDest.top += pDC->rcVport.top; rcDest.right = rcDest.left + Width; rcDest.bottom = rcDest.top + Height; Modified: branches/arwinss/reactos/subsystems/win32/win32k/gre/ellipse.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/gre/ellipse.c [iso-8859-1] (original) +++ branches/arwinss/reactos/subsystems/win32/win32k/gre/ellipse.c [iso-8859-1] Thu Jan 6 13:17:03 2011 @@ -64,8 +64,8 @@ DPRINT("Ellipse 2: XLeft: %d, YLeft: %d, Width: %d, Height: %d\n", CenterX - RadiusX, CenterY + RadiusY, RadiusX*2, RadiusY*2); - BrushOrigin.x = dc->dclevel.ptlBrushOrigin.x + dc->rcDcRect.left; - BrushOrigin.y = dc->dclevel.ptlBrushOrigin.y + dc->rcDcRect.top; + BrushOrigin.x = dc->dclevel.ptlBrushOrigin.x; + BrushOrigin.y = dc->dclevel.ptlBrushOrigin.y; /* Draw filled part */ if (dc->dclevel.pbrFill && !(dc->dclevel.pbrFill->flAttrs & GDIBRUSH_IS_NULL)) Modified: branches/arwinss/reactos/subsystems/win32/win32k/gre/font.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/gre/font.c [iso-8859-1] (original) +++ branches/arwinss/reactos/subsystems/win32/win32k/gre/font.c [iso-8859-1] Thu Jan 6 13:17:03 2011 @@ -225,8 +225,8 @@ for(idx = 0; idx < count; idx++) { sharp_glyph_fn(pDC, - pDC->rcDcRect.left + pDC->rcVport.left + x + offset.x, - pDC->rcDcRect.top + pDC->rcVport.top + y + offset.y, + pDC->rcVport.left + x + offset.x, + pDC->rcVport.top + y + offset.y, formatEntry->bitmaps[wstr[idx]], &formatEntry->gis[wstr[idx]], &pTextPen); Modified: branches/arwinss/reactos/subsystems/win32/win32k/gre/lineto.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/gre/lineto.c [iso-8859-1] (original) +++ branches/arwinss/reactos/subsystems/win32/win32k/gre/lineto.c [iso-8859-1] Thu Jan 6 13:17:03 2011 @@ -115,10 +115,10 @@ Mix = ROP2_TO_MIX(R2_COPYPEN);/*pdcattr->jROP2*/ for (i=0; i<count-1; i++) { - ptLine[0].x = ptPoints[i].x + pDC->rcDcRect.left + pDC->rcVport.left; - ptLine[0].y = ptPoints[i].y + pDC->rcDcRect.top + pDC->rcVport.top; - ptLine[1].x = ptPoints[i+1].x + pDC->rcDcRect.left + pDC->rcVport.left; - ptLine[1].y = ptPoints[i+1].y + pDC->rcDcRect.top + pDC->rcVport.top; + ptLine[0].x = ptPoints[i].x + pDC->rcVport.left; + ptLine[0].y = ptPoints[i].y + pDC->rcVport.top; + ptLine[1].x = ptPoints[i+1].x + pDC->rcVport.left; + ptLine[1].y = ptPoints[i+1].y + pDC->rcVport.top; DestRect.left = min(ptLine[0].x, ptLine[1].x); DestRect.top = min(ptLine[0].y, ptLine[1].y); Modified: branches/arwinss/reactos/subsystems/win32/win32k/gre/rect.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/gre/rect.c [iso-8859-1] (original) +++ branches/arwinss/reactos/subsystems/win32/win32k/gre/rect.c [iso-8859-1] Thu Jan 6 13:17:03 2011 @@ -32,13 +32,13 @@ MIX Mix; POINTL BrushOrigin; - DestRect.left = LeftRect + pDC->rcDcRect.left + pDC->rcVport.left; - DestRect.right = RightRect + pDC->rcDcRect.left + pDC->rcVport.left; - DestRect.top = TopRect + pDC->rcDcRect.top + pDC->rcVport.top; - DestRect.bottom = BottomRect + pDC->rcDcRect.top + pDC->rcVport.top; - - BrushOrigin.x = pDC->dclevel.ptlBrushOrigin.x + pDC->rcDcRect.left; - BrushOrigin.y = pDC->dclevel.ptlBrushOrigin.y + pDC->rcDcRect.top; + DestRect.left = LeftRect + pDC->rcVport.left; + DestRect.right = RightRect + pDC->rcVport.left; + DestRect.top = TopRect + pDC->rcVport.top; + DestRect.bottom = BottomRect + pDC->rcVport.top; + + BrushOrigin.x = pDC->dclevel.ptlBrushOrigin.x; + BrushOrigin.y = pDC->dclevel.ptlBrushOrigin.y; /* Draw brush-based rectangle */ if (pDC->dclevel.pbrFill) @@ -107,8 +107,8 @@ INT i; POINTL BrushOrigin; - BrushOrigin.x = pDC->dclevel.ptlBrushOrigin.x + pDC->rcDcRect.left; - BrushOrigin.y = pDC->dclevel.ptlBrushOrigin.y + pDC->rcDcRect.top; + BrushOrigin.x = pDC->dclevel.ptlBrushOrigin.x; + BrushOrigin.y = pDC->dclevel.ptlBrushOrigin.y; /* Draw brush-based polygon */ if (pDC->dclevel.pbrFill) Modified: branches/arwinss/reactos/subsystems/win32/win32k/gre/surfobj.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/gre/surfobj.c [iso-8859-1] (original) +++ branches/arwinss/reactos/subsystems/win32/win32k/gre/surfobj.c [iso-8859-1] Thu Jan 6 13:17:03 2011 @@ -825,8 +825,8 @@ SURFOBJ *pso; /* Offset coordinate by DC origin */ - x += pDC->rcVport.left + pDC->rcDcRect.left; - y += pDC->rcVport.top + pDC->rcDcRect.top; + x += pDC->rcVport.left; + y += pDC->rcVport.top; /* If point is outside the combined clipping region - return error */ if (!RECTL_bPointInRect(&pDC->CombinedClip->rclBounds, x, y)) Modified: branches/arwinss/reactos/subsystems/win32/win32k/include/dc.h URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/include/dc.h [iso-8859-1] (original) +++ branches/arwinss/reactos/subsystems/win32/win32k/include/dc.h [iso-8859-1] Thu Jan 6 13:17:03 2011 @@ -29,7 +29,6 @@ EBRUSHOBJ eboLine; /* Origins and extents */ - RECT rcDcRect; /* Relative to Vport */ RECT rcVport; /* Combined clipping region */ Modified: branches/arwinss/reactos/subsystems/win32/win32k/include/swm.h URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/include/swm.h [iso-8859-1] (original) +++ branches/arwinss/reactos/subsystems/win32/win32k/include/swm.h [iso-8859-1] Thu Jan 6 13:17:03 2011 @@ -14,6 +14,7 @@ VOID NTAPI SwmInitialize(); +VOID NTAPI GrContextInit(); PSWM_WINDOW NTAPI SwmFindByHwnd(HWND hWnd); VOID NTAPI SwmAcquire(VOID); VOID NTAPI SwmRelease(VOID); Modified: branches/arwinss/reactos/subsystems/win32/win32k/main/init.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/main/init.c [iso-8859-1] (original) +++ branches/arwinss/reactos/subsystems/win32/win32k/main/init.c [iso-8859-1] Thu Jan 6 13:17:03 2011 @@ -382,6 +382,7 @@ /* Initialize window manager */ SwmInitialize(); - - return STATUS_SUCCESS; -} + //GrContextInit(); + + return STATUS_SUCCESS; +} Modified: branches/arwinss/reactos/subsystems/win32/win32k/wine/winesup.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/wine/winesup.c [iso-8859-1] (original) +++ branches/arwinss/reactos/subsystems/win32/win32k/wine/winesup.c [iso-8859-1] Thu Jan 6 13:17:03 2011 @@ -140,6 +140,24 @@ } return NewPtr; +} + +char * __cdecl GdStrDup(const char *src) +{ + char *newstr = ExAllocatePool(PagedPool, strlen(src)); + strcpy(newstr, src); + return newstr; +} + +void *GdCalloc(size_t num, size_t size) +{ + PVOID Buf; + ULONG TotalSize = num * size; + + Buf = ExAllocatePool(PagedPool, TotalSize); + RtlZeroMemory(Buf, TotalSize); + + return Buf; } #define DIFFTIME 0x19db1ded53e8000ULL

13 years, 8 months

[fireball] 50298: - winent.drv: Keep dc_rect in usermode counterpart of DC structure. - winent.drv: Rename hUserDC to hdc for better readibility. - ntrosgdi.h: Update the PHYSDEV struct and remove ...

by fireball＠svn.reactos.org

Author: fireball Date: Thu Jan 6 13:13:47 2011 New Revision: 50298 URL: http://svn.reactos.org/svn/reactos?rev=50298&view=rev Log: - winent.drv: Keep dc_rect in usermode counterpart of DC structure. - winent.drv: Rename hUserDC to hdc for better readibility. - ntrosgdi.h: Update the PHYSDEV struct and remove unused ROS_DCINFO. Modified: branches/arwinss/reactos/dll/win32/winent.drv/bitblt.c branches/arwinss/reactos/dll/win32/winent.drv/dib.c branches/arwinss/reactos/dll/win32/winent.drv/font.c branches/arwinss/reactos/dll/win32/winent.drv/gdidrv.c branches/arwinss/reactos/dll/win32/winent.drv/graphics.c branches/arwinss/reactos/dll/win32/winent.drv/ogldrv.c branches/arwinss/reactos/include/reactos/wine/ntrosgdi.h Modified: branches/arwinss/reactos/dll/win32/winent.drv/bitblt.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/winen… ============================================================================== --- branches/arwinss/reactos/dll/win32/winent.drv/bitblt.c [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/win32/winent.drv/bitblt.c [iso-8859-1] Thu Jan 6 13:13:47 2011 @@ -26,14 +26,16 @@ pts[1].x = left + width; pts[1].y = top + height; - LPtoDP(physDev->hUserDC, pts, 2); + LPtoDP(physDev->hdc, pts, 2); width = pts[1].x - pts[0].x; height = pts[1].y - pts[0].y; - left = pts[0].x; - top = pts[0].y; + left = pts[0].x + physDev->dc_rect.left; + top = pts[0].y + physDev->dc_rect.top; /* Update brush origin */ - GetBrushOrgEx(physDev->hUserDC, &ptBrush); + GetBrushOrgEx(physDev->hdc, &ptBrush); + ptBrush.x += physDev->dc_rect.left; + ptBrush.y += physDev->dc_rect.top; RosGdiSetBrushOrg(physDev->hKernelDC, ptBrush.x, ptBrush.y); return RosGdiPatBlt(physDev->hKernelDC, left, top, width, height, rop); @@ -61,22 +63,24 @@ pts[1].x = xSrc + width; pts[1].y = ySrc + height; - LPtoDP(physDevSrc->hUserDC, pts, 2); + LPtoDP(physDevSrc->hdc, pts, 2); width = pts[1].x - pts[0].x; height = pts[1].y - pts[0].y; - xSrc = pts[0].x; - ySrc = pts[0].y; + xSrc = pts[0].x + physDevSrc->dc_rect.left; + ySrc = pts[0].y + physDevSrc->dc_rect.top; } /* map dest coordinates */ pts[0].x = xDst; pts[0].y = yDst; - LPtoDP(physDevDst->hUserDC, pts, 1); - xDst = pts[0].x; - yDst = pts[0].y; + LPtoDP(physDevDst->hdc, pts, 1); + xDst = pts[0].x + physDevDst->dc_rect.left; + yDst = pts[0].y + physDevDst->dc_rect.top; /* Update brush origin */ - GetBrushOrgEx(physDevDst->hUserDC, &ptBrush); + GetBrushOrgEx(physDevDst->hdc, &ptBrush); + ptBrush.x += physDevDst->dc_rect.left; + ptBrush.y += physDevDst->dc_rect.top; RosGdiSetBrushOrg(physDevDst->hKernelDC, ptBrush.x, ptBrush.y); //FIXME("xDst %d, yDst %d, widthDst %d, heightDst %d, src x %d y %d\n", @@ -105,11 +109,11 @@ pts[1].x = xSrc + widthSrc; pts[1].y = ySrc + heightSrc; - LPtoDP(physDevSrc->hUserDC, pts, 2); + LPtoDP(physDevSrc->hdc, pts, 2); widthSrc = pts[1].x - pts[0].x; heightSrc = pts[1].y - pts[0].y; - xSrc = pts[0].x; - ySrc = pts[0].y; + xSrc = pts[0].x + physDevSrc->dc_rect.left; + ySrc = pts[0].y + physDevSrc->dc_rect.top; } /* map dest coordinates */ @@ -117,14 +121,16 @@ pts[0].y = yDst; pts[1].x = xDst + widthDst; pts[1].y = yDst + heightDst; - LPtoDP(physDevDst->hUserDC, pts, 2); + LPtoDP(physDevDst->hdc, pts, 2); widthDst = pts[1].x - pts[0].x; heightDst = pts[1].y - pts[0].y; - xDst = pts[0].x; - yDst = pts[0].y; + xDst = pts[0].x + physDevDst->dc_rect.left; + yDst = pts[0].y + physDevDst->dc_rect.top; /* Update brush origin */ - GetBrushOrgEx(physDevDst->hUserDC, &ptBrush); + GetBrushOrgEx(physDevDst->hdc, &ptBrush); + ptBrush.x += physDevDst->dc_rect.left; + ptBrush.y += physDevDst->dc_rect.top; RosGdiSetBrushOrg(physDevDst->hKernelDC, ptBrush.x, ptBrush.y); return RosGdiStretchBlt(physDevDst->hKernelDC, xDst, yDst, widthDst, heightDst, @@ -145,11 +151,11 @@ pts[1].x = xSrc + widthSrc; pts[1].y = ySrc + heightSrc; - LPtoDP(physDevSrc->hUserDC, pts, 2); + LPtoDP(physDevSrc->hdc, pts, 2); widthSrc = pts[1].x - pts[0].x; heightSrc = pts[1].y - pts[0].y; - xSrc = pts[0].x; - ySrc = pts[0].y; + xSrc = pts[0].x + physDevSrc->dc_rect.left; + ySrc = pts[0].y + physDevSrc->dc_rect.top; } /* map dest coordinates */ @@ -158,14 +164,16 @@ pts[1].x = xDst + widthDst; pts[1].y = yDst + heightDst; - LPtoDP(physDevDst->hUserDC, pts, 2); + LPtoDP(physDevDst->hdc, pts, 2); widthDst = pts[1].x - pts[0].x; heightDst = pts[1].y - pts[0].y; - xDst = pts[0].x; - yDst = pts[0].y; + xDst = pts[0].x + physDevDst->dc_rect.left; + yDst = pts[0].y + physDevDst->dc_rect.top; /* Update brush origin */ - GetBrushOrgEx(physDevDst->hUserDC, &ptBrush); + GetBrushOrgEx(physDevDst->hdc, &ptBrush); + ptBrush.x += physDevDst->dc_rect.left; + ptBrush.y += physDevDst->dc_rect.top; RosGdiSetBrushOrg(physDevDst->hKernelDC, ptBrush.x, ptBrush.y); return RosGdiAlphaBlend(physDevDst->hKernelDC, xDst, yDst, widthDst, heightDst, Modified: branches/arwinss/reactos/dll/win32/winent.drv/dib.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/winen… ============================================================================== --- branches/arwinss/reactos/dll/win32/winent.drv/dib.c [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/win32/winent.drv/dib.c [iso-8859-1] Thu Jan 6 13:13:47 2011 @@ -82,7 +82,9 @@ POINT pt; pt.x = xDest; pt.y = yDest; - LPtoDP(physDev->hUserDC, &pt, 1); + LPtoDP(physDev->hdc, &pt, 1); + pt.x += physDev->dc_rect.left; + pt.y += physDev->dc_rect.top; /* Perform extensive parameter checking */ if (DIB_GetBitmapInfo( &info->bmiHeader, &width, &height, Modified: branches/arwinss/reactos/dll/win32/winent.drv/font.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/winen… ============================================================================== --- branches/arwinss/reactos/dll/win32/winent.drv/font.c [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/win32/winent.drv/font.c [iso-8859-1] Thu Jan 6 13:13:47 2011 @@ -201,14 +201,14 @@ *flags = 0; - size = GetFontData(physDev->hUserDC, MS_GASP_TAG, 0, NULL, 0); + size = GetFontData(physDev->hdc, MS_GASP_TAG, 0, NULL, 0); if(size == GDI_ERROR) return FALSE; gasp = buffer = HeapAlloc(GetProcessHeap(), 0, size); - GetFontData(physDev->hUserDC, MS_GASP_TAG, 0, gasp, size); - - GetTextMetricsW(physDev->hUserDC, &tm); + GetFontData(physDev->hdc, MS_GASP_TAG, 0, gasp, size); + + GetTextMetricsW(physDev->hdc, &tm); ppem = abs(RosDrv_YWStoDS(physDev, tm.tmAscent + tm.tmDescent - tm.tmInternalLeading)); gasp++; @@ -389,13 +389,13 @@ break; } - buflen = GetGlyphOutlineW(physDev->hUserDC, glyph, ggo_format, &gm, 0, NULL, &identity); + buflen = GetGlyphOutlineW(physDev->hdc, glyph, ggo_format, &gm, 0, NULL, &identity); if(buflen == GDI_ERROR) { if(format != AA_None) { format = AA_None; entry->aa_default = AA_None; ggo_format = GGO_GLYPH_INDEX | GGO_BITMAP; - buflen = GetGlyphOutlineW(physDev->hUserDC, glyph, ggo_format, &gm, 0, NULL, &identity); + buflen = GetGlyphOutlineW(physDev->hdc, glyph, ggo_format, &gm, 0, NULL, &identity); } if(buflen == GDI_ERROR) { WARN("GetGlyphOutlineW failed\n"); @@ -446,7 +446,7 @@ } buf = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, buflen); - GetGlyphOutlineW(physDev->hUserDC, glyph, ggo_format, &gm, buflen, buf, &identity); + GetGlyphOutlineW(physDev->hdc, glyph, ggo_format, &gm, buflen, buf, &identity); formatEntry->realized[glyph] = TRUE; TRACE("buflen = %d. Got metrics: %dx%d adv=%d,%d origin=%d,%d\n", @@ -515,7 +515,7 @@ lfsz.lf.lfWidth = abs( lfsz.lf.lfWidth ); lfsz.devsize.cx = RosDrv_XWStoDS( physDev, lfsz.lf.lfWidth ); lfsz.devsize.cy = RosDrv_YWStoDS( physDev, lfsz.lf.lfHeight ); - GetWorldTransform( physDev->hUserDC, &lfsz.xform ); + GetWorldTransform( physDev->hdc, &lfsz.xform ); lfsz_calc_hash(&lfsz); /*EnterCriticalSection(&xrender_cs);*/ @@ -534,13 +534,14 @@ gsCacheEntry *entry; gsCacheEntryFormat *formatEntry; BOOL retv = FALSE; - //HDC hdc = physDev->hUserDC; + //HDC hdc = physDev->hdc; //int textPixel, backgroundPixel; HRGN saved_region = 0; BOOL disable_antialias = FALSE; AA_Type aa_type = AA_None; //DIBSECTION bmp; unsigned int idx; + RECT rect; //enum drawable_depth_type depth_type = (physDev->depth == 1) ? mono_drawable : color_drawable; //Picture tile_pict = 0; @@ -577,16 +578,18 @@ HBRUSH brush, oldBrush; HPEN pen, oldPen; - brush = CreateSolidBrush(GetBkColor(physDev->hUserDC)); - oldBrush = SelectObject(physDev->hUserDC, brush); + brush = CreateSolidBrush(GetBkColor(physDev->hdc)); + oldBrush = SelectObject(physDev->hdc, brush); pen = CreatePen(PS_NULL, 0, 0); - oldPen = SelectObject(physDev->hUserDC, pen); - - RosGdiRectangle(physDev->hKernelDC, (RECT*)lprect); - - DeleteObject(SelectObject(physDev->hUserDC, oldBrush)); - DeleteObject(SelectObject(physDev->hUserDC, oldPen)); + oldPen = SelectObject(physDev->hdc, pen); + + CopyRect(&rect, lprect); + OffsetRect(&rect, physDev->dc_rect.left, physDev->dc_rect.top); + RosGdiRectangle(physDev->hKernelDC, &rect); + + DeleteObject(SelectObject(physDev->hdc, oldBrush)); + DeleteObject(SelectObject(physDev->hdc, oldPen)); } if(count == 0) @@ -633,9 +636,9 @@ } TRACE("Writing %s at %d,%d\n", debugstr_wn(wstr,count), - /*physDev->dc_rect.left +*/ x, /*physDev->dc_rect.top +*/ y); - - RosGdiExtTextOut(physDev->hKernelDC, x, y, flags, lprect, wstr, count, lpDx, formatEntry, aa_type); + physDev->dc_rect.left + x, physDev->dc_rect.top + y); + + RosGdiExtTextOut(physDev->hKernelDC, physDev->dc_rect.left + x, physDev->dc_rect.top + y, flags, lprect, wstr, count, lpDx, formatEntry, aa_type); //LeaveCriticalSection(&xrender_cs); Modified: branches/arwinss/reactos/dll/win32/winent.drv/gdidrv.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/winen… ============================================================================== --- branches/arwinss/reactos/dll/win32/winent.drv/gdidrv.c [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/win32/winent.drv/gdidrv.c [iso-8859-1] Thu Jan 6 13:13:47 2011 @@ -56,7 +56,7 @@ /* Save newly created DC */ physDev->hKernelDC = hKernelDC; - physDev->hUserDC = hdc; + physDev->hdc = hdc; /* No font is selected */ physDev->cache_index = -1; @@ -108,7 +108,8 @@ { const struct ntdrv_escape_set_drawable *data = in_data; - RosGdiSetDcRects(physDev->hKernelDC, (RECT*)&data->dc_rect, (RECT*)&data->drawable_rect); + physDev->dc_rect = data->dc_rect; + RosGdiSetDcRects(physDev->hKernelDC, NULL, (RECT*)&data->drawable_rect); if (!data->release) RosGdiGetDC(physDev->hKernelDC, data->hwnd, data->clip_children); @@ -116,7 +117,7 @@ RosGdiReleaseDC(physDev->hKernelDC); TRACE( "SET_DRAWABLE hdc %p dc_rect %s drawable_rect %s\n", - physDev->hUserDC, wine_dbgstr_rect(&data->dc_rect), wine_dbgstr_rect(&data->drawable_rect) ); + physDev->hdc, wine_dbgstr_rect(&data->dc_rect), wine_dbgstr_rect(&data->drawable_rect) ); return TRUE; } break; @@ -226,7 +227,7 @@ /* If it's a stock object, then use DC's color */ if (hpen == GetStockObject( DC_PEN )) - logpen.lopnColor = GetDCPenColor(physDev->hUserDC); + logpen.lopnColor = GetDCPenColor(physDev->hdc); /* Call kernelmode */ RosGdiSelectPen(physDev->hKernelDC, &logpen, elogpen); Modified: branches/arwinss/reactos/dll/win32/winent.drv/graphics.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/winen… ============================================================================== --- branches/arwinss/reactos/dll/win32/winent.drv/graphics.c [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/win32/winent.drv/graphics.c [iso-8859-1] Thu Jan 6 13:13:47 2011 @@ -50,9 +50,10 @@ void CDECL RosDrv_SetDeviceClipping( NTDRV_PDEVICE *physDev, HRGN vis_rgn, HRGN clip_rgn ) { RGNDATA *data; - DWORD size; - - //FIXME("SetDeviceClipping hdc %x\n", physDev->hUserDC); + DWORD size, i; + RECT *pRects; + + //FIXME("SetDeviceClipping hdc %x\n", physDev->hdc); /* Update dc region to become a combined region */ CombineRgn( physDev->region, vis_rgn, clip_rgn, clip_rgn ? RGN_AND : RGN_COPY ); @@ -71,6 +72,14 @@ HeapFree( GetProcessHeap(), 0, data ); return; } + + /* Offset all rects */ + pRects = (RECT *)data->Buffer; + for (i=0; i<data->rdh.nCount; i++) + OffsetRect(&pRects[i], physDev->dc_rect.left, physDev->dc_rect.top); + + /* Offset bounding rect */ + OffsetRect(&data->rdh.rcBound, physDev->dc_rect.left, physDev->dc_rect.top); /* Set clipping */ RosGdiSetDeviceClipping(physDev->hKernelDC, data->rdh.nCount, (RECTL *)data->Buffer, (RECTL *)&data->rdh.rcBound); @@ -93,7 +102,7 @@ pt[0].y = 0; pt[1].x = width; pt[1].y = 0; - LPtoDP( physDev->hUserDC, pt, 2 ); + LPtoDP( physDev->hdc, pt, 2 ); return pt[1].x - pt[0].x; } @@ -110,7 +119,7 @@ pt[0].y = 0; pt[1].x = 0; pt[1].y = height; - LPtoDP( physDev->hUserDC, pt, 2 ); + LPtoDP( physDev->hdc, pt, 2 ); return pt[1].y - pt[0].y; } @@ -119,21 +128,23 @@ POINT pt[2]; /* Get current cursor position */ - GetCurrentPositionEx( physDev->hUserDC, &pt[0] ); + GetCurrentPositionEx( physDev->hdc, &pt[0] ); /* Convert both points coordinates to device */ pt[1].x = x; pt[1].y = y; - LPtoDP( physDev->hUserDC, pt, 2 ); + LPtoDP( physDev->hdc, pt, 2 ); /* Draw the line */ - return RosGdiLineTo(physDev->hKernelDC, pt[0].x, pt[0].y, pt[1].x, pt[1].y); + return RosGdiLineTo(physDev->hKernelDC, physDev->dc_rect.left + pt[0].x, physDev->dc_rect.top + pt[0].y, + physDev->dc_rect.left + pt[1].x, physDev->dc_rect.top + pt[1].y); } BOOL CDECL RosDrv_Arc( NTDRV_PDEVICE *physDev, INT left, INT top, INT right, INT bottom, INT xstart, INT ystart, INT xend, INT yend ) { POINT pts[4]; + DWORD i; /* Map coordinates */ pts[0].x = left; @@ -145,7 +156,13 @@ pts[3].x = xend; pts[3].y = yend; - LPtoDP(physDev->hUserDC, pts, 4); + LPtoDP(physDev->hdc, pts, 4); + + for (i=0; i<4; i++) + { + pts[i].x += physDev->dc_rect.left; + pts[i].y += physDev->dc_rect.top; + } return RosGdiArc(physDev->hKernelDC, pts[0].x, pts[0].y, pts[1].x, pts[1].y, pts[2].x, pts[2].y, pts[3].x, pts[3].y, GdiTypeArc); @@ -155,6 +172,7 @@ INT xstart, INT ystart, INT xend, INT yend ) { POINT pts[4]; + DWORD i; /* Map coordinates */ pts[0].x = left; @@ -166,7 +184,13 @@ pts[3].x = xend; pts[3].y = yend; - LPtoDP(physDev->hUserDC, pts, 4); + LPtoDP(physDev->hdc, pts, 4); + + for (i=0; i<4; i++) + { + pts[i].x += physDev->dc_rect.left; + pts[i].y += physDev->dc_rect.top; + } return RosGdiArc(physDev->hKernelDC, pts[0].x, pts[0].y, pts[1].x, pts[1].y, pts[2].x, pts[2].y, pts[3].x, pts[3].y, GdiTypePie); @@ -176,6 +200,7 @@ INT xstart, INT ystart, INT xend, INT yend ) { POINT pts[4]; + DWORD i; /* Map coordinates */ pts[0].x = left; @@ -187,7 +212,13 @@ pts[3].x = xend; pts[3].y = yend; - LPtoDP(physDev->hUserDC, pts, 4); + LPtoDP(physDev->hdc, pts, 4); + + for (i=0; i<4; i++) + { + pts[i].x += physDev->dc_rect.left; + pts[i].y += physDev->dc_rect.top; + } return RosGdiArc(physDev->hKernelDC, pts[0].x, pts[0].y, pts[1].x, pts[1].y, pts[2].x, pts[2].y, pts[3].x, pts[3].y, GdiTypeChord ); @@ -196,6 +227,7 @@ BOOL CDECL RosDrv_Ellipse( NTDRV_PDEVICE *physDev, INT left, INT top, INT right, INT bottom ) { POINT pts[2]; + DWORD i; /* Map coordinates */ pts[0].x = left; @@ -203,7 +235,13 @@ pts[1].x = right; pts[1].y = bottom; - LPtoDP(physDev->hUserDC, pts, 2); + LPtoDP(physDev->hdc, pts, 2); + + for (i=0; i<2; i++) + { + pts[i].x += physDev->dc_rect.left; + pts[i].y += physDev->dc_rect.top; + } return RosGdiEllipse(physDev->hKernelDC, pts[0].x, pts[0].y, pts[1].x, pts[1].y); } @@ -211,7 +249,7 @@ BOOL CDECL RosDrv_Rectangle(NTDRV_PDEVICE *physDev, INT left, INT top, INT right, INT bottom) { POINT ptBrush; - RECT rc = get_device_rect( physDev->hUserDC, left, top, right, bottom ); + RECT rc = get_device_rect( physDev->hdc, left, top, right, bottom ); if ((rc.left == rc.right) || (rc.top == rc.bottom)) return TRUE; @@ -219,9 +257,12 @@ if (rc.bottom < rc.top) { INT tmp = rc.bottom; rc.bottom = rc.top; rc.top = tmp; } /* Update brush origin */ - GetBrushOrgEx(physDev->hUserDC, &ptBrush); + GetBrushOrgEx(physDev->hdc, &ptBrush); + ptBrush.x += physDev->dc_rect.left; + ptBrush.y += physDev->dc_rect.top; RosGdiSetBrushOrg(physDev->hKernelDC, ptBrush.x, ptBrush.y); + OffsetRect(&rc, physDev->dc_rect.left, physDev->dc_rect.top); RosGdiRectangle(physDev->hKernelDC, &rc); return TRUE; @@ -240,9 +281,9 @@ /* Transform to device coordinates */ ptPixel.x = x; ptPixel.y = y; - LPtoDP(physDev->hUserDC, &ptPixel, 1); - - return RosGdiSetPixel(physDev->hKernelDC, ptPixel.x, ptPixel.y, color); + LPtoDP(physDev->hdc, &ptPixel, 1); + + return RosGdiSetPixel(physDev->hKernelDC, physDev->dc_rect.left + ptPixel.x, physDev->dc_rect.top + ptPixel.y, color); } COLORREF CDECL RosDrv_GetPixel( NTDRV_PDEVICE *physDev, INT x, INT y ) @@ -251,9 +292,9 @@ /* Transform to device coordinates */ ptPixel.x = x; ptPixel.y = y; - LPtoDP(physDev->hUserDC, &ptPixel, 1); - - return RosGdiGetPixel(physDev->hKernelDC, ptPixel.x, ptPixel.y); + LPtoDP(physDev->hdc, &ptPixel, 1); + + return RosGdiGetPixel(physDev->hKernelDC, physDev->dc_rect.left + ptPixel.x, physDev->dc_rect.top + ptPixel.y); } BOOL CDECL RosDrv_PaintRgn( NTDRV_PDEVICE *physDev, HRGN hrgn ) @@ -275,9 +316,9 @@ for (i = 0; i < count; i++) { POINT tmp = pt[i]; - LPtoDP(physDev->hUserDC, &tmp, 1); - points[i].x = tmp.x; - points[i].y = tmp.y; + LPtoDP(physDev->hdc, &tmp, 1); + points[i].x = physDev->dc_rect.left + tmp.x; + points[i].y = physDev->dc_rect.top + tmp.y; } /* Call kernel mode */ @@ -301,14 +342,16 @@ for (i = 0; i < count; i++) { POINT tmp = pt[i]; - LPtoDP(physDev->hUserDC, &tmp, 1); - points[i].x = tmp.x; - points[i].y = tmp.y; + LPtoDP(physDev->hdc, &tmp, 1); + points[i].x = physDev->dc_rect.left + tmp.x; + points[i].y = physDev->dc_rect.top + tmp.y; } points[count] = points[0]; /* Update brush origin */ - GetBrushOrgEx(physDev->hUserDC, &ptBrush); + GetBrushOrgEx(physDev->hdc, &ptBrush); + ptBrush.x += physDev->dc_rect.left; + ptBrush.y += physDev->dc_rect.top; RosGdiSetBrushOrg(physDev->hKernelDC, ptBrush.x, ptBrush.y); /* Call kernel mode */ @@ -338,9 +381,9 @@ /* Transform to device coordinates */ ptPixel.x = x; ptPixel.y = y; - LPtoDP(physDev->hUserDC, &ptPixel, 1); - - return RosGdiExtFloodFill(physDev->hKernelDC, ptPixel.x, ptPixel.y, color, fillType); + LPtoDP(physDev->hdc, &ptPixel, 1); + + return RosGdiExtFloodFill(physDev->hKernelDC, physDev->dc_rect.left + ptPixel.x, physDev->dc_rect.top + ptPixel.y, color, fillType); } COLORREF CDECL RosDrv_SetBkColor( NTDRV_PDEVICE *physDev, COLORREF color ) Modified: branches/arwinss/reactos/dll/win32/winent.drv/ogldrv.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/winen… ============================================================================== --- branches/arwinss/reactos/dll/win32/winent.drv/ogldrv.c [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/win32/winent.drv/ogldrv.c [iso-8859-1] Thu Jan 6 13:13:47 2011 @@ -60,7 +60,7 @@ if (!InitOGL()) return 0; - return glChoosePixelFormat(physDev->hUserDC, ppfd); + return glChoosePixelFormat(physDev->hdc, ppfd); } INT CDECL RosDrv_GetPixelFormat(NTDRV_PDEVICE *physDev) @@ -69,7 +69,7 @@ if (!InitOGL()) return 0; - return glGetPixelFormat(physDev->hUserDC); + return glGetPixelFormat(physDev->hdc); } INT CDECL RosDrv_DescribePixelFormat(NTDRV_PDEVICE *physDev, @@ -81,7 +81,7 @@ if (!InitOGL()) return 0; - return glDescribePixelFormat(physDev->hUserDC, iPixelFormat, nBytes, ppfd); + return glDescribePixelFormat(physDev->hdc, iPixelFormat, nBytes, ppfd); } BOOL CDECL RosDrv_SetPixelFormat(NTDRV_PDEVICE *physDev, @@ -92,7 +92,7 @@ if (!InitOGL()) return 0; - return glSetPixelFormat(physDev->hUserDC, iPixelFormat, ppfd); + return glSetPixelFormat(physDev->hdc, iPixelFormat, ppfd); } @@ -102,7 +102,7 @@ if (!InitOGL()) return 0; - return glSwapBuffers(physDev->hUserDC); + return glSwapBuffers(physDev->hdc); } /* EOF */ Modified: branches/arwinss/reactos/include/reactos/wine/ntrosgdi.h URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/include/reactos… ============================================================================== --- branches/arwinss/reactos/include/reactos/wine/ntrosgdi.h [iso-8859-1] (original) +++ branches/arwinss/reactos/include/reactos/wine/ntrosgdi.h [iso-8859-1] Thu Jan 6 13:13:47 2011 @@ -10,22 +10,12 @@ typedef struct _NTDRV_PDEVICE { - HDC hUserDC; + HDC hdc; HDC hKernelDC; + RECT dc_rect; /* DC rectangle relative to drawable */ HRGN region; /* Device region (visible region & clip region) */ int cache_index; /* cache of a currently selected font */ } NTDRV_PDEVICE, *PNTDRV_PDEVICE; - -typedef struct _ROS_DCINFO -{ - WORD dwType; - SIZE szVportExt; - POINT ptVportOrg; - SIZE szWndExt; - POINT ptWndOrg; - XFORM xfWorld2Wnd; - XFORM xfWnd2Vport; -} ROS_DCINFO, *PROS_DCINFO; typedef struct { @@ -97,8 +87,8 @@ INT widthSrc, INT heightSrc, DWORD rop ); /* dc.c */ -BOOL APIENTRY RosGdiCreateDC( PROS_DCINFO dc, HDC *pdev, LPCWSTR driver, LPCWSTR device, - LPCWSTR output, const DEVMODEW* initData ); +BOOL APIENTRY RosGdiCreateDC( HDC *pdev, LPCWSTR driver, LPCWSTR device, + LPCWSTR output, const DEVMODEW* initData, ULONG dcType ); BOOL APIENTRY RosGdiDeleteDC( HDC physDev ); BOOL APIENTRY RosGdiGetDCOrgEx( HDC physDev, LPPOINT lpp ); BOOL APIENTRY RosGdiPaintRgn( HDC physDev, HRGN hrgn );

13 years, 8 months

[dreimer] 50297: Update rapps database

by dreimer＠svn.reactos.org

Author: dreimer Date: Thu Jan 6 12:44:01 2011 New Revision: 50297 URL: http://svn.reactos.org/svn/reactos?rev=50297&view=rev Log: Update rapps database Modified: trunk/reactos/base/applications/rapps/rapps/kdewin.txt trunk/reactos/base/applications/rapps/rapps/mono2.txt trunk/reactos/base/applications/rapps/rapps/python.txt trunk/reactos/base/applications/rapps/rapps/tuxpaint.txt Modified: trunk/reactos/base/applications/rapps/rapps/kdewin.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/kdewin.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/kdewin.txt [iso-8859-1] Thu Jan 6 12:44:01 2011 @@ -2,13 +2,13 @@ [Section] Name = K Desktop Environment -Version = 0.9.7-0 +Version = 0.9.8-0 Licence = GPL Description = KDE for Windows. Size = 2.0MB Category = 15 URLSite = http://www.winkde.org/ -URLDownload = http://www.winkde.org/pub/kde/ports/win32/installer/kdewin-installer-gui-0.… +URLDownload = http://www.winkde.org/pub/kde/ports/win32/installer/kdewin-installer-gui-0.… CDPath = none [Section.0407] Modified: trunk/reactos/base/applications/rapps/rapps/mono2.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/mono2.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/mono2.txt [iso-8859-1] Thu Jan 6 12:44:01 2011 @@ -2,13 +2,13 @@ [Section] Name = Mono .net Development Framework -Version = 2.8.1 +Version = 2.8.2 Licence = Unknown Description = Open Source .net Framework. Size = 77MB Category = 14 URLSite = http://www.mono-project.com/Main_Page -URLDownload = http://ftp.novell.com/pub/mono/archive/2.8.1/windows-installer/3/mono-2.8.1… +URLDownload = http://ftp.novell.com/pub/mono/archive/2.8.2/windows-installer/1/mono-2.8.2… CDPath = none [Section.0415] Modified: trunk/reactos/base/applications/rapps/rapps/python.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/python.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/python.txt [iso-8859-1] Thu Jan 6 12:44:01 2011 @@ -2,13 +2,13 @@ [Section] Name = Python -Version = 2.6.6 +Version = 2.7.1 Licence = GPL/LGPL Description = A remarkably powerful dynamic programming language. -Size = 14.5MB +Size = 15.0MB Category = 7 URLSite = http://www.python.org/ -URLDownload = http://www.python.org/ftp/python/2.6.6/python-2.6.6.msi +URLDownload = http://www.python.org/ftp/python/2.7.1/python-2.7.1.msi CDPath = none [Section.0407] Modified: trunk/reactos/base/applications/rapps/rapps/tuxpaint.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/tuxpaint.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/tuxpaint.txt [iso-8859-1] Thu Jan 6 12:44:01 2011 @@ -2,13 +2,13 @@ [Section] Name = TuxPaint -Version = 0.9.21b +Version = 0.9.21c Licence = GPL Description = An Open Source bitmap graphics editor geared towards young children. Size = 11MB Category = 3 URLSite = http://tuxpaint.org/ -URLDownload = http://ovh.dl.sourceforge.net/project/tuxpaint/tuxpaint/0.9.21b/tuxpaint-0.… +URLDownload = http://ovh.dl.sourceforge.net/project/tuxpaint/tuxpaint/0.9.21c/tuxpaint-0.… CDPath = none [Section.0405]

13 years, 8 months

[tkreuzer] 50296: [WIN32K] Fix a bug in FLOATOBJ_DivLong

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Thu Jan 6 00:19:40 2011 New Revision: 50296 URL: http://svn.reactos.org/svn/reactos?rev=50296&view=rev Log: [WIN32K] Fix a bug in FLOATOBJ_DivLong Modified: trunk/reactos/subsystems/win32/win32k/eng/i386/floatobj.S Modified: trunk/reactos/subsystems/win32/win32k/eng/i386/floatobj.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/en… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/eng/i386/floatobj.S [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/eng/i386/floatobj.S [iso-8859-1] Thu Jan 6 00:19:40 2011 @@ -1,4 +1,4 @@ -/* +/* * COPYRIGHT: LGPL, see LGPL.txt in the top level directory * PROJECT: ReactOS Win32 subsystem * PURPOSE: FLOATOBJ floating point emulation functions for x86 @@ -98,7 +98,7 @@ jz SetFloat0 /* If it's all zero, ... */ shl ecx, 7 /* Put the bits for the mantissa in place */ - + cdq /* Fill edx with the sign from the FLOATL in eax */ and ecx, HEX(7fffffff) /* Mask out invalid field in the mantissa */ @@ -818,7 +818,8 @@ push [ebp + PARAM1] /* Push the FLOATOBJ param on the stack */ call _FLOATOBJ_Div@8 /* Divide */ - pop ebp /* Cleanup and return */ + mov esp, ebp /* Cleanup and return */ + pop ebp ret 8

13 years, 8 months

[fireball] 50295: - Modify RosGdiCreateDC accordingly.

by fireball＠svn.reactos.org

Author: fireball Date: Wed Jan 5 23:19:10 2011 New Revision: 50295 URL: http://svn.reactos.org/svn/reactos?rev=50295&view=rev Log: - Modify RosGdiCreateDC accordingly. Modified: branches/arwinss/reactos/subsystems/win32/win32k/gdi/dc.c branches/arwinss/reactos/subsystems/win32/win32k/swm/winman.c Modified: branches/arwinss/reactos/subsystems/win32/win32k/gdi/dc.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/gdi/dc.c [iso-8859-1] (original) +++ branches/arwinss/reactos/subsystems/win32/win32k/gdi/dc.c [iso-8859-1] Wed Jan 5 23:19:10 2011 @@ -49,8 +49,8 @@ return TRUE; } -BOOL APIENTRY RosGdiCreateDC( PROS_DCINFO dc, HDC *pdev, LPCWSTR driver, LPCWSTR device, - LPCWSTR output, const DEVMODEW* initData ) +BOOL APIENTRY RosGdiCreateDC( HDC *pdev, LPCWSTR driver, LPCWSTR device, + LPCWSTR output, const DEVMODEW* initData, ULONG dcType ) { HGDIOBJ hNewDC; PDC pNewDC; @@ -90,7 +90,7 @@ pNewDC->dclevel.hpal = hStockPalette; pNewDC->dclevel.ppal = PALETTE_ShareLockPalette(pNewDC->dclevel.hpal); - if (dc->dwType == OBJ_MEMDC) + if (dcType == OBJ_MEMDC) { DPRINT("Creating a memory DC %x\n", hNewDC); pNewDC->dclevel.pSurface = SURFACE_ShareLockSurface(hStockBmp); Modified: branches/arwinss/reactos/subsystems/win32/win32k/swm/winman.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/swm/winman.c [iso-8859-1] (original) +++ branches/arwinss/reactos/subsystems/win32/win32k/swm/winman.c [iso-8859-1] Wed Jan 5 23:19:10 2011 @@ -56,15 +56,12 @@ NTAPI SwmCreateScreenDc() { - ROS_DCINFO RosDc; PDC pDC; RECTL rcBounds; /* Create the display DC */ - RtlZeroMemory(&RosDc, sizeof(ROS_DCINFO)); - RosDc.dwType = OBJ_DC; SwmDc = (HDC)0; - RosGdiCreateDC(&RosDc, &SwmDc, NULL, NULL, NULL, NULL); + RosGdiCreateDC(&SwmDc, NULL, NULL, NULL, NULL, OBJ_DC); /* Set clipping to full screen */ pDC = DC_LockDc(SwmDc);

13 years, 8 months

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

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs January 2011