Ros-diffs November 2005

ros-diffs@reactos.org

27 participants
875 discussions

[hpoussin] 19013: Replace a void* by PDEVICE_OBJECT and fix its usage

by hpoussin＠svn.reactos.com

Replace a void* by PDEVICE_OBJECT and fix its usage Modified: trunk/reactos/drivers/usb/miniport/linux/linux_wrapper.h Modified: trunk/reactos/drivers/usb/miniport/usbohci/ohci.c Modified: trunk/reactos/drivers/usb/miniport/usbuhci/uhci.c _____ Modified: trunk/reactos/drivers/usb/miniport/linux/linux_wrapper.h --- trunk/reactos/drivers/usb/miniport/linux/linux_wrapper.h 2005-11-05 10:27:50 UTC (rev 19012) +++ trunk/reactos/drivers/usb/miniport/linux/linux_wrapper.h 2005-11-05 11:51:30 UTC (rev 19013) @@ -129,7 +129,7 @@ struct list_head driver_list; void (*release)(struct device * dev); - void *dev_ext; // ReactOS-specific: pointer to windows device extension + PDEVICE_OBJECT dev_ext; // ReactOS-specific: pointer to windows device object }; struct class_device{int a;}; struct semaphore{int a;}; _____ Modified: trunk/reactos/drivers/usb/miniport/usbohci/ohci.c --- trunk/reactos/drivers/usb/miniport/usbohci/ohci.c 2005-11-05 10:27:50 UTC (rev 19012) +++ trunk/reactos/drivers/usb/miniport/usbohci/ohci.c 2005-11-05 11:51:30 UTC (rev 19013) @@ -21,7 +21,7 @@ /* Initialize generic linux structure */ dev->irq = DeviceExtension->InterruptVector; dev->dev_ext = (PVOID)DeviceExtension; - dev->dev.dev_ext = (PVOID)DeviceExtension; + dev->dev.dev_ext = (PVOID)DeviceObject; dev->slot_name = ExAllocatePoolWithTag(NonPagedPool, 128, USB_OHCI_TAG); // 128 max len for slot name // Init wrapper _____ Modified: trunk/reactos/drivers/usb/miniport/usbuhci/uhci.c --- trunk/reactos/drivers/usb/miniport/usbuhci/uhci.c 2005-11-05 10:27:50 UTC (rev 19012) +++ trunk/reactos/drivers/usb/miniport/usbuhci/uhci.c 2005-11-05 11:51:30 UTC (rev 19013) @@ -26,7 +26,7 @@ /* Initialize generic linux structure */ dev->irq = DeviceExtension->InterruptVector; dev->dev_ext = (PVOID)DeviceExtension; - dev->dev.dev_ext = (PVOID)DeviceExtension; + dev->dev.dev_ext = (PVOID)DeviceObject; dev->slot_name = ExAllocatePoolWithTag(NonPagedPool, 128, USB_UHCI_TAG); // 128 max len for slot name init_wrapper(dev);

19 years, 1 month

[mbosma] 19012: Fill some structs more correctly.

by mbosma＠svn.reactos.com

Fill some structs more correctly. Modified: trunk/reactos/lib/ddraw/hal/surface_hal.c _____ Modified: trunk/reactos/lib/ddraw/hal/surface_hal.c --- trunk/reactos/lib/ddraw/hal/surface_hal.c 2005-11-05 08:37:01 UTC (rev 19011) +++ trunk/reactos/lib/ddraw/hal/surface_hal.c 2005-11-05 10:27:50 UTC (rev 19012) @@ -19,7 +19,8 @@ This->owner = (IDirectDrawImpl*)pDD; - /************ fill the discription of our primary surface ***********************/ + /************ fill the discription of our primary surface ***********************/ + memset (&This->ddsd, 0, sizeof(DDSURFACEDESC)); This->ddsd.dwSize = sizeof(DDSURFACEDESC); @@ -43,6 +44,7 @@ This->ddsd.lpSurface = pDDSD2->lpSurface; /************ Test see if we can Create Surface ***********************/ + if (This->owner->DirectDrawGlobal.lpDDCBtmp->HALDD.dwFlags & DDHAL_CB32_CANCREATESURFACE) { /* can the driver create the surface */ @@ -59,8 +61,6 @@ } /************ Create Surface ***********************/ - - /* FIXME we are skipping filling in some data, I do not care for now */ /* surface global struct */ memset(&This->Global, 0, sizeof(DDRAWI_DDRAWSURFACE_GBL)); @@ -68,21 +68,25 @@ This->Global.wHeight = This->owner->DirectDrawGlobal.vmiData.dwDisplayHeight; This->Global.wWidth = This->owner->DirectDrawGlobal.vmiData.dwDisplayWidth; This->Global.dwLinearSize = This->owner->DirectDrawGlobal.vmiData.lDisplayPitch; - - + if(pDDSD2->ddsCaps.dwCaps & DDSCAPS_PRIMARYSURFACE) + This->Global.dwGlobalFlags = DDRAWISURFGBL_ISGDISURFACE; + /* surface more struct */ memset(&This->More, 0, sizeof(DDRAWI_DDRAWSURFACE_MORE)); This->More.dwSize = sizeof(DDRAWI_DDRAWSURFACE_MORE); + This->More.dmiDDrawReserved7.wWidth = This->Global.wWidth; + This->More.dmiDDrawReserved7.wHeight = This->Global.wHeight; + This->More.dmiDDrawReserved7.wBPP = This->owner->Bpp; + //This->More.dmiDDrawReserved7.wRefreshRate = ; + //This->More.dmiDDrawReserved7.wMonitorsAttachedToDesktop = 2; + /* ToDo: fill ddsCapsEx */ /* surface local struct */ - memset(&This->Local, 0, sizeof(DDRAWI_DDRAWSURFACE_LCL)); This->Local.lpGbl = &This->Global; This->Local.lpSurfMore = &This->More; - - - /* FIXME do a memcopy */ - This->Local.ddsCaps = *(DDSCAPS*)&This->ddsd.ddsCaps; + This->Local.ddsCaps.dwCaps = pDDSD2->ddsCaps.dwCaps; + This->Local.dwProcessId = GetCurrentProcessId(); /* for the double pointer below */ This->pLocal[0] = &This->Local; @@ -92,7 +96,7 @@ DDHAL_CREATESURFACEDATA CreateData; memset(&CreateData, 0, sizeof(DDHAL_CREATESURFACEDATA)); CreateData.lpDD = &This->owner->DirectDrawGlobal; - CreateData.lpDDSurfaceDesc = (LPDDSURFACEDESC) &This->ddsd; + CreateData.lpDDSurfaceDesc = (LPDDSURFACEDESC)&This->ddsd; CreateData.dwSCnt = 1; CreateData.lplpSList = This->pLocal; CreateData.ddRVal = DD_FALSE;

19 years, 1 month

[hpoussin] 19011: - Remove Mou and Mouse strings in names to share more code with kbdclass

by hpoussin＠svn.reactos.com

