Ros-diffs August 2009

ros-diffs@reactos.org

21 participants
654 discussions

[janderwald] 42334: [KS] - Implement KsQueryInformationFile - Properly implement KsStreamIo - Fix a desastreous bug in KsRemoveIrpFromCancelableQueue - Implement KsMoveIrpsOnCancelableQueue [PORTCLS] - Switch portcls to use the provided ks irp queue function instead of the homegrown IRP_MAPPING routines. Irp queueing is now faster and consumes less memory - Return an allocated silence buffer when there are no mappings available - HACK-Remove: Don't pre-complete any audio buffers now anymore. If

by janderwald＠svn.reactos.org

Author: janderwald Date: Sun Aug 2 13:40:38 2009 New Revision: 42334 URL: http://svn.reactos.org/svn/reactos?rev=42334&view=rev Log: [KS] - Implement KsQueryInformationFile - Properly implement KsStreamIo - Fix a desastreous bug in KsRemoveIrpFromCancelableQueue - Implement KsMoveIrpsOnCancelableQueue [PORTCLS] - Switch portcls to use the provided ks irp queue function instead of the homegrown IRP_MAPPING routines. Irp queueing is now faster and consumes less memory - Return an allocated silence buffer when there are no mappings available - HACK-Remove: Don't pre-complete any audio buffers now anymore. If you experience audio stuttering, let me know [SYSAUDIO, PORTCLS, KMIXER] - FastRead / FastWrite routines must store their return values in the status block as KsStreamIo now checks these Modified: trunk/reactos/drivers/ksfilter/ks/irp.c trunk/reactos/drivers/wdm/audio/backpln/portcls/interfaces.h trunk/reactos/drivers/wdm/audio/backpln/portcls/irpstream.c trunk/reactos/drivers/wdm/audio/backpln/portcls/pin_dmus.c trunk/reactos/drivers/wdm/audio/backpln/portcls/pin_wavecyclic.c trunk/reactos/drivers/wdm/audio/backpln/portcls/pin_wavepci.c trunk/reactos/drivers/wdm/audio/backpln/portcls/pin_wavert.c trunk/reactos/drivers/wdm/audio/filters/kmixer/pin.c trunk/reactos/drivers/wdm/audio/legacy/wdmaud/control.c trunk/reactos/drivers/wdm/audio/legacy/wdmaud/wdmaud.h trunk/reactos/drivers/wdm/audio/sysaudio/pin.c Modified: trunk/reactos/drivers/ksfilter/ks/irp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/ksfilter/ks/irp.c?… ============================================================================== --- trunk/reactos/drivers/ksfilter/ks/irp.c [iso-8859-1] (original) +++ trunk/reactos/drivers/ksfilter/ks/irp.c [iso-8859-1] Sun Aug 2 13:40:38 2009 @@ -344,7 +344,7 @@ } /* - @unimplemented + @implemented */ KSDDKAPI NTSTATUS @@ -357,7 +357,13 @@ { PDEVICE_OBJECT DeviceObject; PFAST_IO_DISPATCH FastIoDispatch; + PIRP Irp; + PIO_STACK_LOCATION IoStack; IO_STATUS_BLOCK IoStatus; + KEVENT Event; + LARGE_INTEGER Offset; + IO_STATUS_BLOCK StatusBlock; + NTSTATUS Status; /* get related file object */ DeviceObject = IoGetRelatedDeviceObject(FileObject); @@ -386,10 +392,47 @@ } } } - - /* Implement Me */ - - return STATUS_UNSUCCESSFUL; + /* clear event */ + KeClearEvent(&FileObject->Event); + + /* initialize event */ + KeInitializeEvent(&Event, NotificationEvent, FALSE); + + /* set offset to zero */ + Offset.QuadPart = 0L; + + /* build the request */ + Irp = IoBuildSynchronousFsdRequest(IRP_MJ_QUERY_INFORMATION, IoGetRelatedDeviceObject(FileObject), NULL, 0, &Offset, &Event, &StatusBlock); + + if (!Irp) + return STATUS_INSUFFICIENT_RESOURCES; + + /* get next stack location */ + IoStack = IoGetNextIrpStackLocation(Irp); + + /* setup parameters */ + IoStack->Parameters.QueryFile.FileInformationClass = FileInformationClass; + IoStack->Parameters.QueryFile.Length = Length; + Irp->AssociatedIrp.SystemBuffer = FileInformation; + + + /* call the driver */ + Status = IoCallDriver(IoGetRelatedDeviceObject(FileObject), Irp); + + if (Status == STATUS_PENDING) + { + /* wait for the operation to complete */ + KeWaitForSingleObject(&Event, Executive, KernelMode, FALSE, NULL); + + /* is object sync */ + if (FileObject->Flags & FO_SYNCHRONOUS_IO) + Status = FileObject->FinalStatus; + else + Status = StatusBlock.Status; + } + + /* done */ + return Status; } /* @@ -506,77 +549,104 @@ PIRP Irp; PIO_STACK_LOCATION IoStack; PDEVICE_OBJECT DeviceObject; - ULONG Code; NTSTATUS Status; LARGE_INTEGER Offset; PKSIOBJECT_HEADER ObjectHeader; - - - if (Flags == KSSTREAM_READ) - Code = IRP_MJ_READ; - else if (Flags == KSSTREAM_WRITE) - Code = IRP_MJ_WRITE; - else - return STATUS_INVALID_PARAMETER; - + BOOLEAN Ret; + + /* get related device object */ DeviceObject = IoGetRelatedDeviceObject(FileObject); - if (!DeviceObject) - return STATUS_INVALID_PARAMETER; - + /* sanity check */ + ASSERT(DeviceObject != NULL); + + /* is there a event provided */ if (Event) { - KeResetEvent(Event); - } - - //ASSERT(DeviceObject->DeviceType == FILE_DEVICE_KS); - ObjectHeader = (PKSIOBJECT_HEADER)FileObject->FsContext; - ASSERT(ObjectHeader); - if (Code == IRP_MJ_READ) - { - if (ObjectHeader->DispatchTable.FastRead) - { - if (ObjectHeader->DispatchTable.FastRead(FileObject, NULL, Length, FALSE, 0, StreamHeaders, IoStatusBlock, DeviceObject)) + /* reset event */ + KeClearEvent(Event); + } + + if (RequestorMode || ExGetPreviousMode() == KernelMode) + { + /* requestor is from kernel land */ + ObjectHeader = (PKSIOBJECT_HEADER)FileObject->FsContext; + + if (ObjectHeader) + { + /* there is a object header */ + if (Flags == KSSTREAM_READ) { - return STATUS_SUCCESS; + /* is fast read supported */ + if (ObjectHeader->DispatchTable.FastRead) + { + /* call fast read dispatch routine */ + Ret = ObjectHeader->DispatchTable.FastRead(FileObject, NULL, Length, FALSE, 0, StreamHeaders, IoStatusBlock, DeviceObject); + + if (Ret) + { + /* the request was handeled */ + return IoStatusBlock->Status; + } + } } - } - } - else - { - if (ObjectHeader->DispatchTable.FastWrite) - { - if (ObjectHeader->DispatchTable.FastWrite(FileObject, NULL, Length, FALSE, 0, StreamHeaders, IoStatusBlock, DeviceObject)) + else if (Flags == KSSTREAM_WRITE) { - return STATUS_SUCCESS; + /* is fast write supported */ + if (ObjectHeader->DispatchTable.FastWrite) + { + /* call fast write dispatch routine */ + Ret = ObjectHeader->DispatchTable.FastWrite(FileObject, NULL, Length, FALSE, 0, StreamHeaders, IoStatusBlock, DeviceObject); + + if (Ret) + { + /* the request was handeled */ + return IoStatusBlock->Status; + } + } } } } + /* clear file object event */ + KeClearEvent(&FileObject->Event); + + /* set the offset to zero */ Offset.QuadPart = 0LL; - Irp = IoBuildSynchronousFsdRequest(Code, DeviceObject, (PVOID)StreamHeaders, Length, &Offset, Event, IoStatusBlock); + + /* now build the irp */ + Irp = IoBuildSynchronousFsdRequest(IRP_MJ_DEVICE_CONTROL, + DeviceObject, (PVOID)StreamHeaders, Length, &Offset, Event, IoStatusBlock); if (!Irp) { - return STATUS_UNSUCCESSFUL; - } - + /* not enough memory */ + return STATUS_INSUFFICIENT_RESOURCES; + } + + /* setup irp parameters */ + Irp->RequestorMode = RequestorMode; + Irp->Overlay.AsynchronousParameters.UserApcContext = PortContext; + Irp->Tail.Overlay.OriginalFileObject = FileObject; + Irp->UserBuffer = StreamHeaders; + + /* get next irp stack location */ + IoStack = IoGetNextIrpStackLocation(Irp); + /* setup stack parameters */ + IoStack->FileObject = FileObject; + IoStack->Parameters.DeviceIoControl.InputBufferLength = Length; + IoStack->Parameters.DeviceIoControl.Type3InputBuffer = StreamHeaders; + IoStack->Parameters.DeviceIoControl.IoControlCode = (Flags == KSSTREAM_READ ? IOCTL_KS_READ_STREAM : IOCTL_KS_WRITE_STREAM); if (CompletionRoutine) { - IoSetCompletionRoutine(Irp, - CompletionRoutine, - CompletionContext, - (CompletionInvocationFlags & KsInvokeOnSuccess), - (CompletionInvocationFlags & KsInvokeOnError), - (CompletionInvocationFlags & KsInvokeOnCancel)); - } - - IoStack = IoGetNextIrpStackLocation(Irp); - IoStack->FileObject = FileObject; - + /* setup completion routine for async processing */ + IoSetCompletionRoutine(Irp, CompletionRoutine, CompletionContext, (CompletionInvocationFlags & KsInvokeOnSuccess), (CompletionInvocationFlags & KsInvokeOnError), (CompletionInvocationFlags & KsInvokeOnCancel)); + } + + /* now call the driver */ Status = IoCallDriver(DeviceObject, Irp); + /* done */ return Status; } - /* @unimplemented @@ -933,7 +1003,7 @@ } /* get irp offset */ - Irp = (PIRP)CONTAINING_RECORD(Irp, IRP, Tail.Overlay.ListEntry); + Irp = (PIRP)CONTAINING_RECORD(CurEntry, IRP, Tail.Overlay.ListEntry); if (Irp->Cancel) { @@ -988,7 +1058,7 @@ } /* - @unimplemented + @implemented */ KSDDKAPI NTSTATUS @@ -1002,8 +1072,114 @@ IN PFNKSIRPLISTCALLBACK ListCallback, IN PVOID Context) { - UNIMPLEMENTED; - return STATUS_UNSUCCESSFUL; + KIRQL OldLevel; + PLIST_ENTRY SrcEntry; + PIRP Irp; + NTSTATUS Status; + + if (!DestinationLock) + { + /* no destination lock just acquire the source lock */ + KeAcquireSpinLock(SourceLock, &OldLevel); + } + else + { + /* acquire cancel spinlock */ + IoAcquireCancelSpinLock(&OldLevel); + + /* now acquire source lock */ + KeAcquireSpinLockAtDpcLevel(SourceLock); + + /* now acquire destination lock */ + KeAcquireSpinLockAtDpcLevel(DestinationLock); + } + + /* point to list head */ + SrcEntry = SourceList; + + /* now move all irps */ + while(TRUE) + { + if (ListLocation == KsListEntryTail) + { + /* move queue downwards */ + SrcEntry = SrcEntry->Flink; + } + else + { + /* move queue upwards */ + SrcEntry = SrcEntry->Blink; + } + + if (SrcEntry == DestinationList) + { + /* eof list reached */ + break; + } + + /* get irp offset */ + Irp = (PIRP)CONTAINING_RECORD(SrcEntry, IRP, Tail.Overlay.ListEntry); + + /* now check if irp can be moved */ + Status = ListCallback(Irp, Context); + + /* check if irp can be moved */ + if (Status == STATUS_SUCCESS) + { + /* remove irp from src list */ + RemoveEntryList(&Irp->Tail.Overlay.ListEntry); + + if (ListLocation == KsListEntryTail) + { + /* insert irp end of list */ + InsertTailList(DestinationList, &Irp->Tail.Overlay.ListEntry); + } + else + { + /* insert irp head of list */ + InsertHeadList(DestinationList, &Irp->Tail.Overlay.ListEntry); + } + + /* do we need to update the irp lock */ + if (DestinationLock) + { + /* update irp lock */ + KSQUEUE_SPINLOCK_IRP_STORAGE(Irp) = DestinationLock; + } + } + else + { + if (Status != STATUS_NO_MATCH) + { + /* callback decided to stop enumeration */ + break; + } + + /* reset return value */ + Status = STATUS_SUCCESS; + } + } + + if (!DestinationLock) + { + /* release source lock */ + KeReleaseSpinLock(SourceLock, OldLevel); + } + else + { + /* now release destination lock */ + KeReleaseSpinLockFromDpcLevel(DestinationLock); + + /* now release source lock */ + KeReleaseSpinLockFromDpcLevel(SourceLock); + + + /* now release cancel spinlock */ + IoReleaseCancelSpinLock(OldLevel); + } + + /* done */ + return Status; } /* Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/interfaces.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/interfaces.h [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/interfaces.h [iso-8859-1] Sun Aug 2 13:40:38 2009 @@ -197,7 +197,8 @@ IN PKSDATAFORMAT DataFormat, IN PDEVICE_OBJECT DeviceObject, IN ULONG FrameSize, - IN ULONG Alignment); + IN ULONG Alignment, + IN PVOID SilenceBuffer); STDMETHOD_(NTSTATUS, AddMapping)(THIS_ IN PUCHAR Buffer, Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/irpstream.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/irpstream.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/irpstream.c [iso-8859-1] Sun Aug 2 13:40:38 2009 @@ -8,17 +8,6 @@ #include "private.h" -typedef struct _IRP_MAPPING_ -{ - LIST_ENTRY Entry; - PVOID Buffer; - ULONG BufferSize; - ULONG OriginalBufferSize; - PVOID OriginalBuffer; - PIRP Irp; - - PVOID Tag; -}IRP_MAPPING, *PIRP_MAPPING; typedef struct { @@ -33,9 +22,11 @@ KSPIN_CONNECT *ConnectDetails; PKSDATAFORMAT_WAVEFORMATEX DataFormat; - KSPIN_LOCK Lock; - LIST_ENTRY ListHead; - LIST_ENTRY FreeHead; + KSPIN_LOCK IrpListLock; + LIST_ENTRY IrpList; + LIST_ENTRY FreeIrpList; + PIRP Irp; + PVOID SilenceBuffer; ULONG OutOfMapping; ULONG MaxFrameSize; @@ -44,28 +35,6 @@ }IIrpQueueImpl; -VOID -NTAPI -FreeMappingRoutine( - PIRP_MAPPING CurMapping) -{ - ASSERT(CurMapping); - - if (CurMapping->Irp) - { - CurMapping->Irp->IoStatus.Information = CurMapping->OriginalBufferSize; - CurMapping->Irp->IoStatus.Status = STATUS_SUCCESS; - IoCompleteRequest(CurMapping->Irp, IO_SOUND_INCREMENT); - } - - if (CurMapping->OriginalBuffer) - { - ExFreePool(CurMapping->OriginalBuffer); - } - - ExFreePool(CurMapping); -} - NTSTATUS NTAPI IIrpQueue_fnQueryInterface( @@ -121,19 +90,21 @@ IN PKSDATAFORMAT DataFormat, IN PDEVICE_OBJECT DeviceObject, IN ULONG FrameSize, - IN ULONG Alignment) + IN ULONG Alignment, + IN PVOID SilenceBuffer) { IIrpQueueImpl * This = (IIrpQueueImpl*)iface; This->ConnectDetails = ConnectDetails; This->DataFormat = (PKSDATAFORMAT_WAVEFORMATEX)DataFormat; This->MaxFrameSize = FrameSize; + This->SilenceBuffer = SilenceBuffer; This->Alignment = Alignment; This->MinimumDataThreshold = ((PKSDATAFORMAT_WAVEFORMATEX)DataFormat)->WaveFormatEx.nAvgBytesPerSec / 3; - InitializeListHead(&This->ListHead); - InitializeListHead(&This->FreeHead); - KeInitializeSpinLock(&This->Lock); + InitializeListHead(&This->IrpList); + InitializeListHead(&This->FreeIrpList); + KeInitializeSpinLock(&This->IrpListLock); return STATUS_SUCCESS; } @@ -146,84 +117,35 @@ IN ULONG BufferSize, IN PIRP Irp) { - PIRP_MAPPING Mapping = NULL; - KSSTREAM_HEADER * Header = (KSSTREAM_HEADER*)Buffer; - ULONG Index, NumMappings, Offset; - IIrpQueueImpl * This = (IIrpQueueImpl*)iface; - - - if (This->MaxFrameSize) - { - if (This->MaxFrameSize > Header->DataUsed) - { - /* small mapping */ - NumMappings = 1; - } - else - { - ULONG Rest = Header->DataUsed % This->MaxFrameSize; - - NumMappings = Header->DataUsed / This->MaxFrameSize; - if (Rest) - { - NumMappings++; - } - } - } - else - { - /* no framesize restriction */ - NumMappings = 1; - } - - for(Index = 0; Index < NumMappings; Index++) - { - Mapping = AllocateItem(NonPagedPool, sizeof(IRP_MAPPING), TAG_PORTCLASS); - if (!Mapping) - { - DPRINT("OutOfMemory\n"); - return STATUS_UNSUCCESSFUL; - } - - if (Index) - Offset = Index * This->MaxFrameSize; - else - Offset = 0; - - Mapping->Buffer = (PVOID)UlongToPtr((PtrToUlong(Header->Data) + Offset + 3) & ~(0x3)); - - if (This->MaxFrameSize) - Mapping->BufferSize = min(Header->DataUsed - Offset, This->MaxFrameSize); - else - Mapping->BufferSize = Header->DataUsed; - - Mapping->OriginalBufferSize = Header->FrameExtent; - Mapping->OriginalBuffer = NULL; - Mapping->Irp = NULL; - Mapping->Tag = NULL; - - This->NumDataAvailable += Mapping->BufferSize; - - if (Index == NumMappings - 1) - { - /* last mapping should free the irp if provided */ - Mapping->OriginalBuffer = Header->Data; - Mapping->Irp = Irp; - } - - ExInterlockedInsertTailList(&This->ListHead, &Mapping->Entry, &This->Lock); - (void)InterlockedIncrement((volatile long*)&This->NumMappings); - - DPRINT("IIrpQueue_fnAddMapping NumMappings %u SizeOfMapping %lu NumDataAvailable %lu Mapping %p FrameSize %u\n", This->NumMappings, Mapping->BufferSize, This->NumDataAvailable, Mapping, This->MaxFrameSize); - } - - if (Irp) - { - Irp->IoStatus.Status = STATUS_PENDING; - Irp->IoStatus.Information = 0; - IoMarkIrpPending(Irp); - } - + PKSSTREAM_HEADER Header; + IIrpQueueImpl * This = (IIrpQueueImpl*)iface; + + /* FIXME + * irp should contain the stream header... + */ + + /* get stream header */ + Header = (KSSTREAM_HEADER*)Buffer; + + /* dont exceed max frame size */ + ASSERT(This->MaxFrameSize >= Header->DataUsed); + + /* hack untill stream probing is ready */ + Irp->Tail.Overlay.DriverContext[2] = (PVOID)Header; + + /* increment num mappings */ + InterlockedIncrement(&This->NumMappings); + + /* increment num data available */ + This->NumDataAvailable += Header->DataUsed; + + /* mark irp as pending */ + IoMarkIrpPending(Irp); + + /* add irp to cancelable queue */ + KsAddIrpToCancelableQueue(&This->IrpList, &This->IrpListLock, Irp, KsListEntryTail, NULL); + + /* done */ return STATUS_SUCCESS; } @@ -234,55 +156,102 @@ OUT PUCHAR * Buffer, OUT PULONG BufferSize) { - - PIRP_MAPPING CurMapping; - IIrpQueueImpl * This = (IIrpQueueImpl*)iface; - PLIST_ENTRY CurEntry; - - CurEntry = ExInterlockedRemoveHeadList(&This->ListHead, &This->Lock); - if (!CurEntry) - { + PIRP Irp; + ULONG Offset; + PKSSTREAM_HEADER StreamHeader; + IIrpQueueImpl * This = (IIrpQueueImpl*)iface; + + /* check if there is an irp in the partially processed */ + if (This->Irp) + { + /* use last irp */ + Irp = This->Irp; + Offset = This->CurrentOffset; + /* TODO cancel irp when required */ + ASSERT(Irp->Cancel == FALSE); + } + else + { + /* get a fresh new irp from the queue */ + This->Irp = Irp = KsRemoveIrpFromCancelableQueue(&This->IrpList, &This->IrpListLock, KsListEntryHead, KsAcquireAndRemoveOnlySingleItem); + This->CurrentOffset = Offset = 0; + } + + if (!Irp) + { + /* no irp available, use silence buffer */ + *Buffer = This->SilenceBuffer; + *BufferSize = This->MaxFrameSize; + /* flag for port wave pci driver */ + This->OutOfMapping = TRUE; + /* indicate flag to restart fast buffering */ This->StartStream = FALSE; - This->OutOfMapping = TRUE; - return STATUS_UNSUCCESSFUL; - } - - CurMapping = CONTAINING_RECORD(CurEntry, IRP_MAPPING, Entry); - *Buffer = (PUCHAR)CurMapping->Buffer + This->CurrentOffset; - *BufferSize = CurMapping->BufferSize - This->CurrentOffset; - ExInterlockedInsertHeadList(&This->ListHead, &CurMapping->Entry, &This->Lock); + return STATUS_SUCCESS; + } + + /* HACK get stream header */ + StreamHeader = (PKSSTREAM_HEADER)Irp->Tail.Overlay.DriverContext[2]; + + /* sanity check */ + ASSERT(StreamHeader); + + /* store buffersize */ + *BufferSize = StreamHeader->DataUsed - Offset; + + /* store buffer */ + *Buffer = &((PUCHAR)StreamHeader->Data)[Offset]; + + /* unset flag that no irps are available */ This->OutOfMapping = FALSE; return STATUS_SUCCESS; } - - VOID NTAPI IIrpQueue_fnUpdateMapping( IN IIrpQueue *iface, IN ULONG BytesWritten) { - PLIST_ENTRY CurEntry; - PIRP_MAPPING CurMapping; - IIrpQueueImpl * This = (IIrpQueueImpl*)iface; - - CurEntry = ExInterlockedRemoveHeadList(&This->ListHead, &This->Lock); - CurMapping = CONTAINING_RECORD(CurEntry, IRP_MAPPING, Entry); - + PKSSTREAM_HEADER StreamHeader; + IIrpQueueImpl * This = (IIrpQueueImpl*)iface; + + if (!This->Irp) + { + /* silence buffer was used */ + return; + } + + /* HACK get stream header */ + StreamHeader = (PKSSTREAM_HEADER)This->Irp->Tail.Overlay.DriverContext[2]; + + /* add to current offset */ This->CurrentOffset += BytesWritten; + + /* decrement available data counter */ This->NumDataAvailable -= BytesWritten; - if (CurMapping->BufferSize <= This->CurrentOffset) - { + if (This->CurrentOffset >= StreamHeader->DataUsed) + { + /* irp has been processed completly */ + This->Irp->IoStatus.Status = STATUS_SUCCESS; + + /* frame extend contains the original request size, DataUsed contains the real buffer size + * is different when kmixer performs channel conversion, upsampling etc + */ + This->Irp->IoStatus.Information = StreamHeader->FrameExtent; + + /* free stream data, no tag as wdmaud.drv does it atm */ + ExFreePool(StreamHeader->Data); + + /* free stream header, no tag as wdmaud.drv allocates it atm */ + ExFreePool(StreamHeader); + + /* complete the request */ + IoCompleteRequest(This->Irp, IO_SOUND_INCREMENT); + /* remove irp as it is complete */ + This->Irp = NULL; This->CurrentOffset = 0; - InterlockedDecrement(&This->NumMappings); - FreeMappingRoutine(CurMapping); - } - else - { - ExInterlockedInsertHeadList(&This->ListHead, &CurMapping->Entry, &This->Lock); } } @@ -293,6 +262,7 @@ { IIrpQueueImpl * This = (IIrpQueueImpl*)iface; + /* returns the amount of mappings available */ return This->NumMappings; } @@ -302,6 +272,7 @@ IN IIrpQueue *iface) { IIrpQueueImpl * This = (IIrpQueueImpl*)iface; + /* returns the amount of audio stream data available */ return This->NumDataAvailable; } @@ -363,50 +334,45 @@ OUT PULONG ByteCount, OUT PULONG Flags) { - PIRP_MAPPING CurMapping; - PLIST_ENTRY CurEntry; + PKSSTREAM_HEADER StreamHeader; + PIRP Irp; IIrpQueueImpl * This = (IIrpQueueImpl*)iface; *Flags = 0; ASSERT(Tag != NULL); - - CurEntry = ExInterlockedRemoveHeadList(&This->ListHead, &This->Lock); - if (!CurEntry) - { + /* get an irp from the queue */ + Irp = KsRemoveIrpFromCancelableQueue(&This->IrpList, &This->IrpListLock, KsListEntryHead, KsAcquireAndRemoveOnlySingleItem); + + /* check if there is an irp */ + if (!Irp) + { + /* no irp available */ This->OutOfMapping = TRUE; This->StartStream = FALSE; return STATUS_UNSUCCESSFUL; } - CurMapping = CONTAINING_RECORD(CurEntry, IRP_MAPPING, Entry); - - *PhysicalAddress = MmGetPhysicalAddress(CurMapping->Buffer); - *VirtualAddress = CurMapping->Buffer; - *ByteCount = CurMapping->BufferSize; - + /* HACK get stream header */ + StreamHeader = (PKSSTREAM_HEADER)Irp->Tail.Overlay.DriverContext[2]; + + /* store mapping in the free list */ + ExInterlockedInsertTailList(&This->FreeIrpList, &Irp->Tail.Overlay.ListEntry, &This->IrpListLock); + + /* return mapping */ + *PhysicalAddress = MmGetPhysicalAddress(StreamHeader->Data); + *VirtualAddress = StreamHeader->Data; + *ByteCount = StreamHeader->DataUsed; + + /* decrement mapping count */ InterlockedDecrement(&This->NumMappings); - This->NumDataAvailable -= CurMapping->BufferSize; - - if (CurMapping->OriginalBuffer) - { - /* last partial buffer */ - *Flags = 1; - - /* store tag */ - CurMapping->Tag = Tag; - - /* insert into list to free later */ - ExInterlockedInsertTailList(&This->FreeHead, &CurMapping->Entry, &This->Lock); - DPRINT("IIrpQueue_fnGetMappingWithTag Tag %p Mapping %p\n", Tag, CurMapping); - } - else - { - /* we can free this entry now */ - FreeItem(CurMapping, TAG_PORTCLASS); - DPRINT("IIrpQueue_fnGetMappingWithTag Tag %p Mapping %p FREED\n", Tag, CurMapping); - } - + /* decrement num data available */ + This->NumDataAvailable -= StreamHeader->DataUsed; + + /* store tag in irp */ + Irp->Tail.Overlay.DriverContext[3] = Tag; + + /* done */ return STATUS_SUCCESS; } @@ -416,30 +382,44 @@ IN IIrpQueue *iface, IN PVOID Tag) { - PIRP_MAPPING CurMapping = NULL; + PIRP Irp; PLIST_ENTRY CurEntry; + PKSSTREAM_HEADER StreamHeader; IIrpQueueImpl * This = (IIrpQueueImpl*)iface; DPRINT("IIrpQueue_fnReleaseMappingWithTag Tag %p\n", Tag); - CurEntry = ExInterlockedRemoveHeadList(&This->FreeHead, &This->Lock); - if (!CurMapping) - { - return STATUS_SUCCESS; - } - - CurMapping = CONTAINING_RECORD(CurEntry, IRP_MAPPING, Entry); - if (CurMapping->Tag != Tag) - { - /* the released mapping is not the last one */ - ExInterlockedInsertHeadList(&This->FreeHead, &CurMapping->Entry, &This->Lock); - return STATUS_SUCCESS; - } - - /* last mapping of the irp, free irp */ - DPRINT("IIrpQueue_fnReleaseMappingWithTag Tag %p Mapping %p FREED\n", Tag, CurMapping); - - FreeMappingRoutine(CurMapping); + /* remove irp from used list */ + CurEntry = ExInterlockedRemoveHeadList(&This->FreeIrpList, &This->IrpListLock); + /* sanity check */ + ASSERT(CurEntry); + + /* get irp from list entry */ + Irp = (PIRP)CONTAINING_RECORD(CurEntry, IRP, Tail.Overlay.ListEntry); + + /* HACK get stream header */ + StreamHeader = (PKSSTREAM_HEADER)Irp->Tail.Overlay.DriverContext[2]; + + /* driver must release items in the same order */ + ASSERT(Irp->Tail.Overlay.DriverContext[3] == Tag); + + /* irp has been processed completly */ + Irp->IoStatus.Status = STATUS_SUCCESS; + + /* frame extend contains the original request size, DataUsed contains the real buffer size + * is different when kmixer performs channel conversion, upsampling etc + */ + Irp->IoStatus.Information = StreamHeader->FrameExtent; + + /* free stream data, no tag as wdmaud.drv does it atm */ + ExFreePool(StreamHeader->Data); + + /* free stream header, no tag as wdmaud.drv allocates it atm */ + ExFreePool(StreamHeader); + + /* complete the request */ + IoCompleteRequest(Irp, IO_SOUND_INCREMENT); + return STATUS_SUCCESS; } @@ -457,24 +437,7 @@ IIrpQueue_fnPrintQueueStatus( IN IIrpQueue *iface) { - PIRP_MAPPING CurMapping = NULL; - PLIST_ENTRY CurEntry; - - IIrpQueueImpl * This = (IIrpQueueImpl*)iface; - KeAcquireSpinLockAtDpcLevel(&This->Lock); - - CurEntry = This->ListHead.Flink; - DPRINT("IIrpQueue_fnPrintQueueStatus % u ===============\n", This->NumMappings); - - while (CurEntry != &This->ListHead) - { - CurMapping = CONTAINING_RECORD(CurEntry, IRP_MAPPING, Entry); - DPRINT("Mapping %p Size %u Original %p\n", CurMapping, CurMapping->BufferSize, CurMapping->OriginalBuffer); - CurEntry = CurEntry->Flink; - } - - KeReleaseSpinLockFromDpcLevel(&This->Lock); - DPRINT("IIrpQueue_fnPrintQueueStatus ===============\n"); + } VOID Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/pin_dmus.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/pin_dmus.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/pin_dmus.c [iso-8859-1] Sun Aug 2 13:40:38 2009 @@ -1135,7 +1135,7 @@ This->ServiceGroup->lpVtbl->SupportDelayedService(This->ServiceGroup); } - Status = This->IrpQueue->lpVtbl->Init(This->IrpQueue, ConnectDetails, This->Format, DeviceObject, 0, 0); + Status = This->IrpQueue->lpVtbl->Init(This->IrpQueue, ConnectDetails, This->Format, DeviceObject, 0, 0, NULL /*FIXME*/); if (!NT_SUCCESS(Status)) { DPRINT1("IrpQueue_Init failed with %x\n", Status); Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/pin_wavecyclic.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/pin_wavecyclic.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/pin_wavecyclic.c [iso-8859-1] Sun Aug 2 13:40:38 2009 @@ -970,37 +970,24 @@ PrePostRatio = (This->PreCompleted * 100) / This->TotalPackets; MinData = This->IrpQueue->lpVtbl->NumData(This->IrpQueue); - DPRINT("IPortPinWaveCyclic_fnFastWrite entered Total %u Pre %u Post %u State %x MinData %u Ratio %u\n", This->TotalPackets, This->PreCompleted, This->PostCompleted, This->State, This->IrpQueue->lpVtbl->NumData(This->IrpQueue), PrePostRatio); + DPRINT1("IPortPinWaveCyclic_fnFastWrite entered Total %u Pre %u Post %u State %x MinData %u Ratio %u\n", This->TotalPackets, This->PreCompleted, This->PostCompleted, This->State, This->IrpQueue->lpVtbl->NumData(This->IrpQueue), PrePostRatio); Packet = (PCONTEXT_WRITE)Buffer; - - if (This->IrpQueue->lpVtbl->MinimumDataAvailable(This->IrpQueue)) - { - Irp = Packet->Irp; - StatusBlock->Status = STATUS_PENDING; - InterlockedIncrement((PLONG)&This->PostCompleted); - } - else - { - Irp = NULL; - Packet->Irp->IoStatus.Status = STATUS_SUCCESS; - Packet->Irp->IoStatus.Information = Packet->Header.FrameExtent; - IoCompleteRequest(Packet->Irp, IO_SOUND_INCREMENT); - StatusBlock->Status = STATUS_SUCCESS; - InterlockedIncrement((PLONG)&This->PreCompleted); - } + Irp = Packet->Irp; Status = This->IrpQueue->lpVtbl->AddMapping(This->IrpQueue, Buffer, Length, Irp); if (!NT_SUCCESS(Status)) return FALSE; - if (This->State != KSSTATE_RUN && This->IrpQueue->lpVtbl->MinimumDataAvailable(This->IrpQueue) == TRUE) + if (This->State != KSSTATE_RUN) { SetStreamState(This, KSSTATE_RUN); /* some should initiate a state request but didnt do it */ DPRINT1("Starting stream with %lu mappings Status %x\n", This->IrpQueue->lpVtbl->NumMappings(This->IrpQueue), Status); } + + StatusBlock->Status = STATUS_PENDING; return TRUE; } @@ -1021,6 +1008,7 @@ PKSDATAFORMAT DataFormat; PDEVICE_OBJECT DeviceObject; BOOL Capture; + PVOID SilenceBuffer; //IDrmAudioStream * DrmAudio = NULL; IPortPinWaveCyclicImpl * This = (IPortPinWaveCyclicImpl*)iface; @@ -1114,13 +1102,18 @@ Status = This->Stream->lpVtbl->SetNotificationFreq(This->Stream, 10, &This->FrameSize); - Status = This->IrpQueue->lpVtbl->Init(This->IrpQueue, ConnectDetails, DataFormat, DeviceObject, This->FrameSize, 0); + SilenceBuffer = AllocateItem(NonPagedPool, This->FrameSize, TAG_PORTCLASS); + if (!SilenceBuffer) + return STATUS_INSUFFICIENT_RESOURCES; + + This->Stream->lpVtbl->Silence(This->Stream, SilenceBuffer, This->FrameSize); + + Status = This->IrpQueue->lpVtbl->Init(This->IrpQueue, ConnectDetails, DataFormat, DeviceObject, This->FrameSize, 0, SilenceBuffer); if (!NT_SUCCESS(Status)) { This->IrpQueue->lpVtbl->Release(This->IrpQueue); return Status; } - //This->Stream->lpVtbl->SetFormat(This->Stream, (PKSDATAFORMAT)This->Format); DPRINT1("Setting state to acquire %x\n", This->Stream->lpVtbl->SetState(This->Stream, KSSTATE_ACQUIRE)); Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/pin_wavepci.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/pin_wavepci.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/pin_wavepci.c [iso-8859-1] Sun Aug 2 13:40:38 2009 @@ -1069,7 +1069,7 @@ if (!NT_SUCCESS(Status)) return Status; - Status = This->IrpQueue->lpVtbl->Init(This->IrpQueue, ConnectDetails, This->Format, DeviceObject, This->AllocatorFraming.FrameSize, This->AllocatorFraming.FileAlignment); + Status = This->IrpQueue->lpVtbl->Init(This->IrpQueue, ConnectDetails, This->Format, DeviceObject, This->AllocatorFraming.FrameSize, This->AllocatorFraming.FileAlignment, NULL); if (!NT_SUCCESS(Status)) { DPRINT1("IrpQueue_Init failed with %x\n", Status); Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/pin_wavert.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/pin_wavert.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/pin_wavert.c [iso-8859-1] Sun Aug 2 13:40:38 2009 @@ -992,7 +992,7 @@ goto cleanup; } - Status = This->IrpQueue->lpVtbl->Init(This->IrpQueue, ConnectDetails, DataFormat, DeviceObject, 0, 0); + Status = This->IrpQueue->lpVtbl->Init(This->IrpQueue, ConnectDetails, DataFormat, DeviceObject, 0, 0, NULL); if (!NT_SUCCESS(Status)) { goto cleanup; Modified: trunk/reactos/drivers/wdm/audio/filters/kmixer/pin.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/filters/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/filters/kmixer/pin.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/filters/kmixer/pin.c [iso-8859-1] Sun Aug 2 13:40:38 2009 @@ -668,6 +668,8 @@ } } + IoStatus->Status = Status; + if (NT_SUCCESS(Status)) return TRUE; else Modified: trunk/reactos/drivers/wdm/audio/legacy/wdmaud/control.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/legacy/w… ============================================================================== --- trunk/reactos/drivers/wdm/audio/legacy/wdmaud/control.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/legacy/wdmaud/control.c [iso-8859-1] Sun Aug 2 13:40:38 2009 @@ -706,6 +706,28 @@ NTSTATUS NTAPI +WdmAudWriteCompletion( + IN PDEVICE_OBJECT DeviceObject, + IN PIRP LowerIrp, + IN PVOID Context) +{ + PIRP Irp; + ASSERT(LowerIrp->PendingReturned == FALSE); + /* get original irp */ + Irp = (PIRP)Context; + + /* save status */ + Irp->IoStatus.Status = LowerIrp->IoStatus.Status; + Irp->IoStatus.Information = LowerIrp->IoStatus.Information; + /* complete request */ + IoCompleteRequest(Irp, IO_SOUND_INCREMENT); + /* return success to free irp */ + return STATUS_SUCCESS; +} + + +NTSTATUS +NTAPI WdmAudWrite( IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp) @@ -715,11 +737,13 @@ PWDMAUD_CLIENT ClientInfo; NTSTATUS Status = STATUS_SUCCESS; PUCHAR Buffer; + PFILE_OBJECT FileObject; + PMDL Mdl; + //PIRP LowerIrp; PCONTEXT_WRITE Packet; - PFILE_OBJECT FileObject; + PVOID SystemBuffer; + //LARGE_INTEGER Offset; IO_STATUS_BLOCK IoStatusBlock; - PMDL Mdl; - PVOID SystemBuffer; IoStack = IoGetCurrentIrpStackLocation(Irp); @@ -826,14 +850,51 @@ ExFreePool(Packet); IoFreeMdl(Mdl); ObDereferenceObject(FileObject); - return SetIrpIoStatus(Irp, Status, 0); + return SetIrpIoStatus(Irp, STATUS_INSUFFICIENT_RESOURCES, 0); } RtlMoveMemory(Buffer, SystemBuffer, DeviceInfo->BufferSize); MmUnlockPages(Mdl); IoFreeMdl(Mdl); - KsStreamIo(FileObject, NULL, NULL, NULL, NULL, 0, &IoStatusBlock, Packet, sizeof(CONTEXT_WRITE), KSSTREAM_WRITE, KernelMode); +#if 1 + KsStreamIo(FileObject, NULL, NULL, NULL, NULL, 0, &IoStatusBlock, Packet, sizeof(CONTEXT_WRITE), KSSTREAM_WRITE, UserMode); + /* dereference file object */ ObDereferenceObject(FileObject); return IoStatusBlock.Status; -} +#else + Offset.QuadPart = 0L; + + /* now build the irp */ + LowerIrp = IoBuildAsynchronousFsdRequest (IRP_MJ_WRITE, + IoGetRelatedDeviceObject(FileObject), + Packet, + sizeof(KSSTREAM_HEADER), + &Offset, + NULL); + + if (!LowerIrp) + { + /* failed to create an associated irp */ + ExFreePool(Buffer); + ExFreePool(Packet); + ObDereferenceObject(FileObject); + + return SetIrpIoStatus(Irp, STATUS_INSUFFICIENT_RESOURCES, 0); + } + + /* set a completion routine */ + IoSetCompletionRoutine(LowerIrp, WdmAudWriteCompletion, (PVOID)Irp, TRUE, TRUE, TRUE); + + /* mark irp as pending */ + IoMarkIrpPending(Irp); + + /* call the driver */ + Status = IoCallDriver(IoGetRelatedDeviceObject(FileObject), LowerIrp); + + /* dereference file object */ + ObDereferenceObject(FileObject); + + return STATUS_PENDING; +#endif +} Modified: trunk/reactos/drivers/wdm/audio/legacy/wdmaud/wdmaud.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/legacy/w… ============================================================================== --- trunk/reactos/drivers/wdm/audio/legacy/wdmaud/wdmaud.h [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/legacy/wdmaud/wdmaud.h [iso-8859-1] Sun Aug 2 13:40:38 2009 @@ -56,15 +56,6 @@ PIRP Irp; }CONTEXT_WRITE, *PCONTEXT_WRITE; - -typedef struct -{ - PIRP Irp; - IO_STATUS_BLOCK StatusBlock; - ULONG Length; -}WRITE_CONTEXT, *PWRITE_CONTEXT; - - NTSTATUS WdmAudRegisterDeviceInterface( IN PDEVICE_OBJECT PhysicalDeviceObject, Modified: trunk/reactos/drivers/wdm/audio/sysaudio/pin.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/sysaudio… ============================================================================== --- trunk/reactos/drivers/wdm/audio/sysaudio/pin.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/sysaudio/pin.c [iso-8859-1] Sun Aug 2 13:40:38 2009 @@ -161,7 +161,7 @@ /* call the portcls audio pin */ Status = KsSynchronousIoControlDevice(FileObject, KernelMode, IOCTL_KS_WRITE_STREAM, - MmGetMdlVirtualAddress(Irp->MdlAddress), + Irp->UserBuffer, IoStack->Parameters.Write.Length, NULL, 0, @@ -379,13 +379,14 @@ Status = ObReferenceObjectByHandle(Context->hMixerPin, GENERIC_WRITE, IoFileObjectType, KernelMode, (PVOID*)&RealFileObject, NULL); if (NT_SUCCESS(Status)) { - Status = KsStreamIo(RealFileObject, NULL, NULL, NULL, NULL, 0, IoStatus, Buffer, Length, KSSTREAM_WRITE, KernelMode); + Status = KsStreamIo(RealFileObject, NULL, NULL, NULL, NULL, 0, IoStatus, Buffer, Length, KSSTREAM_WRITE, UserMode); ObDereferenceObject(RealFileObject); } if (!NT_SUCCESS(Status)) { DPRINT1("Mixing stream failed with %lx\n", Status); + DbgBreakPoint(); return FALSE; } } @@ -394,11 +395,11 @@ if (!NT_SUCCESS(Status)) return FALSE; - Status = KsStreamIo(RealFileObject, NULL, NULL, NULL, NULL, 0, IoStatus, Buffer, Length, KSSTREAM_WRITE, KernelMode); + Status = KsStreamIo(RealFileObject, NULL, NULL, NULL, NULL, 0, IoStatus, Buffer, Length, KSSTREAM_WRITE, UserMode); ObDereferenceObject(RealFileObject); - if (Status == STATUS_SUCCESS) + if (NT_SUCCESS(Status)) return TRUE; else return FALSE;

