Ros-diffs

ros-diffs@reactos.org

81390 discussions

[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 06 Jan '11

06 Jan '11

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; +}

1 0

[akhaldi] 50301: [CMAKE] - Fix formatting.
by akhaldi＠svn.reactos.org 06 Jan '11

06 Jan '11

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

1 0

[akhaldi] 50300: [CMAKE] - Initial support of the arm toolchain/build.
by akhaldi＠svn.reactos.org 06 Jan '11

06 Jan '11

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> ")

1 0

[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 06 Jan '11

06 Jan '11

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

1 0

[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 06 Jan '11

06 Jan '11

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 );

1 0

[dreimer] 50297: Update rapps database
by dreimer＠svn.reactos.org 06 Jan '11

06 Jan '11

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]

1 0

[tkreuzer] 50296: [WIN32K] Fix a bug in FLOATOBJ_DivLong
by tkreuzer＠svn.reactos.org 06 Jan '11

06 Jan '11

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

1 0

[fireball] 50295: - Modify RosGdiCreateDC accordingly.
by fireball＠svn.reactos.org 05 Jan '11

05 Jan '11

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);

1 0

[fireball] 50294: - Move font related routines to font.c. - Remove ROS_DCINFO structure and all related stuff. It's totally unnecessary, since coordinate transformation is done in usermode.
by fireball＠svn.reactos.org 05 Jan '11

05 Jan '11

Author: fireball Date: Wed Jan 5 23:18:00 2011 New Revision: 50294 URL: http://svn.reactos.org/svn/reactos?rev=50294&view=rev Log: - Move font related routines to font.c. - Remove ROS_DCINFO structure and all related stuff. It's totally unnecessary, since coordinate transformation is done in usermode. Modified: branches/arwinss/reactos/dll/win32/winent.drv/font.c branches/arwinss/reactos/dll/win32/winent.drv/gdidrv.c 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] Wed Jan 5 23:18:00 2011 @@ -653,4 +653,52 @@ return retv; } +BOOL CDECL RosDrv_ExtTextOut( NTDRV_PDEVICE *physDev, INT x, INT y, UINT flags, + const RECT *lprect, LPCWSTR wstr, UINT count, + const INT *lpDx ) +{ + //if (physDev->has_gdi_font) + return FeTextOut(physDev, x, y, flags, lprect, wstr, count, lpDx); + + //UNIMPLEMENTED; + //return FALSE; +} + +BOOL CDECL RosDrv_GetTextExtentExPoint( NTDRV_PDEVICE *physDev, LPCWSTR str, INT count, + INT maxExt, LPINT lpnFit, LPINT alpDx, LPSIZE size ) +{ + UNIMPLEMENTED; + return FALSE; +} + +BOOL CDECL RosDrv_GetTextMetrics(NTDRV_PDEVICE *physDev, TEXTMETRICW *metrics) +{ + /* Let GDI font engine do the work */ + return FALSE; +} + +BOOL CDECL RosDrv_EnumDeviceFonts( NTDRV_PDEVICE *physDev, LPLOGFONTW plf, + FONTENUMPROCW proc, LPARAM lp ) +{ + /* We're always using client-side fonts. */ + return FALSE; +} + +HFONT CDECL RosDrv_SelectFont( NTDRV_PDEVICE *physDev, HFONT hfont, HANDLE gdiFont ) +{ + /* We don't have a kernelmode font engine */ + if (gdiFont == 0) + { + /*RosGdiSelectFont(physDev->hKernelDC, hfont, gdiFont);*/ + } + else + { + /* Save information about the selected font */ + FeSelectFont(physDev, hfont); + } + + /* Indicate that gdiFont is good to use */ + return 0; +} + /* EOF */ 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] Wed Jan 5 23:18:00 2011 @@ -36,8 +36,7 @@ LPCWSTR output, const DEVMODEW* initData ) { BOOL bRet; - double scaleX, scaleY; - ROS_DCINFO dcInfo = {0}; + DWORD dcType; NTDRV_PDEVICE *physDev; HDC hKernelDC; @@ -45,50 +44,15 @@ physDev = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*physDev) ); if (!physDev) return FALSE; - /* Fill in internal DCINFO structure */ - dcInfo.dwType = GetObjectType(hdc); - GetWorldTransform(hdc, &dcInfo.xfWorld2Wnd); - GetViewportExtEx(hdc, &dcInfo.szVportExt); - GetViewportOrgEx(hdc, &dcInfo.ptVportOrg); - GetWindowExtEx(hdc, &dcInfo.szWndExt); - GetWindowOrgEx(hdc, &dcInfo.ptWndOrg); - - /* Calculate xfWnd2Vport */ - scaleX = (double)dcInfo.szVportExt.cx / (double)dcInfo.szWndExt.cx; - scaleY = (double)dcInfo.szVportExt.cy / (double)dcInfo.szWndExt.cy; - dcInfo.xfWnd2Vport.eM11 = scaleX; - dcInfo.xfWnd2Vport.eM12 = 0.0; - dcInfo.xfWnd2Vport.eM21 = 0.0; - dcInfo.xfWnd2Vport.eM22 = scaleY; - dcInfo.xfWnd2Vport.eDx = (double)dcInfo.ptVportOrg.x - - scaleX * (double)dcInfo.ptWndOrg.x; - dcInfo.xfWnd2Vport.eDy = (double)dcInfo.ptVportOrg.y - - scaleY * (double)dcInfo.ptWndOrg.y; - - /* The following part is done in kernel mode */ -#if 0 - /* Combine with the world transformation */ - CombineTransform( &dc->xformWorld2Vport, &dc->xformWorld2Wnd, - &xformWnd2Vport ); - - /* Create inverse of world-to-viewport transformation */ - dc->vport2WorldValid = DC_InvertXform( &dc->xformWorld2Vport, - &dc->xformVport2World ); -#endif - - /* Save DC handle if it's a compatible one or set it to NULL for - a display DC */ - if (*pdev) - hKernelDC = (*pdev)->hKernelDC; - else - hKernelDC = 0; + /* Get DC type */ + dcType = GetObjectType(hdc); /* Save stock bitmap's handle */ - if (dcInfo.dwType == OBJ_MEMDC && !hStockBitmap) + if (dcType == OBJ_MEMDC && !hStockBitmap) hStockBitmap = GetCurrentObject( hdc, OBJ_BITMAP ); /* Call the win32 kernel */ - bRet = RosGdiCreateDC(&dcInfo, &hKernelDC, driver, device, output, initData); + bRet = RosGdiCreateDC(&hKernelDC, driver, device, output, initData, dcType); /* Save newly created DC */ physDev->hKernelDC = hKernelDC; @@ -127,13 +91,6 @@ /* Return result */ return res; -} - -BOOL CDECL RosDrv_EnumDeviceFonts( NTDRV_PDEVICE *physDev, LPLOGFONTW plf, - FONTENUMPROCW proc, LPARAM lp ) -{ - /* We're always using client-side fonts. */ - return FALSE; } INT CDECL RosDrv_ExtEscape( NTDRV_PDEVICE *physDev, INT escape, INT in_count, LPCVOID in_data, @@ -174,17 +131,6 @@ return 0; } -BOOL CDECL RosDrv_ExtTextOut( NTDRV_PDEVICE *physDev, INT x, INT y, UINT flags, - const RECT *lprect, LPCWSTR wstr, UINT count, - const INT *lpDx ) -{ - //if (physDev->has_gdi_font) - return FeTextOut(physDev, x, y, flags, lprect, wstr, count, lpDx); - - //UNIMPLEMENTED; - //return FALSE; -} - LONG CDECL RosDrv_GetBitmapBits( HBITMAP hbitmap, void *buffer, LONG count ) { return RosGdiGetBitmapBits(hbitmap, buffer, count); @@ -220,19 +166,6 @@ return RosGdiGetSystemPaletteEntries(physDev->hKernelDC, start, count, entries); } -BOOL CDECL RosDrv_GetTextExtentExPoint( NTDRV_PDEVICE *physDev, LPCWSTR str, INT count, - INT maxExt, LPINT lpnFit, LPINT alpDx, LPSIZE size ) -{ - UNIMPLEMENTED; - return FALSE; -} - -BOOL CDECL RosDrv_GetTextMetrics(NTDRV_PDEVICE *physDev, TEXTMETRICW *metrics) -{ - /* Let GDI font engine do the work */ - return FALSE; -} - UINT CDECL RosDrv_RealizeDefaultPalette( NTDRV_PDEVICE *physDev ) { //UNIMPLEMENTED; @@ -271,23 +204,6 @@ RosGdiSelectBrush(physDev->hKernelDC, &logbrush); return hbrush; -} - -HFONT CDECL RosDrv_SelectFont( NTDRV_PDEVICE *physDev, HFONT hfont, HANDLE gdiFont ) -{ - /* We don't have a kernelmode font engine */ - if (gdiFont == 0) - { - /*RosGdiSelectFont(physDev->hKernelDC, hfont, gdiFont);*/ - } - else - { - /* Save information about the selected font */ - FeSelectFont(physDev, hfont); - } - - /* Indicate that gdiFont is good to use */ - return 0; } HPEN CDECL RosDrv_SelectPen( NTDRV_PDEVICE *physDev, HPEN hpen )