- Remove Mou and Mouse strings in names to share more code with kbdclass - Handle IRP_MJ_CLEANUP and IRP_MJ_DEVICE_CONTROL - Read parameters in the right registry key - Force exclusive opening on device object - Reference pointer port DOs when they are linked to pointer class DO - Fix PORT_DEVICE_EXTENSION and CLASS_DEVICE_EXTENSION structures and use them correctly (PORT_DEVICE_EXTENSION was not used...) Modified: trunk/reactos/drivers/input/mouclass/misc.c Modified: trunk/reactos/drivers/input/mouclass/mouclass.c Modified: trunk/reactos/drivers/input/mouclass/mouclass.h _____ Modified: trunk/reactos/drivers/input/mouclass/misc.c --- trunk/reactos/drivers/input/mouclass/misc.c 2005-11-05 08:21:59 UTC (rev 19010) +++ trunk/reactos/drivers/input/mouclass/misc.c 2005-11-05 08:37:01 UTC (rev 19011) @@ -28,10 +28,13 @@ IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp) { - PDEVICE_OBJECT LowerDevice = ((PMOUCLASS_DEVICE_EXTENSION)DeviceObject->DeviceExtension)->LowerDevice ; + PDEVICE_OBJECT LowerDevice; KEVENT Event; NTSTATUS Status; + ASSERT(!((PCOMMON_DEVICE_EXTENSION)DeviceObject->DeviceExtension)->IsCla ssDO); + LowerDevice = ((PPORT_DEVICE_EXTENSION)DeviceObject->DeviceExtension)->LowerDevice; + KeInitializeEvent(&Event, NotificationEvent, FALSE); IoCopyCurrentIrpStackLocationToNext(Irp); @@ -54,8 +57,11 @@ IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp) { - PDEVICE_OBJECT LowerDevice = ((PMOUCLASS_DEVICE_EXTENSION)DeviceObject->DeviceExtension)->LowerDevice ; + PDEVICE_OBJECT LowerDevice; + ASSERT(!((PCOMMON_DEVICE_EXTENSION)DeviceObject->DeviceExtension)->IsCla ssDO); + LowerDevice = ((PPORT_DEVICE_EXTENSION)DeviceObject->DeviceExtension)->LowerDevice; + IoSkipCurrentIrpStackLocation(Irp); return IoCallDriver(LowerDevice, Irp); } _____ Modified: trunk/reactos/drivers/input/mouclass/mouclass.c --- trunk/reactos/drivers/input/mouclass/mouclass.c 2005-11-05 08:21:59 UTC (rev 19010) +++ trunk/reactos/drivers/input/mouclass/mouclass.c 2005-11-05 08:37:01 UTC (rev 19011) @@ -20,7 +20,7 @@ } static NTSTATUS NTAPI -MouclassCreate( +ClassCreate( IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp) { @@ -34,7 +34,7 @@ } static NTSTATUS NTAPI -MouclassClose( +ClassClose( IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp) { @@ -48,10 +48,24 @@ } static NTSTATUS NTAPI -MouclassRead( +ClassCleanup( IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp) { + DPRINT("IRP_MJ_CLEANUP\n"); + + if (!((PCOMMON_DEVICE_EXTENSION)DeviceObject->DeviceExtension)->IsClassDO) + return ForwardIrpAndForget(DeviceObject, Irp); + + /* FIXME: cleanup all associated Port devices */ + return STATUS_SUCCESS; +} + +static NTSTATUS NTAPI +ClassRead( + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp) +{ DPRINT("IRP_MJ_READ\n"); if (!((PCOMMON_DEVICE_EXTENSION)DeviceObject->DeviceExtension)->IsClassDO) @@ -72,6 +86,40 @@ } static NTSTATUS NTAPI +ClassDeviceControl( + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp) +{ + PCLASS_DEVICE_EXTENSION DeviceExtension; + NTSTATUS Status; + + DPRINT("IRP_MJ_DEVICE_CONTROL\n"); + + if (!((PCOMMON_DEVICE_EXTENSION)DeviceObject->DeviceExtension)->IsClassDO) + return ForwardIrpAndForget(DeviceObject, Irp); + + DeviceExtension = (PCLASS_DEVICE_EXTENSION)DeviceObject->DeviceExtension; + + switch (IoGetCurrentIrpStackLocation(Irp)->Parameters.DeviceIoControl.IoControl Code) + { + case IOCTL_MOUSE_QUERY_ATTRIBUTES: + /* FIXME */ + Status = STATUS_NOT_SUPPORTED; + break; + default: + DPRINT1("IRP_MJ_DEVICE_CONTROL / unknown I/O control code 0x%lx\n", + IoGetCurrentIrpStackLocation(Irp)->Parameters.DeviceIoControl.IoControlC ode); + Status = STATUS_NOT_SUPPORTED; + } + + Irp->IoStatus.Status = Status; + Irp->IoStatus.Information = 0; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + + return Status; +} + +static NTSTATUS NTAPI IrpStub( IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp) @@ -110,15 +158,28 @@ static NTSTATUS ReadRegistryEntries( IN PUNICODE_STRING RegistryPath, - IN PMOUCLASS_DRIVER_EXTENSION DriverExtension) + IN PCLASS_DRIVER_EXTENSION DriverExtension) { + UNICODE_STRING ParametersRegistryKey; RTL_QUERY_REGISTRY_TABLE Parameters[4]; NTSTATUS Status; ULONG DefaultConnectMultiplePorts = 1; - ULONG DefaultMouseDataQueueSize = 0x64; - UNICODE_STRING DefaultPointerDeviceBaseName = RTL_CONSTANT_STRING(L"PointerClass"); + ULONG DefaultDataQueueSize = 0x64; + UNICODE_STRING DefaultDeviceBaseName = RTL_CONSTANT_STRING(L"PointerClass"); + ParametersRegistryKey.Length = 0; + ParametersRegistryKey.MaximumLength = RegistryPath->Length + sizeof(L"\\Parameters") + sizeof(UNICODE_NULL); + ParametersRegistryKey.Buffer = ExAllocatePool(PagedPool, ParametersRegistryKey.MaximumLength); + if (!ParametersRegistryKey.Buffer) + { + DPRINT("ExAllocatePool() failed\n"); + return STATUS_INSUFFICIENT_RESOURCES; + } + RtlCopyUnicodeString(&ParametersRegistryKey, RegistryPath); + RtlAppendUnicodeToString(&ParametersRegistryKey, L"\\Parameters"); + ParametersRegistryKey.Buffer[ParametersRegistryKey.Length / sizeof(WCHAR)] = UNICODE_NULL; + RtlZeroMemory(Parameters, sizeof(Parameters)); Parameters[0].Flags = RTL_QUERY_REGISTRY_DIRECT | RTL_REGISTRY_OPTIONAL; @@ -127,24 +188,24 @@ Parameters[0].DefaultType = REG_DWORD; Parameters[0].DefaultData = &DefaultConnectMultiplePorts; Parameters[0].DefaultLength = sizeof(ULONG); - + Parameters[1].Flags = RTL_QUERY_REGISTRY_DIRECT | RTL_REGISTRY_OPTIONAL; Parameters[1].Name = L"MouseDataQueueSize"; - Parameters[1].EntryContext = &DriverExtension->MouseDataQueueSize; + Parameters[1].EntryContext = &DriverExtension->DataQueueSize; Parameters[1].DefaultType = REG_DWORD; - Parameters[1].DefaultData = &DefaultMouseDataQueueSize; + Parameters[1].DefaultData = &DefaultDataQueueSize; Parameters[1].DefaultLength = sizeof(ULONG); - + Parameters[2].Flags = RTL_QUERY_REGISTRY_DIRECT | RTL_REGISTRY_OPTIONAL; Parameters[2].Name = L"PointerDeviceBaseName"; - Parameters[2].EntryContext = &DriverExtension->PointerDeviceBaseName; + Parameters[2].EntryContext = &DriverExtension->DeviceBaseName; Parameters[2].DefaultType = REG_SZ; - Parameters[2].DefaultData = &DefaultPointerDeviceBaseName; + Parameters[2].DefaultData = &DefaultDeviceBaseName; Parameters[2].DefaultLength = sizeof(ULONG); Status = RtlQueryRegistryValues( RTL_REGISTRY_ABSOLUTE, - RegistryPath->Buffer, + ParametersRegistryKey.Buffer, Parameters, NULL, NULL); @@ -157,39 +218,49 @@ { DriverExtension->ConnectMultiplePorts = DefaultConnectMultiplePorts; } - if (DriverExtension->MouseDataQueueSize == 0) + if (DriverExtension->DataQueueSize == 0) { - DriverExtension->MouseDataQueueSize = DefaultMouseDataQueueSize; + DriverExtension->DataQueueSize = DefaultDataQueueSize; } } + else if (Status == STATUS_OBJECT_NAME_NOT_FOUND) + { + /* Registry path doesn't exist. Set defaults */ + DriverExtension->ConnectMultiplePorts = DefaultConnectMultiplePorts; + DriverExtension->DataQueueSize = DefaultDataQueueSize; + Status = RtlDuplicateUnicodeString( + RTL_DUPLICATE_UNICODE_STRING_NULL_TERMINATE, + &DefaultDeviceBaseName, + &DriverExtension->DeviceBaseName); + } return Status; } static NTSTATUS -CreatePointerClassDeviceObject( +CreateClassDeviceObject( IN PDRIVER_OBJECT DriverObject, OUT PDEVICE_OBJECT *ClassDO OPTIONAL) { - PMOUCLASS_DRIVER_EXTENSION DriverExtension; + PCLASS_DRIVER_EXTENSION DriverExtension; ULONG DeviceId = 0; ULONG PrefixLength; UNICODE_STRING DeviceNameU; PWSTR DeviceIdW = NULL; /* Pointer into DeviceNameU.Buffer */ PDEVICE_OBJECT Fdo; - PMOUCLASS_DEVICE_EXTENSION DeviceExtension; + PCLASS_DEVICE_EXTENSION DeviceExtension; NTSTATUS Status; - DPRINT("CreatePointerClassDeviceObject(0x%p)\n", DriverObject); + DPRINT("CreateClassDeviceObject(0x%p)\n", DriverObject); /* Create new device object */ DriverExtension = IoGetDriverObjectExtension(DriverObject, DriverObject); DeviceNameU.Length = 0; DeviceNameU.MaximumLength = - wcslen(L"\\Device\\") * sizeof(WCHAR) /* "\Device\" */ - + DriverExtension->PointerDeviceBaseName.Length /* "PointerClass" */ - + 4 * sizeof(WCHAR) /* Id between 0 and 9999 */ - + sizeof(UNICODE_NULL); /* Final NULL char */ + wcslen(L"\\Device\\") * sizeof(WCHAR) /* "\Device\" */ + + DriverExtension->DeviceBaseName.Length /* "PointerClass" */ + + 4 * sizeof(WCHAR) /* Id between 0 and 9999 */ + + sizeof(UNICODE_NULL); /* Final NULL char */ DeviceNameU.Buffer = ExAllocatePool(PagedPool, DeviceNameU.MaximumLength); if (!DeviceNameU.Buffer) { @@ -202,7 +273,7 @@ DPRINT("RtlAppendUnicodeToString() failed with status 0x%08lx\n", Status); goto cleanup; } - Status = RtlAppendUnicodeStringToString(&DeviceNameU, &DriverExtension->PointerDeviceBaseName); + Status = RtlAppendUnicodeStringToString(&DeviceNameU, &DriverExtension->DeviceBaseName); if (!NT_SUCCESS(Status)) { DPRINT("RtlAppendUnicodeStringToString() failed with status 0x%08lx\n", Status); @@ -215,11 +286,11 @@ DeviceNameU.Length = PrefixLength + swprintf(DeviceIdW, L"%lu", DeviceId) * sizeof(WCHAR); Status = IoCreateDevice( DriverObject, - sizeof(MOUCLASS_DEVICE_EXTENSION), + sizeof(CLASS_DEVICE_EXTENSION), &DeviceNameU, FILE_DEVICE_MOUSE, FILE_DEVICE_SECURE_OPEN, - FALSE, + TRUE, &Fdo); if (NT_SUCCESS(Status)) goto cleanup; @@ -230,27 +301,30 @@ } DeviceId++; } - DPRINT("Too much devices starting with '\\Device\\%wZ'\n", &DriverExtension->PointerDeviceBaseName); + DPRINT("Too much devices starting with '\\Device\\%wZ'\n", &DriverExtension->DeviceBaseName); Status = STATUS_UNSUCCESSFUL; cleanup: - ExFreePool(DeviceNameU.Buffer); if (!NT_SUCCESS(Status)) + { + ExFreePool(DeviceNameU.Buffer); return Status; + } - DeviceExtension = (PMOUCLASS_DEVICE_EXTENSION)Fdo->DeviceExtension; - RtlZeroMemory(DeviceExtension, sizeof(MOUCLASS_DEVICE_EXTENSION)); + DeviceExtension = (PCLASS_DEVICE_EXTENSION)Fdo->DeviceExtension; + RtlZeroMemory(DeviceExtension, sizeof(CLASS_DEVICE_EXTENSION)); DeviceExtension->Common.IsClassDO = TRUE; DeviceExtension->DriverExtension = DriverExtension; - DeviceExtension->PnpState = dsStopped; KeInitializeSpinLock(&(DeviceExtension->SpinLock)); DeviceExtension->ReadIsPending = FALSE; DeviceExtension->InputCount = 0; - DeviceExtension->PortData = ExAllocatePool(NonPagedPool, DeviceExtension->DriverExtension->MouseDataQueueSize * sizeof(MOUSE_INPUT_DATA)); + DeviceExtension->PortData = ExAllocatePool(NonPagedPool, DeviceExtension->DriverExtension->DataQueueSize * sizeof(MOUSE_INPUT_DATA)); Fdo->Flags |= DO_POWER_PAGABLE; Fdo->Flags &= ~DO_DEVICE_INITIALIZING; /* FIXME: create registry entry in HKEY_LOCAL_MACHINE\HARDWARE\DEVICEMAP */ + ExFreePool(DeviceNameU.Buffer); + if (ClassDO) *ClassDO = Fdo; @@ -258,22 +332,22 @@ } static BOOLEAN -MouclassCallback( +ClassCallback( IN PDEVICE_OBJECT ClassDeviceObject, - IN OUT PMOUSE_INPUT_DATA MouseDataStart, - IN PMOUSE_INPUT_DATA MouseDataEnd, + IN OUT PMOUSE_INPUT_DATA DataStart, + IN PMOUSE_INPUT_DATA DataEnd, IN OUT PULONG ConsumedCount) { - PMOUCLASS_DEVICE_EXTENSION ClassDeviceExtension = ClassDeviceObject->DeviceExtension; + PCLASS_DEVICE_EXTENSION ClassDeviceExtension = ClassDeviceObject->DeviceExtension; PIRP Irp = NULL; KIRQL OldIrql; PIO_STACK_LOCATION Stack; - ULONG InputCount = MouseDataEnd - MouseDataStart; + ULONG InputCount = DataEnd - DataStart; ULONG ReadSize; ASSERT(ClassDeviceExtension->Common.IsClassDO); - DPRINT("MouclassCallback()\n"); + DPRINT("ClassCallback()\n"); /* A filter driver might have consumed all the data already; I'm * not sure if they are supposed to move the packets when they * consume them though. @@ -288,7 +362,7 @@ /* FIXME: use SEH */ RtlCopyMemory( Irp->MdlAddress ? MmGetSystemAddressForMdlSafe(Irp->MdlAddress, NormalPagePriority) : Irp->UserBuffer, - MouseDataStart, + DataStart, sizeof(MOUSE_INPUT_DATA)); /* Go to next packet and complete this request with STATUS_SUCCESS */ @@ -299,7 +373,7 @@ ClassDeviceExtension->ReadIsPending = FALSE; /* Skip the packet we just sent away */ - MouseDataStart++; + DataStart++; (*ConsumedCount)++; InputCount--; } @@ -309,23 +383,23 @@ { KeAcquireSpinLock(&ClassDeviceExtension->SpinLock, &OldIrql); - if (ClassDeviceExtension->InputCount + InputCount > ClassDeviceExtension->DriverExtension->MouseDataQueueSize) - ReadSize = ClassDeviceExtension->DriverExtension->MouseDataQueueSize - ClassDeviceExtension->InputCount; + if (ClassDeviceExtension->InputCount + InputCount > ClassDeviceExtension->DriverExtension->DataQueueSize) + ReadSize = ClassDeviceExtension->DriverExtension->DataQueueSize - ClassDeviceExtension->InputCount; else ReadSize = InputCount; /* - * FIXME: If we exceed the buffer, mouse data gets thrown away.. better + * FIXME: If we exceed the buffer, data gets thrown away.. better * solution? */ /* - * Move the mouse input data from the port data queue to our class data + * Move the input data from the port data queue to our class data * queue. */ RtlMoveMemory( ClassDeviceExtension->PortData, - (PCHAR)MouseDataStart, + (PCHAR)DataStart, sizeof(MOUSE_INPUT_DATA) * ReadSize); /* Move the pointer and counter up */ @@ -337,7 +411,7 @@ } else { - DPRINT("MouclassCallBack() entered, InputCount = %lu - DOING NOTHING\n", InputCount); + DPRINT("ClassCallBack() entered, InputCount = %lu - DOING NOTHING\n", InputCount); } if (Irp != NULL) @@ -346,15 +420,15 @@ IoCompleteRequest(Irp, IO_MOUSE_INCREMENT); } - DPRINT("Leaving MouclassCallback()\n"); + DPRINT("Leaving ClassCallback()\n"); return TRUE; } -/* Send IOCTL_INTERNAL_MOUSE_CONNECT to pointer port */ +/* Send IOCTL_INTERNAL_*_CONNECT to port */ static NTSTATUS -ConnectMousePortDriver( - IN PDEVICE_OBJECT PointerPortDO, - IN PDEVICE_OBJECT PointerClassDO) +ConnectPortDriver( + IN PDEVICE_OBJECT PortDO, + IN PDEVICE_OBJECT ClassDO) { KEVENT Event; PIRP Irp; @@ -364,47 +438,50 @@ KeInitializeEvent(&Event, NotificationEvent, FALSE); - ConnectData.ClassDeviceObject = PointerClassDO; - ConnectData.ClassService = MouclassCallback; + ConnectData.ClassDeviceObject = ClassDO; + ConnectData.ClassService = ClassCallback; Irp = IoBuildDeviceIoControlRequest(IOCTL_INTERNAL_MOUSE_CONNECT, - PointerPortDO, + PortDO, &ConnectData, sizeof(CONNECT_DATA), NULL, 0, TRUE, &Event, &IoStatus); - Status = IoCallDriver(PointerPortDO, Irp); + Status = IoCallDriver(PortDO, Irp); if (Status == STATUS_PENDING) KeWaitForSingleObject(&Event, Suspended, KernelMode, FALSE, NULL); else IoStatus.Status = Status; + if (NT_SUCCESS(IoStatus.Status)) + ObReferenceObject(PortDO); + return IoStatus.Status; } static NTSTATUS NTAPI -MouclassAddDevice( +ClassAddDevice( IN PDRIVER_OBJECT DriverObject, IN PDEVICE_OBJECT Pdo) { - PMOUCLASS_DRIVER_EXTENSION DriverExtension; + PCLASS_DRIVER_EXTENSION DriverExtension; PDEVICE_OBJECT Fdo; - PMOUCLASS_DEVICE_EXTENSION DeviceExtension; + PPORT_DEVICE_EXTENSION DeviceExtension; NTSTATUS Status; - DPRINT("MouclassAddDevice called. Pdo = 0x%p\n", Pdo); + DPRINT("ClassAddDevice called. Pdo = 0x%p\n", Pdo); DriverExtension = IoGetDriverObjectExtension(DriverObject, DriverObject); /* Create new device object */ Status = IoCreateDevice( DriverObject, - sizeof(MOUCLASS_DEVICE_EXTENSION), + sizeof(PORT_DEVICE_EXTENSION), NULL, Pdo->DeviceType, FILE_DEVICE_SECURE_OPEN, - FALSE, + TRUE, &Fdo); if (!NT_SUCCESS(Status)) { @@ -412,8 +489,8 @@ return Status; } - DeviceExtension = (PMOUCLASS_DEVICE_EXTENSION)Fdo->DeviceExtension; - RtlZeroMemory(DeviceExtension, sizeof(MOUCLASS_DEVICE_EXTENSION)); + DeviceExtension = (PPORT_DEVICE_EXTENSION)Fdo->DeviceExtension; + RtlZeroMemory(DeviceExtension, sizeof(CLASS_DEVICE_EXTENSION)); DeviceExtension->Common.IsClassDO = FALSE; DeviceExtension->PnpState = dsStopped; Fdo->Flags |= DO_POWER_PAGABLE; @@ -425,27 +502,27 @@ return Status; } Fdo->Flags |= DO_BUFFERED_IO; - Fdo->Flags &= ~DO_DEVICE_INITIALIZING; if (DriverExtension->ConnectMultiplePorts) - Status = ConnectMousePortDriver(Fdo, DriverExtension->MainMouclassDeviceObject); + Status = ConnectPortDriver(Fdo, DriverExtension->MainClassDeviceObject); else - Status = ConnectMousePortDriver(Fdo, Fdo); + Status = ConnectPortDriver(Fdo, Fdo); if (!NT_SUCCESS(Status)) { - DPRINT("ConnectMousePortDriver() failed with status 0x%08lx\n", Status); + DPRINT("ConnectPortDriver() failed with status 0x%08lx\n", Status); + IoDetachDevice(DeviceExtension->LowerDevice); /* FIXME: why can't I cleanup without error? */ - //IoDetachDevice(Fdo); //IoDeleteDevice(Fdo); return Status; } + Fdo->Flags &= ~DO_DEVICE_INITIALIZING; - /* Register GUID_DEVINTERFACE_MOUSE interface */ + /* Register interface */ Status = IoRegisterDeviceInterface( Pdo, &GUID_DEVINTERFACE_MOUSE, NULL, - &DeviceExtension->MouseInterfaceName); + &DeviceExtension->InterfaceName); if (!NT_SUCCESS(Status)) { DPRINT("IoRegisterDeviceInterface() failed with status 0x%08lx\n", Status); @@ -456,11 +533,11 @@ } static VOID NTAPI -MouclassStartIo( +ClassStartIo( IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp) { - PMOUCLASS_DEVICE_EXTENSION DeviceExtension = DeviceObject->DeviceExtension; + PCLASS_DEVICE_EXTENSION DeviceExtension = DeviceObject->DeviceExtension; PIO_STACK_LOCATION Stack = IoGetCurrentIrpStackLocation(Irp); ASSERT(DeviceExtension->Common.IsClassDO); @@ -506,7 +583,7 @@ static NTSTATUS SearchForLegacyDrivers( IN PDRIVER_OBJECT DriverObject, - IN PMOUCLASS_DRIVER_EXTENSION DriverExtension) + IN PCLASS_DRIVER_EXTENSION DriverExtension) { UNICODE_STRING DeviceMapKeyU = RTL_CONSTANT_STRING(L"\\REGISTRY\\MACHINE\\HARDWARE\\DEVICEMAP"); UNICODE_STRING PortBaseName = {0, }; @@ -521,7 +598,7 @@ /* Create port base name, by replacing Class by Port at the end of the class base name */ Status = RtlDuplicateUnicodeString( RTL_DUPLICATE_UNICODE_STRING_NULL_TERMINATE, - &DriverExtension->PointerDeviceBaseName, + &DriverExtension->DeviceBaseName, &PortBaseName); if (!NT_SUCCESS(Status)) { @@ -544,8 +621,14 @@ /* Open HKEY_LOCAL_MACHINE\HARDWARE\DEVICEMAP */ InitializeObjectAttributes(&ObjectAttributes, &DeviceMapKeyU, OBJ_KERNEL_HANDLE | OBJ_CASE_INSENSITIVE, NULL, NULL); Status = ZwOpenKey(&hDeviceMapKey, 0, &ObjectAttributes); - if (!NT_SUCCESS(Status)) + if (Status == STATUS_OBJECT_NAME_NOT_FOUND) { + DPRINT("HKLM\\HARDWARE\\DEVICEMAP is non-existent\n"); + Status = STATUS_SUCCESS; + goto cleanup; + } + else if (!NT_SUCCESS(Status)) + { DPRINT("ZwOpenKey() failed with status 0x%08lx\n", Status); goto cleanup; } @@ -553,10 +636,15 @@ /* Open sub key */ InitializeObjectAttributes(&ObjectAttributes, &PortBaseName, OBJ_KERNEL_HANDLE | OBJ_CASE_INSENSITIVE, hDeviceMapKey, NULL); Status = ZwOpenKey(&hPortKey, KEY_QUERY_VALUE, &ObjectAttributes); - if (!NT_SUCCESS(Status)) + if (Status == STATUS_OBJECT_NAME_NOT_FOUND) { + DPRINT("HKLM\\HARDWARE\\DEVICEMAP\\%wZ is non-existent\n", &PortBaseName); + Status = STATUS_SUCCESS; + goto cleanup; + } + else if (!NT_SUCCESS(Status)) + { DPRINT("ZwOpenKey() failed with status 0x%08lx\n", Status); - DPRINT1("ZwOpenKey() failed with status 0x%08lx\n", Status); goto cleanup; } @@ -580,31 +668,29 @@ /* Connect the port device object */ if (DriverExtension->ConnectMultiplePorts) { - Status = ConnectMousePortDriver(PortDeviceObject, DriverExtension->MainMouclassDeviceObject); + Status = ConnectPortDriver(PortDeviceObject, DriverExtension->MainClassDeviceObject); if (!NT_SUCCESS(Status)) { /* FIXME: Log the error */ - DPRINT("ConnectMousePortDriver() failed with status 0x%08lx\n", Status); - /* FIXME: cleanup */ + DPRINT("ConnectPortDriver() failed with status 0x%08lx\n", Status); } } else { PDEVICE_OBJECT ClassDO; - Status = CreatePointerClassDeviceObject(DriverObject, &ClassDO); + Status = CreateClassDeviceObject(DriverObject, &ClassDO); if (!NT_SUCCESS(Status)) { /* FIXME: Log the error */ DPRINT("CreatePointerClassDeviceObject() failed with status 0x%08lx\n", Status); - /* FIXME: cleanup */ continue; } - Status = ConnectMousePortDriver(PortDeviceObject, ClassDO); + Status = ConnectPortDriver(PortDeviceObject, ClassDO); if (!NT_SUCCESS(Status)) { /* FIXME: Log the error */ - DPRINT("ConnectMousePortDriver() failed with status 0x%08lx\n", Status); - /* FIXME: cleanup */ + DPRINT("ConnectPortDriver() failed with status 0x%08lx\n", Status); + IoDeleteDevice(ClassDO); } } } @@ -629,21 +715,21 @@ IN PDRIVER_OBJECT DriverObject, IN PUNICODE_STRING RegistryPath) { - PMOUCLASS_DRIVER_EXTENSION DriverExtension; + PCLASS_DRIVER_EXTENSION DriverExtension; ULONG i; NTSTATUS Status; Status = IoAllocateDriverObjectExtension( DriverObject, DriverObject, - sizeof(MOUCLASS_DRIVER_EXTENSION), + sizeof(CLASS_DRIVER_EXTENSION), (PVOID*)&DriverExtension); if (!NT_SUCCESS(Status)) { DPRINT("IoAllocateDriverObjectExtension() failed with status 0x%08lx\n", Status); return Status; } - RtlZeroMemory(DriverExtension, sizeof(MOUCLASS_DRIVER_EXTENSION)); + RtlZeroMemory(DriverExtension, sizeof(CLASS_DRIVER_EXTENSION)); Status = ReadRegistryEntries(RegistryPath, DriverExtension); if (!NT_SUCCESS(Status)) @@ -654,26 +740,28 @@ if (DriverExtension->ConnectMultiplePorts == 1) { - Status = CreatePointerClassDeviceObject( + Status = CreateClassDeviceObject( DriverObject, - &DriverExtension->MainMouclassDeviceObject); + &DriverExtension->MainClassDeviceObject); if (!NT_SUCCESS(Status)) { - DPRINT("CreatePointerClassDeviceObject() failed with status 0x%08lx\n", Status); + DPRINT("CreateClassDeviceObject() failed with status 0x%08lx\n", Status); return Status; } } - DriverObject->DriverExtension->AddDevice = MouclassAddDevice; + DriverObject->DriverExtension->AddDevice = ClassAddDevice; DriverObject->DriverUnload = DriverUnload; for (i = 0; i < IRP_MJ_MAXIMUM_FUNCTION; i++) DriverObject->MajorFunction[i] = IrpStub; - DriverObject->MajorFunction[IRP_MJ_CREATE] = MouclassCreate; - DriverObject->MajorFunction[IRP_MJ_CLOSE] = MouclassClose; - DriverObject->MajorFunction[IRP_MJ_READ] = MouclassRead; - DriverObject->DriverStartIo = MouclassStartIo; + DriverObject->MajorFunction[IRP_MJ_CREATE] = ClassCreate; + DriverObject->MajorFunction[IRP_MJ_CLOSE] = ClassClose; + DriverObject->MajorFunction[IRP_MJ_CLEANUP] = ClassCleanup; + DriverObject->MajorFunction[IRP_MJ_READ] = ClassRead; + DriverObject->MajorFunction[IRP_MJ_DEVICE_CONTROL] = ClassDeviceControl; + DriverObject->DriverStartIo = ClassStartIo; Status = SearchForLegacyDrivers(DriverObject, DriverExtension); _____ Modified: trunk/reactos/drivers/input/mouclass/mouclass.h --- trunk/reactos/drivers/input/mouclass/mouclass.h 2005-11-05 08:21:59 UTC (rev 19010) +++ trunk/reactos/drivers/input/mouclass/mouclass.h 2005-11-05 08:37:01 UTC (rev 19011) @@ -20,42 +20,43 @@ dsPaused, dsRemoved, dsSurpriseRemoved -} MOUCLASS_DEVICE_STATE; +} PORT_DEVICE_STATE; -typedef struct _MOUCLASS_DRIVER_EXTENSION +typedef struct _CLASS_DRIVER_EXTENSION { /* Registry settings */ ULONG ConnectMultiplePorts; - ULONG MouseDataQueueSize; - UNICODE_STRING PointerDeviceBaseName; + ULONG DataQueueSize; + UNICODE_STRING DeviceBaseName; - PDEVICE_OBJECT MainMouclassDeviceObject; -} MOUCLASS_DRIVER_EXTENSION, *PMOUCLASS_DRIVER_EXTENSION; + PDEVICE_OBJECT MainClassDeviceObject; +} CLASS_DRIVER_EXTENSION, *PCLASS_DRIVER_EXTENSION; typedef struct _COMMON_DEVICE_EXTENSION { BOOLEAN IsClassDO; } COMMON_DEVICE_EXTENSION, *PCOMMON_DEVICE_EXTENSION; -typedef struct _MOUPORT_DEVICE_EXTENSION +typedef struct _PORT_DEVICE_EXTENSION { COMMON_DEVICE_EXTENSION Common; -} MOUPORT_DEVICE_EXTENSION, *PMOUPORT_DEVICE_EXTENSION; -typedef struct _MOUCLASS_DEVICE_EXTENSION + PORT_DEVICE_STATE PnpState; + PDEVICE_OBJECT LowerDevice; + UNICODE_STRING InterfaceName; +} PORT_DEVICE_EXTENSION, *PPORT_DEVICE_EXTENSION; + +typedef struct _CLASS_DEVICE_EXTENSION { COMMON_DEVICE_EXTENSION Common; - MOUCLASS_DEVICE_STATE PnpState; - PMOUCLASS_DRIVER_EXTENSION DriverExtension; - PDEVICE_OBJECT LowerDevice; - UNICODE_STRING MouseInterfaceName; + PCLASS_DRIVER_EXTENSION DriverExtension; KSPIN_LOCK SpinLock; BOOLEAN ReadIsPending; ULONG InputCount; PMOUSE_INPUT_DATA PortData; -} MOUCLASS_DEVICE_EXTENSION, *PMOUCLASS_DEVICE_EXTENSION; +} CLASS_DEVICE_EXTENSION, *PCLASS_DEVICE_EXTENSION; /* misc.c */

19 years, 1 month

[hpoussin] 19010: Revert Kdb and Keyboard strings in name to share more code with mouclass

by hpoussin＠svn.reactos.com

Revert Kdb and Keyboard strings in name to share more code with mouclass Fix PORT_DEVICE_EXTENSION and CLASS_DEVICE_EXTENSION structures and use them correctly (PORT_DEVICE_EXTENSION was not used...) ObDereference DOs when an error occurs, instead of ObReferencing them Modified: trunk/reactos/drivers/input/kbdclass/kbdclass.c Modified: trunk/reactos/drivers/input/kbdclass/kbdclass.h Modified: trunk/reactos/drivers/input/kbdclass/misc.c _____ Modified: trunk/reactos/drivers/input/kbdclass/kbdclass.c --- trunk/reactos/drivers/input/kbdclass/kbdclass.c 2005-11-05 06:44:03 UTC (rev 19009) +++ trunk/reactos/drivers/input/kbdclass/kbdclass.c 2005-11-05 08:21:59 UTC (rev 19010) @@ -20,7 +20,7 @@ } static NTSTATUS NTAPI -KbdclassCreate( +ClassCreate( IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp) { @@ -34,7 +34,7 @@ } static NTSTATUS NTAPI -KbdclassClose( +ClassClose( IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp) { @@ -48,7 +48,7 @@ } static NTSTATUS NTAPI -KbdclassCleanup( +ClassCleanup( IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp) { @@ -57,12 +57,12 @@ if (!((PCOMMON_DEVICE_EXTENSION)DeviceObject->DeviceExtension)->IsClassDO) return ForwardIrpAndForget(DeviceObject, Irp); - /* FIXME: close all associated Port devices */ + /* FIXME: cleanup all associated Port devices */ return STATUS_SUCCESS; } static NTSTATUS NTAPI -KbdclassRead( +ClassRead( IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp) { @@ -86,10 +86,11 @@ } static NTSTATUS NTAPI -KbdclassDeviceControl( +ClassDeviceControl( IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp) { + PCLASS_DEVICE_EXTENSION DeviceExtension; NTSTATUS Status; DPRINT("IRP_MJ_DEVICE_CONTROL\n"); @@ -97,6 +98,8 @@ if (!((PCOMMON_DEVICE_EXTENSION)DeviceObject->DeviceExtension)->IsClassDO) return ForwardIrpAndForget(DeviceObject, Irp); + DeviceExtension = (PCLASS_DEVICE_EXTENSION)DeviceObject->DeviceExtension; + switch (IoGetCurrentIrpStackLocation(Irp)->Parameters.DeviceIoControl.IoControl Code) { case IOCTL_KEYBOARD_QUERY_ATTRIBUTES: @@ -160,15 +163,15 @@ static NTSTATUS ReadRegistryEntries( IN PUNICODE_STRING RegistryPath, - IN PKBDCLASS_DRIVER_EXTENSION DriverExtension) + IN PCLASS_DRIVER_EXTENSION DriverExtension) { UNICODE_STRING ParametersRegistryKey; RTL_QUERY_REGISTRY_TABLE Parameters[4]; NTSTATUS Status; - ULONG DefaultConnectMultiplePorts = 1; - ULONG DefaultKeyboardDataQueueSize = 0x64; - UNICODE_STRING DefaultKeyboardDeviceBaseName = RTL_CONSTANT_STRING(L"KeyboardClass"); + ULONG DefaultConnectMultiplePorts = 0; + ULONG DefaultDataQueueSize = 0x64; + UNICODE_STRING DefaultDeviceBaseName = RTL_CONSTANT_STRING(L"KeyboardClass"); ParametersRegistryKey.Length = 0; ParametersRegistryKey.MaximumLength = RegistryPath->Length + sizeof(L"\\Parameters") + sizeof(UNICODE_NULL); @@ -193,16 +196,16 @@ Parameters[1].Flags = RTL_QUERY_REGISTRY_DIRECT | RTL_REGISTRY_OPTIONAL; Parameters[1].Name = L"KeyboardDataQueueSize"; - Parameters[1].EntryContext = &DriverExtension->KeyboardDataQueueSize; + Parameters[1].EntryContext = &DriverExtension->DataQueueSize; Parameters[1].DefaultType = REG_DWORD; - Parameters[1].DefaultData = &DefaultKeyboardDataQueueSize; + Parameters[1].DefaultData = &DefaultDataQueueSize; Parameters[1].DefaultLength = sizeof(ULONG); Parameters[2].Flags = RTL_QUERY_REGISTRY_DIRECT | RTL_REGISTRY_OPTIONAL; Parameters[2].Name = L"KeyboardDeviceBaseName"; - Parameters[2].EntryContext = &DriverExtension->KeyboardDeviceBaseName; + Parameters[2].EntryContext = &DriverExtension->DeviceBaseName; Parameters[2].DefaultType = REG_SZ; - Parameters[2].DefaultData = &DefaultKeyboardDeviceBaseName; + Parameters[2].DefaultData = &DefaultDeviceBaseName; Parameters[2].DefaultLength = sizeof(ULONG); Status = RtlQueryRegistryValues( @@ -220,50 +223,50 @@ { DriverExtension->ConnectMultiplePorts = DefaultConnectMultiplePorts; } - if (DriverExtension->KeyboardDataQueueSize == 0) + if (DriverExtension->DataQueueSize == 0) { - DriverExtension->KeyboardDataQueueSize = DefaultKeyboardDataQueueSize; + DriverExtension->DataQueueSize = DefaultDataQueueSize; } } else if (Status == STATUS_OBJECT_NAME_NOT_FOUND) { /* Registry path doesn't exist. Set defaults */ DriverExtension->ConnectMultiplePorts = DefaultConnectMultiplePorts; - DriverExtension->KeyboardDataQueueSize = DefaultKeyboardDataQueueSize; + DriverExtension->DataQueueSize = DefaultDataQueueSize; Status = RtlDuplicateUnicodeString( RTL_DUPLICATE_UNICODE_STRING_NULL_TERMINATE, - &DefaultKeyboardDeviceBaseName, - &DriverExtension->KeyboardDeviceBaseName); + &DefaultDeviceBaseName, + &DriverExtension->DeviceBaseName); } return Status; } static NTSTATUS -CreateKeyboardClassDeviceObject( +CreateClassDeviceObject( IN PDRIVER_OBJECT DriverObject, OUT PDEVICE_OBJECT *ClassDO OPTIONAL) { - PKBDCLASS_DRIVER_EXTENSION DriverExtension; + PCLASS_DRIVER_EXTENSION DriverExtension; UNICODE_STRING SymbolicLinkName = RTL_CONSTANT_STRING(L"\\??\\Keyboard"); ULONG DeviceId = 0; ULONG PrefixLength; UNICODE_STRING DeviceNameU; PWSTR DeviceIdW = NULL; /* Pointer into DeviceNameU.Buffer */ PDEVICE_OBJECT Fdo; - PKBDCLASS_DEVICE_EXTENSION DeviceExtension; + PCLASS_DEVICE_EXTENSION DeviceExtension; NTSTATUS Status; - DPRINT("CreateKeyboardClassDeviceObject(0x%p)\n", DriverObject); + DPRINT("CreateClassDeviceObject(0x%p)\n", DriverObject); /* Create new device object */ DriverExtension = IoGetDriverObjectExtension(DriverObject, DriverObject); DeviceNameU.Length = 0; DeviceNameU.MaximumLength = - wcslen(L"\\Device\\") * sizeof(WCHAR) /* "\Device\" */ - + DriverExtension->KeyboardDeviceBaseName.Length/* "KeyboardClass" */ - + 4 * sizeof(WCHAR) /* Id between 0 and 9999 */ - + sizeof(UNICODE_NULL); /* Final NULL char */ + wcslen(L"\\Device\\") * sizeof(WCHAR) /* "\Device\" */ + + DriverExtension->DeviceBaseName.Length /* "KeyboardClass" */ + + 4 * sizeof(WCHAR) /* Id between 0 and 9999 */ + + sizeof(UNICODE_NULL); /* Final NULL char */ DeviceNameU.Buffer = ExAllocatePool(PagedPool, DeviceNameU.MaximumLength); if (!DeviceNameU.Buffer) { @@ -276,7 +279,7 @@ DPRINT("RtlAppendUnicodeToString() failed with status 0x%08lx\n", Status); goto cleanup; } - Status = RtlAppendUnicodeStringToString(&DeviceNameU, &DriverExtension->KeyboardDeviceBaseName); + Status = RtlAppendUnicodeStringToString(&DeviceNameU, &DriverExtension->DeviceBaseName); if (!NT_SUCCESS(Status)) { DPRINT("RtlAppendUnicodeStringToString() failed with status 0x%08lx\n", Status); @@ -289,7 +292,7 @@ DeviceNameU.Length = PrefixLength + swprintf(DeviceIdW, L"%lu", DeviceId) * sizeof(WCHAR); Status = IoCreateDevice( DriverObject, - sizeof(KBDCLASS_DEVICE_EXTENSION), + sizeof(CLASS_DEVICE_EXTENSION), &DeviceNameU, FILE_DEVICE_KEYBOARD, FILE_DEVICE_SECURE_OPEN, @@ -304,7 +307,7 @@ } DeviceId++; } - DPRINT("Too much devices starting with '\\Device\\%wZ'\n", &DriverExtension->KeyboardDeviceBaseName); + DPRINT("Too much devices starting with '\\Device\\%wZ'\n", &DriverExtension->DeviceBaseName); Status = STATUS_UNSUCCESSFUL; cleanup: if (!NT_SUCCESS(Status)) @@ -313,15 +316,14 @@ return Status; } - DeviceExtension = (PKBDCLASS_DEVICE_EXTENSION)Fdo->DeviceExtension; - RtlZeroMemory(DeviceExtension, sizeof(KBDCLASS_DEVICE_EXTENSION)); + DeviceExtension = (PCLASS_DEVICE_EXTENSION)Fdo->DeviceExtension; + RtlZeroMemory(DeviceExtension, sizeof(CLASS_DEVICE_EXTENSION)); DeviceExtension->Common.IsClassDO = TRUE; DeviceExtension->DriverExtension = DriverExtension; - DeviceExtension->PnpState = dsStopped; KeInitializeSpinLock(&(DeviceExtension->SpinLock)); DeviceExtension->ReadIsPending = FALSE; DeviceExtension->InputCount = 0; - DeviceExtension->PortData = ExAllocatePool(NonPagedPool, DeviceExtension->DriverExtension->KeyboardDataQueueSize * sizeof(KEYBOARD_INPUT_DATA)); + DeviceExtension->PortData = ExAllocatePool(NonPagedPool, DeviceExtension->DriverExtension->DataQueueSize * sizeof(KEYBOARD_INPUT_DATA)); Fdo->Flags |= DO_POWER_PAGABLE | DO_BUFFERED_IO; Fdo->Flags &= ~DO_DEVICE_INITIALIZING; @@ -340,22 +342,22 @@ } static BOOLEAN -KbdclassCallback( +ClassCallback( IN PDEVICE_OBJECT ClassDeviceObject, - IN OUT PKEYBOARD_INPUT_DATA KeyboardDataStart, - IN PKEYBOARD_INPUT_DATA KeyboardDataEnd, + IN OUT PKEYBOARD_INPUT_DATA DataStart, + IN PKEYBOARD_INPUT_DATA DataEnd, IN OUT PULONG ConsumedCount) { - PKBDCLASS_DEVICE_EXTENSION ClassDeviceExtension = ClassDeviceObject->DeviceExtension; + PCLASS_DEVICE_EXTENSION ClassDeviceExtension = ClassDeviceObject->DeviceExtension; PIRP Irp = NULL; KIRQL OldIrql; PIO_STACK_LOCATION Stack; - ULONG InputCount = KeyboardDataEnd - KeyboardDataStart; + ULONG InputCount = DataEnd - DataStart; ULONG ReadSize; ASSERT(ClassDeviceExtension->Common.IsClassDO); - DPRINT("KbdclassCallback()\n"); + DPRINT("ClassCallback()\n"); /* A filter driver might have consumed all the data already; I'm * not sure if they are supposed to move the packets when they * consume them though. @@ -370,7 +372,7 @@ /* FIXME: use SEH */ RtlCopyMemory( Irp->MdlAddress ? MmGetSystemAddressForMdlSafe(Irp->MdlAddress, NormalPagePriority) : Irp->AssociatedIrp.SystemBuffer, - KeyboardDataStart, + DataStart, sizeof(KEYBOARD_INPUT_DATA)); /* Go to next packet and complete this request with STATUS_SUCCESS */ @@ -381,7 +383,7 @@ ClassDeviceExtension->ReadIsPending = FALSE; /* Skip the packet we just sent away */ - KeyboardDataStart++; + DataStart++; (*ConsumedCount)++; InputCount--; } @@ -391,23 +393,23 @@ { KeAcquireSpinLock(&ClassDeviceExtension->SpinLock, &OldIrql); - if (ClassDeviceExtension->InputCount + InputCount > ClassDeviceExtension->DriverExtension->KeyboardDataQueueSize) - ReadSize = ClassDeviceExtension->DriverExtension->KeyboardDataQueueSize - ClassDeviceExtension->InputCount; + if (ClassDeviceExtension->InputCount + InputCount > ClassDeviceExtension->DriverExtension->DataQueueSize) + ReadSize = ClassDeviceExtension->DriverExtension->DataQueueSize - ClassDeviceExtension->InputCount; else ReadSize = InputCount; /* - * FIXME: If we exceed the buffer, keyboard data gets thrown away.. better + * FIXME: If we exceed the buffer, data gets thrown away.. better * solution? */ /* - * Move the keyboard input data from the port data queue to our class data + * Move the input data from the port data queue to our class data * queue. */ RtlMoveMemory( ClassDeviceExtension->PortData, - (PCHAR)KeyboardDataStart, + (PCHAR)DataStart, sizeof(KEYBOARD_INPUT_DATA) * ReadSize); /* Move the pointer and counter up */ @@ -419,7 +421,7 @@ } else { - DPRINT("KbdclassCallBack() entered, InputCount = %lu - DOING NOTHING\n", InputCount); + DPRINT("ClassCallBack() entered, InputCount = %lu - DOING NOTHING\n", InputCount); } if (Irp != NULL) @@ -428,15 +430,15 @@ IoCompleteRequest(Irp, IO_KEYBOARD_INCREMENT); } - DPRINT("Leaving KbdclassCallback()\n"); + DPRINT("Leaving ClassCallback()\n"); return TRUE; } -/* Send IOCTL_INTERNAL_KEYBOARD_CONNECT to keyboard port */ +/* Send IOCTL_INTERNAL_*_CONNECT to port */ static NTSTATUS -ConnectKeyboardPortDriver( - IN PDEVICE_OBJECT KeyboardPortDO, - IN PDEVICE_OBJECT KeyboardClassDO) +ConnectPortDriver( + IN PDEVICE_OBJECT PortDO, + IN PDEVICE_OBJECT ClassDO) { KEVENT Event; PIRP Irp; @@ -446,16 +448,16 @@ KeInitializeEvent(&Event, NotificationEvent, FALSE); - ConnectData.ClassDeviceObject = KeyboardClassDO; - ConnectData.ClassService = KbdclassCallback; + ConnectData.ClassDeviceObject = ClassDO; + ConnectData.ClassService = ClassCallback; Irp = IoBuildDeviceIoControlRequest(IOCTL_INTERNAL_KEYBOARD_CONNECT, - KeyboardPortDO, + PortDO, &ConnectData, sizeof(CONNECT_DATA), NULL, 0, TRUE, &Event, &IoStatus); - Status = IoCallDriver(KeyboardPortDO, Irp); + Status = IoCallDriver(PortDO, Irp); if (Status == STATUS_PENDING) KeWaitForSingleObject(&Event, Suspended, KernelMode, FALSE, NULL); @@ -463,29 +465,29 @@ IoStatus.Status = Status; if (NT_SUCCESS(Status)) - ObReferenceObject(KeyboardPortDO); + ObReferenceObject(PortDO); return IoStatus.Status; } static NTSTATUS NTAPI -KbdclassAddDevice( +ClassAddDevice( IN PDRIVER_OBJECT DriverObject, IN PDEVICE_OBJECT Pdo) { - PKBDCLASS_DRIVER_EXTENSION DriverExtension; + PCLASS_DRIVER_EXTENSION DriverExtension; PDEVICE_OBJECT Fdo; - PKBDCLASS_DEVICE_EXTENSION DeviceExtension; + PPORT_DEVICE_EXTENSION DeviceExtension; NTSTATUS Status; - DPRINT("KbdclassAddDevice called. Pdo = 0x%p\n", Pdo); + DPRINT("ClassAddDevice called. Pdo = 0x%p\n", Pdo); DriverExtension = IoGetDriverObjectExtension(DriverObject, DriverObject); /* Create new device object */ Status = IoCreateDevice( DriverObject, - sizeof(KBDCLASS_DEVICE_EXTENSION), + sizeof(PORT_DEVICE_EXTENSION), NULL, Pdo->DeviceType, FILE_DEVICE_SECURE_OPEN, @@ -497,8 +499,8 @@ return Status; } - DeviceExtension = (PKBDCLASS_DEVICE_EXTENSION)Fdo->DeviceExtension; - RtlZeroMemory(DeviceExtension, sizeof(KBDCLASS_DEVICE_EXTENSION)); + DeviceExtension = (PPORT_DEVICE_EXTENSION)Fdo->DeviceExtension; + RtlZeroMemory(DeviceExtension, sizeof(CLASS_DEVICE_EXTENSION)); DeviceExtension->Common.IsClassDO = FALSE; DeviceExtension->PnpState = dsStopped; Fdo->Flags |= DO_POWER_PAGABLE; @@ -512,12 +514,12 @@ Fdo->Flags |= DO_BUFFERED_IO; if (DriverExtension->ConnectMultiplePorts) - Status = ConnectKeyboardPortDriver(Fdo, DriverExtension->MainKbdclassDeviceObject); + Status = ConnectPortDriver(Fdo, DriverExtension->MainClassDeviceObject); else - Status = ConnectKeyboardPortDriver(Fdo, Fdo); + Status = ConnectPortDriver(Fdo, Fdo); if (!NT_SUCCESS(Status)) { - DPRINT("ConnectKeyboardPortDriver() failed with status 0x%08lx\n", Status); + DPRINT("ConnectPortDriver() failed with status 0x%08lx\n", Status); IoDetachDevice(DeviceExtension->LowerDevice); /* FIXME: why can't I cleanup without error? */ //IoDeleteDevice(Fdo); @@ -525,12 +527,12 @@ } Fdo->Flags &= ~DO_DEVICE_INITIALIZING; - /* Register GUID_DEVINTERFACE_KEYBOARD interface */ + /* Register interface */ Status = IoRegisterDeviceInterface( Pdo, &GUID_DEVINTERFACE_KEYBOARD, NULL, - &DeviceExtension->KeyboardInterfaceName); + &DeviceExtension->InterfaceName); if (!NT_SUCCESS(Status)) { DPRINT("IoRegisterDeviceInterface() failed with status 0x%08lx\n", Status); @@ -541,11 +543,11 @@ } static VOID NTAPI -KbdclassStartIo( +ClassStartIo( IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp) { - PKBDCLASS_DEVICE_EXTENSION DeviceExtension = DeviceObject->DeviceExtension; + PCLASS_DEVICE_EXTENSION DeviceExtension = DeviceObject->DeviceExtension; PIO_STACK_LOCATION Stack = IoGetCurrentIrpStackLocation(Irp); ASSERT(DeviceExtension->Common.IsClassDO); @@ -591,7 +593,7 @@ static NTSTATUS SearchForLegacyDrivers( IN PDRIVER_OBJECT DriverObject, - IN PKBDCLASS_DRIVER_EXTENSION DriverExtension) + IN PCLASS_DRIVER_EXTENSION DriverExtension) { UNICODE_STRING DeviceMapKeyU = RTL_CONSTANT_STRING(L"\\REGISTRY\\MACHINE\\HARDWARE\\DEVICEMAP"); UNICODE_STRING PortBaseName = {0, }; @@ -606,7 +608,7 @@ /* Create port base name, by replacing Class by Port at the end of the class base name */ Status = RtlDuplicateUnicodeString( RTL_DUPLICATE_UNICODE_STRING_NULL_TERMINATE, - &DriverExtension->KeyboardDeviceBaseName, + &DriverExtension->DeviceBaseName, &PortBaseName); if (!NT_SUCCESS(Status)) { @@ -629,8 +631,14 @@ /* Open HKEY_LOCAL_MACHINE\HARDWARE\DEVICEMAP */ InitializeObjectAttributes(&ObjectAttributes, &DeviceMapKeyU, OBJ_KERNEL_HANDLE | OBJ_CASE_INSENSITIVE, NULL, NULL); Status = ZwOpenKey(&hDeviceMapKey, 0, &ObjectAttributes); - if (!NT_SUCCESS(Status)) + if (Status == STATUS_OBJECT_NAME_NOT_FOUND) { + DPRINT("HKLM\\HARDWARE\\DEVICEMAP is non-existent\n"); + Status = STATUS_SUCCESS; + goto cleanup; + } + else if (!NT_SUCCESS(Status)) + { DPRINT("ZwOpenKey() failed with status 0x%08lx\n", Status); goto cleanup; } @@ -638,10 +646,15 @@ /* Open sub key */ InitializeObjectAttributes(&ObjectAttributes, &PortBaseName, OBJ_KERNEL_HANDLE | OBJ_CASE_INSENSITIVE, hDeviceMapKey, NULL); Status = ZwOpenKey(&hPortKey, KEY_QUERY_VALUE, &ObjectAttributes); - if (!NT_SUCCESS(Status)) + if (Status == STATUS_OBJECT_NAME_NOT_FOUND) { + DPRINT("HKLM\\HARDWARE\\DEVICEMAP\\%wZ is non-existent\n", &PortBaseName); + Status = STATUS_SUCCESS; + goto cleanup; + } + else if (!NT_SUCCESS(Status)) + { DPRINT("ZwOpenKey() failed with status 0x%08lx\n", Status); - DPRINT1("ZwOpenKey() failed with status 0x%08lx\n", Status); goto cleanup; } @@ -665,31 +678,31 @@ /* Connect the port device object */ if (DriverExtension->ConnectMultiplePorts) { - Status = ConnectKeyboardPortDriver(PortDeviceObject, DriverExtension->MainKbdclassDeviceObject); + Status = ConnectPortDriver(PortDeviceObject, DriverExtension->MainClassDeviceObject); if (!NT_SUCCESS(Status)) { /* FIXME: Log the error */ - DPRINT("ConnectKeyboardPortDriver() failed with status 0x%08lx\n", Status); - ObReferenceObject(PortDeviceObject); + DPRINT("ConnectPortDriver() failed with status 0x%08lx\n", Status); + ObDereferenceObject(PortDeviceObject); } } else { PDEVICE_OBJECT ClassDO; - Status = CreateKeyboardClassDeviceObject(DriverObject, &ClassDO); + Status = CreateClassDeviceObject(DriverObject, &ClassDO); if (!NT_SUCCESS(Status)) { /* FIXME: Log the error */ DPRINT("CreatePointerClassDeviceObject() failed with status 0x%08lx\n", Status); - ObReferenceObject(PortDeviceObject); + ObDereferenceObject(PortDeviceObject); continue; } - Status = ConnectKeyboardPortDriver(PortDeviceObject, ClassDO); + Status = ConnectPortDriver(PortDeviceObject, ClassDO); if (!NT_SUCCESS(Status)) { /* FIXME: Log the error */ - DPRINT("ConnectKeyboardPortDriver() failed with status 0x%08lx\n", Status); - ObReferenceObject(PortDeviceObject); + DPRINT("ConnectPortDriver() failed with status 0x%08lx\n", Status); + ObDereferenceObject(PortDeviceObject); IoDeleteDevice(ClassDO); } } @@ -715,21 +728,21 @@ IN PDRIVER_OBJECT DriverObject, IN PUNICODE_STRING RegistryPath) { - PKBDCLASS_DRIVER_EXTENSION DriverExtension; + PCLASS_DRIVER_EXTENSION DriverExtension; ULONG i; NTSTATUS Status; Status = IoAllocateDriverObjectExtension( DriverObject, DriverObject, - sizeof(KBDCLASS_DRIVER_EXTENSION), + sizeof(CLASS_DRIVER_EXTENSION), (PVOID*)&DriverExtension); if (!NT_SUCCESS(Status)) { DPRINT("IoAllocateDriverObjectExtension() failed with status 0x%08lx\n", Status); return Status; } - RtlZeroMemory(DriverExtension, sizeof(KBDCLASS_DRIVER_EXTENSION)); + RtlZeroMemory(DriverExtension, sizeof(CLASS_DRIVER_EXTENSION)); Status = ReadRegistryEntries(RegistryPath, DriverExtension); if (!NT_SUCCESS(Status)) @@ -740,28 +753,28 @@ if (DriverExtension->ConnectMultiplePorts == 1) { - Status = CreateKeyboardClassDeviceObject( + Status = CreateClassDeviceObject( DriverObject, - &DriverExtension->MainKbdclassDeviceObject); + &DriverExtension->MainClassDeviceObject); if (!NT_SUCCESS(Status)) { - DPRINT("CreateKeyboardClassDeviceObject() failed with status 0x%08lx\n", Status); + DPRINT("CreateClassDeviceObject() failed with status 0x%08lx\n", Status); return Status; } } - DriverObject->DriverExtension->AddDevice = KbdclassAddDevice; + DriverObject->DriverExtension->AddDevice = ClassAddDevice; DriverObject->DriverUnload = DriverUnload; for (i = 0; i < IRP_MJ_MAXIMUM_FUNCTION; i++) DriverObject->MajorFunction[i] = IrpStub; - DriverObject->MajorFunction[IRP_MJ_CREATE] = KbdclassCreate; - DriverObject->MajorFunction[IRP_MJ_CLOSE] = KbdclassClose; - DriverObject->MajorFunction[IRP_MJ_CLEANUP] = KbdclassCleanup; - DriverObject->MajorFunction[IRP_MJ_READ] = KbdclassRead; - DriverObject->MajorFunction[IRP_MJ_DEVICE_CONTROL] = KbdclassDeviceControl; - DriverObject->DriverStartIo = KbdclassStartIo; + DriverObject->MajorFunction[IRP_MJ_CREATE] = ClassCreate; + DriverObject->MajorFunction[IRP_MJ_CLOSE] = ClassClose; + DriverObject->MajorFunction[IRP_MJ_CLEANUP] = ClassCleanup; + DriverObject->MajorFunction[IRP_MJ_READ] = ClassRead; + DriverObject->MajorFunction[IRP_MJ_DEVICE_CONTROL] = ClassDeviceControl; + DriverObject->DriverStartIo = ClassStartIo; Status = SearchForLegacyDrivers(DriverObject, DriverExtension); _____ Modified: trunk/reactos/drivers/input/kbdclass/kbdclass.h --- trunk/reactos/drivers/input/kbdclass/kbdclass.h 2005-11-05 06:44:03 UTC (rev 19009) +++ trunk/reactos/drivers/input/kbdclass/kbdclass.h 2005-11-05 08:21:59 UTC (rev 19010) @@ -20,42 +20,43 @@ dsPaused, dsRemoved, dsSurpriseRemoved -} KBDCLASS_DEVICE_STATE; +} PORT_DEVICE_STATE; -typedef struct _KBDCLASS_DRIVER_EXTENSION +typedef struct _CLASS_DRIVER_EXTENSION { /* Registry settings */ ULONG ConnectMultiplePorts; - ULONG KeyboardDataQueueSize; - UNICODE_STRING KeyboardDeviceBaseName; + ULONG DataQueueSize; + UNICODE_STRING DeviceBaseName; - PDEVICE_OBJECT MainKbdclassDeviceObject; -} KBDCLASS_DRIVER_EXTENSION, *PKBDCLASS_DRIVER_EXTENSION; + PDEVICE_OBJECT MainClassDeviceObject; +} CLASS_DRIVER_EXTENSION, *PCLASS_DRIVER_EXTENSION; typedef struct _COMMON_DEVICE_EXTENSION { BOOLEAN IsClassDO; } COMMON_DEVICE_EXTENSION, *PCOMMON_DEVICE_EXTENSION; -typedef struct _KBDPORT_DEVICE_EXTENSION +typedef struct _PORT_DEVICE_EXTENSION { COMMON_DEVICE_EXTENSION Common; -} KBDPORT_DEVICE_EXTENSION, *PKBDPORT_DEVICE_EXTENSION; -typedef struct _KBDCLASS_DEVICE_EXTENSION + PORT_DEVICE_STATE PnpState; + PDEVICE_OBJECT LowerDevice; + UNICODE_STRING InterfaceName; +} PORT_DEVICE_EXTENSION, *PPORT_DEVICE_EXTENSION; + +typedef struct _CLASS_DEVICE_EXTENSION { COMMON_DEVICE_EXTENSION Common; - KBDCLASS_DEVICE_STATE PnpState; - PKBDCLASS_DRIVER_EXTENSION DriverExtension; - PDEVICE_OBJECT LowerDevice; - UNICODE_STRING KeyboardInterfaceName; + PCLASS_DRIVER_EXTENSION DriverExtension; KSPIN_LOCK SpinLock; BOOLEAN ReadIsPending; ULONG InputCount; PKEYBOARD_INPUT_DATA PortData; -} KBDCLASS_DEVICE_EXTENSION, *PKBDCLASS_DEVICE_EXTENSION; +} CLASS_DEVICE_EXTENSION, *PCLASS_DEVICE_EXTENSION; /* misc.c */ _____ Modified: trunk/reactos/drivers/input/kbdclass/misc.c --- trunk/reactos/drivers/input/kbdclass/misc.c 2005-11-05 06:44:03 UTC (rev 19009) +++ trunk/reactos/drivers/input/kbdclass/misc.c 2005-11-05 08:21:59 UTC (rev 19010) @@ -28,10 +28,13 @@ IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp) { - PDEVICE_OBJECT LowerDevice = ((PKBDCLASS_DEVICE_EXTENSION)DeviceObject->DeviceExtension)->LowerDevice ; + PDEVICE_OBJECT LowerDevice; KEVENT Event; NTSTATUS Status; + ASSERT(!((PCOMMON_DEVICE_EXTENSION)DeviceObject->DeviceExtension)->IsCla ssDO); + LowerDevice = ((PPORT_DEVICE_EXTENSION)DeviceObject->DeviceExtension)->LowerDevice; + KeInitializeEvent(&Event, NotificationEvent, FALSE); IoCopyCurrentIrpStackLocationToNext(Irp); @@ -54,8 +57,11 @@ IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp) { - PDEVICE_OBJECT LowerDevice = ((PKBDCLASS_DEVICE_EXTENSION)DeviceObject->DeviceExtension)->LowerDevice ; + PDEVICE_OBJECT LowerDevice; + ASSERT(!((PCOMMON_DEVICE_EXTENSION)DeviceObject->DeviceExtension)->IsCla ssDO); + LowerDevice = ((PPORT_DEVICE_EXTENSION)DeviceObject->DeviceExtension)->LowerDevice; + IoSkipCurrentIrpStackLocation(Irp); return IoCallDriver(LowerDevice, Irp); }

19 years, 1 month

[ion] 19009: - Move some NDK definitions (Cm Callbacks) to the DDK since they are actually public.

by ion＠svn.reactos.com

- Move some NDK definitions (Cm Callbacks) to the DDK since they are actually public. - Fix strange/incorrect hack which disabled DPRINT in msvc - Move UNIMPLEMENTED to the proper DBG block - Fix rtltypes.h compatibility with the PSDK/DDK I hope this doesn't break anything, my tree is quite off-sync. Modified: trunk/reactos/include/ndk/cmtypes.h Modified: trunk/reactos/include/ndk/rtltypes.h Modified: trunk/reactos/include/reactos/debug.h Modified: trunk/reactos/w32api/include/ddk/winddk.h Modified: trunk/reactos/w32api/include/windef.h _____ Modified: trunk/reactos/include/ndk/cmtypes.h --- trunk/reactos/include/ndk/cmtypes.h 2005-11-04 23:37:06 UTC (rev 19008) +++ trunk/reactos/include/ndk/cmtypes.h 2005-11-05 06:44:03 UTC (rev 19009) @@ -175,116 +175,6 @@ WCHAR Name[1]; } KEY_BASIC_INFORMATION, *PKEY_BASIC_INFORMATION; -#else - -typedef struct _REG_DELETE_KEY_INFORMATION -{ - PVOID Object; -} REG_DELETE_KEY_INFORMATION, *PREG_DELETE_KEY_INFORMATION; - -typedef struct _REG_SET_VALUE_KEY_INFORMATION -{ - PVOID Object; - PUNICODE_STRING ValueName; - ULONG TitleIndex; - ULONG Type; - PVOID Data; - ULONG DataSize; -} REG_SET_VALUE_KEY_INFORMATION, *PREG_SET_VALUE_KEY_INFORMATION; - -typedef struct _REG_DELETE_VALUE_KEY_INFORMATION -{ - PVOID Object; - PUNICODE_STRING ValueName; -} REG_DELETE_VALUE_KEY_INFORMATION, *PREG_DELETE_VALUE_KEY_INFORMATION; - -typedef struct _REG_SET_INFORMATION_KEY_INFORMATION -{ - PVOID Object; - KEY_SET_INFORMATION_CLASS KeySetInformationClass; - PVOID KeySetInformation; - ULONG KeySetInformationLength; -} REG_SET_INFORMATION_KEY_INFORMATION, *PREG_SET_INFORMATION_KEY_INFORMATION; - -typedef struct _REG_ENUMERATE_KEY_INFORMATION -{ - PVOID Object; - ULONG Index; - KEY_INFORMATION_CLASS KeyInformationClass; - PVOID KeyInformation; - ULONG Length; - PULONG ResultLength; -} REG_ENUMERATE_KEY_INFORMATION, *PREG_ENUMERATE_KEY_INFORMATION; - -typedef struct _REG_ENUMERATE_VALUE_KEY_INFORMATION -{ - PVOID Object; - ULONG Index; - KEY_VALUE_INFORMATION_CLASS KeyValueInformationClass; - PVOID KeyValueInformation; - ULONG Length; - PULONG ResultLength; -} REG_ENUMERATE_VALUE_KEY_INFORMATION, *PREG_ENUMERATE_VALUE_KEY_INFORMATION; - -typedef struct _REG_QUERY_KEY_INFORMATION -{ - PVOID Object; - KEY_INFORMATION_CLASS KeyInformationClass; - PVOID KeyInformation; - ULONG Length; - PULONG ResultLength; -} REG_QUERY_KEY_INFORMATION, *PREG_QUERY_KEY_INFORMATION; - -typedef struct _REG_QUERY_VALUE_KEY_INFORMATION -{ - PVOID Object; - PUNICODE_STRING ValueName; - KEY_VALUE_INFORMATION_CLASS KeyValueInformationClass; - PVOID KeyValueInformation; - ULONG Length; - PULONG ResultLength; -} REG_QUERY_VALUE_KEY_INFORMATION, *PREG_QUERY_VALUE_KEY_INFORMATION; - -typedef struct _REG_QUERY_MULTIPLE_VALUE_KEY_INFORMATION -{ - PVOID Object; - PKEY_VALUE_ENTRY ValueEntries; - ULONG EntryCount; - PVOID ValueBuffer; - PULONG BufferLength; - PULONG RequiredBufferLength; -} REG_QUERY_MULTIPLE_VALUE_KEY_INFORMATION, *PREG_QUERY_MULTIPLE_VALUE_KEY_INFORMATION; - -typedef struct _REG_PRE_CREATE_KEY_INFORMATION -{ - PUNICODE_STRING CompleteName; -} REG_PRE_CREATE_KEY_INFORMATION, *PREG_PRE_CREATE_KEY_INFORMATION; - -typedef struct _REG_POST_CREATE_KEY_INFORMATION -{ - PUNICODE_STRING CompleteName; - PVOID Object; - NTSTATUS Status; -} REG_POST_CREATE_KEY_INFORMATION, *PREG_POST_CREATE_KEY_INFORMATION; - -typedef struct _REG_PRE_OPEN_KEY_INFORMATION -{ - PUNICODE_STRING CompleteName; -} REG_PRE_OPEN_KEY_INFORMATION, *PREG_PRE_OPEN_KEY_INFORMATION; - -typedef struct _REG_POST_OPEN_KEY_INFORMATION -{ - PUNICODE_STRING CompleteName; - PVOID Object; - NTSTATUS Status; -} REG_POST_OPEN_KEY_INFORMATION, *PREG_POST_OPEN_KEY_INFORMATION; - -typedef struct _REG_POST_OPERATION_INFORMATION -{ - PVOID Object; - NTSTATUS Status; -} REG_POST_OPERATION_INFORMATION,*PREG_POST_OPERATION_INFORMATION; - #endif typedef struct _PLUGPLAY_EVENT_BLOCK _____ Modified: trunk/reactos/include/ndk/rtltypes.h --- trunk/reactos/include/ndk/rtltypes.h 2005-11-04 23:37:06 UTC (rev 19008) +++ trunk/reactos/include/ndk/rtltypes.h 2005-11-05 06:44:03 UTC (rev 19009) @@ -282,6 +282,17 @@ /* FUNCTION TYPES ************************************************************/ #ifndef NTOS_MODE_USER typedef VOID (NTAPI *WAITORTIMERCALLBACKFUNC)(PVOID, BOOLEAN); + +#else + +typedef EXCEPTION_DISPOSITION +(NTAPI *PEXCEPTION_ROUTINE)( + IN struct _EXCEPTION_RECORD *ExceptionRecord, + IN PVOID EstablisherFrame, + IN OUT struct _CONTEXT *ContextRecord, + IN OUT PVOID DispatcherContext +); + #endif struct _RTL_AVL_TABLE; @@ -294,14 +305,6 @@ IN PVOID UserParam ); -typedef EXCEPTION_DISPOSITION -(NTAPI *PEXCEPTION_ROUTINE)( - IN struct _EXCEPTION_RECORD *ExceptionRecord, - IN PVOID EstablisherFrame, - IN OUT struct _CONTEXT *ContextRecord, - IN OUT PVOID DispatcherContext -); - typedef LONG (NTAPI *PVECTORED_EXCEPTION_HANDLER)( PEXCEPTION_POINTERS ExceptionPointers ); @@ -394,14 +397,6 @@ typedef OSVERSIONINFOEXW RTL_OSVERSIONINFOEXW; typedef LPOSVERSIONINFOEXW PRTL_OSVERSIONINFOEXW; -typedef EXCEPTION_DISPOSITION -(*PEXCEPTION_HANDLER)( - struct _EXCEPTION_RECORD*, - PVOID, - struct _CONTEXT*, - PVOID -); - typedef struct _RTL_HEAP_PARAMETERS { ULONG Length; @@ -540,6 +535,14 @@ } TIME_FIELDS, *PTIME_FIELDS; #endif +typedef EXCEPTION_DISPOSITION +(*PEXCEPTION_HANDLER)( + struct _EXCEPTION_RECORD*, + PVOID, + struct _CONTEXT*, + PVOID +); + typedef struct _ACE { ACE_HEADER Header; _____ Modified: trunk/reactos/include/reactos/debug.h --- trunk/reactos/include/reactos/debug.h 2005-11-04 23:37:06 UTC (rev 19008) +++ trunk/reactos/include/reactos/debug.h 2005-11-05 06:44:03 UTC (rev 19009) @@ -16,8 +16,6 @@ #ifndef __INTERNAL_DEBUG #define __INTERNAL_DEBUG -#define UNIMPLEMENTED DbgPrint("WARNING: %s at %s:%d is UNIMPLEMENTED!\n",__FUNCTION__,__FILE__,__LINE__); - /* FIXME: should probably remove this later */ #if !defined(CHECKED) && !defined(NDEBUG) #define CHECKED @@ -61,22 +59,22 @@ #define CHECKPOINT do { DbgPrint("%s:%d\n",__FILE__,__LINE__); } while(0); #else - #if defined (__STDC__) - #define DPRINT(...) do { if(0) { DbgPrint(__VA_ARGS__); } } while(0) - #endif + #define DPRINT(...) do { if(0) { DbgPrint(__VA_ARGS__); } } while(0) #define CHECKPOINT #endif + #define UNIMPLEMENTED \ + DbgPrint("WARNING: %s at %s:%d is UNIMPLEMENTED!\n",__FUNCTION__,__FILE__,__LINE__); + #else /* On non-debug builds, we never show these */ - #if defined (__STDC__) #define DPRINT1(...) do { if(0) { DbgPrint(__VA_ARGS__); } } while(0) #define DPRINT(...) do { if(0) { DbgPrint(__VA_ARGS__); } } while(0) - #endif #define CHECKPOINT1 #define CHECKPOINT + #define UNIMPLEMENTED #endif /* _____ Modified: trunk/reactos/w32api/include/ddk/winddk.h --- trunk/reactos/w32api/include/ddk/winddk.h 2005-11-04 23:37:06 UTC (rev 19008) +++ trunk/reactos/w32api/include/ddk/winddk.h 2005-11-05 06:44:03 UTC (rev 19009) @@ -4574,8 +4574,114 @@ IN REG_NOTIFY_CLASS Argument1, IN PVOID Argument2); +typedef struct _REG_DELETE_KEY_INFORMATION +{ + PVOID Object; +} REG_DELETE_KEY_INFORMATION, *PREG_DELETE_KEY_INFORMATION; +typedef struct _REG_SET_VALUE_KEY_INFORMATION +{ + PVOID Object; + PUNICODE_STRING ValueName; + ULONG TitleIndex; + ULONG Type; + PVOID Data; + ULONG DataSize; +} REG_SET_VALUE_KEY_INFORMATION, *PREG_SET_VALUE_KEY_INFORMATION; +typedef struct _REG_DELETE_VALUE_KEY_INFORMATION +{ + PVOID Object; + PUNICODE_STRING ValueName; +} REG_DELETE_VALUE_KEY_INFORMATION, *PREG_DELETE_VALUE_KEY_INFORMATION; + +typedef struct _REG_SET_INFORMATION_KEY_INFORMATION +{ + PVOID Object; + KEY_SET_INFORMATION_CLASS KeySetInformationClass; + PVOID KeySetInformation; + ULONG KeySetInformationLength; +} REG_SET_INFORMATION_KEY_INFORMATION, *PREG_SET_INFORMATION_KEY_INFORMATION; + +typedef struct _REG_ENUMERATE_KEY_INFORMATION +{ + PVOID Object; + ULONG Index; + KEY_INFORMATION_CLASS KeyInformationClass; + PVOID KeyInformation; + ULONG Length; + PULONG ResultLength; +} REG_ENUMERATE_KEY_INFORMATION, *PREG_ENUMERATE_KEY_INFORMATION; + +typedef struct _REG_ENUMERATE_VALUE_KEY_INFORMATION +{ + PVOID Object; + ULONG Index; + KEY_VALUE_INFORMATION_CLASS KeyValueInformationClass; + PVOID KeyValueInformation; + ULONG Length; + PULONG ResultLength; +} REG_ENUMERATE_VALUE_KEY_INFORMATION, *PREG_ENUMERATE_VALUE_KEY_INFORMATION; + +typedef struct _REG_QUERY_KEY_INFORMATION +{ + PVOID Object; + KEY_INFORMATION_CLASS KeyInformationClass; + PVOID KeyInformation; + ULONG Length; + PULONG ResultLength; +} REG_QUERY_KEY_INFORMATION, *PREG_QUERY_KEY_INFORMATION; + +typedef struct _REG_QUERY_VALUE_KEY_INFORMATION +{ + PVOID Object; + PUNICODE_STRING ValueName; + KEY_VALUE_INFORMATION_CLASS KeyValueInformationClass; + PVOID KeyValueInformation; + ULONG Length; + PULONG ResultLength; +} REG_QUERY_VALUE_KEY_INFORMATION, *PREG_QUERY_VALUE_KEY_INFORMATION; + +typedef struct _REG_QUERY_MULTIPLE_VALUE_KEY_INFORMATION +{ + PVOID Object; + PKEY_VALUE_ENTRY ValueEntries; + ULONG EntryCount; + PVOID ValueBuffer; + PULONG BufferLength; + PULONG RequiredBufferLength; +} REG_QUERY_MULTIPLE_VALUE_KEY_INFORMATION, *PREG_QUERY_MULTIPLE_VALUE_KEY_INFORMATION; + +typedef struct _REG_PRE_CREATE_KEY_INFORMATION +{ + PUNICODE_STRING CompleteName; +} REG_PRE_CREATE_KEY_INFORMATION, *PREG_PRE_CREATE_KEY_INFORMATION; + +typedef struct _REG_POST_CREATE_KEY_INFORMATION +{ + PUNICODE_STRING CompleteName; + PVOID Object; + NTSTATUS Status; +} REG_POST_CREATE_KEY_INFORMATION, *PREG_POST_CREATE_KEY_INFORMATION; + +typedef struct _REG_PRE_OPEN_KEY_INFORMATION +{ + PUNICODE_STRING CompleteName; +} REG_PRE_OPEN_KEY_INFORMATION, *PREG_PRE_OPEN_KEY_INFORMATION; + +typedef struct _REG_POST_OPEN_KEY_INFORMATION +{ + PUNICODE_STRING CompleteName; + PVOID Object; + NTSTATUS Status; +} REG_POST_OPEN_KEY_INFORMATION, *PREG_POST_OPEN_KEY_INFORMATION; + +typedef struct _REG_POST_OPERATION_INFORMATION +{ + PVOID Object; + NTSTATUS Status; +} REG_POST_OPERATION_INFORMATION,*PREG_POST_OPERATION_INFORMATION; + /* ** Storage structures */ _____ Modified: trunk/reactos/w32api/include/windef.h --- trunk/reactos/w32api/include/windef.h 2005-11-04 23:37:06 UTC (rev 19008) +++ trunk/reactos/w32api/include/windef.h 2005-11-05 06:44:03 UTC (rev 19009) @@ -281,6 +281,7 @@ /* FIXME: How to handle these. SM_CMONITORS etc in winuser.h also. */ /* #if (WINVER >= 0x0500) */ DECLARE_HANDLE(HMONITOR); +DECLARE_HANDLE(HUMPD); #define HMONITOR_DECLARED 1 DECLARE_HANDLE(HTERMINAL); DECLARE_HANDLE(HWINEVENTHOOK);

19 years, 1 month

[blight] 19008: Implement (Int)EngAlphaBlend and 8, 16, 24 and 32 bpp DIB AlphaBlend functions. AlphaBlend() should work now.

by blight＠svn.reactos.com

Implement (Int)EngAlphaBlend and 8, 16, 24 and 32 bpp DIB AlphaBlend functions. AlphaBlend() should work now. Modified: trunk/reactos/subsys/win32k/dib/dib.c Modified: trunk/reactos/subsys/win32k/dib/dib.h Modified: trunk/reactos/subsys/win32k/dib/dib16bpp.c Modified: trunk/reactos/subsys/win32k/dib/dib1bpp.c Modified: trunk/reactos/subsys/win32k/dib/dib24bpp.c Modified: trunk/reactos/subsys/win32k/dib/dib32bpp.c Modified: trunk/reactos/subsys/win32k/dib/dib4bpp.c Modified: trunk/reactos/subsys/win32k/dib/dib8bpp.c Modified: trunk/reactos/subsys/win32k/eng/bitblt.c Modified: trunk/reactos/subsys/win32k/eng/xlate.c Modified: trunk/reactos/subsys/win32k/include/inteng.h Modified: trunk/reactos/subsys/win32k/objects/bitmaps.c Modified: trunk/reactos/subsys/win32k/stubs/xpstubs.c _____ Modified: trunk/reactos/subsys/win32k/dib/dib.c --- trunk/reactos/subsys/win32k/dib/dib.c 2005-11-04 23:25:03 UTC (rev 19007) +++ trunk/reactos/subsys/win32k/dib/dib.c 2005-11-04 23:37:06 UTC (rev 19008) @@ -33,63 +33,68 @@ /* 0 */ { Dummy_PutPixel, Dummy_GetPixel, Dummy_HLine, Dummy_VLine, - Dummy_BitBlt, Dummy_BitBlt, Dummy_StretchBlt, Dummy_TransparentBlt + Dummy_BitBlt, Dummy_BitBlt, Dummy_StretchBlt, Dummy_TransparentBlt, + Dummy_ColorFill, Dummy_AlphaBlend }, /* BMF_1BPP */ { DIB_1BPP_PutPixel, DIB_1BPP_GetPixel, DIB_1BPP_HLine, DIB_1BPP_VLine, DIB_1BPP_BitBlt, DIB_1BPP_BitBltSrcCopy, DIB_1BPP_StretchBlt, - DIB_1BPP_TransparentBlt, DIB_1BPP_ColorFill + DIB_1BPP_TransparentBlt, DIB_1BPP_ColorFill, DIB_1BPP_AlphaBlend }, /* BMF_4BPP */ { DIB_4BPP_PutPixel, DIB_4BPP_GetPixel, DIB_4BPP_HLine, DIB_4BPP_VLine, DIB_4BPP_BitBlt, DIB_4BPP_BitBltSrcCopy, DIB_4BPP_StretchBlt, - DIB_4BPP_TransparentBlt, DIB_4BPP_ColorFill + DIB_4BPP_TransparentBlt, DIB_4BPP_ColorFill, DIB_4BPP_AlphaBlend }, /* BMF_8BPP */ { DIB_8BPP_PutPixel, DIB_8BPP_GetPixel, DIB_8BPP_HLine, DIB_8BPP_VLine, DIB_8BPP_BitBlt, DIB_8BPP_BitBltSrcCopy, DIB_8BPP_StretchBlt, - DIB_8BPP_TransparentBlt, DIB_8BPP_ColorFill + DIB_8BPP_TransparentBlt, DIB_8BPP_ColorFill, DIB_8BPP_AlphaBlend }, /* BMF_16BPP */ { DIB_16BPP_PutPixel, DIB_16BPP_GetPixel, DIB_16BPP_HLine, DIB_16BPP_VLine, DIB_16BPP_BitBlt, DIB_16BPP_BitBltSrcCopy, DIB_16BPP_StretchBlt, - DIB_16BPP_TransparentBlt, DIB_16BPP_ColorFill + DIB_16BPP_TransparentBlt, DIB_16BPP_ColorFill, DIB_16BPP_AlphaBlend }, /* BMF_24BPP */ { DIB_24BPP_PutPixel, DIB_24BPP_GetPixel, DIB_24BPP_HLine, DIB_24BPP_VLine, DIB_24BPP_BitBlt, DIB_24BPP_BitBltSrcCopy, DIB_24BPP_StretchBlt, - DIB_24BPP_TransparentBlt, DIB_24BPP_ColorFill + DIB_24BPP_TransparentBlt, DIB_24BPP_ColorFill, DIB_24BPP_AlphaBlend }, /* BMF_32BPP */ { DIB_32BPP_PutPixel, DIB_32BPP_GetPixel, DIB_32BPP_HLine, DIB_32BPP_VLine, DIB_32BPP_BitBlt, DIB_32BPP_BitBltSrcCopy, DIB_32BPP_StretchBlt, - DIB_32BPP_TransparentBlt, DIB_32BPP_ColorFill + DIB_32BPP_TransparentBlt, DIB_32BPP_ColorFill, DIB_32BPP_AlphaBlend }, /* BMF_4RLE */ { Dummy_PutPixel, Dummy_GetPixel, Dummy_HLine, Dummy_VLine, - Dummy_BitBlt, Dummy_BitBlt, Dummy_StretchBlt, Dummy_TransparentBlt, Dummy_ColorFill + Dummy_BitBlt, Dummy_BitBlt, Dummy_StretchBlt, Dummy_TransparentBlt, + Dummy_ColorFill, Dummy_AlphaBlend }, /* BMF_8RLE */ { Dummy_PutPixel, Dummy_GetPixel, Dummy_HLine, Dummy_VLine, - Dummy_BitBlt, Dummy_BitBlt, Dummy_StretchBlt, Dummy_TransparentBlt, Dummy_ColorFill + Dummy_BitBlt, Dummy_BitBlt, Dummy_StretchBlt, Dummy_TransparentBlt, + Dummy_ColorFill, Dummy_AlphaBlend }, /* BMF_JPEG */ { Dummy_PutPixel, Dummy_GetPixel, Dummy_HLine, Dummy_VLine, - Dummy_BitBlt, Dummy_BitBlt, Dummy_StretchBlt, Dummy_TransparentBlt, Dummy_ColorFill + Dummy_BitBlt, Dummy_BitBlt, Dummy_StretchBlt, Dummy_TransparentBlt, + Dummy_ColorFill, Dummy_AlphaBlend }, /* BMF_PNG */ { Dummy_PutPixel, Dummy_GetPixel, Dummy_HLine, Dummy_VLine, - Dummy_BitBlt, Dummy_BitBlt, Dummy_StretchBlt, Dummy_TransparentBlt, Dummy_ColorFill + Dummy_BitBlt, Dummy_BitBlt, Dummy_StretchBlt, Dummy_TransparentBlt, + Dummy_ColorFill, Dummy_AlphaBlend } }; @@ -240,4 +245,12 @@ } +BOOLEAN +Dummy_AlphaBlend(SURFOBJ* Dest, SURFOBJ* Source, RECTL* DestRect, + RECTL* SourceRect, CLIPOBJ* ClipRegion, + XLATEOBJ* ColorTranslation, BLENDOBJ* BlendObj) +{ + return FALSE; +} + /* EOF */ _____ Modified: trunk/reactos/subsys/win32k/dib/dib.h --- trunk/reactos/subsys/win32k/dib/dib.h 2005-11-04 23:25:03 UTC (rev 19007) +++ trunk/reactos/subsys/win32k/dib/dib.h 2005-11-04 23:37:06 UTC (rev 19008) @@ -44,6 +44,7 @@ typedef BOOLEAN (*PFN_DIB_StretchBlt)(SURFOBJ*,SURFOBJ*,RECTL*,RECTL*,POINTL*,POINTL,CLI POBJ*,XLATEOBJ*,ULONG); typedef BOOLEAN (*PFN_DIB_TransparentBlt)(SURFOBJ*,SURFOBJ*,RECTL*,POINTL*,XLATEOBJ*,ULO NG); typedef BOOLEAN (*PFN_DIB_ColorFill)(SURFOBJ*, RECTL*, ULONG); +typedef BOOLEAN (*PFN_DIB_AlphaBlend)(SURFOBJ*, SURFOBJ*, RECTL*, RECTL*, CLIPOBJ*, XLATEOBJ*, BLENDOBJ*); typedef struct { @@ -56,6 +57,7 @@ PFN_DIB_StretchBlt DIB_StretchBlt; PFN_DIB_TransparentBlt DIB_TransparentBlt; PFN_DIB_ColorFill DIB_ColorFill; + PFN_DIB_AlphaBlend DIB_AlphaBlend; } DIB_FUNCTIONS; extern DIB_FUNCTIONS DibFunctionsForBitmapFormat[]; @@ -68,6 +70,7 @@ BOOLEAN Dummy_StretchBlt(SURFOBJ*,SURFOBJ*,RECTL*,RECTL*,POINTL*,POINTL,CLIPOBJ* ,XLATEOBJ*,ULONG); BOOLEAN Dummy_TransparentBlt(SURFOBJ*,SURFOBJ*,RECTL*,POINTL*,XLATEOBJ*,ULONG); BOOLEAN Dummy_ColorFill(SURFOBJ*, RECTL*, ULONG); +BOOLEAN Dummy_AlphaBlend(SURFOBJ*, SURFOBJ*, RECTL*, RECTL*, CLIPOBJ*, XLATEOBJ*, BLENDOBJ*); VOID DIB_1BPP_PutPixel(SURFOBJ*,LONG,LONG,ULONG); ULONG DIB_1BPP_GetPixel(SURFOBJ*,LONG,LONG); @@ -78,6 +81,7 @@ BOOLEAN DIB_1BPP_StretchBlt(SURFOBJ*,SURFOBJ*,RECTL*,RECTL*,POINTL*,POINTL,CLIPO BJ*,XLATEOBJ*,ULONG); BOOLEAN DIB_1BPP_TransparentBlt(SURFOBJ*,SURFOBJ*,RECTL*,POINTL*,XLATEOBJ*,ULONG ); BOOLEAN DIB_1BPP_ColorFill(SURFOBJ*, RECTL*, ULONG); +BOOLEAN DIB_1BPP_AlphaBlend(SURFOBJ*, SURFOBJ*, RECTL*, RECTL*, CLIPOBJ*, XLATEOBJ*, BLENDOBJ*); VOID DIB_4BPP_PutPixel(SURFOBJ*,LONG,LONG,ULONG); ULONG DIB_4BPP_GetPixel(SURFOBJ*,LONG,LONG); @@ -88,6 +92,7 @@ BOOLEAN DIB_4BPP_StretchBlt(SURFOBJ*,SURFOBJ*,RECTL*,RECTL*,POINTL*,POINTL,CLIPO BJ*,XLATEOBJ*,ULONG); BOOLEAN DIB_4BPP_TransparentBlt(SURFOBJ*,SURFOBJ*,RECTL*,POINTL*,XLATEOBJ*,ULONG ); BOOLEAN DIB_4BPP_ColorFill(SURFOBJ*, RECTL*, ULONG); +BOOLEAN DIB_4BPP_AlphaBlend(SURFOBJ*, SURFOBJ*, RECTL*, RECTL*, CLIPOBJ*, XLATEOBJ*, BLENDOBJ*); VOID DIB_8BPP_PutPixel(SURFOBJ*,LONG,LONG,ULONG); ULONG DIB_8BPP_GetPixel(SURFOBJ*,LONG,LONG); @@ -98,6 +103,7 @@ BOOLEAN DIB_8BPP_StretchBlt(SURFOBJ*,SURFOBJ*,RECTL*,RECTL*,POINTL*,POINTL,CLIPO BJ*,XLATEOBJ*,ULONG); BOOLEAN DIB_8BPP_TransparentBlt(SURFOBJ*,SURFOBJ*,RECTL*,POINTL*,XLATEOBJ*,ULONG ); BOOLEAN DIB_8BPP_ColorFill(SURFOBJ*, RECTL*, ULONG); +BOOLEAN DIB_8BPP_AlphaBlend(SURFOBJ*, SURFOBJ*, RECTL*, RECTL*, CLIPOBJ*, XLATEOBJ*, BLENDOBJ*); VOID DIB_16BPP_PutPixel(SURFOBJ*,LONG,LONG,ULONG); ULONG DIB_16BPP_GetPixel(SURFOBJ*,LONG,LONG); @@ -108,6 +114,7 @@ BOOLEAN DIB_16BPP_StretchBlt(SURFOBJ*,SURFOBJ*,RECTL*,RECTL*,POINTL*,POINTL,CLIP OBJ*,XLATEOBJ*,ULONG); BOOLEAN DIB_16BPP_TransparentBlt(SURFOBJ*,SURFOBJ*,RECTL*,POINTL*,XLATEOBJ*,ULON G); BOOLEAN DIB_16BPP_ColorFill(SURFOBJ*, RECTL*, ULONG); +BOOLEAN DIB_16BPP_AlphaBlend(SURFOBJ*, SURFOBJ*, RECTL*, RECTL*, CLIPOBJ*, XLATEOBJ*, BLENDOBJ*); VOID DIB_24BPP_PutPixel(SURFOBJ*,LONG,LONG,ULONG); ULONG DIB_24BPP_GetPixel(SURFOBJ*,LONG,LONG); @@ -118,6 +125,7 @@ BOOLEAN DIB_24BPP_StretchBlt(SURFOBJ*,SURFOBJ*,RECTL*,RECTL*,POINTL*,POINTL,CLIP OBJ*,XLATEOBJ*,ULONG); BOOLEAN DIB_24BPP_TransparentBlt(SURFOBJ*,SURFOBJ*,RECTL*,POINTL*,XLATEOBJ*,ULON G); BOOLEAN DIB_24BPP_ColorFill(SURFOBJ*, RECTL*, ULONG); +BOOLEAN DIB_24BPP_AlphaBlend(SURFOBJ*, SURFOBJ*, RECTL*, RECTL*, CLIPOBJ*, XLATEOBJ*, BLENDOBJ*); VOID DIB_32BPP_PutPixel(SURFOBJ*,LONG,LONG,ULONG); ULONG DIB_32BPP_GetPixel(SURFOBJ*,LONG,LONG); @@ -128,6 +136,7 @@ BOOLEAN DIB_32BPP_StretchBlt(SURFOBJ*,SURFOBJ*,RECTL*,RECTL*,POINTL*,POINTL,CLIP OBJ*,XLATEOBJ*,ULONG); BOOLEAN DIB_32BPP_TransparentBlt(SURFOBJ*,SURFOBJ*,RECTL*,POINTL*,XLATEOBJ*,ULON G); BOOLEAN DIB_32BPP_ColorFill(SURFOBJ*, RECTL*, ULONG); +BOOLEAN DIB_32BPP_AlphaBlend(SURFOBJ*, SURFOBJ*, RECTL*, RECTL*, CLIPOBJ*, XLATEOBJ*, BLENDOBJ*); extern unsigned char notmask[2]; extern unsigned char altnotmask[2]; _____ Modified: trunk/reactos/subsys/win32k/dib/dib16bpp.c --- trunk/reactos/subsys/win32k/dib/dib16bpp.c 2005-11-04 23:25:03 UTC (rev 19007) +++ trunk/reactos/subsys/win32k/dib/dib16bpp.c 2005-11-04 23:37:06 UTC (rev 19008) @@ -1358,4 +1358,123 @@ return TRUE; } +typedef union { + ULONG ul; + struct { + UCHAR red; + UCHAR green; + UCHAR blue; + UCHAR alpha; + } col; +} NICEPIXEL32; + +typedef union { + USHORT us; + struct { + USHORT red:5, + green:6, + blue:5; + } col; +} NICEPIXEL16; + +STATIC inline UCHAR +Clamp5(ULONG val) +{ + return (val > 31) ? 31 : val; +} + +STATIC inline UCHAR +Clamp6(ULONG val) +{ + return (val > 63) ? 63 : val; +} + +BOOLEAN +DIB_16BPP_AlphaBlend(SURFOBJ* Dest, SURFOBJ* Source, RECTL* DestRect, + RECTL* SourceRect, CLIPOBJ* ClipRegion, + XLATEOBJ* ColorTranslation, BLENDOBJ* BlendObj) +{ + INT Rows, Cols, SrcX, SrcY; + register PUSHORT Dst; + ULONG DstDelta; + BLENDFUNCTION BlendFunc; + register NICEPIXEL16 DstPixel; + register NICEPIXEL32 SrcPixel; + UCHAR Alpha, SrcBpp; + + DPRINT("DIB_16BPP_AlphaBlend: srcRect: (%d,%d)-(%d,%d), dstRect: (%d,%d)-(%d,%d)\n", + SourceRect->left, SourceRect->top, SourceRect->right, SourceRect->bottom, + DestRect->left, DestRect->top, DestRect->right, DestRect->bottom); + + ASSERT(DestRect->bottom - DestRect->top == SourceRect->bottom - SourceRect->top && + DestRect->right - DestRect->left == SourceRect->right - SourceRect->left); + + BlendFunc = BlendObj->BlendFunction; + if (BlendFunc.BlendOp != AC_SRC_OVER) + { + DPRINT1("BlendOp != AC_SRC_OVER\n"); + return FALSE; + } + if (BlendFunc.BlendFlags != 0) + { + DPRINT1("BlendFlags != 0\n"); + return FALSE; + } + if ((BlendFunc.AlphaFormat & ~AC_SRC_ALPHA) != 0) + { + DPRINT1("Unsupported AlphaFormat (0x%x)\n", BlendFunc.AlphaFormat); + return FALSE; + } + if ((BlendFunc.AlphaFormat & AC_SRC_ALPHA) != 0 && + BitsPerFormat(Source->iBitmapFormat) != 32) + { + DPRINT1("Source bitmap must be 32bpp when AC_SRC_ALPHA is set\n"); + return FALSE; + } + + Dst = (PUSHORT)((ULONG_PTR)Dest->pvScan0 + (DestRect->top * Dest->lDelta) + + (DestRect->left << 1)); + DstDelta = Dest->lDelta - ((DestRect->right - DestRect->left) << 1); + SrcBpp = BitsPerFormat(Source->iBitmapFormat); + + Rows = DestRect->bottom - DestRect->top; + SrcY = SourceRect->top; + while (--Rows >= 0) + { + Cols = DestRect->right - DestRect->left; + SrcX = SourceRect->left; + while (--Cols >= 0) + { + if (SrcBpp <= 16) + { + DstPixel.us = DIB_GetSource(Source, SrcX++, SrcY, ColorTranslation); + SrcPixel.col.red = (DstPixel.col.red << 3) | (DstPixel.col.red >> 2); + SrcPixel.col.green = (DstPixel.col.green << 2) | (DstPixel.col.green >> 4); + SrcPixel.col.blue = (DstPixel.col.blue << 3) | (DstPixel.col.blue >> 2); + } + else + { + SrcPixel.ul = DIB_GetSourceIndex(Source, SrcX++, SrcY); + } + SrcPixel.col.red = SrcPixel.col.red * BlendFunc.SourceConstantAlpha / 255; + SrcPixel.col.green = SrcPixel.col.green * BlendFunc.SourceConstantAlpha / 255; + SrcPixel.col.blue = SrcPixel.col.blue * BlendFunc.SourceConstantAlpha / 255; + SrcPixel.col.alpha = (SrcBpp == 32) ? (SrcPixel.col.alpha * BlendFunc.SourceConstantAlpha / 255) : BlendFunc.SourceConstantAlpha; + + Alpha = ((BlendFunc.AlphaFormat & AC_SRC_ALPHA) != 0) ? + SrcPixel.col.alpha : BlendFunc.SourceConstantAlpha; + + DstPixel.us = *Dst; + DstPixel.col.red = Clamp5(DstPixel.col.red * (255 - Alpha) / 255 + (SrcPixel.col.red >> 3)); + DstPixel.col.green = Clamp6(DstPixel.col.green * (255 - Alpha) / 255 + (SrcPixel.col.green >> 2)); + DstPixel.col.blue = Clamp5(DstPixel.col.blue * (255 - Alpha) / 255 + (SrcPixel.col.blue >> 3)); + *Dst++ = DstPixel.us; + } + Dst = (PUSHORT)((ULONG_PTR)Dst + DstDelta); + SrcY++; + } + + return TRUE; +} + /* EOF */ _____ Modified: trunk/reactos/subsys/win32k/dib/dib1bpp.c --- trunk/reactos/subsys/win32k/dib/dib1bpp.c 2005-11-04 23:25:03 UTC (rev 19007) +++ trunk/reactos/subsys/win32k/dib/dib1bpp.c 2005-11-04 23:37:06 UTC (rev 19008) @@ -1303,4 +1303,13 @@ return FALSE; } +BOOLEAN +DIB_1BPP_AlphaBlend(SURFOBJ* Dest, SURFOBJ* Source, RECTL* DestRect, + RECTL* SourceRect, CLIPOBJ* ClipRegion, + XLATEOBJ* ColorTranslation, BLENDOBJ* BlendObj) +{ + UNIMPLEMENTED; + return FALSE; +} + /* EOF */ _____ Modified: trunk/reactos/subsys/win32k/dib/dib24bpp.c --- trunk/reactos/subsys/win32k/dib/dib24bpp.c 2005-11-04 23:25:03 UTC (rev 19007) +++ trunk/reactos/subsys/win32k/dib/dib24bpp.c 2005-11-04 23:37:06 UTC (rev 19008) @@ -1331,4 +1331,98 @@ return TRUE; } +typedef union { + ULONG ul; + struct { + UCHAR red; + UCHAR green; + UCHAR blue; + UCHAR alpha; + } col; +} NICEPIXEL32; + +STATIC inline UCHAR +Clamp8(ULONG val) +{ + return (val > 255) ? 255 : val; +} + +BOOLEAN +DIB_24BPP_AlphaBlend(SURFOBJ* Dest, SURFOBJ* Source, RECTL* DestRect, + RECTL* SourceRect, CLIPOBJ* ClipRegion, + XLATEOBJ* ColorTranslation, BLENDOBJ* BlendObj) +{ + INT Rows, Cols, SrcX, SrcY; + register PUCHAR Dst; + ULONG DstDelta; + BLENDFUNCTION BlendFunc; + register NICEPIXEL32 DstPixel, SrcPixel; + UCHAR Alpha, SrcBpp; + + DPRINT("DIB_24BPP_AlphaBlend: srcRect: (%d,%d)-(%d,%d), dstRect: (%d,%d)-(%d,%d)\n", + SourceRect->left, SourceRect->top, SourceRect->right, SourceRect->bottom, + DestRect->left, DestRect->top, DestRect->right, DestRect->bottom); + + ASSERT(DestRect->bottom - DestRect->top == SourceRect->bottom - SourceRect->top && + DestRect->right - DestRect->left == SourceRect->right - SourceRect->left); + + BlendFunc = BlendObj->BlendFunction; + if (BlendFunc.BlendOp != AC_SRC_OVER) + { + DPRINT1("BlendOp != AC_SRC_OVER\n"); + return FALSE; + } + if (BlendFunc.BlendFlags != 0) + { + DPRINT1("BlendFlags != 0\n"); + return FALSE; + } + if ((BlendFunc.AlphaFormat & ~AC_SRC_ALPHA) != 0) + { + DPRINT1("Unsupported AlphaFormat (0x%x)\n", BlendFunc.AlphaFormat); + return FALSE; + } + if ((BlendFunc.AlphaFormat & AC_SRC_ALPHA) != 0 && + BitsPerFormat(Source->iBitmapFormat) != 32) + { + DPRINT1("Source bitmap must be 32bpp when AC_SRC_ALPHA is set\n"); + return FALSE; + } + + Dst = (PUCHAR)((ULONG_PTR)Dest->pvScan0 + (DestRect->top * Dest->lDelta) + + (DestRect->left * 3)); + DstDelta = Dest->lDelta - ((DestRect->right - DestRect->left) * 3); + SrcBpp = BitsPerFormat(Source->iBitmapFormat); + + Rows = DestRect->bottom - DestRect->top; + SrcY = SourceRect->top; + while (--Rows >= 0) + { + Cols = DestRect->right - DestRect->left; + SrcX = SourceRect->left; + while (--Cols >= 0) + { + SrcPixel.ul = DIB_GetSource(Source, SrcX++, SrcY, ColorTranslation); + SrcPixel.col.red = SrcPixel.col.red * BlendFunc.SourceConstantAlpha / 255; + SrcPixel.col.green = SrcPixel.col.green * BlendFunc.SourceConstantAlpha / 255; + SrcPixel.col.blue = SrcPixel.col.blue * BlendFunc.SourceConstantAlpha / 255; + SrcPixel.col.alpha = (SrcBpp == 32) ? (SrcPixel.col.alpha * BlendFunc.SourceConstantAlpha / 255) : BlendFunc.SourceConstantAlpha; + + Alpha = ((BlendFunc.AlphaFormat & AC_SRC_ALPHA) != 0) ? + SrcPixel.col.alpha : BlendFunc.SourceConstantAlpha; + + DstPixel.ul = *Dst; + DstPixel.col.red = Clamp8(DstPixel.col.red * (255 - Alpha) / 255 + SrcPixel.col.red); + DstPixel.col.green = Clamp8(DstPixel.col.green * (255 - Alpha) / 255 + SrcPixel.col.green); + DstPixel.col.blue = Clamp8(DstPixel.col.blue * (255 - Alpha) / 255 + SrcPixel.col.blue); + *Dst = DstPixel.ul; + Dst = (PUCHAR)((ULONG_PTR)Dst + 3); + } + Dst = (PUCHAR)((ULONG_PTR)Dst + DstDelta); + SrcY++; + } + + return TRUE; +} + /* EOF */ _____ Modified: trunk/reactos/subsys/win32k/dib/dib32bpp.c --- trunk/reactos/subsys/win32k/dib/dib32bpp.c 2005-11-04 23:25:03 UTC (rev 19007) +++ trunk/reactos/subsys/win32k/dib/dib32bpp.c 2005-11-04 23:37:06 UTC (rev 19008) @@ -1256,4 +1256,98 @@ return TRUE; } +typedef union { + ULONG ul; + struct { + UCHAR red; + UCHAR green; + UCHAR blue; + UCHAR alpha; + } col; +} NICEPIXEL32; + +STATIC inline UCHAR +Clamp8(ULONG val) +{ + return (val > 255) ? 255 : val; +} + +BOOLEAN +DIB_32BPP_AlphaBlend(SURFOBJ* Dest, SURFOBJ* Source, RECTL* DestRect, + RECTL* SourceRect, CLIPOBJ* ClipRegion, + XLATEOBJ* ColorTranslation, BLENDOBJ* BlendObj) +{ + INT Rows, Cols, SrcX, SrcY; + register PULONG Dst; + ULONG DstDelta; + BLENDFUNCTION BlendFunc; + register NICEPIXEL32 DstPixel, SrcPixel; + UCHAR Alpha, SrcBpp; + + DPRINT("DIB_32BPP_AlphaBlend: srcRect: (%d,%d)-(%d,%d), dstRect: (%d,%d)-(%d,%d)\n", + SourceRect->left, SourceRect->top, SourceRect->right, SourceRect->bottom, + DestRect->left, DestRect->top, DestRect->right, DestRect->bottom); + + ASSERT(DestRect->bottom - DestRect->top == SourceRect->bottom - SourceRect->top && + DestRect->right - DestRect->left == SourceRect->right - SourceRect->left); + + BlendFunc = BlendObj->BlendFunction; + if (BlendFunc.BlendOp != AC_SRC_OVER) + { + DPRINT1("BlendOp != AC_SRC_OVER\n"); + return FALSE; + } + if (BlendFunc.BlendFlags != 0) + { + DPRINT1("BlendFlags != 0\n"); + return FALSE; + } + if ((BlendFunc.AlphaFormat & ~AC_SRC_ALPHA) != 0) + { + DPRINT1("Unsupported AlphaFormat (0x%x)\n", BlendFunc.AlphaFormat); + return FALSE; + } + if ((BlendFunc.AlphaFormat & AC_SRC_ALPHA) != 0 && + BitsPerFormat(Source->iBitmapFormat) != 32) + { + DPRINT1("Source bitmap must be 32bpp when AC_SRC_ALPHA is set\n"); + return FALSE; + } + + Dst = (PULONG)((ULONG_PTR)Dest->pvScan0 + (DestRect->top * Dest->lDelta) + + (DestRect->left << 2)); + DstDelta = Dest->lDelta - ((DestRect->right - DestRect->left) << 2); + SrcBpp = BitsPerFormat(Source->iBitmapFormat); + + Rows = DestRect->bottom - DestRect->top; + SrcY = SourceRect->top; + while (--Rows >= 0) + { + Cols = DestRect->right - DestRect->left; + SrcX = SourceRect->left; + while (--Cols >= 0) + { + SrcPixel.ul = DIB_GetSource(Source, SrcX++, SrcY, ColorTranslation); + SrcPixel.col.red = SrcPixel.col.red * BlendFunc.SourceConstantAlpha / 255; + SrcPixel.col.green = SrcPixel.col.green * BlendFunc.SourceConstantAlpha / 255; + SrcPixel.col.blue = SrcPixel.col.blue * BlendFunc.SourceConstantAlpha / 255; + SrcPixel.col.alpha = (SrcBpp == 32) ? (SrcPixel.col.alpha * BlendFunc.SourceConstantAlpha / 255) : BlendFunc.SourceConstantAlpha; + + Alpha = ((BlendFunc.AlphaFormat & AC_SRC_ALPHA) != 0) ? + SrcPixel.col.alpha : BlendFunc.SourceConstantAlpha; + + DstPixel.ul = *Dst; + DstPixel.col.red = Clamp8(DstPixel.col.red * (255 - Alpha) / 255 + SrcPixel.col.red); + DstPixel.col.green = Clamp8(DstPixel.col.green * (255 - Alpha) / 255 + SrcPixel.col.green); + DstPixel.col.blue = Clamp8(DstPixel.col.blue * (255 - Alpha) / 255 + SrcPixel.col.blue); + DstPixel.col.alpha = Clamp8(DstPixel.col.alpha * (255 - Alpha) / 255 + SrcPixel.col.alpha); + *Dst++ = DstPixel.ul; + } + Dst = (PULONG)((ULONG_PTR)Dst + DstDelta); + SrcY++; + } + + return TRUE; +} + /* EOF */ _____ Modified: trunk/reactos/subsys/win32k/dib/dib4bpp.c --- trunk/reactos/subsys/win32k/dib/dib4bpp.c 2005-11-04 23:25:03 UTC (rev 19007) +++ trunk/reactos/subsys/win32k/dib/dib4bpp.c 2005-11-04 23:37:06 UTC (rev 19008) @@ -1189,4 +1189,13 @@ return FALSE; } +BOOLEAN +DIB_4BPP_AlphaBlend(SURFOBJ* Dest, SURFOBJ* Source, RECTL* DestRect, + RECTL* SourceRect, CLIPOBJ* ClipRegion, + XLATEOBJ* ColorTranslation, BLENDOBJ* BlendObj) +{ + UNIMPLEMENTED; + return FALSE; +} + /* EOF */ _____ Modified: trunk/reactos/subsys/win32k/dib/dib8bpp.c --- trunk/reactos/subsys/win32k/dib/dib8bpp.c 2005-11-04 23:25:03 UTC (rev 19007) +++ trunk/reactos/subsys/win32k/dib/dib8bpp.c 2005-11-04 23:37:06 UTC (rev 19008) @@ -1217,4 +1217,162 @@ return TRUE; } +typedef union { + ULONG ul; + struct { + UCHAR red; + UCHAR green; + UCHAR blue; + UCHAR alpha; + } col; +} NICEPIXEL32; + +typedef union { + USHORT us; + struct { + USHORT red:5, + green:6, + blue:5; + } col; +} NICEPIXEL16; + +STATIC inline UCHAR +Clamp8(ULONG val) +{ + return (val > 255) ? 255 : val; +} + +BOOLEAN +DIB_8BPP_AlphaBlend(SURFOBJ* Dest, SURFOBJ* Source, RECTL* DestRect, + RECTL* SourceRect, CLIPOBJ* ClipRegion, + XLATEOBJ* ColorTranslation, BLENDOBJ* BlendObj) +{ + INT Rows, Cols, SrcX, SrcY; + register PUCHAR Dst; + ULONG DstDelta; + BLENDFUNCTION BlendFunc; + register NICEPIXEL32 DstPixel; + register NICEPIXEL32 SrcPixel; + register NICEPIXEL16 SrcPixel16; + UCHAR Alpha, SrcBpp; + HPALETTE SrcPalette, DstPalette; + XLATEOBJ *SrcTo32Xlate, *DstTo32Xlate, *DstFrom32Xlate; + + DPRINT("DIB_8BPP_AlphaBlend: srcRect: (%d,%d)-(%d,%d), dstRect: (%d,%d)-(%d,%d)\n", + SourceRect->left, SourceRect->top, SourceRect->right, SourceRect->bottom, + DestRect->left, DestRect->top, DestRect->right, DestRect->bottom); + + ASSERT(DestRect->bottom - DestRect->top == SourceRect->bottom - SourceRect->top && + DestRect->right - DestRect->left == SourceRect->right - SourceRect->left); + + BlendFunc = BlendObj->BlendFunction; + if (BlendFunc.BlendOp != AC_SRC_OVER) + { + DPRINT1("BlendOp != AC_SRC_OVER\n"); + return FALSE; + } + if (BlendFunc.BlendFlags != 0) + { + DPRINT1("BlendFlags != 0\n"); + return FALSE; + } + if ((BlendFunc.AlphaFormat & ~AC_SRC_ALPHA) != 0) + { + DPRINT1("Unsupported AlphaFormat (0x%x)\n", BlendFunc.AlphaFormat); + return FALSE; + } + if ((BlendFunc.AlphaFormat & AC_SRC_ALPHA) != 0 && + BitsPerFormat(Source->iBitmapFormat) != 32) + { + DPRINT1("Source bitmap must be 32bpp when AC_SRC_ALPHA is set\n"); + return FALSE; + } + + SrcBpp = BitsPerFormat(Source->iBitmapFormat); + SrcPalette = IntEngGetXlatePalette(ColorTranslation, XO_SRCPALETTE); + if (SrcPalette != 0) + { + SrcTo32Xlate = IntEngCreateXlate(PAL_RGB, 0, NULL, SrcPalette); + if (SrcTo32Xlate == NULL) + { + DPRINT1("IntEngCreateXlate failed\n"); + return FALSE; + } + } + else + { + SrcTo32Xlate = NULL; + ASSERT(SrcBpp >= 16); + } + + DstPalette = IntEngGetXlatePalette(ColorTranslation, XO_DESTPALETTE); + DstTo32Xlate = IntEngCreateXlate(PAL_RGB, 0, NULL, DstPalette); + DstFrom32Xlate = IntEngCreateXlate(0, PAL_RGB, DstPalette, NULL); + if (DstTo32Xlate == NULL || DstFrom32Xlate == NULL) + { + if (SrcTo32Xlate != NULL) + EngDeleteXlate(SrcTo32Xlate); + if (DstTo32Xlate != NULL) + EngDeleteXlate(DstTo32Xlate); + if (DstFrom32Xlate != NULL) + EngDeleteXlate(DstFrom32Xlate); + DPRINT1("IntEngCreateXlate failed\n"); + return FALSE; + } + + Dst = (PUCHAR)((ULONG_PTR)Dest->pvScan0 + (DestRect->top * Dest->lDelta) + + DestRect->left); + DstDelta = Dest->lDelta - (DestRect->right - DestRect->left); + + Rows = DestRect->bottom - DestRect->top; + SrcY = SourceRect->top; + while (--Rows >= 0) + { + Cols = DestRect->right - DestRect->left; + SrcX = SourceRect->left; + while (--Cols >= 0) + { + if (SrcTo32Xlate != NULL) + { + SrcPixel.ul = DIB_GetSource(Source, SrcX++, SrcY, SrcTo32Xlate); + } + else if (SrcBpp <= 16) + { + SrcPixel16.us = DIB_GetSource(Source, SrcX++, SrcY, ColorTranslation); + SrcPixel.col.red = (SrcPixel16.col.red << 3) | (SrcPixel16.col.red >> 2); + SrcPixel.col.green = (SrcPixel16.col.green << 2) | (SrcPixel16.col.green >> 4); + SrcPixel.col.blue = (SrcPixel16.col.blue << 3) | (SrcPixel16.col.blue >> 2); + } + else + { + SrcPixel.ul = DIB_GetSourceIndex(Source, SrcX++, SrcY); + } + SrcPixel.col.red = SrcPixel.col.red * BlendFunc.SourceConstantAlpha / 255; + SrcPixel.col.green = SrcPixel.col.green * BlendFunc.SourceConstantAlpha / 255; + SrcPixel.col.blue = SrcPixel.col.blue * BlendFunc.SourceConstantAlpha / 255; + SrcPixel.col.alpha = (SrcBpp == 32) ? (SrcPixel.col.alpha * BlendFunc.SourceConstantAlpha / 255) : BlendFunc.SourceConstantAlpha; + + Alpha = ((BlendFunc.AlphaFormat & AC_SRC_ALPHA) != 0) ? + SrcPixel.col.alpha : BlendFunc.SourceConstantAlpha; + + DstPixel.ul = XLATEOBJ_iXlate(DstTo32Xlate, *Dst); + DstPixel.col.red = Clamp8(DstPixel.col.red * (255 - Alpha) / 255 + SrcPixel.col.red); + DstPixel.col.green = Clamp8(DstPixel.col.green * (255 - Alpha) / 255 + SrcPixel.col.green); + DstPixel.col.blue = Clamp8(DstPixel.col.blue * (255 - Alpha) / 255 + SrcPixel.col.blue); + *Dst++ = XLATEOBJ_iXlate(DstFrom32Xlate, DstPixel.ul); + } + Dst = (PUCHAR)((ULONG_PTR)Dst + DstDelta); + SrcY++; + } + + if (SrcTo32Xlate != NULL) + EngDeleteXlate(SrcTo32Xlate); + if (DstTo32Xlate != NULL) + EngDeleteXlate(DstTo32Xlate); + if (DstFrom32Xlate != NULL) + EngDeleteXlate(DstFrom32Xlate); + + return TRUE; +} + /* EOF */ _____ Modified: trunk/reactos/subsys/win32k/eng/bitblt.c --- trunk/reactos/subsys/win32k/eng/bitblt.c 2005-11-04 23:25:03 UTC (rev 19007) +++ trunk/reactos/subsys/win32k/eng/bitblt.c 2005-11-04 23:37:06 UTC (rev 19008) @@ -889,60 +889,320 @@ return ret; } +BOOL +STDCALL +EngAlphaBlend(IN SURFOBJ *Dest, + IN SURFOBJ *Source, + IN CLIPOBJ *ClipRegion, + IN XLATEOBJ *ColorTranslation, + IN PRECTL DestRect, + IN PRECTL SourceRect, + IN BLENDOBJ *BlendObj) +{ + RECTL SourceStretchedRect; + SIZEL SourceStretchedSize; + HBITMAP SourceStretchedBitmap = 0; + SURFOBJ* SourceStretchedObj = NULL; + RECTL InputRect; + RECTL OutputRect; + RECTL ClipRect; + RECTL CombinedRect; + RECTL Rect; + POINTL Translate; + INTENG_ENTER_LEAVE EnterLeaveSource; + INTENG_ENTER_LEAVE EnterLeaveDest; + SURFOBJ* InputObj; + SURFOBJ* OutputObj; + LONG Width; + LONG ClippingType; + RECT_ENUM RectEnum; + BOOL EnumMore; + INT i; + BOOLEAN Ret; + + DPRINT("EngAlphaBlend(Dest:0x%p, Source:0x%p, ClipRegion:0x%p, ColorTranslation:0x%p,\n", Dest, Source, ClipRegion, ColorTranslation); + DPRINT(" DestRect:{0x%x, 0x%x, 0x%x, 0x%x}, SourceRect:{0x%x, 0x%x, 0x%x, 0x%x},\n", + DestRect->left, DestRect->top, DestRect->right, DestRect->bottom, + SourceRect->left, SourceRect->top, SourceRect->right, SourceRect->bottom); + DPRINT(" BlendObj:{0x%x, 0x%x, 0x%x, 0x%x}\n", BlendObj->BlendFunction.BlendOp, + BlendObj->BlendFunction.BlendFlags, BlendObj->BlendFunction.SourceConstantAlpha, + BlendObj->BlendFunction.AlphaFormat); + + /* Validate input */ + if (DestRect->left >= DestRect->right || DestRect->top >= DestRect->bottom) + { + DPRINT1("Empty destination rectangle!\n"); + return FALSE; + } + if (SourceRect->left >= SourceRect->right || SourceRect->top >= SourceRect->bottom) + { + DPRINT1("Empty source rectangle!\n"); + return FALSE; + } + if (Dest == Source && + !(DestRect->left >= SourceRect->right || SourceRect->left >= DestRect->right || + DestRect->top >= SourceRect->bottom || SourceRect->top >= DestRect->bottom)) + { + DPRINT1("Source and destination rectangles overlap!\n"); + return FALSE; + } + + if (BlendObj->BlendFunction.BlendOp != AC_SRC_OVER) + { + DPRINT1("BlendOp != AC_SRC_OVER (0x%x)\n", BlendObj->BlendFunction.BlendOp); + return FALSE; + } + if (BlendObj->BlendFunction.BlendFlags != 0) + { + DPRINT1("BlendFlags != 0 (0x%x)\n", BlendObj->BlendFunction.BlendFlags); + return FALSE; + } + if ((BlendObj->BlendFunction.AlphaFormat & ~AC_SRC_ALPHA) != 0) + { + DPRINT1("Unsupported AlphaFormat (0x%x)\n", BlendObj->BlendFunction.AlphaFormat); + return FALSE; + } + + /* Check if there is anything to draw */ + if (ClipRegion != NULL && + (ClipRegion->rclBounds.left >= ClipRegion->rclBounds.right || + ClipRegion->rclBounds.top >= ClipRegion->rclBounds.bottom)) + { + /* Nothing to do */ + return TRUE; + } + + /* Stretch source if needed */ + if (DestRect->right - DestRect->left != SourceRect->right - SourceRect->left || + DestRect->bottom - DestRect->top != SourceRect->bottom - SourceRect->top) + { + SourceStretchedSize.cx = DestRect->right - DestRect->left; + SourceStretchedSize.cy = DestRect->bottom - DestRect->top; + Width = DIB_GetDIBWidthBytes(SourceStretchedSize.cx, BitsPerFormat(Source->iBitmapFormat)); + /* FIXME: Maybe it is a good idea to use EngCreateDeviceBitmap and IntEngStretchBlt + if possible to get a HW accelerated stretch. */ + SourceStretchedBitmap = EngCreateBitmap(SourceStretchedSize, Width, Source->iBitmapFormat, + BMF_TOPDOWN | BMF_NOZEROINIT, NULL); + if (SourceStretchedBitmap == 0) + { + DPRINT1("EngCreateBitmap failed!\n"); + return FALSE; + } + SourceStretchedObj = EngLockSurface((HSURF)SourceStretchedBitmap); + if (SourceStretchedObj == NULL) + { + DPRINT1("EngLockSurface failed!\n"); + EngDeleteSurface((HSURF)SourceStretchedBitmap); + return FALSE; + } + + SourceStretchedRect.left = 0; + SourceStretchedRect.right = SourceStretchedSize.cx; + SourceStretchedRect.top = 0; + SourceStretchedRect.bottom = SourceStretchedSize.cy; + /* FIXME: IntEngStretchBlt isn't used here atm because it results in a + try to acquire an already acquired mutex (lock the already locked source surface) */ + /*if (!IntEngStretchBlt(SourceStretchedObj, Source, NULL, NULL, + NULL, &SourceStretchedRect, SourceRect, NULL, + NULL, NULL, COLORONCOLOR))*/ + if (!EngStretchBlt(SourceStretchedObj, Source, NULL, NULL, NULL, + NULL, NULL, &SourceStretchedRect, SourceRect, + NULL, COLORONCOLOR)) + { + DPRINT1("EngStretchBlt failed!\n"); + EngFreeMem(SourceStretchedObj->pvBits); + EngUnlockSurface(SourceStretchedObj); + EngDeleteSurface((HSURF)SourceStretchedBitmap); + return FALSE; + } + SourceRect = &SourceStretchedRect; + Source = SourceStretchedObj; + } + + /* Now call the DIB function */ + InputRect.left = SourceRect->left; + InputRect.right = SourceRect->right; + InputRect.top = SourceRect->top; + InputRect.bottom = SourceRect->bottom; + if (!IntEngEnter(&EnterLeaveSource, Source, &InputRect, TRUE, &Translate, &InputObj)) + { + if (SourceStretchedObj != NULL) + { + EngFreeMem(SourceStretchedObj->pvBits); + EngUnlockSurface(SourceStretchedObj); + } + if (SourceStretchedBitmap != 0) + { + EngDeleteSurface((HSURF)SourceStretchedBitmap); + } + return FALSE; + } + InputRect.left = SourceRect->left + Translate.x; + InputRect.right = SourceRect->right + Translate.x; + InputRect.top = SourceRect->top + Translate.y; + InputRect.bottom = SourceRect->bottom + Translate.y; + + OutputRect.left = DestRect->left; + OutputRect.right = DestRect->right; + OutputRect.top = DestRect->top; + OutputRect.bottom = DestRect->bottom; + if (!IntEngEnter(&EnterLeaveDest, Dest, &OutputRect, FALSE, &Translate, &OutputObj)) + { + IntEngLeave(&EnterLeaveSource); + if (SourceStretchedObj != NULL) + { + EngFreeMem(SourceStretchedObj->pvBits); + EngUnlockSurface(SourceStretchedObj); + } + if (SourceStretchedBitmap != 0) + { + EngDeleteSurface((HSURF)SourceStretchedBitmap); + } + return FALSE; + } + OutputRect.left = DestRect->left + Translate.x; + OutputRect.right = DestRect->right + Translate.x; + OutputRect.top = DestRect->top + Translate.y; + OutputRect.bottom = DestRect->bottom + Translate.y; + + Ret = FALSE; + ClippingType = (ClipRegion == NULL) ? DC_TRIVIAL : ClipRegion->iDComplexity; + switch(ClippingType) + { + case DC_TRIVIAL: + Ret = DibFunctionsForBitmapFormat[OutputObj->iBitmapFormat].DIB_AlphaBlend( + OutputObj, InputObj, &OutputRect, &InputRect, ClipRegion, ColorTranslation, BlendObj); + break; + + case DC_RECT: + ClipRect.left = ClipRegion->rclBounds.left + Translate.x; + ClipRect.right = ClipRegion->rclBounds.right + Translate.x; + ClipRect.top = ClipRegion->rclBounds.top + Translate.y; + ClipRect.bottom = ClipRegion->rclBounds.bottom + Translate.y; + if (EngIntersectRect(&CombinedRect, &OutputRect, &ClipRect)) + { + Rect.left = InputRect.left + CombinedRect.left - OutputRect.left; + Rect.right = InputRect.right + CombinedRect.right - OutputRect.right; + Rect.top = InputRect.top + CombinedRect.top - OutputRect.top; + Rect.bottom = InputRect.bottom + CombinedRect.bottom - OutputRect.bottom; + Ret = DibFunctionsForBitmapFormat[OutputObj->iBitmapFormat].DIB_AlphaBlend( + OutputObj, InputObj, &CombinedRect, &Rect, ClipRegion, ColorTranslation, BlendObj); + } + break; + + case DC_COMPLEX: + Ret = TRUE; + CLIPOBJ_cEnumStart(ClipRegion, FALSE, CT_RECTANGLES, CD_ANY, 0); + do + { + EnumMore = CLIPOBJ_bEnum(ClipRegion,(ULONG) sizeof(RectEnum), + (PVOID) &RectEnum); + + for (i = 0; i < RectEnum.c; i++) + { + ClipRect.left = RectEnum.arcl[i].left + Translate.x; + ClipRect.right = RectEnum.arcl[i].right + Translate.x; + ClipRect.top = RectEnum.arcl[i].top + Translate.y; + ClipRect.bottom = RectEnum.arcl[i].bottom + Translate.y; + if (EngIntersectRect(&CombinedRect, &OutputRect, &ClipRect)) + { + Rect.left = InputRect.left + CombinedRect.left - OutputRect.left; + Rect.right = InputRect.right + CombinedRect.right - OutputRect.right; + Rect.top = InputRect.top + CombinedRect.top - OutputRect.top; + Rect.bottom = InputRect.bottom + CombinedRect.bottom - OutputRect.bottom; + Ret = DibFunctionsForBitmapFormat[OutputObj->iBitmapFormat].DIB_AlphaBlend( + OutputObj, InputObj, &CombinedRect, &Rect, ClipRegion, ColorTranslation, BlendObj) && Ret; + } + } + } + while(EnumMore); + break; + + default: + UNIMPLEMENTED; + ASSERT(FALSE); + break; + } + + IntEngLeave(&EnterLeaveDest); + IntEngLeave(&EnterLeaveSource); + + if (SourceStretchedObj != NULL) + { + EngFreeMem(SourceStretchedObj->pvBits); + EngUnlockSurface(SourceStretchedObj); + } + if (SourceStretchedBitmap != 0) + { + EngDeleteSurface((HSURF)SourceStretchedBitmap); + } + + return Ret; +} + BOOL STDCALL IntEngAlphaBlend(IN SURFOBJ *Dest, IN SURFOBJ *Source, - IN CLIPOBJ *Clip, + IN CLIPOBJ *ClipRegion, IN XLATEOBJ *ColorTranslation, IN PRECTL DestRect, IN PRECTL SourceRect, IN BLENDOBJ *BlendObj) { - BOOL ret = FALSE; - BITMAPOBJ *DestObj; - BITMAPOBJ *SourceObj; + BOOL ret = FALSE; + BITMAPOBJ *DestObj; + BITMAPOBJ *SourceObj; - ASSERT(Dest); - DestObj = CONTAINING_RECORD(Dest, BITMAPOBJ, SurfObj); - ASSERT(DestObj); + ASSERT(Dest); + DestObj = CONTAINING_RECORD(Dest, BITMAPOBJ, SurfObj); + ASSERT(DestObj); - ASSERT(Source); - SourceObj = CONTAINING_RECORD(Source, BITMAPOBJ, SurfObj); - ASSERT(SourceObj); + ASSERT(Source); + SourceObj = CONTAINING_RECORD(Source, BITMAPOBJ, SurfObj); + ASSERT(SourceObj); [truncated at 1000 lines; 164 more skipped]

19 years, 1 month

[blight] 19007: Add very primitive AlphaBlend test.

by blight＠svn.reactos.com

Add very primitive AlphaBlend test. Added: trunk/reactos/apps/utils/rosperf/alphablend.c Modified: trunk/reactos/apps/utils/rosperf/rosperf.h Modified: trunk/reactos/apps/utils/rosperf/rosperf.xml Modified: trunk/reactos/apps/utils/rosperf/testlist.c _____ Added: trunk/reactos/apps/utils/rosperf/alphablend.c --- trunk/reactos/apps/utils/rosperf/alphablend.c 2005-11-04 21:03:35 UTC (rev 19006) +++ trunk/reactos/apps/utils/rosperf/alphablend.c 2005-11-04 23:25:03 UTC (rev 19007) @@ -0,0 +1,88 @@ +/* + * ReactOS RosPerf - ReactOS GUI performance test program + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ + +#include <windows.h> +#include <wingdi.h> +#include "rosperf.h" + +typedef struct _ALPHABLEND_CONTEXT { + HDC BitmapDc; + HBITMAP Bitmap; +} ALPHABLEND_CONTEXT, *PALPHABLEND_CONTEXT; + +unsigned +AlphaBlendInit(void **Context, PPERF_INFO PerfInfo, unsigned Reps) +{ + PALPHABLEND_CONTEXT ctx = HeapAlloc(GetProcessHeap(), 0, sizeof (ALPHABLEND_CONTEXT)); + INT x, y; + + ctx->BitmapDc = CreateCompatibleDC(PerfInfo->BackgroundDc); + ctx->Bitmap = CreateCompatibleBitmap(PerfInfo->BackgroundDc, PerfInfo->WndWidth, PerfInfo->WndHeight); + SelectObject(ctx->BitmapDc, ctx->Bitmap); + + for (y = 0; y < PerfInfo->WndHeight; y++) + { + for (x = 0; x < PerfInfo->WndWidth; x++) + { + SetPixel(ctx->BitmapDc, x, y, RGB(0xff, 0x00, 0x00)); + } + } + + *Context = ctx; + + return Reps; +} + +void +AlphaBlendCleanup(void *Context, PPERF_INFO PerfInfo) +{ + PALPHABLEND_CONTEXT ctx = Context; + DeleteDC(ctx->BitmapDc); + DeleteObject(ctx->Bitmap); + HeapFree(GetProcessHeap(), 0, ctx); +} + + +ULONG +DbgPrint( + IN PCH Format, + IN ...); + +void +AlphaBlendProc(void *Context, PPERF_INFO PerfInfo, unsigned Reps) +{ + PALPHABLEND_CONTEXT ctx = Context; + unsigned Rep; + BLENDFUNCTION BlendFunc = { AC_SRC_OVER, 0, 0, 0 }; + + for (Rep = 0; Rep < Reps; Rep++) + { + BlendFunc.SourceConstantAlpha = 255 * Rep / Reps; +#if 0 + PatBlt(PerfInfo->BackgroundDc, 0, 0, PerfInfo->WndWidth, PerfInfo->WndHeight, PATCOPY); +#endif + if (!AlphaBlend(PerfInfo->BackgroundDc, 0, 0, PerfInfo->WndWidth, PerfInfo->WndHeight, + ctx->BitmapDc, 0, 0, PerfInfo->WndWidth, PerfInfo->WndHeight, + BlendFunc)) + { + DbgPrint("AlphaBlend failed (0x%lx)\n", GetLastError()); + } + } +} + +/* EOF */ Property changes on: trunk/reactos/apps/utils/rosperf/alphablend.c ___________________________________________________________________ Name: svn:eol-style + native _____ Modified: trunk/reactos/apps/utils/rosperf/rosperf.h --- trunk/reactos/apps/utils/rosperf/rosperf.h 2005-11-04 21:03:35 UTC (rev 19006) +++ trunk/reactos/apps/utils/rosperf/rosperf.h 2005-11-04 23:25:03 UTC (rev 19007) @@ -61,6 +61,10 @@ void TextProc(void *Context, PPERF_INFO PerfInfo, unsigned Reps); +unsigned AlphaBlendInit(void **Context, PPERF_INFO PerfInfo, unsigned Reps); +void AlphaBlendCleanup(void *Context, PPERF_INFO PerfInfo); +void AlphaBlendProc(void *Context, PPERF_INFO PerfInfo, unsigned Reps); + #endif /* ROSPERF_H_INCLUDED */ /* EOF */ _____ Modified: trunk/reactos/apps/utils/rosperf/rosperf.xml --- trunk/reactos/apps/utils/rosperf/rosperf.xml 2005-11-04 21:03:35 UTC (rev 19006) +++ trunk/reactos/apps/utils/rosperf/rosperf.xml 2005-11-04 23:25:03 UTC (rev 19007) @@ -2,7 +2,9 @@ <include base="rosperf">.</include> <define name="__USE_W32API" /> <define name="UNICODE" /> + <define name="WINVER">0x0500</define> <library>version</library> + <library>msimg32</library> <library>gdi32</library> <library>user32</library> <library>kernel32</library> @@ -11,6 +13,7 @@ <file>lines.c</file> <file>fill.c</file> <file>text.c</file> + <file>alphablend.c</file> <file>testlist.c</file> <file>rosperf.rc</file> </module> _____ Modified: trunk/reactos/apps/utils/rosperf/testlist.c --- trunk/reactos/apps/utils/rosperf/testlist.c 2005-11-04 21:03:35 UTC (rev 19006) +++ trunk/reactos/apps/utils/rosperf/testlist.c 2005-11-04 23:25:03 UTC (rev 19007) @@ -26,7 +26,8 @@ { L"hlines", L"Horizontal Lines", NullInit, LinesHorizontalProc, NullCleanup, NullCleanup }, { L"vlines", L"Vertical Lines", NullInit, LinesVerticalProc, NullCleanup, NullCleanup }, { L"lines", L"Lines", NullInit, LinesProc, NullCleanup, NullCleanup }, - { L"text", L"Text", NullInit, TextProc, NullCleanup, NullCleanup } + { L"text", L"Text", NullInit, TextProc, NullCleanup, NullCleanup }, + { L"alpha", L"Alpha Blend", AlphaBlendInit, AlphaBlendProc, NullCleanup, AlphaBlendCleanup } };

19 years, 1 month

[OTAnn] Groups:New Developments at Roomity

by shenanigans

I was interested in getting feedback from current communities of Roomity.com and let you know the recent improvements we are working on for better interface. Roomity.com v 1.5 is a web 2.01/RiA poster child community webapp. This new version adds broadcast video, social networking such as favorite authors and html editor. Its likely already you have groups and content you are already using but aggregated and safer, including technology, Java, etc., but it only works on broadband. S. *This is not spam! I work for Roomity and are trying to find better ways to enhance our members' experience. ------------------------------------------------------------------------------------------------------------------------------------------------------------ Broadband interface (RIA) + mail box saftey = <a href="http://React_OS_Differences_Commit_List.roomity.com">React_OS_Differences_Commit_List.roomity.com</a> *Your* clubs, no sign up to read, ad supported; try broadband internet. ~~1131143745484~~ ------------------------------------------------------------------------------------------------------------------------------------------------------------

19 years, 1 month

[blight] 19006: Delete Mesa-6.2

by blight＠svn.reactos.com

Delete Mesa-6.2 Deleted: vendor/Mesa3D/Mesa-6.2/

19 years, 1 month

[blight] 19005: Remove unused driver sources.

by blight＠svn.reactos.com

Remove unused driver sources. Deleted: trunk/reactos/lib/mesa32/src/drivers/beos/ Deleted: trunk/reactos/lib/mesa32/src/drivers/directfb/ Deleted: trunk/reactos/lib/mesa32/src/drivers/dos/ Deleted: trunk/reactos/lib/mesa32/src/drivers/dri/ Deleted: trunk/reactos/lib/mesa32/src/drivers/fbdev/ Deleted: trunk/reactos/lib/mesa32/src/drivers/ggi/ Deleted: trunk/reactos/lib/mesa32/src/drivers/glide/ Deleted: trunk/reactos/lib/mesa32/src/drivers/osmesa/ Deleted: trunk/reactos/lib/mesa32/src/drivers/svga/ Deleted: trunk/reactos/lib/mesa32/src/drivers/x11/

19 years, 1 month

← Newer
1
...
76
77
78
79
80
81
82
...
88
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs November 2005