15 years, 1 month

[fireball] 42333: - Handle case when RosGdiSetDeviceClipping is being called without rects at all (with a respective DPRINT1). - Use combined clipping object everywhere to ensure drawing happens only in allowed rectangle, see arwinss nr. 15. As a side effect, it fixes FireFox and other apps which would corrupt memory if trying to blit to area outside of DC. - Enable commented out XLATE object creation in GreStretchBltMask. Start menu icons now get masked properly too, but still are black.

by fireball＠svn.reactos.org

Author: fireball Date: Sun Aug 2 12:32:57 2009 New Revision: 42333 URL: http://svn.reactos.org/svn/reactos?rev=42333&view=rev Log: - Handle case when RosGdiSetDeviceClipping is being called without rects at all (with a respective DPRINT1). - Use combined clipping object everywhere to ensure drawing happens only in allowed rectangle, see arwinss nr. 15. As a side effect, it fixes FireFox and other apps which would corrupt memory if trying to blit to area outside of DC. - Enable commented out XLATE object creation in GreStretchBltMask. Start menu icons now get masked properly too, but still are black. Modified: branches/arwinss/reactos/subsystems/win32/win32k/gdi/dc.c branches/arwinss/reactos/subsystems/win32/win32k/gdi/misc.c branches/arwinss/reactos/subsystems/win32/win32k/gre/bitblt.c branches/arwinss/reactos/subsystems/win32/win32k/gre/lineto.c branches/arwinss/reactos/subsystems/win32/win32k/gre/polyfill.c branches/arwinss/reactos/subsystems/win32/win32k/gre/rect.c Modified: branches/arwinss/reactos/subsystems/win32/win32k/gdi/dc.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/gdi/dc.c [iso-8859-1] (original) +++ branches/arwinss/reactos/subsystems/win32/win32k/gdi/dc.c [iso-8859-1] Sun Aug 2 12:32:57 2009 @@ -373,14 +373,17 @@ /* Capture the rects buffer */ _SEH2_TRY { - ProbeForRead(pRects, count * sizeof(RECTL), 1); - - /* Use pool allocated buffer if data doesn't fit */ - if (count > sizeof(*pStackBuf) / sizeof(RECTL)) - pSafeRects = ExAllocatePool(PagedPool, sizeof(RECTL) * count); - - /* Copy points data */ - RtlCopyMemory(pSafeRects, pRects, count * sizeof(RECTL)); + if (count > 0) + { + ProbeForRead(pRects, count * sizeof(RECTL), 1); + + /* Use pool allocated buffer if data doesn't fit */ + if (count > sizeof(*pStackBuf) / sizeof(RECTL)) + pSafeRects = ExAllocatePool(PagedPool, sizeof(RECTL) * count); + + /* Copy points data */ + RtlCopyMemory(pSafeRects, pRects, count * sizeof(RECTL)); + } /* Copy bounding rect */ ProbeForRead(rcBounds, sizeof(RECTL), 1); @@ -421,8 +424,25 @@ if (pDC->CombinedClip) IntEngDeleteClipRegion(pDC->CombinedClip); - /* Set the clipping object */ - pDC->CombinedClip = IntEngCreateClipRegion(count, pSafeRects, &rcSafeBounds); + if (count == 0) + { + /* Special case, set it to full screen then */ + RECTL_vSetRect(&rcSafeBounds, + pDC->rcVport.left, + pDC->rcVport.top, + pDC->rcVport.right, + pDC->rcVport.bottom); + + /* Set the clipping object */ + pDC->CombinedClip = IntEngCreateClipRegion(1, &rcSafeBounds, &rcSafeBounds); + + DPRINT1("FIXME: Setting device clipping to NULL region, using full screen instead\n"); + } + else + { + /* Set the clipping object */ + pDC->CombinedClip = IntEngCreateClipRegion(count, pSafeRects, &rcSafeBounds); + } DPRINT("RosGdiSetDeviceClipping() for DC %x, bounding rect (%d,%d)-(%d, %d)\n", physDev, rcSafeBounds.left, rcSafeBounds.top, rcSafeBounds.right, rcSafeBounds.bottom); Modified: branches/arwinss/reactos/subsystems/win32/win32k/gdi/misc.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/gdi/misc.c [iso-8859-1] (original) +++ branches/arwinss/reactos/subsystems/win32/win32k/gdi/misc.c [iso-8859-1] Sun Aug 2 12:32:57 2009 @@ -71,7 +71,6 @@ BOOL APIENTRY RosGdiLineTo( HDC physDev, INT x1, INT y1, INT x2, INT y2 ) { PDC pDC; - CLIPOBJ *pClipObj; RECTL scrRect; POINT pt[2]; @@ -80,12 +79,7 @@ /* Get a pointer to the DC */ pDC = DC_Lock(physDev); - scrRect.left = scrRect.top = 0; - scrRect.right = PrimarySurface.GDIInfo.ulHorzRes; - scrRect.bottom = PrimarySurface.GDIInfo.ulVertRes; - - pClipObj = IntEngCreateClipRegion(1, NULL, &scrRect); - + /* Set points */ pt[0].x = x1; pt[0].y = y1; pt[1].x = x2; pt[1].y = y2; @@ -96,16 +90,13 @@ pt[1].y += pDC->rcVport.top + pDC->rcDcRect.top; GreLineTo(&pDC->pBitmap->SurfObj, - pClipObj, - //pDC->CombinedClip, + pDC->CombinedClip, &(pDC->pLineBrush->BrushObj), pt[0].x, pt[0].y, pt[1].x, pt[1].y, &scrRect, 0); - IntEngDeleteClipRegion(pClipObj); - /* Release the object */ DC_Unlock(pDC); Modified: branches/arwinss/reactos/subsystems/win32/win32k/gre/bitblt.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/gre/bitblt.c [iso-8859-1] (original) +++ branches/arwinss/reactos/subsystems/win32/win32k/gre/bitblt.c [iso-8859-1] Sun Aug 2 12:32:57 2009 @@ -111,14 +111,12 @@ /* Is the source surface device managed? */ else if (psoSrc && psurfSrc->flHooks & HOOK_BITBLT) { - DPRINT1("psoSrc %p\n", psoSrc); pfnBitBlt = GDIDEVFUNCS(psoSrc).BitBlt; } else { pfnBitBlt = EngBitBlt; } - bResult = pfnBitBlt(psoTrg, psoSrc, psoMask, @@ -204,7 +202,7 @@ &pDest->pBitmap->SurfObj, pSrc ? &pSrc->pBitmap->SurfObj : NULL, NULL, - NULL,//dc->rosdc.CombinedClip, + pDest->CombinedClip, XlateObj, &DestRect, &SourcePoint, @@ -231,6 +229,8 @@ POINTL BrushOrigin = {0, 0}; BOOLEAN bRet = FALSE; + DPRINT("GrePatBlt %p %d %d %d %d %x %p\n", pDC, XLeft, YLeft, Width, Height, ROP, BrushObj); + if (!(BrushObj->flAttrs & GDIBRUSH_IS_NULL)) { if (Width > 0) @@ -267,7 +267,7 @@ &pDC->pBitmap->SurfObj, NULL, NULL, - NULL,//dc->rosdc.CombinedClip, + pDC->CombinedClip, NULL, &DestRect, NULL, @@ -354,13 +354,13 @@ } /* Create the XLATEOBJ. */ - XlateObj = NULL;/*IntCreateXlateForBlt(DCDest, DCSrc, BitmapDest, BitmapSrc); + XlateObj = IntCreateXlateForBlt(DCDest, DCSrc, BitmapDest, BitmapSrc); if (XlateObj == (XLATEOBJ*)-1) { SetLastWin32Error(ERROR_NO_SYSTEM_RESOURCES); XlateObj = NULL; goto failed; - }*/ + } } /* Offset the brush */ @@ -384,7 +384,7 @@ Status = EngpStretchBlt(&BitmapDest->SurfObj, &BitmapSrc->SurfObj, BitmapMask ? &BitmapMask->SurfObj : NULL, - NULL,//DCDest->CombinedClip, + DCDest->CombinedClip, XlateObj, &DestRect, &SourceRect, Modified: branches/arwinss/reactos/subsystems/win32/win32k/gre/lineto.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/gre/lineto.c [iso-8859-1] (original) +++ branches/arwinss/reactos/subsystems/win32/win32k/gre/lineto.c [iso-8859-1] Sun Aug 2 12:32:57 2009 @@ -124,7 +124,7 @@ for (i=0; i<count-1; i++) { bRet = GreLineTo(&pDC->pBitmap->SurfObj, - NULL,//dc->rosdc.CombinedClip, + pDC->CombinedClip, &pDC->pLineBrush->BrushObj, ptPoints[i].x + pDC->rcDcRect.left + pDC->rcVport.left, ptPoints[i].y + pDC->rcDcRect.top + pDC->rcVport.top, Modified: branches/arwinss/reactos/subsystems/win32/win32k/gre/polyfill.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/gre/polyfill.c [iso-8859-1] (original) +++ branches/arwinss/reactos/subsystems/win32/win32k/gre/polyfill.c [iso-8859-1] Sun Aug 2 12:32:57 2009 @@ -431,7 +431,7 @@ //DPRINT("Fill Line (%d, %d) to (%d, %d)\n",x1, ScanLine, x2, ScanLine); GreLineTo(&psurf->SurfObj, - NULL,//dc->rosdc.CombinedClip, + dc->CombinedClip, BrushObj, x1, ScanLine, @@ -503,7 +503,7 @@ //DPRINT("Fill Line (%d, %d) to (%d, %d)\n",x1, ScanLine, x2, ScanLine); GreLineTo(&psurf->SurfObj, - NULL,//dc->rosdc.CombinedClip, + dc->CombinedClip, BrushObj, x1, ScanLine, @@ -526,7 +526,7 @@ //DPRINT("Fill Line (%d, %d) to (%d, %d)\n",x1, ScanLine, x2, ScanLine); GreLineTo(&psurf->SurfObj, - NULL, //dc->rosdc.CombinedClip, + dc->CombinedClip, BrushObj, x1, ScanLine, @@ -649,7 +649,7 @@ GrepBitBltEx(psurf, NULL, NULL, - NULL,//dc->rosdc.CombinedClip, + dc->CombinedClip, NULL, &LineRect, NULL, Modified: branches/arwinss/reactos/subsystems/win32/win32k/gre/rect.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/gre/rect.c [iso-8859-1] (original) +++ branches/arwinss/reactos/subsystems/win32/win32k/gre/rect.c [iso-8859-1] Sun Aug 2 12:32:57 2009 @@ -45,7 +45,7 @@ bRet = GrepBitBltEx(&pDC->pBitmap->SurfObj, NULL, NULL, - NULL,//dc->rosdc.CombinedClip, + pDC->CombinedClip, NULL, &DestRect, NULL, @@ -63,28 +63,28 @@ { Mix = ROP2_TO_MIX(R2_COPYPEN);/*pdcattr->jROP2*/ GreLineTo(&pDC->pBitmap->SurfObj, - NULL,//dc->rosdc.CombinedClip, + pDC->CombinedClip, &pDC->pLineBrush->BrushObj, DestRect.left, DestRect.top, DestRect.right, DestRect.top, &DestRect, // Bounding rectangle Mix); GreLineTo(&pDC->pBitmap->SurfObj, - NULL,//dc->rosdc.CombinedClip, + pDC->CombinedClip, &pDC->pLineBrush->BrushObj, DestRect.right, DestRect.top, DestRect.right, DestRect.bottom, &DestRect, // Bounding rectangle Mix); GreLineTo(&pDC->pBitmap->SurfObj, - NULL,//dc->rosdc.CombinedClip, + pDC->CombinedClip, &pDC->pLineBrush->BrushObj, DestRect.right, DestRect.bottom, DestRect.left, DestRect.bottom, &DestRect, // Bounding rectangle Mix); GreLineTo(&pDC->pBitmap->SurfObj, - NULL,//dc->rosdc.CombinedClip, + pDC->CombinedClip, &pDC->pLineBrush->BrushObj, DestRect.left, DestRect.bottom, DestRect.left, DestRect.top, &DestRect, // Bounding rectangle @@ -135,7 +135,7 @@ for (i=0; i<count-1; i++) { bRet = GreLineTo(&pDC->pBitmap->SurfObj, - NULL,//dc->rosdc.CombinedClip, + pDC->CombinedClip, &pDC->pLineBrush->BrushObj, ptPoints[i].x, ptPoints[i].y,

15 years, 1 month

[fireball] 42332: - Capture user's buffer using SEH in RosGdiSetDeviceClipping. - Offset combined clipping region by DC and viewport origins, which was the problem preventing its usage. - Remove unneeded stuff from RosGdiSetDcRects. Setting DC rects to fullscreen dimensions is done in usermode.

by fireball＠svn.reactos.org

Author: fireball Date: Sun Aug 2 11:56:44 2009 New Revision: 42332 URL: http://svn.reactos.org/svn/reactos?rev=42332&view=rev Log: - Capture user's buffer using SEH in RosGdiSetDeviceClipping. - Offset combined clipping region by DC and viewport origins, which was the problem preventing its usage. - Remove unneeded stuff from RosGdiSetDcRects. Setting DC rects to fullscreen dimensions is done in usermode. Modified: branches/arwinss/reactos/subsystems/win32/win32k/gdi/dc.c Modified: branches/arwinss/reactos/subsystems/win32/win32k/gdi/dc.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/gdi/dc.c [iso-8859-1] (original) +++ branches/arwinss/reactos/subsystems/win32/win32k/gdi/dc.c [iso-8859-1] Sun Aug 2 11:56:44 2009 @@ -140,6 +140,9 @@ pNewDC->rcDcRect = pNewDC->rcVport; } + + /* Create an empty combined clipping region */ + pNewDC->CombinedClip = EngCreateClip(); /* Give handle to the caller */ *pdev = hNewDC; @@ -358,22 +361,83 @@ void APIENTRY RosGdiSetDeviceClipping( HDC physDev, UINT count, PRECTL pRects, PRECTL rcBounds ) { PDC pDC; - - /* Get a pointer to the DC */ - pDC = DC_Lock(physDev); + RECTL pStackBuf[8]; + RECTL *pSafeRects = pStackBuf; + RECTL rcSafeBounds; + ULONG i; + NTSTATUS Status = STATUS_SUCCESS; + + /* Get a pointer to the DC */ + pDC = DC_Lock(physDev); + + /* Capture the rects buffer */ + _SEH2_TRY + { + ProbeForRead(pRects, count * sizeof(RECTL), 1); + + /* Use pool allocated buffer if data doesn't fit */ + if (count > sizeof(*pStackBuf) / sizeof(RECTL)) + pSafeRects = ExAllocatePool(PagedPool, sizeof(RECTL) * count); + + /* Copy points data */ + RtlCopyMemory(pSafeRects, pRects, count * sizeof(RECTL)); + + /* Copy bounding rect */ + ProbeForRead(rcBounds, sizeof(RECTL), 1); + rcSafeBounds = *rcBounds; + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + Status = _SEH2_GetExceptionCode(); + } + _SEH2_END; + + if (!NT_SUCCESS(Status)) + { + /* Release the object */ + DC_Unlock(pDC); + + /* Free the buffer if it was allocated */ + if (pSafeRects != pStackBuf) ExFreePool(pSafeRects); + + /* Return failure */ + return; + } + + /* Offset all rects */ + for (i=0; i<count; i++) + { + RECTL_vOffsetRect(&pSafeRects[i], + pDC->rcDcRect.left + pDC->rcVport.left, + pDC->rcDcRect.top + pDC->rcVport.top); + } + + /* Offset bounding rect */ + RECTL_vOffsetRect(&rcSafeBounds, + pDC->rcDcRect.left + pDC->rcVport.left, + pDC->rcDcRect.top + pDC->rcVport.top); /* Delete old clipping region */ if (pDC->CombinedClip) IntEngDeleteClipRegion(pDC->CombinedClip); /* Set the clipping object */ - pDC->CombinedClip = IntEngCreateClipRegion(count, pRects, rcBounds); + pDC->CombinedClip = IntEngCreateClipRegion(count, pSafeRects, &rcSafeBounds); DPRINT("RosGdiSetDeviceClipping() for DC %x, bounding rect (%d,%d)-(%d, %d)\n", - physDev, rcBounds->left, rcBounds->bottom, rcBounds->right, rcBounds->top); - - /* Release the object */ - DC_Unlock(pDC); + physDev, rcSafeBounds.left, rcSafeBounds.top, rcSafeBounds.right, rcSafeBounds.bottom); + + DPRINT("rects: %d\n", count); + for (i=0; i<count; i++) + { + DPRINT("%d: (%d,%d)-(%d, %d)\n", i, pSafeRects[i].left, pSafeRects[i].top, pSafeRects[i].right, pSafeRects[i].bottom); + } + + /* Release the object */ + DC_Unlock(pDC); + + /* Free the buffer if it was allocated */ + if (pSafeRects != pStackBuf) ExFreePool(pSafeRects); } BOOL APIENTRY RosGdiSetDeviceGammaRamp(HDC physDev, LPVOID ramp) @@ -422,23 +486,11 @@ /* Set DC rectangle */ if (rcDcRect) - { pDC->rcDcRect = *rcDcRect; - -#if 0 - /* Set back to full screen */ - pDC->rcDcRect.top = 0; - pDC->rcDcRect.left = 0; - pDC->rcDcRect.right = pDC->szVportExt.cx; - pDC->rcDcRect.top = pDC->szVportExt.cy; -#endif - } /* Set viewport rectangle */ if (rcVport) - { pDC->rcVport = *rcVport; - } /* Release the object */ DC_Unlock(pDC);

15 years, 1 month

[fireball] 42331: - Set drawable rect back to full screen size when releasing a DC.

by fireball＠svn.reactos.org

Author: fireball Date: Sun Aug 2 10:45:28 2009 New Revision: 42331 URL: http://svn.reactos.org/svn/reactos?rev=42331&view=rev Log: - Set drawable rect back to full screen size when releasing a DC. Modified: branches/arwinss/reactos/dll/win32/winent.drv/userdrv.c Modified: branches/arwinss/reactos/dll/win32/winent.drv/userdrv.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/winen… ============================================================================== --- branches/arwinss/reactos/dll/win32/winent.drv/userdrv.c [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/win32/winent.drv/userdrv.c [iso-8859-1] Sun Aug 2 10:45:28 2009 @@ -552,8 +552,8 @@ escape.dc_rect.bottom = 0; escape.drawable_rect.left = 0; escape.drawable_rect.top = 0; - escape.drawable_rect.right = 0; - escape.drawable_rect.bottom = 0; + escape.drawable_rect.right = GetSystemMetrics(SM_CXVIRTUALSCREEN); + escape.drawable_rect.bottom = GetSystemMetrics(SM_CYVIRTUALSCREEN); ExtEscape( hdc, NTDRV_ESCAPE, sizeof(escape), (LPSTR)&escape, 0, NULL ); }

15 years, 1 month

[hpoussin] 42330: [rbuild] Copy files to livecd output directory only if they have changed

by hpoussin＠svn.reactos.org

Author: hpoussin Date: Sun Aug 2 10:06:17 2009 New Revision: 42330 URL: http://svn.reactos.org/svn/reactos?rev=42330&view=rev Log: [rbuild] Copy files to livecd output directory only if they have changed Modified: trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp trunk/reactos/tools/rbuild/backend/mingw/modulehandler.h Modified: trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/mingw… ============================================================================== --- trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp [iso-8859-1] (original) +++ trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp [iso-8859-1] Sun Aug 2 10:06:17 2009 @@ -336,6 +336,22 @@ backend->GetFullName ( *PassThruCacheDirectory ( &destination ) ).c_str () ); } +void +MingwModuleHandler::OutputCopyCommandSingle ( const FileLocation& source, + const FileLocation& destination ) +{ + fprintf ( fMakefile, + "%s : %s\n", + backend->GetFullName ( *PassThruCacheDirectory ( &destination ) ).c_str (), + backend->GetFullName ( source ).c_str () ); + fprintf ( fMakefile, + "\t$(ECHO_CP)\n" ); + fprintf ( fMakefile, + "\t${cp} %s %s 1>$(NUL)\n", + backend->GetFullName ( source ).c_str (), + backend->GetFullName ( *PassThruCacheDirectory ( &destination ) ).c_str () ); +} + string MingwModuleHandler::GetImportLibraryDependency ( const Module& importedModule, @@ -3196,7 +3212,8 @@ void MingwLiveIsoModuleHandler::OutputModuleCopyCommands ( string& livecdDirectory, - string& reactosDirectory ) + string& reactosDirectory, + std::vector<FileLocation>& destinations ) { for ( std::map<std::string, Module*>::const_iterator p = module.project.modules.begin (); p != module.project.modules.end (); ++ p ) { @@ -3211,15 +3228,17 @@ ? livecdDirectory + sSep + reactosDirectory + sSep + m.install->relative_path : livecdDirectory + sSep + reactosDirectory, m.install->name ); - OutputCopyCommand ( *aliasedModule.output, - destination); + OutputCopyCommandSingle ( *aliasedModule.output, + destination); + destinations.push_back ( destination ); } } } void MingwLiveIsoModuleHandler::OutputNonModuleCopyCommands ( string& livecdDirectory, - string& reactosDirectory ) + string& reactosDirectory, + std::vector<FileLocation>& destinations ) { for ( size_t i = 0; i < module.project.installfiles.size (); i++ ) { @@ -3229,12 +3248,14 @@ ? livecdDirectory + sSep + reactosDirectory + sSep + installfile.target->relative_path : livecdDirectory + sSep + reactosDirectory, installfile.target->name ); - OutputCopyCommand ( *installfile.source, target ); - } -} - -void -MingwLiveIsoModuleHandler::OutputProfilesDirectoryCommands ( string& livecdDirectory ) + OutputCopyCommandSingle ( *installfile.source, target ); + destinations.push_back ( target ); + } +} + +void +MingwLiveIsoModuleHandler::OutputProfilesDirectoryCommands ( string& livecdDirectory, + vector<FileLocation>& destinations ) { CreateDirectory ( livecdDirectory + sSep + "Profiles" ); CreateDirectory ( livecdDirectory + sSep + "Profiles" + sSep + "All Users") ; @@ -3249,12 +3270,14 @@ FileLocation destination ( OutputDirectory, livecdDirectory, "freeldr.ini" ); - OutputCopyCommand ( livecdIni, - destination ); -} - -void -MingwLiveIsoModuleHandler::OutputLoaderCommands ( string& livecdDirectory ) + OutputCopyCommandSingle ( livecdIni, + destination ); + destinations.push_back ( destination ); +} + +void +MingwLiveIsoModuleHandler::OutputLoaderCommands ( string& livecdDirectory, + std::vector<FileLocation>& destinations ) { FileLocation freeldr ( OutputDirectory, "boot" + sSep + "freeldr" + sSep + "freeldr", @@ -3262,8 +3285,9 @@ FileLocation destination ( OutputDirectory, livecdDirectory + sSep + "loader", "setupldr.sys" ); - OutputCopyCommand ( freeldr, - destination ); + OutputCopyCommandSingle ( freeldr, + destination ); + destinations.push_back ( destination ); } void @@ -3316,19 +3340,31 @@ "" ); CLEAN_FILE ( livecdReactos ); + std::vector<FileLocation> sourceFiles; + OutputModuleCopyCommands ( livecdDirectory, + reactosDirectory, + sourceFiles ); + OutputNonModuleCopyCommands ( livecdDirectory, + reactosDirectory, + sourceFiles ); + OutputProfilesDirectoryCommands ( livecdDirectory, sourceFiles ); + OutputLoaderCommands ( livecdDirectory, sourceFiles ); + + fprintf( fMakefile, + "\n%s_OBJS := %s\n\n", + module.name.c_str (), + v2s ( backend, sourceFiles, 5 ).c_str () ); + fprintf ( fMakefile, ".PHONY: %s\n\n", module.name.c_str ()); fprintf ( fMakefile, - "%s: all %s %s $(MKHIVE_TARGET) $(CDMAKE_TARGET)\n", + "%s : $(%s_OBJS) %s %s $(MKHIVE_TARGET) $(CDMAKE_TARGET)\n", + module.name.c_str (), module.name.c_str (), backend->GetFullName ( *isoboot) .c_str (), - backend->GetFullPath ( livecdReactos ).c_str () ); - OutputModuleCopyCommands ( livecdDirectory, - reactosDirectory ); - OutputNonModuleCopyCommands ( livecdDirectory, - reactosDirectory ); - OutputProfilesDirectoryCommands ( livecdDirectory ); - OutputLoaderCommands ( livecdDirectory ); + backend->GetFullPath ( FileLocation ( OutputDirectory, + livecdDirectory, + "" ) ).c_str () ); OutputRegistryCommands ( livecdDirectory ); fprintf ( fMakefile, "\t$(ECHO_CDMAKE)\n" ); fprintf ( fMakefile, Modified: trunk/reactos/tools/rbuild/backend/mingw/modulehandler.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/mingw… ============================================================================== --- trunk/reactos/tools/rbuild/backend/mingw/modulehandler.h [iso-8859-1] (original) +++ trunk/reactos/tools/rbuild/backend/mingw/modulehandler.h [iso-8859-1] Sun Aug 2 10:06:17 2009 @@ -90,6 +90,8 @@ void OutputCopyCommand ( const FileLocation& source, const FileLocation& destination ); + void OutputCopyCommandSingle ( const FileLocation& source, + const FileLocation& destination ); protected: virtual void GetModuleSpecificCompilationUnits ( std::vector<CompilationUnit*>& compilationUnits ); std::string GetWorkingDirectory () const; @@ -335,11 +337,15 @@ void GenerateLiveIsoModuleTarget (); void CreateDirectory ( const std::string& directory ); void OutputModuleCopyCommands ( std::string& livecdDirectory, - std::string& livecdReactos ); + std::string& livecdReactos, + std::vector<FileLocation>& destinations ); void OutputNonModuleCopyCommands ( std::string& livecdDirectory, - std::string& livecdReactos ); - void OutputProfilesDirectoryCommands ( std::string& livecdDirectory ); - void OutputLoaderCommands ( std::string& livecdDirectory ); + std::string& livecdReactos, + std::vector<FileLocation>& destinations ); + void OutputProfilesDirectoryCommands ( std::string& livecdDirectory, + std::vector<FileLocation>& destinations ); + void OutputLoaderCommands ( std::string& livecdDirectory, + std::vector<FileLocation>& destinations ); void OutputRegistryCommands ( std::string& livecdDirectory ); };

15 years, 1 month

[hpoussin] 42329: [rbuild] Fix wrapping of long lines in generated makefile

by hpoussin＠svn.reactos.org

Author: hpoussin Date: Sun Aug 2 10:06:04 2009 New Revision: 42329 URL: http://svn.reactos.org/svn/reactos?rev=42329&view=rev Log: [rbuild] Fix wrapping of long lines in generated makefile Modified: trunk/reactos/tools/rbuild/backend/mingw/mingw.cpp Modified: trunk/reactos/tools/rbuild/backend/mingw/mingw.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/mingw… ============================================================================== --- trunk/reactos/tools/rbuild/backend/mingw/mingw.cpp [iso-8859-1] (original) +++ trunk/reactos/tools/rbuild/backend/mingw/mingw.cpp [iso-8859-1] Sun Aug 2 10:06:04 2009 @@ -164,7 +164,10 @@ { const FileLocation& file = files[i]; if ( wrap_at > 0 && wrap_count++ == wrap_at ) + { s += " \\\n\t\t"; + wrap_count = 1; + } else if ( s.size() ) s += " "; s += backend->GetFullName ( file ); @@ -185,7 +188,10 @@ if ( !v[i].size() ) continue; if ( wrap_at > 0 && wrap_count++ == wrap_at ) + { s += " \\\n\t\t"; + wrap_count = 1; + } else if ( s.size() ) s += " "; s += v[i];

15 years, 1 month

[tkreuzer] 42328: Add regtests/gdi Tests for gdi, written in winetest style so it can be easily plugged into sysreg. Currently containing some xlate tests. More to come.

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Sun Aug 2 02:26:51 2009 New Revision: 42328 URL: http://svn.reactos.org/svn/reactos?rev=42328&view=rev Log: Add regtests/gdi Tests for gdi, written in winetest style so it can be easily plugged into sysreg. Currently containing some xlate tests. More to come. Added: trunk/rostests/regtests/ (with props) trunk/rostests/regtests/directory.rbuild (with props) trunk/rostests/regtests/gdi/ (with props) trunk/rostests/regtests/gdi/gdi_regtest.rbuild (with props) trunk/rostests/regtests/gdi/testlist.c (with props) trunk/rostests/regtests/gdi/xlate.c (with props) Modified: trunk/rostests/directory.rbuild Modified: trunk/rostests/directory.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rostests/directory.rbuild?rev=4232… ============================================================================== --- trunk/rostests/directory.rbuild [iso-8859-1] (original) +++ trunk/rostests/directory.rbuild [iso-8859-1] Sun Aug 2 02:26:51 2009 @@ -9,6 +9,9 @@ </directory> <directory name="dxtest"> <xi:include href="dxtest/directory.rbuild" /> + </directory> + <directory name="regtests"> + <xi:include href="regtests/directory.rbuild" /> </directory> <directory name="rosautotest"> <xi:include href="rosautotest/rosautotest.rbuild" /> Propchange: trunk/rostests/regtests/ ------------------------------------------------------------------------------ --- bugtraq:logregex (added) +++ bugtraq:logregex Sun Aug 2 02:26:51 2009 @@ -1,0 +1,2 @@ +([Ii]ssue|[Bb]ug)s? #?(\d+)(,? ?#?(\d+))*(,? ?(and |or )?#?(\d+))? +(\d+) Propchange: trunk/rostests/regtests/ ------------------------------------------------------------------------------ bugtraq:message = See issue #%BUGID% for more details. Propchange: trunk/rostests/regtests/ ------------------------------------------------------------------------------ bugtraq:url = http://www.reactos.org/bugzilla/show_bug.cgi?id=%BUGID% Propchange: trunk/rostests/regtests/ ------------------------------------------------------------------------------ tsvn:logminsize = 10 Added: trunk/rostests/regtests/directory.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rostests/regtests/directory.rbuild… ============================================================================== --- trunk/rostests/regtests/directory.rbuild (added) +++ trunk/rostests/regtests/directory.rbuild [iso-8859-1] Sun Aug 2 02:26:51 2009 @@ -1,0 +1,7 @@ +<?xml version="1.0"?> +<!DOCTYPE group SYSTEM "../../../tools/rbuild/project.dtd"> +<group xmlns:xi="http://www.w3.org/2001/XInclude"> + <directory name="gdi"> + <xi:include href="gdi/gdi_regtest.rbuild" /> + </directory> +</group> Propchange: trunk/rostests/regtests/directory.rbuild ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/rostests/regtests/gdi/ ------------------------------------------------------------------------------ --- bugtraq:logregex (added) +++ bugtraq:logregex Sun Aug 2 02:26:51 2009 @@ -1,0 +1,2 @@ +([Ii]ssue|[Bb]ug)s? #?(\d+)(,? ?#?(\d+))*(,? ?(and |or )?#?(\d+))? +(\d+) Propchange: trunk/rostests/regtests/gdi/ ------------------------------------------------------------------------------ bugtraq:message = See issue #%BUGID% for more details. Propchange: trunk/rostests/regtests/gdi/ ------------------------------------------------------------------------------ bugtraq:url = http://www.reactos.org/bugzilla/show_bug.cgi?id=%BUGID% Propchange: trunk/rostests/regtests/gdi/ ------------------------------------------------------------------------------ tsvn:logminsize = 10 Added: trunk/rostests/regtests/gdi/gdi_regtest.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rostests/regtests/gdi/gdi_regtest.… ============================================================================== --- trunk/rostests/regtests/gdi/gdi_regtest.rbuild (added) +++ trunk/rostests/regtests/gdi/gdi_regtest.rbuild [iso-8859-1] Sun Aug 2 02:26:51 2009 @@ -1,0 +1,15 @@ +<?xml version="1.0"?> +<!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> +<group> +<module name="gdi_regtest" type="win32cui" installbase="bin" installname="gdi_regtest.exe"> + <include base="gdi_regtest">.</include> + <library>wine</library> + <library>gdi32</library> + <library>user32</library> + <library>kernel32</library> + <library>ntdll</library> + + <file>xlate.c</file> + <file>testlist.c</file> +</module> +</group> Propchange: trunk/rostests/regtests/gdi/gdi_regtest.rbuild ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rostests/regtests/gdi/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/regtests/gdi/testlist.c?r… ============================================================================== --- trunk/rostests/regtests/gdi/testlist.c (added) +++ trunk/rostests/regtests/gdi/testlist.c [iso-8859-1] Sun Aug 2 02:26:51 2009 @@ -1,0 +1,17 @@ +/* Automatically generated file; DO NOT EDIT!! */ + +#define WIN32_LEAN_AND_MEAN +#define __ROS_LONG64__ +#include <windows.h> + +#define STANDALONE +#include "wine/test.h" + +extern void func_xlate(void); + +const struct test winetest_testlist[] = +{ + { "xlate", func_xlate }, + { 0, 0 } +}; + Propchange: trunk/rostests/regtests/gdi/testlist.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rostests/regtests/gdi/xlate.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/regtests/gdi/xlate.c?rev=… ============================================================================== --- trunk/rostests/regtests/gdi/xlate.c (added) +++ trunk/rostests/regtests/gdi/xlate.c [iso-8859-1] Sun Aug 2 02:26:51 2009 @@ -1,0 +1,285 @@ + +#include <stdio.h> +#include <windows.h> +#include <wine/test.h> + +static BYTE ajBits1[] = {0xAA, 0xAA, 0xAA, 0xAA, 0,0,0,0}; +static BYTE ajBits8[] = {0x00, 0xFF, 0x80, 0xCC, 0,0,0,0}; +static WORD ajBits16[] = {0x0000, 0xFFFF, 0x1000, 0x0C0C, 0,0,0,0}; +static DWORD ajBits24[] = {0x0000, 0xFFFF, 0x1000, 0x0C0C, 0,0,0,0}; +static DWORD ajBits32[] = {0x0000, 0xFFFF, 0x1000, 0x0C0C, 0,0,0,0}; +static HBITMAP hbmp1bpp_a, hbmp1bpp_b; +static HBITMAP hbmp8bpp_a, hbmp8bpp_b; +static HBITMAP hbmp16bpp_a, hbmp16bpp_b; +static HBITMAP hbmp24bpp_a, hbmp24bpp_b; +static HBITMAP hbmp32bpp_a, hbmp32bpp_b; +static HDC hdcSrc, hdcDst; +static ULONG dstbpp; + +ULONG +GetRealColorDepth() +{ + HBITMAP hbmp; + HDC hdc; + struct + { + BITMAPINFOHEADER bmiHeader; + ULONG aulMasks[3]; + } bmi; + PBITMAPINFO pbmi = (PBITMAPINFO)&bmi; + ULONG ulColorDepth; + + /* Get the screen DC */ + hdc = GetDC(NULL); + + /* Create a compatible bitmap */ + hbmp = CreateCompatibleBitmap(hdc, 1, 1); + + /* Fill BITMAPINFOHEADER */ + bmi.bmiHeader.biSize = sizeof(BITMAPINFOHEADER); + GetDIBits(hdc, hbmp, 0, 1, NULL, pbmi, DIB_RGB_COLORS); + + /* Get the basic color depth */ + ulColorDepth = bmi.bmiHeader.biBitCount; + + /* Special case 16 bpp */ + if (ulColorDepth == 16) + { + /* Call again to fill in the bitfields */ + GetDIBits(hdc, hbmp, 0, 1, NULL, pbmi, DIB_RGB_COLORS); + + /* Check the red mask */ + if (bmi.aulMasks[0] == 0x7c00) + ulColorDepth = 15; + } + + /* Cleanup and return */ + DeleteObject(hbmp); + return ulColorDepth; +} + +static +ULONG +GetClosestColor(ULONG bpp, COLORREF crColor) +{ + ULONG ulRed, ulGreen, ulBlue; + + ulRed = GetRValue(crColor); + ulGreen = GetGValue(crColor); + ulBlue = GetBValue(crColor); + + switch (bpp) + { + case 1: + return crColor ? 0xffffff : 0; + case 8: + case 15: + ulRed &= 0xF8; + ulGreen &= 0xF8; + ulBlue &= 0xF8; + printf("ulRed = %lx\n", ulRed); + ulRed |= ulRed >> 5; + ulGreen |= ulGreen >> 5; + ulBlue |= ulBlue >> 5; + printf("ulRed = %lx\n", ulRed); + return RGB(ulRed, ulGreen, ulBlue); + + case 16: + ulRed &= 0xF8; + ulGreen &= 0xFC; + ulBlue &= 0xF8; + ulRed |= ulRed >> 5; + ulGreen |= ulGreen >> 6; + ulBlue |= ulBlue >> 5; + return RGB(ulRed, ulGreen, ulBlue); + + case 24: + case 32: + return crColor; + } + return 0; +} + + +static +void +Initialize() +{ + hdcSrc = CreateCompatibleDC(0); + hdcDst = CreateCompatibleDC(0); + + dstbpp = GetRealColorDepth(); + + hbmp1bpp_a = CreateBitmap(4, 2, 1, 1, ajBits1); + ok(hbmp1bpp_a != 0, "CreateBitmap failed\n"); + + hbmp1bpp_b = CreateBitmap(4, 2, 1, 1, ajBits1); + ok(hbmp1bpp_b != 0, "CreateBitmap failed\n"); + + hbmp8bpp_a = CreateBitmap(4, 2, 1, 8, ajBits8); + ok(hbmp8bpp_a != 0, "CreateBitmap failed\n"); + + hbmp8bpp_b = CreateBitmap(4, 2, 1, 8, ajBits8); + ok(hbmp8bpp_b != 0, "CreateBitmap failed\n"); + + hbmp16bpp_a = CreateBitmap(4, 2, 1, 16, ajBits16); + ok(hbmp16bpp_a != 0, "CreateBitmap failed\n"); + + hbmp16bpp_b = CreateBitmap(4, 2, 1, 16, ajBits16); + ok(hbmp16bpp_b != 0, "CreateBitmap failed\n"); + + hbmp24bpp_a = CreateBitmap(4, 2, 1, 24, ajBits24); + ok(hbmp24bpp_a != 0, "CreateBitmap failed\n"); + + hbmp24bpp_b = CreateBitmap(4, 2, 1, 24, ajBits24); + ok(hbmp24bpp_b != 0, "CreateBitmap failed\n"); + + hbmp32bpp_a = CreateBitmap(4, 2, 1, 32, ajBits32); + ok(hbmp32bpp_a != 0, "CreateBitmap failed\n"); + + hbmp32bpp_b = CreateBitmap(4, 2, 1, 32, ajBits32); + ok(hbmp32bpp_b != 0, "CreateBitmap failed\n"); + + +} + +void +Test_SrcMono1(UINT cBits, HBITMAP hbmpDst) +{ + ULONG c, expected; + HBRUSH hbr; + RECT rect; + ULONG dstbpp = GetDeviceCaps(hdcDst, BITSPIXEL); + struct + { + BITMAPINFOHEADER bmiHeader; + ULONG bmiColors[2]; + BYTE aj[32]; + } bmi; + + SelectObject(hdcSrc, hbmp1bpp_a); + SelectObject(hdcDst, hbmpDst); + + /* Set default dc fore and back colors */ + SetTextColor(hdcSrc, 0x000000); + SetBkColor(hdcSrc, 0xffffff); + SetTextColor(hdcDst, 0x000000); + SetBkColor(hdcDst, 0xffffff); + + /* Do a bitblt operation */ + ok(BitBlt(hdcDst, 0, 0, 2, 2, hdcSrc, 0, 0, SRCCOPY), "%dbpp: BitBlt failed", cBits); + + /* Check resulting colors */ + c = GetPixel(hdcDst, 0, 0); + ok(c == RGB(255, 255, 255), "%dbpp: wrong color, expected 0, got %lx\n", cBits, c); + c = GetPixel(hdcDst, 1, 0); + ok(c == RGB(0, 0, 0), "%dbpp: wrong color, expected ffffff, got %lx\n", cBits, c); + + /* Set different dc fore and back colors */ + SetTextColor(hdcSrc, 0xf00f0f); + SetBkColor(hdcSrc, 0xf0ff0f); + SetTextColor(hdcDst, 0xffFFff); + SetBkColor(hdcDst, 0x000000); + + /* Make sure this alone didn't affect the resulting colors */ + c = GetPixel(hdcDst, 0, 0); + ok(c == RGB(255, 255, 255), "%dbpp: wrong color, expected 0, got %lx\n", cBits, c); + c = GetPixel(hdcDst, 1, 0); + ok(c == RGB(0, 0, 0), "%dbpp: wrong color, expected ffffff, got %lx\n", cBits, c); + + /* Repeat the bitblt operation */ + ok(BitBlt(hdcDst, 0, 0, 2, 2, hdcSrc, 0, 0, SRCCOPY), "%dbpp: BitBlt failed", cBits); + + /* Finally test effect of the fore / cack color on the operation */ + c = GetPixel(hdcDst, 0, 0); + expected = cBits >= dstbpp ? GetBkColor(hdcDst) : 0xffffff; + ok(c == expected, "%dbpp: wrong color, expected %lx, got %lx\n", cBits, expected, c); + c = GetPixel(hdcDst, 1, 0); + expected = cBits >= dstbpp ? GetTextColor(hdcDst) : 0; + ok(c == expected, "%dbpp: wrong color, expected %lx, got %lx\n", cBits, expected, c); + + /* Set dc fore and back colors */ + SetTextColor(hdcDst, 0x102030); + SetBkColor(hdcDst, 0xeeccee); + SetBkMode(hdcDst, OPAQUE); + + /* Create a hatch brush */ + hbr = CreateHatchBrush(HS_DIAGCROSS, 0x123456); + + /* Fill the destination bitmap */ + rect.left = rect.top = 0; + rect.bottom = rect.right = 4; + ok(FillRect(hdcDst, &rect, hbr), "FillRect failed\n"); + + /* Test the fore color of the hatch brush */ + c = GetPixel(hdcDst, 0, 0); + expected = cBits >= dstbpp ? 0x123456 : 0; + expected = GetClosestColor(dstbpp, expected); + ok(c == expected, "%dbpp: wrong color, expected %lx, got %lx\n", cBits, expected, c); + + /* Test the back color of the hatch brush */ + c = GetPixel(hdcDst, 1, 0); + expected = cBits >= dstbpp ? GetBkColor(hdcDst) : 0xffffff; + expected = GetClosestColor(dstbpp, expected); + ok(c == expected, "%dbpp: wrong color, expected %lx, got %lx\n", cBits, expected, c); + + DeleteObject(hbr); + + bmi.bmiHeader.biSize = sizeof(BITMAPINFOHEADER); + bmi.bmiHeader.biWidth = 8; + bmi.bmiHeader.biHeight = 8; + bmi.bmiHeader.biPlanes = 1; + bmi.bmiHeader.biBitCount = 1; + bmi.bmiHeader.biCompression = BI_RGB; + bmi.bmiHeader.biSizeImage = 0; + bmi.bmiHeader.biXPelsPerMeter = 1; + bmi.bmiHeader.biYPelsPerMeter = 1; + bmi.bmiHeader.biClrUsed = 2; + bmi.bmiHeader.biClrImportant = 2; + bmi.bmiColors[0] = 0xeeeeee; + bmi.bmiColors[1] = 0x111111; + memset(bmi.aj, 0xaaaa, sizeof(bmi.aj)); + hbr = CreateDIBPatternBrushPt(&bmi, DIB_RGB_COLORS); + ok(hbr != 0, "CreateDIBPatternBrushPt failed\n"); + + rect.left = rect.top = 0; + rect.bottom = rect.right = 4; + ok(FillRect(hdcDst, &rect, hbr),"FillRect failed\n"); + + /* Test the fore and back color of the dib brush */ + c = GetPixel(hdcDst, 0, 1); + expected = cBits >= dstbpp ? bmi.bmiColors[1] : 0; + expected = GetClosestColor(dstbpp, expected); + ok(c == expected, "%dbpp: wrong color, expected %lx, got %lx\n", cBits, expected, c); + + c = GetPixel(hdcDst, 1, 0); + expected = cBits >= dstbpp ? bmi.bmiColors[0] : 0xffffff; + expected = GetClosestColor(dstbpp, expected); + ok(c == expected, "%dbpp: wrong color, expected %lx, got %lx\n", cBits, expected, c); + + DeleteObject(hbr); + + + +} + + +void +Test_SrcMono() +{ + + Test_SrcMono1(1, hbmp1bpp_b); + Test_SrcMono1(8, hbmp8bpp_b); + Test_SrcMono1(16, hbmp16bpp_b); + Test_SrcMono1(24, hbmp24bpp_b); + Test_SrcMono1(32, hbmp32bpp_b); + + +} + +START_TEST(xlate) +{ + Initialize(); + + Test_SrcMono(); +} Propchange: trunk/rostests/regtests/gdi/xlate.c ------------------------------------------------------------------------------ svn:eol-style = native

15 years, 1 month

[sginsberg] 42327: - Properly define dummy unions/structs for MSVC too.

by sginsberg＠svn.reactos.org

Author: sginsberg Date: Sat Aug 1 21:10:16 2009 New Revision: 42327 URL: http://svn.reactos.org/svn/reactos?rev=42327&view=rev Log: - Properly define dummy unions/structs for MSVC too. Modified: trunk/reactos/include/ddk/ntdef.h trunk/reactos/include/psdk/windef.h trunk/reactos/tools/winebuild/winglue.h Modified: trunk/reactos/include/ddk/ntdef.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/ntdef.h?rev=42… ============================================================================== --- trunk/reactos/include/ddk/ntdef.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/ntdef.h [iso-8859-1] Sat Aug 1 21:10:16 2009 @@ -85,8 +85,8 @@ // We should use the -fms-extensions compiler flag for gcc, // and clean up the mess. // +#ifndef NONAMELESSUNION #ifdef __GNUC__ -#ifndef NONAMELESSUNION #if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 95) #define _ANONYMOUS_UNION __extension__ #define _ANONYMOUS_STRUCT __extension__ @@ -95,11 +95,11 @@ #define _ANONYMOUS_UNION __extension__ #endif /* __cplusplus */ #endif /* __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 95) */ -#endif /* NONAMELESSUNION */ #elif defined(__WATCOMC__) || defined(_MSC_VER) #define _ANONYMOUS_UNION #define _ANONYMOUS_STRUCT #endif /* __GNUC__/__WATCOMC__ */ +#endif /* NONAMELESSUNION */ #ifndef _ANONYMOUS_UNION #define _ANONYMOUS_UNION Modified: trunk/reactos/include/psdk/windef.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/windef.h?rev=… ============================================================================== --- trunk/reactos/include/psdk/windef.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/windef.h [iso-8859-1] Sat Aug 1 21:10:16 2009 @@ -202,8 +202,8 @@ #define DBG_UNREFERENCED_PARAMETER(P) #define DBG_UNREFERENCED_LOCAL_VARIABLE(L) +#ifndef NONAMELESSUNION #ifdef __GNUC__ -#ifndef NONAMELESSUNION #if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 95) #define _ANONYMOUS_UNION __extension__ #define _ANONYMOUS_STRUCT __extension__ @@ -212,11 +212,11 @@ #define _ANONYMOUS_UNION __extension__ #endif /* __cplusplus */ #endif /* __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 95) */ -#endif /* NONAMELESSUNION */ #elif defined(__WATCOMC__) || defined(_MSC_VER) #define _ANONYMOUS_UNION #define _ANONYMOUS_STRUCT #endif /* __GNUC__/__WATCOMC__ */ +#endif /* NONAMELESSUNION */ #ifndef _ANONYMOUS_UNION #define _ANONYMOUS_UNION Modified: trunk/reactos/tools/winebuild/winglue.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/winebuild/winglue.h?… ============================================================================== --- trunk/reactos/tools/winebuild/winglue.h [iso-8859-1] (original) +++ trunk/reactos/tools/winebuild/winglue.h [iso-8859-1] Sat Aug 1 21:10:16 2009 @@ -33,8 +33,8 @@ #define IMAGE_NT_OPTIONAL_HDR_MAGIC IMAGE_NT_OPTIONAL_HDR32_MAGIC #endif +#ifndef NONAMELESSUNION #ifdef __GNUC__ -#ifndef NONAMELESSUNION #if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 95) #define _ANONYMOUS_UNION __extension__ #define _ANONYMOUS_STRUCT __extension__ @@ -43,11 +43,12 @@ #define _ANONYMOUS_UNION __extension__ #endif /* __cplusplus */ #endif /* __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 95) */ -#endif /* NONAMELESSUNION */ #elif defined(__WATCOMC__) || defined(_MSC_VER) #define _ANONYMOUS_UNION #define _ANONYMOUS_STRUCT #endif /* __GNUC__/__WATCOMC__ */ +#endif /* NONAMELESSUNION */ + #ifndef _ANONYMOUS_UNION #define _ANONYMOUS_UNION #define _UNION_NAME(x) x

15 years, 1 month

[fireball] 42326: - Remove GreatLord's "uberoptimized" DIB_32BPP_ColorFill since it doesn't really conform to any calling convention and doesn't correctly set up ebp and esp as it should. As an example of such actions it's impossible to have a backtrace if an exception occurs in this function.

by fireball＠svn.reactos.org

Author: fireball Date: Sat Aug 1 21:00:07 2009 New Revision: 42326 URL: http://svn.reactos.org/svn/reactos?rev=42326&view=rev Log: - Remove GreatLord's "uberoptimized" DIB_32BPP_ColorFill since it doesn't really conform to any calling convention and doesn't correctly set up ebp and esp as it should. As an example of such actions it's impossible to have a backtrace if an exception occurs in this function. Removed: branches/arwinss/reactos/subsystems/win32/win32k/dib/i386/dib32bpp_colorfill.s Modified: branches/arwinss/reactos/subsystems/win32/win32k/dib/dib32bpp.c branches/arwinss/reactos/subsystems/win32/win32k/win32k.rbuild Modified: branches/arwinss/reactos/subsystems/win32/win32k/dib/dib32bpp.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/dib/dib32bpp.c [iso-8859-1] (original) +++ branches/arwinss/reactos/subsystems/win32/win32k/dib/dib32bpp.c [iso-8859-1] Sat Aug 1 21:00:07 2009 @@ -294,6 +294,19 @@ } BOOLEAN +DIB_32BPP_ColorFill(SURFOBJ* DestSurface, RECTL* DestRect, ULONG color) +{ + ULONG DestY; + + for (DestY = DestRect->top; DestY < DestRect->bottom; DestY++) + { + DIB_32BPP_HLine(DestSurface, DestRect->left, DestRect->right, DestY, color); + } + + return TRUE; +} + +BOOLEAN DIB_32BPP_TransparentBlt(SURFOBJ *DestSurf, SURFOBJ *SourceSurf, RECTL* DestRect, RECTL *SourceRect, XLATEOBJ *ColorTranslation, ULONG iTransColor) Removed: branches/arwinss/reactos/subsystems/win32/win32k/dib/i386/dib32bpp_colorfill.s URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/dib/i386/dib32bpp_colorfill.s [iso-8859-1] (original) +++ branches/arwinss/reactos/subsystems/win32/win32k/dib/i386/dib32bpp_colorfill.s (removed) @@ -1,93 +1,0 @@ - -/* - * ReactOS W32 Subsystem - * Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003 2004, 2005, 2006 ReactOS Team - * - * 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. - */ -/* $Id: */ - .globl _DIB_32BPP_ColorFill - .intel_syntax noprefix - - .def _DIB_32BPP_ColorFill; - .scl 2; - .type 32; - .endef - - _DIB_32BPP_ColorFill: - sub esp, 24 - mov ecx, [esp+32] - mov [esp+8], ebx - mov ebx, [esp+28] - mov [esp+20], ebp - mov ebp, [esp+36] - mov [esp+12], esi - mov [esp+16], edi - mov edi, [ecx] - mov esi, [ecx+8] - mov edx, [ebx+36] - sub esi, edi - mov edi, [ecx+4] - mov eax, edi - imul eax, edx - add eax, [ebx+32] - mov ebx, [ecx] - lea eax, [eax+ebx*4] - mov [esp+4], eax - mov eax, [ecx+12] - cmp eax, edi - jbe end - sub eax, edi - mov [esp], eax - lea esi, [esi+0] - - for_loop: - mov eax, ebp - cld - mov ebx, esi - mov edi, [esp+4] - test edi, 3 - jnz algin_draw - mov ecx, esi - rep stosd - add [esp+4], edx - dec dword ptr [esp] - jnz for_loop - end: - mov ebx, [esp+8] - mov eax, 1 - mov esi, [esp+12] - mov edi, [esp+16] - mov ebp, [esp+20] - add esp, 24 - ret - - algin_draw: - stosd - dec ebx - mov ecx, ebx - rol eax, 16 - stosd - add [esp+4], edx - dec dword ptr [esp] - jnz for_loop - - mov ebx, [esp+8] - mov eax, 1 - mov esi, [esp+12] - mov edi, [esp+16] - mov ebp, [esp+20] - add esp, 24 - ret Modified: branches/arwinss/reactos/subsystems/win32/win32k/win32k.rbuild URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/win32k.rbuild [iso-8859-1] (original) +++ branches/arwinss/reactos/subsystems/win32/win32k/win32k.rbuild [iso-8859-1] Sat Aug 1 21:00:07 2009 @@ -43,7 +43,6 @@ <directory name="i386"> <file>dib24bpp_hline.s</file> <file>dib32bpp_hline.s</file> - <file>dib32bpp_colorfill.s</file> </directory> </if> <ifnot property="ARCH" value="i386">

15 years, 1 month

[fireball] 42325: Giannis Adamopoulos - Remove hardcoded dependency to 800x600 (and 640x480 in monitor functions) display size (see arwinss issue nr. 18), explorer now correctly shows its desktop on a full screen.

by fireball＠svn.reactos.org

Author: fireball Date: Sat Aug 1 20:24:39 2009 New Revision: 42325 URL: http://svn.reactos.org/svn/reactos?rev=42325&view=rev Log: Giannis Adamopoulos - Remove hardcoded dependency to 800x600 (and 640x480 in monitor functions) display size (see arwinss issue nr. 18), explorer now correctly shows its desktop on a full screen. Added: branches/arwinss/reactos/subsystems/win32/win32k/include/monitor.h (with props) branches/arwinss/reactos/subsystems/win32/win32k/main/monitor.c (with props) Modified: branches/arwinss/reactos/dll/win32/winent.drv/userdrv.c branches/arwinss/reactos/include/reactos/win32k/rosuser.h branches/arwinss/reactos/subsystems/win32/csrss/win32csr/input.c branches/arwinss/reactos/subsystems/win32/win32k/eng/device.c branches/arwinss/reactos/subsystems/win32/win32k/gdi/misc.c branches/arwinss/reactos/subsystems/win32/win32k/gre/lineto.c branches/arwinss/reactos/subsystems/win32/win32k/gre/rect.c branches/arwinss/reactos/subsystems/win32/win32k/include/user.h branches/arwinss/reactos/subsystems/win32/win32k/include/win32kp.h branches/arwinss/reactos/subsystems/win32/win32k/w32ksvc.db branches/arwinss/reactos/subsystems/win32/win32k/win32k.rbuild Modified: branches/arwinss/reactos/dll/win32/winent.drv/userdrv.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/winen… ============================================================================== --- branches/arwinss/reactos/dll/win32/winent.drv/userdrv.c [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/win32/winent.drv/userdrv.c [iso-8859-1] Sat Aug 1 20:24:39 2009 @@ -89,7 +89,7 @@ void CDECL RosDrv_Beep(void) { - UNIMPLEMENTED; + Beep(500, 100); } SHORT CDECL RosDrv_GetAsyncKeyState( INT key ) @@ -361,12 +361,62 @@ BOOL CDECL RosDrv_EnumDisplayMonitors( HDC hdc, LPRECT rect, MONITORENUMPROC proc, LPARAM lp ) { - RECT monrect = {0, 0, 640, 480}; - - FIXME("RosDrv_EnumDisplayMonitors is a hack\n"); - - proc((HMONITOR)1, hdc, &monrect, lp); - + int i; + int nb_monitors; + HMONITOR *monitors; + RECT *monitors_rect; + + /* Get the count of the display monitors */ + nb_monitors = RosUserEnumDisplayMonitors(NULL, NULL, 0); + if (nb_monitors <= 0) + { + return FALSE; + } + + /* Allocate the buffers that will be filled by RosUserEnumDisplayMonitors */ + monitors = HeapAlloc( GetProcessHeap(), 0, nb_monitors * sizeof(HMONITOR)); + monitors_rect = HeapAlloc( GetProcessHeap(), 0, nb_monitors * sizeof(RECT)); + if(!monitors || !monitors_rect) + { + return FALSE; + } + + /* Fill the buffers with the handles and the rects of all display monitors */ + nb_monitors = RosUserEnumDisplayMonitors(monitors, (PRECTL)monitors_rect, nb_monitors); + if (nb_monitors <= 0) + { + return FALSE; + } + + if (hdc) + { + POINT origin; + RECT limit; + + if (!GetDCOrgEx( hdc, &origin )) return FALSE; + if (GetClipBox( hdc, &limit ) == ERROR) return FALSE; + + if (rect && !IntersectRect( &limit, &limit, rect )) return TRUE; + + for (i = 0; i < nb_monitors; i++) + { + RECT monrect = monitors_rect[i]; + OffsetRect( &monrect, -origin.x, -origin.y ); + if (IntersectRect( &monrect, &monrect, &limit )) + if (!proc( monitors[i], hdc, &monrect, lp )) + return FALSE; + } + } + else + { + for (i = 0; i < nb_monitors; i++) + { + RECT unused; + if (!rect || IntersectRect( &unused, &monitors_rect[i], rect )) + if (!proc( monitors[i], 0, &monitors_rect[i], lp )) + return FALSE; + } + } return TRUE; } @@ -378,14 +428,7 @@ BOOL CDECL RosDrv_GetMonitorInfo( HMONITOR handle, LPMONITORINFO info ) { - RECT monrect = {0, 0, 640, 480}; - - FIXME("RosDrv_GetMonitorInfo(%x %p) is a hack\n", handle, info); - - info->rcMonitor = monrect; - info->rcWork = monrect; - - return TRUE; + return RosUserGetMonitorInfo(handle, info); } BOOL CDECL RosDrv_CreateDesktopWindow( HWND hwnd ) @@ -413,8 +456,8 @@ req->flags = SWP_NOZORDER; req->window.left = 0; req->window.top = 0; - req->window.right = 800; // FIXME: Use primary surface's dimensions! - req->window.bottom = 600; + req->window.right = GetSystemMetrics(SM_CXVIRTUALSCREEN); + req->window.bottom = GetSystemMetrics(SM_CYVIRTUALSCREEN); req->client = req->window; wine_server_call( req ); } Modified: branches/arwinss/reactos/include/reactos/win32k/rosuser.h URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/include/reactos… ============================================================================== --- branches/arwinss/reactos/include/reactos/win32k/rosuser.h [iso-8859-1] (original) +++ branches/arwinss/reactos/include/reactos/win32k/rosuser.h [iso-8859-1] Sat Aug 1 20:24:39 2009 @@ -49,6 +49,19 @@ void NTAPI RosUserSetCursor( ICONINFO* IconInfo ); +INT +APIENTRY +RosUserEnumDisplayMonitors( + OPTIONAL OUT HMONITOR *hMonitorList, + OPTIONAL OUT PRECTL monitorRectList, + OPTIONAL IN DWORD listSize); + +BOOL +APIENTRY +RosUserGetMonitorInfo( + IN HMONITOR hMonitor, + OUT LPMONITORINFO pMonitorInfo); + VOID NTAPI RosUserConnectCsrss(); Modified: branches/arwinss/reactos/subsystems/win32/csrss/win32csr/input.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- branches/arwinss/reactos/subsystems/win32/csrss/win32csr/input.c [iso-8859-1] (original) +++ branches/arwinss/reactos/subsystems/win32/csrss/win32csr/input.c [iso-8859-1] Sat Aug 1 20:24:39 2009 @@ -183,8 +183,6 @@ HANDLE MouseThreadHandle; ClipCursor(NULL); - SetCursorPos(GetSystemMetrics( SM_CXVIRTUALSCREEN ) /2, - GetSystemMetrics( SM_CYVIRTUALSCREEN ) /2); MouseThreadHandle = CreateThread(NULL, 0, MouseInputThread, NULL, 0,NULL); } Modified: branches/arwinss/reactos/subsystems/win32/win32k/eng/device.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/eng/device.c [iso-8859-1] (original) +++ branches/arwinss/reactos/subsystems/win32/win32k/eng/device.c [iso-8859-1] Sat Aug 1 20:24:39 2009 @@ -534,14 +534,17 @@ SurfaceRect.bottom = SurfObj->sizlBitmap.cy; //EngEraseSurface(SurfObj, &SurfaceRect, 0); - /* Put the pointer in the center of the screen */ - //gpsi->ptCursor.x = (SurfaceRect.right - SurfaceRect.left) / 2; - //gpsi->ptCursor.y = (SurfaceRect.bottom - SurfaceRect.top) / 2; - /* Give the PDEV a MovePointer function */ PrimarySurface.pfnMovePointer = PrimarySurface.DriverFunctions.MovePointer; if (!PrimarySurface.pfnMovePointer) PrimarySurface.pfnMovePointer = EngMovePointer; + + /* attach monitor */ + AttachMonitor(&PrimarySurface, PrimarySurface.DisplayNumber); + + /* Put the pointer in the center of the screen */ + RosUserSetCursorPos((SurfaceRect.right - SurfaceRect.left) / 2, + (SurfaceRect.bottom - SurfaceRect.top) / 2); EngUnlockSurface(SurfObj); Modified: branches/arwinss/reactos/subsystems/win32/win32k/gdi/misc.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/gdi/misc.c [iso-8859-1] (original) +++ branches/arwinss/reactos/subsystems/win32/win32k/gdi/misc.c [iso-8859-1] Sat Aug 1 20:24:39 2009 @@ -12,6 +12,8 @@ #define NDEBUG #include <debug.h> +extern PDEVOBJ PrimarySurface; + /* PUBLIC FUNCTIONS **********************************************************/ BOOL APIENTRY RosGdiArc( HDC physDev, INT left, INT top, INT right, INT bottom, @@ -79,8 +81,8 @@ pDC = DC_Lock(physDev); scrRect.left = scrRect.top = 0; - scrRect.right = 800; - scrRect.bottom = 600; + scrRect.right = PrimarySurface.GDIInfo.ulHorzRes; + scrRect.bottom = PrimarySurface.GDIInfo.ulVertRes; pClipObj = IntEngCreateClipRegion(1, NULL, &scrRect); Modified: branches/arwinss/reactos/subsystems/win32/win32k/gre/lineto.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/gre/lineto.c [iso-8859-1] (original) +++ branches/arwinss/reactos/subsystems/win32/win32k/gre/lineto.c [iso-8859-1] Sat Aug 1 20:24:39 2009 @@ -13,6 +13,8 @@ #include <win32k.h> #define NDEBUG #include <debug.h> + +extern PDEVOBJ PrimarySurface; /* PUBLIC FUNCTIONS **********************************************************/ @@ -112,8 +114,8 @@ // HACK DestRect.left = 0; DestRect.top = 0; - DestRect.bottom = 600; - DestRect.right = 800; + DestRect.bottom = PrimarySurface.GDIInfo.ulVertRes; + DestRect.right = PrimarySurface.GDIInfo.ulHorzRes; /* Draw pen-based polygon */ if (!(pDC->pLineBrush->flAttrs & GDIBRUSH_IS_NULL)) Modified: branches/arwinss/reactos/subsystems/win32/win32k/gre/rect.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/gre/rect.c [iso-8859-1] (original) +++ branches/arwinss/reactos/subsystems/win32/win32k/gre/rect.c [iso-8859-1] Sat Aug 1 20:24:39 2009 @@ -11,6 +11,8 @@ #include <win32k.h> #define NDEBUG #include <debug.h> + +extern PDEVOBJ PrimarySurface; /* PUBLIC FUNCTIONS **********************************************************/ @@ -105,8 +107,8 @@ // HACK DestRect.left = 0; DestRect.top = 0; - DestRect.bottom = 600; - DestRect.right = 800; + DestRect.bottom = PrimarySurface.GDIInfo.ulVertRes; + DestRect.right = PrimarySurface.GDIInfo.ulHorzRes; /* Draw brush-based polygon */ if (pDC->pFillBrush) Added: branches/arwinss/reactos/subsystems/win32/win32k/include/monitor.h URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/include/monitor.h (added) +++ branches/arwinss/reactos/subsystems/win32/win32k/include/monitor.h [iso-8859-1] Sat Aug 1 20:24:39 2009 @@ -1,0 +1,26 @@ +#ifndef _WIN32K_MONITOR_H +#define _WIN32K_MONITOR_H + +typedef struct _MONITOR_OBJECT +{ + HANDLE Handle; /* system object handle */ + FAST_MUTEX Lock; /* R/W lock */ + + BOOL IsPrimary; /* wether this is the primary monitor */ + UNICODE_STRING DeviceName; /* name of the monitor */ + PDEVOBJ *GdiDevice; /* pointer to the GDI device to + which this monitor is attached */ + struct _MONITOR_OBJECT *Prev, *Next; /* double linked list */ + + RECT rcMonitor; + RECT rcWork; +} MONITOR, *PMONITOR; + +NTSTATUS +AttachMonitor(IN PDEVOBJ *pGdiDevice, + IN ULONG DisplayNumber); + +NTSTATUS +DetachMonitor(IN PDEVOBJ *pGdiDevice); + +#endif /* _WIN32K_MONITOR_H */ Propchange: branches/arwinss/reactos/subsystems/win32/win32k/include/monitor.h ------------------------------------------------------------------------------ svn:eol-style = native Modified: branches/arwinss/reactos/subsystems/win32/win32k/include/user.h URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/include/user.h [iso-8859-1] (original) +++ branches/arwinss/reactos/subsystems/win32/win32k/include/user.h [iso-8859-1] Sat Aug 1 20:24:39 2009 @@ -35,7 +35,8 @@ enum user_object { USER_WINDOW = 1, - USER_HOOK + USER_HOOK, + USER_MONITOR }; #define DESKTOP_ATOM ((atom_t)32769) Modified: branches/arwinss/reactos/subsystems/win32/win32k/include/win32kp.h URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/include/win32kp.h [iso-8859-1] (original) +++ branches/arwinss/reactos/subsystems/win32/win32k/include/win32kp.h [iso-8859-1] Sat Aug 1 20:24:39 2009 @@ -48,6 +48,7 @@ #include <xlateobj.h> #include <cursor.h> #include <gre.h> +#include <monitor.h> #include "winesup.h" Added: branches/arwinss/reactos/subsystems/win32/win32k/main/monitor.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/main/monitor.c (added) +++ branches/arwinss/reactos/subsystems/win32/win32k/main/monitor.c [iso-8859-1] Sat Aug 1 20:24:39 2009 @@ -1,0 +1,457 @@ +/* + * ReactOS W32 Subsystem + * Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004 ReactOS Team + * + * 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. + * + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS kernel + * PURPOSE: Monitor support + * FILE: subsys/win32k/ntuser/monitor.c + * PROGRAMER: Anich Gregor (blight(a)blight.eu.org) + * REVISION HISTORY: + * 26-02-2004 Created + */ + +/* INCLUDES ******************************************************************/ + +#include <win32k.h> +#include "object.h" +#include "user.h" +#define NDEBUG +#include <debug.h> + +/* GLOBALS *******************************************************************/ + +/* list of monitors */ +static PMONITOR gMonitorList = NULL; + +/* PRIVATE FUNCTIONS **********************************************************/ + +/* IntCreateMonitorObject + * + * Creates a MONITOR struct + * + * Return value + * If the function succeeds a pointer to a MONITOR struct is returned. On failure + * NULL is returned. + */ +static +PMONITOR +IntCreateMonitorObject() +{ + PMONITOR Monitor; + + Monitor = ExAllocatePool( PagedPool, sizeof (MONITOR) ); + if (Monitor == NULL) + { + return NULL; + } + + RtlZeroMemory(Monitor, sizeof (MONITOR)); + Monitor->Handle = (HANDLE)alloc_user_handle(Monitor, USER_MONITOR); + + ExInitializeFastMutex(&Monitor->Lock); + + return Monitor; +} + +/* IntDestroyMonitorObject + * + * Destroys a MONITOR struct + * You have to be the owner of the monitors lock to safely destroy it. + * + * Arguments + * + * pMonitor + * Pointer to the MONITOR struct which shall be deleted + */ +static +void +IntDestroyMonitorObject(IN PMONITOR pMonitor) +{ + RtlFreeUnicodeString(&pMonitor->DeviceName); + free_user_handle((user_handle_t)pMonitor->Handle); + //UserDereferenceObject(pMonitor); +} + + +PMONITOR FASTCALL +UserGetMonitorObject(IN HMONITOR hMonitor) +{ + PMONITOR Monitor; + + if (!hMonitor) + { + SetLastWin32Error(ERROR_INVALID_MONITOR_HANDLE); + return NULL; + } + + Monitor = (PMONITOR)get_user_object((user_handle_t)hMonitor, USER_MONITOR); + if (!Monitor) + { + SetLastWin32Error(ERROR_INVALID_MONITOR_HANDLE); + return NULL; + } + + return Monitor; +} + + +/* IntAttachMonitor + * + * Creates a new MONITOR struct and appends it to the list of monitors. + * + * Arguments + * + * pGdiDevice Pointer to the PDEVOBJ onto which the monitor was attached + * DisplayNumber Display Number (starting with 0) + * + * Return value + * Returns a NTSTATUS + */ +NTSTATUS +AttachMonitor(IN PDEVOBJ *pGdiDevice, + IN ULONG DisplayNumber) +{ + PMONITOR Monitor; + WCHAR Buffer[CCHDEVICENAME]; + + DPRINT("Attaching monitor...\n"); + + /* create new monitor object */ + Monitor = IntCreateMonitorObject(); + if (Monitor == NULL) + { + DPRINT1("Couldnt create monitor object\n"); + return STATUS_INSUFFICIENT_RESOURCES; + } + + _snwprintf(Buffer, CCHDEVICENAME, L"\\\\.\\DISPLAY%d", DisplayNumber + 1); + if (!RtlCreateUnicodeString(&Monitor->DeviceName, Buffer)) + { + DPRINT1("Couldn't duplicate monitor name!\n"); + //UserDereferenceObject(Monitor); + //UserDeleteObject(Monitor->Handle, Monitor); + free_user_handle((user_handle_t)Monitor->Handle); + return STATUS_INSUFFICIENT_RESOURCES; + } + + Monitor->GdiDevice = pGdiDevice; + if (gMonitorList == NULL) + { + DPRINT("Primary monitor is beeing attached\n"); + Monitor->IsPrimary = TRUE; + gMonitorList = Monitor; + } + else + { + PMONITOR p; + DPRINT("Additional monitor is beeing attached\n"); + for (p = gMonitorList; p->Next != NULL; p = p->Next) + ; + { + p->Next = Monitor; + } + Monitor->Prev = p; + } + + return STATUS_SUCCESS; +} + +/* IntDetachMonitor + * + * Deletes a MONITOR struct and removes it from the list of monitors. + * + * Arguments + * + * pGdiDevice Pointer to the PDEVOBJ from which the monitor was detached + * + * Return value + * Returns a NTSTATUS + */ +NTSTATUS +DetachMonitor(IN PDEVOBJ *pGdiDevice) +{ + PMONITOR Monitor; + + for (Monitor = gMonitorList; Monitor != NULL; Monitor = Monitor->Next) + { + if (Monitor->GdiDevice == pGdiDevice) + break; + } + + if (Monitor == NULL) + { + /* no monitor for given device found */ + return STATUS_INVALID_PARAMETER; + } + + if (Monitor->IsPrimary && (Monitor->Next != NULL || Monitor->Prev != NULL)) + { + PMONITOR NewPrimaryMonitor = (Monitor->Prev != NULL) ? (Monitor->Prev) : (Monitor->Next); + + ExEnterCriticalRegionAndAcquireFastMutexUnsafe(&NewPrimaryMonitor->Lock); + NewPrimaryMonitor->IsPrimary = TRUE; + ExReleaseFastMutexUnsafeAndLeaveCriticalRegion(&NewPrimaryMonitor->Lock); + } + + if (gMonitorList == Monitor) + { + gMonitorList = Monitor->Next; + if (Monitor->Next != NULL) + Monitor->Next->Prev = NULL; + } + else + { + Monitor->Prev->Next = Monitor->Next; + if (Monitor->Next != NULL) + Monitor->Next->Prev = Monitor->Prev; + } + + IntDestroyMonitorObject(Monitor); + + return STATUS_SUCCESS; +} + +/* PUBLIC FUNCTIONS ***********************************************************/ + +/* RosUserEnumDisplayMonitors + * + * Fills hMonitorList with handles to all available monitors and their rectangles + * + */ +INT +APIENTRY +RosUserEnumDisplayMonitors( + OPTIONAL OUT HMONITOR *hMonitorList, + OPTIONAL OUT PRECTL monitorRectList, + OPTIONAL IN DWORD listSize) +{ + INT numMonitors = 0,i =0; + HMONITOR *safeHMonitorList = NULL; + PMONITOR Monitor; + PRECTL safeRectList = NULL; + NTSTATUS Status = STATUS_SUCCESS; + + DPRINT("RosUserEnumDisplayMonitors called\n"); + + /* get monitors count */ + for (Monitor = gMonitorList; Monitor != NULL; Monitor = Monitor->Next) + { + numMonitors++; + } + + if (numMonitors == 0 || listSize == 0 || (hMonitorList == NULL && monitorRectList == NULL)) + { + return numMonitors; + } + + safeHMonitorList = ExAllocatePool(PagedPool, sizeof (HMONITOR) * listSize); + if (safeHMonitorList == NULL) + { + /* FIXME: SetLastWin32Error? */ + DPRINT1("safeHMonitorList == NULL\n"); + return -1; + } + + safeRectList = ExAllocatePool(PagedPool, sizeof (RECT) * listSize); + if (safeRectList == NULL) + { + ExFreePool(safeHMonitorList); + /* FIXME: SetLastWin32Error? */ + DPRINT1("safeRectList == NULL\n"); + return -1; + } + + for (Monitor = gMonitorList; Monitor != NULL; Monitor = Monitor->Next) + { + safeHMonitorList[i] = Monitor->Handle; + safeRectList[i].left = 0; /* FIXME: get origin */ + safeRectList[i].top = 0; /* FIXME: get origin */ + safeRectList[i].right = safeRectList->left + Monitor->GdiDevice->GDIInfo.ulHorzRes; + safeRectList[i].bottom = safeRectList->top + Monitor->GdiDevice->GDIInfo.ulVertRes; + + i++; + } + + /* output result */ + if (hMonitorList != NULL) + { + _SEH2_TRY + { + ProbeForWrite(hMonitorList, sizeof (HMONITOR) * listSize, 1); + RtlCopyMemory(hMonitorList,safeHMonitorList,sizeof (HMONITOR) * listSize); + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + Status = _SEH2_GetExceptionCode(); + } + _SEH2_END; + + if (!NT_SUCCESS(Status)) + { + ExFreePool(safeHMonitorList); + SetLastNtError(Status); + return -1; + } + } + if (monitorRectList != NULL) + { + _SEH2_TRY + { + ProbeForWrite(monitorRectList, sizeof (RECT) * listSize, 1); + RtlCopyMemory(monitorRectList,safeRectList,sizeof (RECT) * listSize); + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + Status = _SEH2_GetExceptionCode(); + } + _SEH2_END; + + ExFreePool(safeRectList); + if (!NT_SUCCESS(Status)) + { + SetLastNtError(Status); + return -1; + } + } + + return numMonitors; +} + +/* RosUserGetMonitorInfo + * + * Retrieves information about a given monitor + * + * Arguments + * + * hMonitor + * Handle to a monitor for which to get information + * + * pMonitorInfo + * Pointer to a MONITORINFO struct which is filled with the information. + * The cbSize member must be set to sizeof(MONITORINFO) or + * sizeof(MONITORINFOEX). Even if set to sizeof(MONITORINFOEX) only parts + * from MONITORINFO will be filled. + * + * pDevice + * Pointer to a UNICODE_STRING which will recieve the device's name. The + * length should be CCHDEVICENAME + * Can be NULL + * + * Return value + * TRUE on success; FALSE on failure (calls SetLastNtError()) + * + */ +BOOL +APIENTRY +RosUserGetMonitorInfo( + IN HMONITOR hMonitor, + OUT LPMONITORINFO pMonitorInfo) +{ + PMONITOR Monitor; + MONITORINFOEXW MonitorInfo; + NTSTATUS Status = STATUS_SUCCESS; + + DPRINT("Enter NtUserGetMonitorInfo\n"); + //FIXME: lock + + /* get monitor object */ + if (!(Monitor = UserGetMonitorObject(hMonitor))) + { + DPRINT1("Couldnt find monitor 0x%lx\n", hMonitor); + return FALSE; + } + + if(pMonitorInfo == NULL) + { + SetLastNtError(STATUS_INVALID_PARAMETER); + return FALSE; + } + + /* get size of pMonitorInfo */ + _SEH2_TRY + { + ProbeForRead(&pMonitorInfo->cbSize, sizeof (MonitorInfo.cbSize), 1); + RtlCopyMemory(&MonitorInfo.cbSize, &pMonitorInfo->cbSize, sizeof (MonitorInfo.cbSize)); + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + Status = _SEH2_GetExceptionCode(); + } + _SEH2_END; + + if (!NT_SUCCESS(Status)) + { + SetLastNtError(Status); + return FALSE; + } + if ((MonitorInfo.cbSize != sizeof (MONITORINFO)) && + (MonitorInfo.cbSize != sizeof (MONITORINFOEXW))) + { + SetLastNtError(STATUS_INVALID_PARAMETER); + return FALSE; + } + + /* fill monitor info */ + MonitorInfo.rcMonitor.left = 0; /* FIXME: get origin */ + MonitorInfo.rcMonitor.top = 0; /* FIXME: get origin */ + MonitorInfo.rcMonitor.right = MonitorInfo.rcMonitor.left + Monitor->GdiDevice->GDIInfo.ulHorzRes; + MonitorInfo.rcMonitor.bottom = MonitorInfo.rcMonitor.top + Monitor->GdiDevice->GDIInfo.ulVertRes; + MonitorInfo.rcWork = MonitorInfo.rcMonitor; /* FIXME: use DEVMODE panning to calculate work area? */ + MonitorInfo.dwFlags = 0; + + if (Monitor->IsPrimary) + MonitorInfo.dwFlags |= MONITORINFOF_PRIMARY; + + /* fill device name */ + if (MonitorInfo.cbSize == sizeof (MONITORINFOEXW)) + { + WCHAR nul = L'\0'; + INT len = Monitor->DeviceName.Length; + if (len >= CCHDEVICENAME * sizeof (WCHAR)) + len = (CCHDEVICENAME - 1) * sizeof (WCHAR); + + memcpy(MonitorInfo.szDevice, Monitor->DeviceName.Buffer, len); + memcpy(MonitorInfo.szDevice + (len / sizeof (WCHAR)), &nul, sizeof (WCHAR)); + } + + /* output data */ + _SEH2_TRY + { + ProbeForWrite(pMonitorInfo, MonitorInfo.cbSize, 1); + RtlCopyMemory(pMonitorInfo,&MonitorInfo,MonitorInfo.cbSize); + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + Status = _SEH2_GetExceptionCode(); + } + _SEH2_END; + + if (!NT_SUCCESS(Status)) + { + SetLastNtError(Status); + return FALSE; + } + + //FIXME: unlock + + DPRINT("GetMonitorInfo: success\n"); + + return TRUE; + + +} Propchange: branches/arwinss/reactos/subsystems/win32/win32k/main/monitor.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: branches/arwinss/reactos/subsystems/win32/win32k/w32ksvc.db URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/w32ksvc.db [iso-8859-1] (original) +++ branches/arwinss/reactos/subsystems/win32/win32k/w32ksvc.db [iso-8859-1] Sat Aug 1 20:24:39 2009 @@ -65,4 +65,6 @@ RosUserGetCursorPos 1 RosUserSetCursorPos 2 RosUserClipCursor 1 -RosUserSetCursor 1 +RosUserSetCursor 1 +RosUserEnumDisplayMonitors 3 +RosUserGetMonitorInfo 2 Modified: branches/arwinss/reactos/subsystems/win32/win32k/win32k.rbuild URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/win32k.rbuild [iso-8859-1] (original) +++ branches/arwinss/reactos/subsystems/win32/win32k/win32k.rbuild [iso-8859-1] Sat Aug 1 20:24:39 2009 @@ -114,6 +114,7 @@ <file>init.c</file> <file>usrheap.c</file> <file>cursor.c</file> + <file>monitor.c</file> </directory> <directory name="wine"> <file>atom.c</file>

15 years, 1 month

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 August 2009