1 0

[fireball] 50293: - More code cleanup: put GDI code into appropriate places.
by fireball＠svn.reactos.org 05 Jan '11

05 Jan '11

Author: fireball Date: Wed Jan 5 22:39:38 2011 New Revision: 50293 URL: http://svn.reactos.org/svn/reactos?rev=50293&view=rev Log: - More code cleanup: put GDI code into appropriate places. 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/winent.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] Wed Jan 5 22:39:38 2011 @@ -16,4 +16,162 @@ /* FUNCTIONS **************************************************************/ +BOOL CDECL RosDrv_PatBlt( NTDRV_PDEVICE *physDev, INT left, INT top, INT width, INT height, DWORD rop ) +{ + POINT pts[2], ptBrush; + + /* Map coordinates */ + pts[0].x = left; + pts[0].y = top; + pts[1].x = left + width; + pts[1].y = top + height; + + LPtoDP(physDev->hUserDC, pts, 2); + width = pts[1].x - pts[0].x; + height = pts[1].y - pts[0].y; + left = pts[0].x; + top = pts[0].y; + + /* Update brush origin */ + GetBrushOrgEx(physDev->hUserDC, &ptBrush); + RosGdiSetBrushOrg(physDev->hKernelDC, ptBrush.x, ptBrush.y); + + return RosGdiPatBlt(physDev->hKernelDC, left, top, width, height, rop); +} + +BOOL CDECL RosDrv_BitBlt( NTDRV_PDEVICE *physDevDst, INT xDst, INT yDst, + INT width, INT height, NTDRV_PDEVICE *physDevSrc, + INT xSrc, INT ySrc, DWORD rop ) +{ + BOOL useSrc; + POINT pts[2], ptBrush; + + useSrc = (((rop >> 2) & 0x330000) != (rop & 0x330000)); + if (!physDevSrc && useSrc) return FALSE; + + /* Forward to PatBlt if src dev is missing */ + if (!physDevSrc) + return RosDrv_PatBlt(physDevDst, xDst, yDst, width, height, rop); + + /* map source coordinates */ + if (physDevSrc) + { + pts[0].x = xSrc; + pts[0].y = ySrc; + pts[1].x = xSrc + width; + pts[1].y = ySrc + height; + + LPtoDP(physDevSrc->hUserDC, pts, 2); + width = pts[1].x - pts[0].x; + height = pts[1].y - pts[0].y; + xSrc = pts[0].x; + ySrc = pts[0].y; + } + + /* map dest coordinates */ + pts[0].x = xDst; + pts[0].y = yDst; + LPtoDP(physDevDst->hUserDC, pts, 1); + xDst = pts[0].x; + yDst = pts[0].y; + + /* Update brush origin */ + GetBrushOrgEx(physDevDst->hUserDC, &ptBrush); + RosGdiSetBrushOrg(physDevDst->hKernelDC, ptBrush.x, ptBrush.y); + + //FIXME("xDst %d, yDst %d, widthDst %d, heightDst %d, src x %d y %d\n", + // xDst, yDst, width, height, xSrc, ySrc); + + return RosGdiBitBlt(physDevDst->hKernelDC, xDst, yDst, width, height, + physDevSrc->hKernelDC, xSrc, ySrc, rop); +} + +BOOL CDECL RosDrv_StretchBlt( NTDRV_PDEVICE *physDevDst, INT xDst, INT yDst, + INT widthDst, INT heightDst, + NTDRV_PDEVICE *physDevSrc, INT xSrc, INT ySrc, + INT widthSrc, INT heightSrc, DWORD rop ) +{ + BOOL useSrc; + POINT pts[2], ptBrush; + + useSrc = (((rop >> 2) & 0x330000) != (rop & 0x330000)); + if (!physDevSrc && useSrc) return FALSE; + + /* map source coordinates */ + if (physDevSrc) + { + pts[0].x = xSrc; + pts[0].y = ySrc; + pts[1].x = xSrc + widthSrc; + pts[1].y = ySrc + heightSrc; + + LPtoDP(physDevSrc->hUserDC, pts, 2); + widthSrc = pts[1].x - pts[0].x; + heightSrc = pts[1].y - pts[0].y; + xSrc = pts[0].x; + ySrc = pts[0].y; + } + + /* map dest coordinates */ + pts[0].x = xDst; + pts[0].y = yDst; + pts[1].x = xDst + widthDst; + pts[1].y = yDst + heightDst; + LPtoDP(physDevDst->hUserDC, pts, 2); + widthDst = pts[1].x - pts[0].x; + heightDst = pts[1].y - pts[0].y; + xDst = pts[0].x; + yDst = pts[0].y; + + /* Update brush origin */ + GetBrushOrgEx(physDevDst->hUserDC, &ptBrush); + RosGdiSetBrushOrg(physDevDst->hKernelDC, ptBrush.x, ptBrush.y); + + return RosGdiStretchBlt(physDevDst->hKernelDC, xDst, yDst, widthDst, heightDst, + physDevSrc->hKernelDC, xSrc, ySrc, widthSrc, heightSrc, rop); +} + +BOOL CDECL RosDrv_AlphaBlend(NTDRV_PDEVICE *physDevDst, INT xDst, INT yDst, INT widthDst, INT heightDst, + NTDRV_PDEVICE *physDevSrc, INT xSrc, INT ySrc, INT widthSrc, INT heightSrc, + BLENDFUNCTION blendfn) +{ + POINT pts[2], ptBrush; + + /* map source coordinates */ + if (physDevSrc) + { + pts[0].x = xSrc; + pts[0].y = ySrc; + pts[1].x = xSrc + widthSrc; + pts[1].y = ySrc + heightSrc; + + LPtoDP(physDevSrc->hUserDC, pts, 2); + widthSrc = pts[1].x - pts[0].x; + heightSrc = pts[1].y - pts[0].y; + xSrc = pts[0].x; + ySrc = pts[0].y; + } + + /* map dest coordinates */ + pts[0].x = xDst; + pts[0].y = yDst; + pts[1].x = xDst + widthDst; + pts[1].y = yDst + heightDst; + + LPtoDP(physDevDst->hUserDC, pts, 2); + widthDst = pts[1].x - pts[0].x; + heightDst = pts[1].y - pts[0].y; + xDst = pts[0].x; + yDst = pts[0].y; + + /* Update brush origin */ + GetBrushOrgEx(physDevDst->hUserDC, &ptBrush); + RosGdiSetBrushOrg(physDevDst->hKernelDC, ptBrush.x, ptBrush.y); + + return RosGdiAlphaBlend(physDevDst->hKernelDC, xDst, yDst, widthDst, heightDst, + physDevSrc->hKernelDC, xSrc, ySrc, widthSrc, heightSrc, blendfn); + +} + + /* EOF */ 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] Wed Jan 5 22:39:38 2011 @@ -4,6 +4,7 @@ * FILE: dll/win32/winent.drv/bitblt.c * PURPOSE: GDI driver stub for ReactOS/Windows * PROGRAMMERS: Aleksey Bragin (aleksey(a)reactos.org) + * Some code is taken from winex11.drv (c) Wine project */ /* INCLUDES ***************************************************************/ @@ -15,4 +16,207 @@ /* FUNCTIONS **************************************************************/ +/*********************************************************************** + * DIB_GetBitmapInfoEx + * + * Get the info from a bitmap header. + * Return 1 for INFOHEADER, 0 for COREHEADER, -1 for error. + */ +static int DIB_GetBitmapInfoEx( const BITMAPINFOHEADER *header, LONG *width, + LONG *height, WORD *planes, WORD *bpp, + WORD *compr, DWORD *size ) +{ + if (header->biSize == sizeof(BITMAPCOREHEADER)) + { + const BITMAPCOREHEADER *core = (const BITMAPCOREHEADER *)header; + *width = core->bcWidth; + *height = core->bcHeight; + *planes = core->bcPlanes; + *bpp = core->bcBitCount; + *compr = 0; + *size = 0; + return 0; + } + if (header->biSize >= sizeof(BITMAPINFOHEADER)) + { + *width = header->biWidth; + *height = header->biHeight; + *planes = header->biPlanes; + *bpp = header->biBitCount; + *compr = header->biCompression; + *size = header->biSizeImage; + return 1; + } + ERR("(%d): unknown/wrong size for header\n", header->biSize ); + return -1; +} + +/*********************************************************************** + * DIB_GetBitmapInfo + * + * Get the info from a bitmap header. + * Return 1 for INFOHEADER, 0 for COREHEADER, -1 for error. + */ +int DIB_GetBitmapInfo( const BITMAPINFOHEADER *header, LONG *width, + LONG *height, WORD *bpp, WORD *compr ) +{ + WORD planes; + DWORD size; + + return DIB_GetBitmapInfoEx( header, width, height, &planes, bpp, compr, &size); +} + +INT DIB_GetDIBWidthBytes(INT width, INT depth) +{ + return ((width * depth + 31) & ~31) >> 3; +} + +INT CDECL RosDrv_SetDIBitsToDevice( NTDRV_PDEVICE *physDev, INT xDest, INT yDest, DWORD cx, + DWORD cy, INT xSrc, INT ySrc, + UINT startscan, UINT lines, LPCVOID bits, + const BITMAPINFO *info, UINT coloruse ) +{ + BOOL top_down; + LONG height, width; + WORD infoBpp, compression; + POINT pt; + + pt.x = xDest; pt.y = yDest; + LPtoDP(physDev->hUserDC, &pt, 1); + + /* Perform extensive parameter checking */ + if (DIB_GetBitmapInfo( &info->bmiHeader, &width, &height, + &infoBpp, &compression ) == -1) + return 0; + + top_down = (height < 0); + if (top_down) height = -height; + + if (!lines || (startscan >= height)) return 0; + if (!top_down && startscan + lines > height) lines = height - startscan; + + /* make xSrc,ySrc point to the upper-left corner, not the lower-left one, + * and clamp all values to fit inside [startscan,startscan+lines] + */ + if (ySrc + cy <= startscan + lines) + { + UINT y = startscan + lines - (ySrc + cy); + if (ySrc < startscan) cy -= (startscan - ySrc); + if (!top_down) + { + /* avoid getting unnecessary lines */ + ySrc = 0; + if (y >= lines) return 0; + lines -= y; + } + else + { + if (y >= lines) return lines; + ySrc = y; /* need to get all lines in top down mode */ + } + } + else + { + if (ySrc >= startscan + lines) return lines; + pt.y += ySrc + cy - (startscan + lines); + cy = startscan + lines - ySrc; + ySrc = 0; + if (cy > lines) cy = lines; + } + if (xSrc >= width) return lines; + if (xSrc + cx >= width) cx = width - xSrc; + if (!cx || !cy) return lines; + + return RosGdiSetDIBitsToDevice(physDev->hKernelDC, pt.x, pt.y, cx, cy, + xSrc, ySrc, startscan, top_down ? -lines : lines, bits, info, coloruse); +} + +INT CDECL RosDrv_SetDIBits( NTDRV_PDEVICE *physDev, HBITMAP hbitmap, UINT startscan, + UINT lines, LPCVOID bits, const BITMAPINFO *info, UINT coloruse ) +{ + LONG height, width, tmpheight; + WORD infoBpp, compression; + PVOID safeBits = NULL; + INT result, bitsSize; + + /* Perform extensive parameter checking */ + if (DIB_GetBitmapInfo( &info->bmiHeader, &width, &height, + &infoBpp, &compression ) == -1) + return 0; + + tmpheight = height; + if (height < 0) height = -height; + if (!lines || (startscan >= height)) + return 0; + + if (startscan + lines > height) lines = height - startscan; + + /* Create a safe copy of bits */ + bitsSize = DIB_GetDIBWidthBytes( width, infoBpp ) * height; + + if ( bits ) + { + safeBits = HeapAlloc( GetProcessHeap(), 0, bitsSize ); + if (safeBits) + { + _SEH2_TRY + { + RtlCopyMemory( safeBits, bits, bitsSize ); + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + ERR("StretchDIBits failed to read bits 0x%p, size: %d\n", bits, bitsSize); + } + _SEH2_END + } + } + + result = RosGdiSetDIBits(physDev->hKernelDC, hbitmap, startscan, + lines, safeBits, info, coloruse); + + /* Free safe copy of bits */ + if ( safeBits ) + HeapFree( GetProcessHeap(), 0, safeBits ); + + return result; +} + +INT CDECL RosDrv_GetDIBits( NTDRV_PDEVICE *physDev, HBITMAP hbitmap, UINT startscan, UINT lines, + LPVOID bits, BITMAPINFO *info, UINT coloruse ) +{ + size_t obj_size; + DIBSECTION dib; + + /* Check if this bitmap has a DIB section */ + if (!(obj_size = GetObjectW( hbitmap, sizeof(dib), &dib ))) return 0; + + /* Perform GetDIBits */ + return RosGdiGetDIBits(physDev->hKernelDC, hbitmap, startscan, lines, bits, info, coloruse, &dib); +} + +HBITMAP CDECL RosDrv_CreateDIBSection( NTDRV_PDEVICE *physDev, HBITMAP hbitmap, + const BITMAPINFO *bmi, UINT usage ) +{ + DIBSECTION dib; + LONG height, width; + WORD infoBpp, compression; + + GetObjectW( hbitmap, sizeof(dib), &dib ); + + /* Get parameters to check if it's topdown or not. + GetObject doesn't return this info */ + DIB_GetBitmapInfo(&bmi->bmiHeader, &width, &height, &infoBpp, &compression); + + // TODO: Should pass as a flag instead + if (height < 0) dib.dsBmih.biHeight *= -1; + + return RosGdiCreateDIBSection(physDev->hKernelDC, hbitmap, bmi, usage, &dib); +} + +UINT CDECL RosDrv_SetDIBColorTable( NTDRV_PDEVICE *physDev, UINT start, UINT count, const RGBQUAD *colors ) +{ + return RosGdiSetDIBColorTable(physDev->hKernelDC, start, count, colors); +} + + /* EOF */ 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] Wed Jan 5 22:39:38 2011 @@ -46,44 +46,6 @@ #endif /* FUNCTIONS **************************************************************/ - -/*********************************************************************** - * RosDrv_XWStoDS - * - * Performs a world-to-viewport transformation on the specified width. - * Copyright 1993,1994 Alexandre Julliard - * Copyright 1998 Huw Davies - */ -INT RosDrv_XWStoDS( NTDRV_PDEVICE *physDev, INT width ) -{ - POINT pt[2]; - - pt[0].x = 0; - pt[0].y = 0; - pt[1].x = width; - pt[1].y = 0; - LPtoDP( physDev->hUserDC, pt, 2 ); - return pt[1].x - pt[0].x; -} - -/*********************************************************************** - * RosDrv_YWStoDS - * - * Performs a world-to-viewport transformation on the specified height. - * Copyright 1993,1994 Alexandre Julliard - * Copyright 1998 Huw Davies - */ -INT RosDrv_YWStoDS( NTDRV_PDEVICE *physDev, INT height ) -{ - POINT pt[2]; - - pt[0].x = 0; - pt[0].y = 0; - pt[1].x = 0; - pt[1].y = height; - LPtoDP( physDev->hUserDC, pt, 2 ); - return pt[1].y - pt[0].y; -} /* from winex11/xrender.c * Copyright 2001, 2002 Huw D M Davies for CodeWeavers 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] Wed Jan 5 22:39:38 2011 @@ -17,171 +17,6 @@ HANDLE hStockBitmap; /* FUNCTIONS **************************************************************/ - -BOOL CDECL RosDrv_PatBlt( NTDRV_PDEVICE *physDev, INT left, INT top, INT width, INT height, DWORD rop ); - -/* get the rectangle in device coordinates, with optional mirroring */ -static RECT get_device_rect( HDC hdc, int left, int top, int right, int bottom ) -{ - RECT rect; - - rect.left = left; - rect.top = top; - rect.right = right; - rect.bottom = bottom; - if (GetLayout( hdc ) & LAYOUT_RTL) - { - /* shift the rectangle so that the right border is included after mirroring */ - /* it would be more correct to do this after LPtoDP but that's not what Windows does */ - rect.left--; - rect.right--; - } - LPtoDP( hdc, (POINT *)&rect, 2 ); - if (rect.left > rect.right) - { - int tmp = rect.left; - rect.left = rect.right; - rect.right = tmp; - } - if (rect.top > rect.bottom) - { - int tmp = rect.top; - rect.top = rect.bottom; - rect.bottom = tmp; - } - return rect; -} - -BOOL CDECL RosDrv_AlphaBlend(NTDRV_PDEVICE *physDevDst, INT xDst, INT yDst, INT widthDst, INT heightDst, - NTDRV_PDEVICE *physDevSrc, INT xSrc, INT ySrc, INT widthSrc, INT heightSrc, - BLENDFUNCTION blendfn) -{ - POINT pts[2], ptBrush; - - /* map source coordinates */ - if (physDevSrc) - { - pts[0].x = xSrc; - pts[0].y = ySrc; - pts[1].x = xSrc + widthSrc; - pts[1].y = ySrc + heightSrc; - - LPtoDP(physDevSrc->hUserDC, pts, 2); - widthSrc = pts[1].x - pts[0].x; - heightSrc = pts[1].y - pts[0].y; - xSrc = pts[0].x; - ySrc = pts[0].y; - } - - /* map dest coordinates */ - pts[0].x = xDst; - pts[0].y = yDst; - pts[1].x = xDst + widthDst; - pts[1].y = yDst + heightDst; - - LPtoDP(physDevDst->hUserDC, pts, 2); - widthDst = pts[1].x - pts[0].x; - heightDst = pts[1].y - pts[0].y; - xDst = pts[0].x; - yDst = pts[0].y; - - /* Update brush origin */ - GetBrushOrgEx(physDevDst->hUserDC, &ptBrush); - RosGdiSetBrushOrg(physDevDst->hKernelDC, ptBrush.x, ptBrush.y); - - return RosGdiAlphaBlend(physDevDst->hKernelDC, xDst, yDst, widthDst, heightDst, - physDevSrc->hKernelDC, xSrc, ySrc, widthSrc, heightSrc, blendfn); - -} - -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]; - - /* Map coordinates */ - pts[0].x = left; - pts[0].y = top; - pts[1].x = right; - pts[1].y = bottom; - pts[2].x = xstart; - pts[2].y = ystart; - pts[3].x = xend; - pts[3].y = yend; - - LPtoDP(physDev->hUserDC, pts, 4); - - 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); -} - -BOOL CDECL RosDrv_BitBlt( NTDRV_PDEVICE *physDevDst, INT xDst, INT yDst, - INT width, INT height, NTDRV_PDEVICE *physDevSrc, - INT xSrc, INT ySrc, DWORD rop ) -{ - BOOL useSrc; - POINT pts[2], ptBrush; - - useSrc = (((rop >> 2) & 0x330000) != (rop & 0x330000)); - if (!physDevSrc && useSrc) return FALSE; - - /* Forward to PatBlt if src dev is missing */ - if (!physDevSrc) - return RosDrv_PatBlt(physDevDst, xDst, yDst, width, height, rop); - - /* map source coordinates */ - if (physDevSrc) - { - pts[0].x = xSrc; - pts[0].y = ySrc; - pts[1].x = xSrc + width; - pts[1].y = ySrc + height; - - LPtoDP(physDevSrc->hUserDC, pts, 2); - width = pts[1].x - pts[0].x; - height = pts[1].y - pts[0].y; - xSrc = pts[0].x; - ySrc = pts[0].y; - } - - /* map dest coordinates */ - pts[0].x = xDst; - pts[0].y = yDst; - LPtoDP(physDevDst->hUserDC, pts, 1); - xDst = pts[0].x; - yDst = pts[0].y; - - /* Update brush origin */ - GetBrushOrgEx(physDevDst->hUserDC, &ptBrush); - RosGdiSetBrushOrg(physDevDst->hKernelDC, ptBrush.x, ptBrush.y); - - //FIXME("xDst %d, yDst %d, widthDst %d, heightDst %d, src x %d y %d\n", - // xDst, yDst, width, height, xSrc, ySrc); - - return RosGdiBitBlt(physDevDst->hKernelDC, xDst, yDst, width, height, - physDevSrc->hKernelDC, xSrc, ySrc, rop); -} - -BOOL CDECL RosDrv_Chord( NTDRV_PDEVICE *physDev, INT left, INT top, INT right, INT bottom, - INT xstart, INT ystart, INT xend, INT yend ) -{ - POINT pts[4]; - - /* Map coordinates */ - pts[0].x = left; - pts[0].y = top; - pts[1].x = right; - pts[1].y = bottom; - pts[2].x = xstart; - pts[2].y = ystart; - pts[3].x = xend; - pts[3].y = yend; - - LPtoDP(physDev->hUserDC, pts, 4); - - 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 ); -} BOOL CDECL RosDrv_CreateBitmap( NTDRV_PDEVICE *physDev, HBITMAP hbitmap, LPVOID bmBits ) { @@ -272,25 +107,6 @@ return bRet; } -HBITMAP CDECL RosDrv_CreateDIBSection( NTDRV_PDEVICE *physDev, HBITMAP hbitmap, - const BITMAPINFO *bmi, UINT usage ) -{ - DIBSECTION dib; - LONG height, width; - WORD infoBpp, compression; - - GetObjectW( hbitmap, sizeof(dib), &dib ); - - /* Get parameters to check if it's topdown or not. - GetObject doesn't return this info */ - DIB_GetBitmapInfo(&bmi->bmiHeader, &width, &height, &infoBpp, &compression); - - // TODO: Should pass as a flag instead - if (height < 0) dib.dsBmih.biHeight *= -1; - - return RosGdiCreateDIBSection(physDev->hKernelDC, hbitmap, bmi, usage, &dib); -} - BOOL CDECL RosDrv_DeleteBitmap( HBITMAP hbitmap ) { return RosGdiDeleteBitmap(hbitmap); @@ -311,21 +127,6 @@ /* Return result */ return res; -} - -BOOL CDECL RosDrv_Ellipse( NTDRV_PDEVICE *physDev, INT left, INT top, INT right, INT bottom ) -{ - POINT pts[2]; - - /* Map coordinates */ - pts[0].x = left; - pts[0].y = top; - pts[1].x = right; - pts[1].y = bottom; - - LPtoDP(physDev->hUserDC, pts, 2); - - return RosGdiEllipse(physDev->hKernelDC, pts[0].x, pts[0].y, pts[1].x, pts[1].y); } BOOL CDECL RosDrv_EnumDeviceFonts( NTDRV_PDEVICE *physDev, LPLOGFONTW plf, @@ -373,19 +174,6 @@ return 0; } -BOOL CDECL RosDrv_ExtFloodFill( NTDRV_PDEVICE *physDev, INT x, INT y, COLORREF color, - UINT fillType ) -{ - POINT ptPixel; - - /* 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); -} - BOOL CDECL RosDrv_ExtTextOut( NTDRV_PDEVICE *physDev, INT x, INT y, UINT flags, const RECT *lprect, LPCWSTR wstr, UINT count, const INT *lpDx ) @@ -409,19 +197,6 @@ return FALSE; } -INT CDECL RosDrv_GetDIBits( NTDRV_PDEVICE *physDev, HBITMAP hbitmap, UINT startscan, UINT lines, - LPVOID bits, BITMAPINFO *info, UINT coloruse ) -{ - size_t obj_size; - DIBSECTION dib; - - /* Check if this bitmap has a DIB section */ - if (!(obj_size = GetObjectW( hbitmap, sizeof(dib), &dib ))) return 0; - - /* Perform GetDIBits */ - return RosGdiGetDIBits(physDev->hKernelDC, hbitmap, startscan, lines, bits, info, coloruse, &dib); -} - INT CDECL RosDrv_GetDeviceCaps( NTDRV_PDEVICE *physDev, INT cap ) { return RosGdiGetDeviceCaps(physDev->hKernelDC, cap); @@ -433,33 +208,10 @@ return FALSE; } -BOOL CDECL RosDrv_GetICMProfile( NTDRV_PDEVICE *physDev, LPDWORD size, LPWSTR filename ) -{ - UNIMPLEMENTED; - return FALSE; -} - -INT CDECL RosDrv_EnumICMProfiles( NTDRV_PDEVICE *physDev, ICMENUMPROCW proc, LPARAM lparam ) -{ - UNIMPLEMENTED; - return 0; -} - COLORREF CDECL RosDrv_GetNearestColor( NTDRV_PDEVICE *physDev, COLORREF color ) { UNIMPLEMENTED; return 0; -} - -COLORREF CDECL RosDrv_GetPixel( NTDRV_PDEVICE *physDev, INT x, INT y ) -{ - POINT ptPixel; - - /* Transform to device coordinates */ - ptPixel.x = x; ptPixel.y = y; - LPtoDP(physDev->hUserDC, &ptPixel, 1); - - return RosGdiGetPixel(physDev->hKernelDC, ptPixel.x, ptPixel.y); } UINT CDECL RosDrv_GetSystemPaletteEntries( NTDRV_PDEVICE *physDev, UINT start, UINT count, @@ -481,140 +233,6 @@ return FALSE; } -BOOL CDECL RosDrv_LineTo( NTDRV_PDEVICE *physDev, INT x, INT y ) -{ - POINT pt[2]; - - /* Get current cursor position */ - GetCurrentPositionEx( physDev->hUserDC, &pt[0] ); - - /* Convert both points coordinates to device */ - pt[1].x = x; - pt[1].y = y; - LPtoDP( physDev->hUserDC, pt, 2 ); - - /* Draw the line */ - return RosGdiLineTo(physDev->hKernelDC, pt[0].x, pt[0].y, pt[1].x, pt[1].y); -} - -BOOL CDECL RosDrv_PaintRgn( NTDRV_PDEVICE *physDev, HRGN hrgn ) -{ - UNIMPLEMENTED; - return FALSE; -} - -BOOL CDECL RosDrv_PatBlt( NTDRV_PDEVICE *physDev, INT left, INT top, INT width, INT height, DWORD rop ) -{ - POINT pts[2], ptBrush; - - /* Map coordinates */ - pts[0].x = left; - pts[0].y = top; - pts[1].x = left + width; - pts[1].y = top + height; - - LPtoDP(physDev->hUserDC, pts, 2); - width = pts[1].x - pts[0].x; - height = pts[1].y - pts[0].y; - left = pts[0].x; - top = pts[0].y; - - /* Update brush origin */ - GetBrushOrgEx(physDev->hUserDC, &ptBrush); - RosGdiSetBrushOrg(physDev->hKernelDC, ptBrush.x, ptBrush.y); - - return RosGdiPatBlt(physDev->hKernelDC, left, top, width, height, rop); -} - -BOOL CDECL RosDrv_Pie( NTDRV_PDEVICE *physDev, INT left, INT top, INT right, INT bottom, - INT xstart, INT ystart, INT xend, INT yend ) -{ - POINT pts[4]; - - /* Map coordinates */ - pts[0].x = left; - pts[0].y = top; - pts[1].x = right; - pts[1].y = bottom; - pts[2].x = xstart; - pts[2].y = ystart; - pts[3].x = xend; - pts[3].y = yend; - - LPtoDP(physDev->hUserDC, pts, 4); - - 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); -} - -BOOL CDECL RosDrv_PolyPolygon( NTDRV_PDEVICE *physDev, const POINT* pt, const INT* counts, UINT polygons) -{ - UNIMPLEMENTED; - return FALSE; -} - -BOOL CDECL RosDrv_PolyPolyline( NTDRV_PDEVICE *physDev, const POINT* pt, const DWORD* counts, DWORD polylines ) -{ - UNIMPLEMENTED; - return FALSE; -} - -BOOL CDECL RosDrv_Polygon( NTDRV_PDEVICE *physDev, const POINT* pt, INT count ) -{ - register int i; - POINT *points; - POINT ptBrush; - - if (!(points = HeapAlloc( GetProcessHeap(), 0, sizeof(POINT) * (count+1) ))) - { - WARN("No memory to convert POINTs!\n"); - return FALSE; - } - 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; - } - points[count] = points[0]; - - /* Update brush origin */ - GetBrushOrgEx(physDev->hUserDC, &ptBrush); - RosGdiSetBrushOrg(physDev->hKernelDC, ptBrush.x, ptBrush.y); - - /* Call kernel mode */ - RosGdiPolygon(physDev->hKernelDC, points, count+1); - - HeapFree( GetProcessHeap(), 0, points ); - return TRUE; -} - -BOOL CDECL RosDrv_Polyline( NTDRV_PDEVICE *physDev, const POINT* pt, INT count ) -{ - register int i; - POINT *points; - - if (!(points = HeapAlloc( GetProcessHeap(), 0, sizeof(POINT) * count ))) - { - WARN("No memory to convert POINTs!\n"); - return FALSE; - } - 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; - } - - /* Call kernel mode */ - RosGdiPolyline(physDev->hKernelDC, points, count); - - HeapFree( GetProcessHeap(), 0, points ); - return TRUE; -} - UINT CDECL RosDrv_RealizeDefaultPalette( NTDRV_PDEVICE *physDev ) { //UNIMPLEMENTED; @@ -622,32 +240,6 @@ } UINT CDECL RosDrv_RealizePalette( NTDRV_PDEVICE *physDev, HPALETTE hpal, BOOL primary ) -{ - UNIMPLEMENTED; - return FALSE; -} - -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 ); - - if ((rc.left == rc.right) || (rc.top == rc.bottom)) return TRUE; - - if (rc.right < rc.left) { INT tmp = rc.right; rc.right = rc.left; rc.left = tmp; } - if (rc.bottom < rc.top) { INT tmp = rc.bottom; rc.bottom = rc.top; rc.top = tmp; } - - /* Update brush origin */ - GetBrushOrgEx(physDev->hUserDC, &ptBrush); - RosGdiSetBrushOrg(physDev->hKernelDC, ptBrush.x, ptBrush.y); - - RosGdiRectangle(physDev->hKernelDC, &rc); - - return TRUE; -} - -BOOL CDECL RosDrv_RoundRect( NTDRV_PDEVICE *physDev, INT left, INT top, INT right, - INT bottom, INT ell_width, INT ell_height ) { UNIMPLEMENTED; return FALSE; @@ -736,11 +328,6 @@ return 0; } -COLORREF CDECL RosDrv_SetBkColor( NTDRV_PDEVICE *physDev, COLORREF color ) -{ - return RosGdiSetBkColor(physDev->hKernelDC, color); -} - COLORREF CDECL RosDrv_SetDCBrushColor( NTDRV_PDEVICE *physDev, COLORREF crColor ) { UNIMPLEMENTED; @@ -753,279 +340,16 @@ return 0; } -UINT CDECL RosDrv_SetDIBColorTable( NTDRV_PDEVICE *physDev, UINT start, UINT count, const RGBQUAD *colors ) -{ - return RosGdiSetDIBColorTable(physDev->hKernelDC, start, count, colors); -} - -INT CDECL RosDrv_SetDIBits( NTDRV_PDEVICE *physDev, HBITMAP hbitmap, UINT startscan, - UINT lines, LPCVOID bits, const BITMAPINFO *info, UINT coloruse ) -{ - LONG height, width, tmpheight; - WORD infoBpp, compression; - PVOID safeBits = NULL; - INT result, bitsSize; - - /* Perform extensive parameter checking */ - if (DIB_GetBitmapInfo( &info->bmiHeader, &width, &height, - &infoBpp, &compression ) == -1) - return 0; - - tmpheight = height; - if (height < 0) height = -height; - if (!lines || (startscan >= height)) - return 0; - - if (startscan + lines > height) lines = height - startscan; - - /* Create a safe copy of bits */ - bitsSize = DIB_GetDIBWidthBytes( width, infoBpp ) * height; - - if ( bits ) - { - safeBits = HeapAlloc( GetProcessHeap(), 0, bitsSize ); - if (safeBits) - { - _SEH2_TRY - { - RtlCopyMemory( safeBits, bits, bitsSize ); - } - _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) - { - ERR("StretchDIBits failed to read bits 0x%p, size: %d\n", bits, bitsSize); - } - _SEH2_END - } - } - - result = RosGdiSetDIBits(physDev->hKernelDC, hbitmap, startscan, - lines, safeBits, info, coloruse); - - /* Free safe copy of bits */ - if ( safeBits ) - HeapFree( GetProcessHeap(), 0, safeBits ); - - return result; -} - -INT CDECL RosDrv_SetDIBitsToDevice( NTDRV_PDEVICE *physDev, INT xDest, INT yDest, DWORD cx, - DWORD cy, INT xSrc, INT ySrc, - UINT startscan, UINT lines, LPCVOID bits, - const BITMAPINFO *info, UINT coloruse ) -{ - BOOL top_down; - LONG height, width; - WORD infoBpp, compression; - POINT pt; - - pt.x = xDest; pt.y = yDest; - LPtoDP(physDev->hUserDC, &pt, 1); - - /* Perform extensive parameter checking */ - if (DIB_GetBitmapInfo( &info->bmiHeader, &width, &height, - &infoBpp, &compression ) == -1) - return 0; - - top_down = (height < 0); - if (top_down) height = -height; - - if (!lines || (startscan >= height)) return 0; - if (!top_down && startscan + lines > height) lines = height - startscan; - - /* make xSrc,ySrc point to the upper-left corner, not the lower-left one, - * and clamp all values to fit inside [startscan,startscan+lines] - */ - if (ySrc + cy <= startscan + lines) - { - UINT y = startscan + lines - (ySrc + cy); - if (ySrc < startscan) cy -= (startscan - ySrc); - if (!top_down) - { - /* avoid getting unnecessary lines */ - ySrc = 0; - if (y >= lines) return 0; - lines -= y; - } - else - { - if (y >= lines) return lines; - ySrc = y; /* need to get all lines in top down mode */ - } - } - else - { - if (ySrc >= startscan + lines) return lines; - pt.y += ySrc + cy - (startscan + lines); - cy = startscan + lines - ySrc; - ySrc = 0; - if (cy > lines) cy = lines; - } - if (xSrc >= width) return lines; - if (xSrc + cx >= width) cx = width - xSrc; - if (!cx || !cy) return lines; - - return RosGdiSetDIBitsToDevice(physDev->hKernelDC, pt.x, pt.y, cx, cy, - xSrc, ySrc, startscan, top_down ? -lines : lines, bits, info, coloruse); -} - -void CDECL RosDrv_SetDeviceClipping( NTDRV_PDEVICE *physDev, HRGN vis_rgn, HRGN clip_rgn ) -{ - RGNDATA *data; - DWORD size; - - //FIXME("SetDeviceClipping hdc %x\n", physDev->hUserDC); - - /* Update dc region to become a combined region */ - CombineRgn( physDev->region, vis_rgn, clip_rgn, clip_rgn ? RGN_AND : RGN_COPY ); - - /* Get region data size */ - if (!(size = GetRegionData( physDev->region, 0, NULL ))) - return; - - /* Allocate memory for it */ - if (!(data = HeapAlloc( GetProcessHeap(), 0, size ))) - return; - - /* Get region data */ - if (!GetRegionData( physDev->region, size, data )) - { - HeapFree( GetProcessHeap(), 0, data ); - return; - } - - /* Set clipping */ - RosGdiSetDeviceClipping(physDev->hKernelDC, data->rdh.nCount, (RECTL *)data->Buffer, (RECTL *)&data->rdh.rcBound); - - /* Free memory and delete clipping region */ - HeapFree( GetProcessHeap(), 0, data ); -} - BOOL CDECL RosDrv_SetDeviceGammaRamp(NTDRV_PDEVICE *physDev, LPVOID ramp) { UNIMPLEMENTED; return FALSE; } -COLORREF CDECL RosDrv_SetPixel( NTDRV_PDEVICE *physDev, INT x, INT y, COLORREF color ) -{ - POINT ptPixel; - - /* Transform to device coordinates */ - ptPixel.x = x; ptPixel.y = y; - LPtoDP(physDev->hUserDC, &ptPixel, 1); - - return RosGdiSetPixel(physDev->hKernelDC, ptPixel.x, ptPixel.y, color); -} - -COLORREF CDECL RosDrv_SetTextColor( NTDRV_PDEVICE *physDev, COLORREF color ) -{ - return RosGdiSetTextColor(physDev->hKernelDC, color); -} - -BOOL CDECL RosDrv_StretchBlt( NTDRV_PDEVICE *physDevDst, INT xDst, INT yDst, - INT widthDst, INT heightDst, - NTDRV_PDEVICE *physDevSrc, INT xSrc, INT ySrc, - INT widthSrc, INT heightSrc, DWORD rop ) -{ - BOOL useSrc; - POINT pts[2], ptBrush; - - useSrc = (((rop >> 2) & 0x330000) != (rop & 0x330000)); - if (!physDevSrc && useSrc) return FALSE; - - /* map source coordinates */ - if (physDevSrc) - { - pts[0].x = xSrc; - pts[0].y = ySrc; - pts[1].x = xSrc + widthSrc; - pts[1].y = ySrc + heightSrc; - - LPtoDP(physDevSrc->hUserDC, pts, 2); - widthSrc = pts[1].x - pts[0].x; - heightSrc = pts[1].y - pts[0].y; - xSrc = pts[0].x; - ySrc = pts[0].y; - } - - /* map dest coordinates */ - pts[0].x = xDst; - pts[0].y = yDst; - pts[1].x = xDst + widthDst; - pts[1].y = yDst + heightDst; - LPtoDP(physDevDst->hUserDC, pts, 2); - widthDst = pts[1].x - pts[0].x; - heightDst = pts[1].y - pts[0].y; - xDst = pts[0].x; - yDst = pts[0].y; - - /* Update brush origin */ - GetBrushOrgEx(physDevDst->hUserDC, &ptBrush); - RosGdiSetBrushOrg(physDevDst->hKernelDC, ptBrush.x, ptBrush.y); - - return RosGdiStretchBlt(physDevDst->hKernelDC, xDst, yDst, widthDst, heightDst, - physDevSrc->hKernelDC, xSrc, ySrc, widthSrc, heightSrc, rop); -} - BOOL CDECL RosDrv_UnrealizePalette( HPALETTE hpal ) { UNIMPLEMENTED; return FALSE; } -/*********************************************************************** - * DIB_GetBitmapInfoEx - * - * Get the info from a bitmap header. - * Return 1 for INFOHEADER, 0 for COREHEADER, -1 for error. - */ -int DIB_GetBitmapInfoEx( const BITMAPINFOHEADER *header, LONG *width, - LONG *height, WORD *planes, WORD *bpp, - WORD *compr, DWORD *size ) -{ - if (header->biSize == sizeof(BITMAPCOREHEADER)) - { - const BITMAPCOREHEADER *core = (const BITMAPCOREHEADER *)header; - *width = core->bcWidth; - *height = core->bcHeight; - *planes = core->bcPlanes; - *bpp = core->bcBitCount; - *compr = 0; - *size = 0; - return 0; - } - if (header->biSize >= sizeof(BITMAPINFOHEADER)) - { - *width = header->biWidth; - *height = header->biHeight; - *planes = header->biPlanes; - *bpp = header->biBitCount; - *compr = header->biCompression; - *size = header->biSizeImage; - return 1; - } - ERR("(%d): unknown/wrong size for header\n", header->biSize ); - return -1; -} - -/*********************************************************************** - * DIB_GetBitmapInfo - * - * Get the info from a bitmap header. - * Return 1 for INFOHEADER, 0 for COREHEADER, -1 for error. - */ -int DIB_GetBitmapInfo( const BITMAPINFOHEADER *header, LONG *width, - LONG *height, WORD *bpp, WORD *compr ) -{ - WORD planes; - DWORD size; - - return DIB_GetBitmapInfoEx( header, width, height, &planes, bpp, compr, &size); -} - -INT DIB_GetDIBWidthBytes(INT width, INT depth) -{ - return ((width * depth + 31) & ~31) >> 3; -} - /* EOF */ 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] Wed Jan 5 22:39:38 2011 @@ -15,4 +15,354 @@ /* FUNCTIONS **************************************************************/ +/* get the rectangle in device coordinates, with optional mirroring */ +static RECT get_device_rect( HDC hdc, int left, int top, int right, int bottom ) +{ + RECT rect; + + rect.left = left; + rect.top = top; + rect.right = right; + rect.bottom = bottom; + if (GetLayout( hdc ) & LAYOUT_RTL) + { + /* shift the rectangle so that the right border is included after mirroring */ + /* it would be more correct to do this after LPtoDP but that's not what Windows does */ + rect.left--; + rect.right--; + } + LPtoDP( hdc, (POINT *)&rect, 2 ); + if (rect.left > rect.right) + { + int tmp = rect.left; + rect.left = rect.right; + rect.right = tmp; + } + if (rect.top > rect.bottom) + { + int tmp = rect.top; + rect.top = rect.bottom; + rect.bottom = tmp; + } + return rect; +} + +void CDECL RosDrv_SetDeviceClipping( NTDRV_PDEVICE *physDev, HRGN vis_rgn, HRGN clip_rgn ) +{ + RGNDATA *data; + DWORD size; + + //FIXME("SetDeviceClipping hdc %x\n", physDev->hUserDC); + + /* Update dc region to become a combined region */ + CombineRgn( physDev->region, vis_rgn, clip_rgn, clip_rgn ? RGN_AND : RGN_COPY ); + + /* Get region data size */ + if (!(size = GetRegionData( physDev->region, 0, NULL ))) + return; + + /* Allocate memory for it */ + if (!(data = HeapAlloc( GetProcessHeap(), 0, size ))) + return; + + /* Get region data */ + if (!GetRegionData( physDev->region, size, data )) + { + HeapFree( GetProcessHeap(), 0, data ); + return; + } + + /* Set clipping */ + RosGdiSetDeviceClipping(physDev->hKernelDC, data->rdh.nCount, (RECTL *)data->Buffer, (RECTL *)&data->rdh.rcBound); + + /* Free memory and delete clipping region */ + HeapFree( GetProcessHeap(), 0, data ); +} + + +/*********************************************************************** + * RosDrv_XWStoDS + * + * Performs a world-to-viewport transformation on the specified width. + */ +INT RosDrv_XWStoDS( NTDRV_PDEVICE *physDev, INT width ) +{ + POINT pt[2]; + + pt[0].x = 0; + pt[0].y = 0; + pt[1].x = width; + pt[1].y = 0; + LPtoDP( physDev->hUserDC, pt, 2 ); + return pt[1].x - pt[0].x; +} + +/*********************************************************************** + * RosDrv_YWStoDS + * + * Performs a world-to-viewport transformation on the specified height. + */ +INT RosDrv_YWStoDS( NTDRV_PDEVICE *physDev, INT height ) +{ + POINT pt[2]; + + pt[0].x = 0; + pt[0].y = 0; + pt[1].x = 0; + pt[1].y = height; + LPtoDP( physDev->hUserDC, pt, 2 ); + return pt[1].y - pt[0].y; +} + +BOOL CDECL RosDrv_LineTo( NTDRV_PDEVICE *physDev, INT x, INT y ) +{ + POINT pt[2]; + + /* Get current cursor position */ + GetCurrentPositionEx( physDev->hUserDC, &pt[0] ); + + /* Convert both points coordinates to device */ + pt[1].x = x; + pt[1].y = y; + LPtoDP( physDev->hUserDC, pt, 2 ); + + /* Draw the line */ + return RosGdiLineTo(physDev->hKernelDC, pt[0].x, pt[0].y, pt[1].x, 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]; + + /* Map coordinates */ + pts[0].x = left; + pts[0].y = top; + pts[1].x = right; + pts[1].y = bottom; + pts[2].x = xstart; + pts[2].y = ystart; + pts[3].x = xend; + pts[3].y = yend; + + LPtoDP(physDev->hUserDC, pts, 4); + + 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); +} + +BOOL CDECL RosDrv_Pie( NTDRV_PDEVICE *physDev, INT left, INT top, INT right, INT bottom, + INT xstart, INT ystart, INT xend, INT yend ) +{ + POINT pts[4]; + + /* Map coordinates */ + pts[0].x = left; + pts[0].y = top; + pts[1].x = right; + pts[1].y = bottom; + pts[2].x = xstart; + pts[2].y = ystart; + pts[3].x = xend; + pts[3].y = yend; + + LPtoDP(physDev->hUserDC, pts, 4); + + 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); +} + +BOOL CDECL RosDrv_Chord( NTDRV_PDEVICE *physDev, INT left, INT top, INT right, INT bottom, + INT xstart, INT ystart, INT xend, INT yend ) +{ + POINT pts[4]; + + /* Map coordinates */ + pts[0].x = left; + pts[0].y = top; + pts[1].x = right; + pts[1].y = bottom; + pts[2].x = xstart; + pts[2].y = ystart; + pts[3].x = xend; + pts[3].y = yend; + + LPtoDP(physDev->hUserDC, pts, 4); + + 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 ); +} + +BOOL CDECL RosDrv_Ellipse( NTDRV_PDEVICE *physDev, INT left, INT top, INT right, INT bottom ) +{ + POINT pts[2]; + + /* Map coordinates */ + pts[0].x = left; + pts[0].y = top; + pts[1].x = right; + pts[1].y = bottom; + + LPtoDP(physDev->hUserDC, pts, 2); + + return RosGdiEllipse(physDev->hKernelDC, pts[0].x, pts[0].y, pts[1].x, pts[1].y); +} + +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 ); + + if ((rc.left == rc.right) || (rc.top == rc.bottom)) return TRUE; + + if (rc.right < rc.left) { INT tmp = rc.right; rc.right = rc.left; rc.left = tmp; } + if (rc.bottom < rc.top) { INT tmp = rc.bottom; rc.bottom = rc.top; rc.top = tmp; } + + /* Update brush origin */ + GetBrushOrgEx(physDev->hUserDC, &ptBrush); + RosGdiSetBrushOrg(physDev->hKernelDC, ptBrush.x, ptBrush.y); + + RosGdiRectangle(physDev->hKernelDC, &rc); + + return TRUE; +} + +BOOL CDECL RosDrv_RoundRect( NTDRV_PDEVICE *physDev, INT left, INT top, INT right, + INT bottom, INT ell_width, INT ell_height ) +{ + UNIMPLEMENTED; + return FALSE; +} + +COLORREF CDECL RosDrv_SetPixel( NTDRV_PDEVICE *physDev, INT x, INT y, COLORREF color ) +{ + POINT ptPixel; + + /* Transform to device coordinates */ + ptPixel.x = x; ptPixel.y = y; + LPtoDP(physDev->hUserDC, &ptPixel, 1); + + return RosGdiSetPixel(physDev->hKernelDC, ptPixel.x, ptPixel.y, color); +} + +COLORREF CDECL RosDrv_GetPixel( NTDRV_PDEVICE *physDev, INT x, INT y ) +{ + POINT ptPixel; + + /* Transform to device coordinates */ + ptPixel.x = x; ptPixel.y = y; + LPtoDP(physDev->hUserDC, &ptPixel, 1); + + return RosGdiGetPixel(physDev->hKernelDC, ptPixel.x, ptPixel.y); +} + +BOOL CDECL RosDrv_PaintRgn( NTDRV_PDEVICE *physDev, HRGN hrgn ) +{ + UNIMPLEMENTED; + return FALSE; +} + +BOOL CDECL RosDrv_Polyline( NTDRV_PDEVICE *physDev, const POINT* pt, INT count ) +{ + register int i; + POINT *points; + + if (!(points = HeapAlloc( GetProcessHeap(), 0, sizeof(POINT) * count ))) + { + WARN("No memory to convert POINTs!\n"); + return FALSE; + } + 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; + } + + /* Call kernel mode */ + RosGdiPolyline(physDev->hKernelDC, points, count); + + HeapFree( GetProcessHeap(), 0, points ); + return TRUE; +} + +BOOL CDECL RosDrv_Polygon( NTDRV_PDEVICE *physDev, const POINT* pt, INT count ) +{ + register int i; + POINT *points; + POINT ptBrush; + + if (!(points = HeapAlloc( GetProcessHeap(), 0, sizeof(POINT) * (count+1) ))) + { + WARN("No memory to convert POINTs!\n"); + return FALSE; + } + 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; + } + points[count] = points[0]; + + /* Update brush origin */ + GetBrushOrgEx(physDev->hUserDC, &ptBrush); + RosGdiSetBrushOrg(physDev->hKernelDC, ptBrush.x, ptBrush.y); + + /* Call kernel mode */ + RosGdiPolygon(physDev->hKernelDC, points, count+1); + + HeapFree( GetProcessHeap(), 0, points ); + return TRUE; +} + +BOOL CDECL RosDrv_PolyPolygon( NTDRV_PDEVICE *physDev, const POINT* pt, const INT* counts, UINT polygons) +{ + UNIMPLEMENTED; + return FALSE; +} + +BOOL CDECL RosDrv_PolyPolyline( NTDRV_PDEVICE *physDev, const POINT* pt, const DWORD* counts, DWORD polylines ) +{ + UNIMPLEMENTED; + return FALSE; +} + +BOOL CDECL RosDrv_ExtFloodFill( NTDRV_PDEVICE *physDev, INT x, INT y, COLORREF color, + UINT fillType ) +{ + POINT ptPixel; + + /* 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); +} + +COLORREF CDECL RosDrv_SetBkColor( NTDRV_PDEVICE *physDev, COLORREF color ) +{ + return RosGdiSetBkColor(physDev->hKernelDC, color); +} + +COLORREF CDECL RosDrv_SetTextColor( NTDRV_PDEVICE *physDev, COLORREF color ) +{ + return RosGdiSetTextColor(physDev->hKernelDC, color); +} + +BOOL CDECL RosDrv_GetICMProfile( NTDRV_PDEVICE *physDev, LPDWORD size, LPWSTR filename ) +{ + UNIMPLEMENTED; + return FALSE; +} + +INT CDECL RosDrv_EnumICMProfiles( NTDRV_PDEVICE *physDev, ICMENUMPROCW proc, LPARAM lparam ) +{ + UNIMPLEMENTED; + return 0; +} + /* EOF */ Modified: branches/arwinss/reactos/dll/win32/winent.drv/winent.h URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/winen… ============================================================================== --- branches/arwinss/reactos/dll/win32/winent.drv/winent.h [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/win32/winent.drv/winent.h [iso-8859-1] Wed Jan 5 22:39:38 2011 @@ -86,16 +86,11 @@ void NTDRV_InitClipboard(void); /* gdidrv.c */ -int DIB_GetBitmapInfoEx( const BITMAPINFOHEADER *header, LONG *width, - LONG *height, WORD *planes, WORD *bpp, - WORD *compr, DWORD *size ); +void CDECL RosDrv_SetDeviceClipping( NTDRV_PDEVICE *physDev, HRGN vis_rgn, HRGN clip_rgn ); -int DIB_GetBitmapInfo( const BITMAPINFOHEADER *header, LONG *width, - LONG *height, WORD *bpp, WORD *compr ); - -INT DIB_GetDIBWidthBytes(INT width, INT depth); - -void CDECL RosDrv_SetDeviceClipping( NTDRV_PDEVICE *physDev, HRGN vis_rgn, HRGN clip_rgn ); +/* graphics.c */ +INT RosDrv_XWStoDS( NTDRV_PDEVICE *physDev, INT width ); +INT RosDrv_YWStoDS( NTDRV_PDEVICE *physDev, INT height ); /* font.c */ VOID

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs