Ros-diffs November 2009

ros-diffs@reactos.org

23 participants
444 discussions

[cfinck] 44316: Revert 43921 on demand of Aleksey

by cfinck＠svn.reactos.org

Author: cfinck Date: Sat Nov 28 23:54:47 2009 New Revision: 44316 URL: http://svn.reactos.org/svn/reactos?rev=44316&view=rev Log: Revert 43921 on demand of Aleksey Modified: branches/ros-branch-0_3_11/reactos/drivers/storage/ide/uniata/id_ata.cpp Modified: branches/ros-branch-0_3_11/reactos/drivers/storage/ide/uniata/id_ata.cpp URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_11/reactos/drive… ============================================================================== --- branches/ros-branch-0_3_11/reactos/drivers/storage/ide/uniata/id_ata.cpp [iso-8859-1] (original) +++ branches/ros-branch-0_3_11/reactos/drivers/storage/ide/uniata/id_ata.cpp [iso-8859-1] Sat Nov 28 23:54:47 2009 @@ -493,10 +493,10 @@ { ULONG i; UCHAR Status; - for (i=0; i<200; i++) { + for (i=0; i<20000; i++) { GetStatus(chan, Status); if (Status & IDE_STATUS_BUSY) { - AtapiStallExecution(10); + AtapiStallExecution(150); continue; } else { break; @@ -537,10 +537,10 @@ { ULONG i; UCHAR Status; - for (i=0; i<200; i++) { + for (i=0; i<20000; i++) { GetBaseStatus(chan, Status); if (Status & IDE_STATUS_BUSY) { - AtapiStallExecution(10); + AtapiStallExecution(150); continue; } else { break; @@ -640,11 +640,11 @@ for (i=0; i<1000; i++) { GetStatus(chan, Status); if (Status & IDE_STATUS_BUSY) { - AtapiStallExecution(10); + AtapiStallExecution(100); } else if (Status & IDE_STATUS_DRQ) { break; } else { - AtapiStallExecution(10); + AtapiStallExecution(200); } } return Status; @@ -661,11 +661,11 @@ for (i=0; i<2; i++) { GetStatus(chan, Status); if (Status & IDE_STATUS_BUSY) { - AtapiStallExecution(10); + AtapiStallExecution(100); } else if (Status & IDE_STATUS_DRQ) { break; } else { - AtapiStallExecution(10); + AtapiStallExecution(100); } } return Status;

14 years, 10 months

[janderwald] 44315: - Try fix increase of winmm:mixer tests failure - Found by Gregor Schneider (DosX)

by janderwald＠svn.reactos.org

Author: janderwald Date: Sat Nov 28 23:15:20 2009 New Revision: 44315 URL: http://svn.reactos.org/svn/reactos?rev=44315&view=rev Log: - Try fix increase of winmm:mixer tests failure - Found by Gregor Schneider (DosX) Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/undoc.cpp Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/undoc.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/undoc.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/undoc.cpp [iso-8859-1] Sat Nov 28 23:15:20 2009 @@ -122,7 +122,7 @@ // check if this a GUID_NULL request if (Status == STATUS_NOT_FOUND) { - if (IoStack->Parameters.DeviceIoControl.InputBufferLength < sizeof(KSP_NODE) || !(Property->Property.Flags & KSPROPERTY_TYPE_TOPOLOGY)) + if (IoStack->Parameters.DeviceIoControl.InputBufferLength < sizeof(KSP_NODE)) return Status; // check if its a request for a topology node

14 years, 10 months

[hyperion] 44314: Nevermind.

by hyperion＠svn.reactos.org

Author: hyperion Date: Sat Nov 28 21:09:07 2009 New Revision: 44314 URL: http://svn.reactos.org/svn/reactos?rev=44314&view=rev Log: Nevermind. Modified: trunk/reactos/Makefile Modified: trunk/reactos/Makefile URL: http://svn.reactos.org/svn/reactos/trunk/reactos/Makefile?rev=44314&r1=4431… ============================================================================== --- trunk/reactos/Makefile [iso-8859-1] (original) +++ trunk/reactos/Makefile [iso-8859-1] Sat Nov 28 21:09:07 2009 @@ -18,6 +18,11 @@ # install # This target installs all of ReactOS to a location specified by the # ROS_INSTALL environment variable. +# +# module_install +# These targets installs a single module to a location specified by the +# ROS_INSTALL environment variable. Replace module with the name of the +# module you want to install. # # clean # This target cleans (deletes) all files that are generated when building

14 years, 10 months

[gschneider] 44313: [msvcrt] - Validate the process heap - Remove validation as soon as this function is tested

by gschneider＠svn.reactos.org

Author: gschneider Date: Sat Nov 28 20:35:47 2009 New Revision: 44313 URL: http://svn.reactos.org/svn/reactos?rev=44313&view=rev Log: [msvcrt] - Validate the process heap - Remove validation as soon as this function is tested Modified: trunk/reactos/lib/sdk/crt/misc/getargs.c Modified: trunk/reactos/lib/sdk/crt/misc/getargs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/misc/getargs.c… ============================================================================== --- trunk/reactos/lib/sdk/crt/misc/getargs.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/misc/getargs.c [iso-8859-1] Sat Nov 28 20:35:47 2009 @@ -21,8 +21,6 @@ int __argc = 0; extern wchar_t **__winitenv; - -extern HANDLE hHeap; char* strndup(char* name, size_t len) { @@ -179,7 +177,7 @@ } /* - * @unimplemented + * @implemented */ void __getmainargs(int* argc, char*** argv, char*** env, int expand_wildcards, int* new_mode) { @@ -243,7 +241,7 @@ aexpand(strndup(_acmdln+afterlastspace, i - afterlastspace), doexpand); } - HeapValidate(hHeap, 0, NULL); + HeapValidate(GetProcessHeap(), 0, NULL); *argc = __argc; if (__argv == NULL) @@ -259,7 +257,7 @@ } /* - * @unimplemented + * @implemented */ void __wgetmainargs(int* argc, wchar_t*** wargv, wchar_t*** wenv, int expand_wildcards, int* new_mode) @@ -323,7 +321,7 @@ wexpand(wcsndup(_wcmdln+afterlastspace, i - afterlastspace), doexpand); } - HeapValidate(hHeap, 0, NULL); + HeapValidate(GetProcessHeap(), 0, NULL); *argc = __argc; if (__wargv == NULL)

14 years, 10 months

[jimtabor] 44312: - [Win32k] Add comments to text functions.

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Sat Nov 28 20:34:45 2009 New Revision: 44312 URL: http://svn.reactos.org/svn/reactos?rev=44312&view=rev Log: - [Win32k] Add comments to text functions. Modified: trunk/reactos/subsystems/win32/win32k/objects/text.c Modified: trunk/reactos/subsystems/win32/win32k/objects/text.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/text.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/text.c [iso-8859-1] Sat Nov 28 20:34:45 2009 @@ -15,6 +15,11 @@ /** Functions *****************************************************************/ +/* + flOpts : + GetTextExtentPoint32W = 0 + GetTextExtentPointW = 1 + */ BOOL FASTCALL GreGetTextExtentW( @@ -65,6 +70,12 @@ return Result; } + +/* + fl : + GetTextExtentExPointW = 0 and everything else that uses this. + GetTextExtentExPointI = 1 + */ BOOL FASTCALL GreGetTextExtentExW( @@ -235,6 +246,12 @@ return Ret; } + +/* + fl : + GetTextExtentExPointW = 0 and everything else that uses this. + GetTextExtentExPointI = 1 + */ W32KAPI BOOL APIENTRY @@ -389,6 +406,12 @@ return TRUE; } + +/* + flOpts : + GetTextExtentPoint32W = 0 + GetTextExtentPointW = 1 + */ BOOL APIENTRY NtGdiGetTextExtent(HDC hdc,

14 years, 10 months

[janderwald] 44311: - Implement IOCTL_RESET_STREAM which is required for waveInReset waveOutReset

by janderwald＠svn.reactos.org

Author: janderwald Date: Sat Nov 28 18:06:22 2009 New Revision: 44311 URL: http://svn.reactos.org/svn/reactos?rev=44311&view=rev Log: - Implement IOCTL_RESET_STREAM which is required for waveInReset waveOutReset Modified: trunk/reactos/drivers/wdm/audio/legacy/wdmaud/control.c trunk/reactos/drivers/wdm/audio/legacy/wdmaud/interface.h 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] Sat Nov 28 18:06:22 2009 @@ -314,6 +314,38 @@ } return SetIrpIoStatus(Irp, STATUS_INVALID_DEVICE_REQUEST, sizeof(WDMAUD_DEVICE_INFO)); +} + +NTSTATUS +NTAPI +WdmAudResetStream( + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp, + IN PWDMAUD_DEVICE_INFO DeviceInfo) +{ + KSRESET ResetStream; + NTSTATUS Status; + ULONG BytesReturned; + PFILE_OBJECT FileObject; + + DPRINT("WdmAudResetStream\n"); + + Status = ObReferenceObjectByHandle(DeviceInfo->hDevice, GENERIC_READ | GENERIC_WRITE, IoFileObjectType, KernelMode, (PVOID*)&FileObject, NULL); + if (!NT_SUCCESS(Status)) + { + DPRINT1("Error: invalid device handle provided %p Type %x\n", DeviceInfo->hDevice, DeviceInfo->DeviceType); + return SetIrpIoStatus(Irp, STATUS_UNSUCCESSFUL, 0); + } + + ResetStream = DeviceInfo->u.ResetStream; + ASSERT(ResetStream == KSRESET_BEGIN || ResetStream == KSRESET_END); + + Status = KsSynchronousIoControlDevice(FileObject, KernelMode, IOCTL_KS_RESET_STATE, (PVOID)&ResetStream, sizeof(KSRESET), NULL, 0, &BytesReturned); + + ObDereferenceObject(FileObject); + + DPRINT("WdmAudResetStream Status %x\n", Status); + return SetIrpIoStatus(Irp, Status, sizeof(WDMAUD_DEVICE_INFO)); } NTSTATUS @@ -382,6 +414,8 @@ return WdmAudGetDeviceInterface(DeviceObject, Irp, DeviceInfo); case IOCTL_GET_MIXER_EVENT: return WdmAudGetMixerEvent(DeviceObject, Irp, DeviceInfo, ClientInfo); + case IOCTL_RESET_STREAM: + return WdmAudResetStream(DeviceObject, Irp, DeviceInfo); case IOCTL_GETPOS: case IOCTL_GETDEVID: case IOCTL_GETVOLUME: Modified: trunk/reactos/drivers/wdm/audio/legacy/wdmaud/interface.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/legacy/w… ============================================================================== --- trunk/reactos/drivers/wdm/audio/legacy/wdmaud/interface.h [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/legacy/wdmaud/interface.h [iso-8859-1] Sat Nov 28 18:06:22 2009 @@ -57,6 +57,7 @@ ULONG Value; }MixerEvent; KSSTATE State; + KSRESET ResetStream; ULONG Volume; ULONG FrameSize; HANDLE hNotifyEvent; @@ -346,7 +347,7 @@ /// IOCTL_GET_MIXER_EVENT /// -/// Description: This IOCTL queries for +/// Description: This IOCTL queries for wdmaud driver if there any new kernel streaming events available /// /// Arguments: InputBuffer is a pointer to a WDMAUD_DEVICE_INFO structure, /// InputBufferSize is size of WDMAUD_DEVICE_INFO structure @@ -360,5 +361,18 @@ METHOD_BUFFERED, \ FILE_CREATE_TREE_CONNECTION | FILE_ANY_ACCESS) - +/// IOCTL_RESET_STREAM +/// +/// Description: This IOCTL instructs wdmaud to reset a stream +/// +/// Arguments: InputBuffer is a pointer to a WDMAUD_DEVICE_INFO structure, +/// InputBufferSize is size of WDMAUD_DEVICE_INFO structure +/// Note: The hDevice member must be set and DeviceType +/// ReturnCode: STATUS_SUCCESS indicates success + +#define IOCTL_RESET_STREAM \ + CTL_CODE(FILE_DEVICE_SOUND, \ + 17, \ + METHOD_BUFFERED, \ + FILE_CREATE_TREE_CONNECTION | FILE_ANY_ACCESS) #endif

14 years, 10 months

[janderwald] 44310: - Silence debug print

by janderwald＠svn.reactos.org

Author: janderwald Date: Sat Nov 28 18:05:06 2009 New Revision: 44310 URL: http://svn.reactos.org/svn/reactos?rev=44310&view=rev Log: - Silence debug print Modified: trunk/reactos/drivers/ksfilter/ks/connectivity.c Modified: trunk/reactos/drivers/ksfilter/ks/connectivity.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/ksfilter/ks/connec… ============================================================================== --- trunk/reactos/drivers/ksfilter/ks/connectivity.c [iso-8859-1] (original) +++ trunk/reactos/drivers/ksfilter/ks/connectivity.c [iso-8859-1] Sat Nov 28 18:05:06 2009 @@ -217,7 +217,7 @@ /* open the key */ Status = ZwOpenKey(&hKey, GENERIC_READ, &ObjectAttributes); - DPRINT1("ZwOpenKey() status 0x%08lx %S\n", Status, Path.Buffer); + DPRINT("ZwOpenKey() status 0x%08lx %S\n", Status, Path.Buffer); /* free path buffer */ ExFreePool(Path.Buffer);

14 years, 10 months

[janderwald] 44309: [PORTCLS] - Store KSOBJECT_HEADER as the first member in a struct, which ks can use to access object header. Fixes initialization of ReactOS portcls in WinXP - Partly implement power querying / setting. Fixes bsod when shutting down the system in WinXP with ReactOS portcls - Change the pin state at PASSIVE_LEVEL - Implement IOCTL_KS_RESET for CPinWaveCyclic

by janderwald＠svn.reactos.org

Author: janderwald Date: Sat Nov 28 18:01:46 2009 New Revision: 44309 URL: http://svn.reactos.org/svn/reactos?rev=44309&view=rev Log: [PORTCLS] - Store KSOBJECT_HEADER as the first member in a struct, which ks can use to access object header. Fixes initialization of ReactOS portcls in WinXP - Partly implement power querying / setting. Fixes bsod when shutting down the system in WinXP with ReactOS portcls - Change the pin state at PASSIVE_LEVEL - Implement IOCTL_KS_RESET for CPinWaveCyclic Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/dispatcher.cpp trunk/reactos/drivers/wdm/audio/backpln/portcls/dma_slave.cpp trunk/reactos/drivers/wdm/audio/backpln/portcls/interrupt.cpp trunk/reactos/drivers/wdm/audio/backpln/portcls/irp.cpp trunk/reactos/drivers/wdm/audio/backpln/portcls/irpstream.cpp trunk/reactos/drivers/wdm/audio/backpln/portcls/pin_wavecyclic.cpp trunk/reactos/drivers/wdm/audio/backpln/portcls/port_dmus.cpp trunk/reactos/drivers/wdm/audio/backpln/portcls/private.hpp trunk/reactos/drivers/wdm/audio/backpln/portcls/propertyhandler.cpp trunk/reactos/drivers/wdm/audio/backpln/portcls/undoc.cpp Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/dispatcher.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/dispatcher.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/dispatcher.cpp [iso-8859-1] Sat Nov 28 18:01:46 2009 @@ -16,16 +16,16 @@ PIRP Irp) { PIO_STACK_LOCATION IoStack; - IIrpTarget * IrpTarget; - - // get current irp stack - IoStack = IoGetCurrentIrpStackLocation(Irp); - - // access IrpTarget - IrpTarget = (IIrpTarget *)IoStack->FileObject->FsContext; - - // let IrpTarget handle request - return IrpTarget->DeviceIoControl(DeviceObject, Irp); + PDISPATCH_CONTEXT DispatchContext; + + // get current irp stack + IoStack = IoGetCurrentIrpStackLocation(Irp); + + // get dispatch context + DispatchContext = (PDISPATCH_CONTEXT)IoStack->FileObject->FsContext; + + // let IrpTarget handle request + return DispatchContext->Target->DeviceIoControl(DeviceObject, Irp); } NTSTATUS @@ -35,17 +35,17 @@ PIRP Irp) { PIO_STACK_LOCATION IoStack; - IIrpTarget * IrpTarget; - - // get current irp stack - IoStack = IoGetCurrentIrpStackLocation(Irp); - - // access IrpTarget - IrpTarget = (IIrpTarget *)IoStack->FileObject->FsContext; - - - // let IrpTarget handle request - return IrpTarget->Read(DeviceObject, Irp); + PDISPATCH_CONTEXT DispatchContext; + + // get current irp stack + IoStack = IoGetCurrentIrpStackLocation(Irp); + + // get dispatch context + DispatchContext = (PDISPATCH_CONTEXT)IoStack->FileObject->FsContext; + + + // let IrpTarget handle request + return DispatchContext->Target->Read(DeviceObject, Irp); } NTSTATUS @@ -55,17 +55,17 @@ PIRP Irp) { PIO_STACK_LOCATION IoStack; - IIrpTarget * IrpTarget; - - // get current irp stack - IoStack = IoGetCurrentIrpStackLocation(Irp); - - // access IrpTarget - IrpTarget = (IIrpTarget *)IoStack->FileObject->FsContext; - - - // let IrpTarget handle request - return IrpTarget->Write(DeviceObject, Irp); + PDISPATCH_CONTEXT DispatchContext; + + // get current irp stack + IoStack = IoGetCurrentIrpStackLocation(Irp); + + // get dispatch context + DispatchContext = (PDISPATCH_CONTEXT)IoStack->FileObject->FsContext; + + + // let IrpTarget handle request + return DispatchContext->Target->Write(DeviceObject, Irp); } NTSTATUS @@ -75,17 +75,17 @@ PIRP Irp) { PIO_STACK_LOCATION IoStack; - IIrpTarget * IrpTarget; - - // get current irp stack - IoStack = IoGetCurrentIrpStackLocation(Irp); - - // access IrpTarget - IrpTarget = (IIrpTarget *)IoStack->FileObject->FsContext; - - - // let IrpTarget handle request - return IrpTarget->Flush(DeviceObject, Irp); + PDISPATCH_CONTEXT DispatchContext; + + // get current irp stack + IoStack = IoGetCurrentIrpStackLocation(Irp); + + // get dispatch context + DispatchContext = (PDISPATCH_CONTEXT)IoStack->FileObject->FsContext; + + + // let IrpTarget handle request + return DispatchContext->Target->Flush(DeviceObject, Irp); } NTSTATUS @@ -95,17 +95,24 @@ PIRP Irp) { PIO_STACK_LOCATION IoStack; - IIrpTarget * IrpTarget; - - // get current irp stack - IoStack = IoGetCurrentIrpStackLocation(Irp); - - // access IrpTarget - IrpTarget = (IIrpTarget *)IoStack->FileObject->FsContext; - - - // let IrpTarget handle request - return IrpTarget->Close(DeviceObject, Irp); + PDISPATCH_CONTEXT DispatchContext; + NTSTATUS Status; + + // get current irp stack + IoStack = IoGetCurrentIrpStackLocation(Irp); + // get dispatch context + DispatchContext = (PDISPATCH_CONTEXT)IoStack->FileObject->FsContext; + + // let IrpTarget handle request + Status = DispatchContext->Target->Close(DeviceObject, Irp); + + if (NT_SUCCESS(Status)) + { + KsFreeObjectHeader(DispatchContext->ObjectHeader); + FreeItem(DispatchContext, TAG_PORTCLASS); + } + // done + return Status; } NTSTATUS @@ -115,17 +122,17 @@ PIRP Irp) { PIO_STACK_LOCATION IoStack; - IIrpTarget * IrpTarget; - - // get current irp stack - IoStack = IoGetCurrentIrpStackLocation(Irp); - - // access IrpTarget - IrpTarget = (IIrpTarget *)IoStack->FileObject->FsContext; - - - // let IrpTarget handle request - return IrpTarget->QuerySecurity(DeviceObject, Irp); + PDISPATCH_CONTEXT DispatchContext; + + // get current irp stack + IoStack = IoGetCurrentIrpStackLocation(Irp); + + // get dispatch context + DispatchContext = (PDISPATCH_CONTEXT)IoStack->FileObject->FsContext; + + + // let IrpTarget handle request + return DispatchContext->Target->QuerySecurity(DeviceObject, Irp); } NTSTATUS @@ -135,17 +142,16 @@ PIRP Irp) { PIO_STACK_LOCATION IoStack; - IIrpTarget * IrpTarget; - - // get current irp stack - IoStack = IoGetCurrentIrpStackLocation(Irp); - - // access IrpTarget - IrpTarget = (IIrpTarget *)IoStack->FileObject->FsContext; - - - // let IrpTarget handle request - return IrpTarget->SetSecurity(DeviceObject, Irp); + PDISPATCH_CONTEXT DispatchContext; + + // get current irp stack + IoStack = IoGetCurrentIrpStackLocation(Irp); + + // get dispatch context + DispatchContext = (PDISPATCH_CONTEXT)IoStack->FileObject->FsContext; + + // let IrpTarget handle request + return DispatchContext->Target->SetSecurity(DeviceObject, Irp); } BOOLEAN @@ -161,13 +167,13 @@ PIO_STATUS_BLOCK IoStatus, PDEVICE_OBJECT DeviceObject) { - IIrpTarget * IrpTarget; - - // access IrpTarget - IrpTarget = (IIrpTarget *)FileObject->FsContext; - - // let IrpTarget handle request - return IrpTarget->FastDeviceIoControl(FileObject, Wait, InputBuffer, InputBufferLength, OutputBuffer, OutputBufferLength, IoControlCode, IoStatus, DeviceObject); + PDISPATCH_CONTEXT DispatchContext; + + // get dispatch context + DispatchContext = (PDISPATCH_CONTEXT)FileObject->FsContext; + + // let IrpTarget handle request + return DispatchContext->Target->FastDeviceIoControl(FileObject, Wait, InputBuffer, InputBufferLength, OutputBuffer, OutputBufferLength, IoControlCode, IoStatus, DeviceObject); } @@ -183,13 +189,13 @@ PIO_STATUS_BLOCK IoStatus, PDEVICE_OBJECT DeviceObject) { - IIrpTarget * IrpTarget; - - // access IrpTarget - IrpTarget = (IIrpTarget *)FileObject->FsContext; - - // let IrpTarget handle request - return IrpTarget->FastRead(FileObject, FileOffset, Length, Wait, LockKey, Buffer, IoStatus, DeviceObject); + PDISPATCH_CONTEXT DispatchContext; + + // get dispatch context + DispatchContext = (PDISPATCH_CONTEXT)FileObject->FsContext; + + // let IrpTarget handle request + return DispatchContext->Target->FastRead(FileObject, FileOffset, Length, Wait, LockKey, Buffer, IoStatus, DeviceObject); } BOOLEAN @@ -204,12 +210,12 @@ PIO_STATUS_BLOCK IoStatus, PDEVICE_OBJECT DeviceObject) { - IIrpTarget * IrpTarget; - - // access IrpTarget - IrpTarget = (IIrpTarget *)FileObject->FsContext; - // let IrpTarget handle request - return IrpTarget->FastWrite(FileObject, FileOffset, Length, Wait, LockKey, Buffer, IoStatus, DeviceObject); + PDISPATCH_CONTEXT DispatchContext; + + // get dispatch context + DispatchContext = (PDISPATCH_CONTEXT)FileObject->FsContext; + // let IrpTarget handle request + return DispatchContext->Target->FastWrite(FileObject, FileOffset, Length, Wait, LockKey, Buffer, IoStatus, DeviceObject); } static KSDISPATCH_TABLE DispatchTable = @@ -226,7 +232,6 @@ Dispatch_fnFastWrite, }; - NTSTATUS NTAPI NewDispatchObject( @@ -238,14 +243,35 @@ NTSTATUS Status; KSOBJECT_HEADER ObjectHeader; PIO_STACK_LOCATION IoStack; + PDISPATCH_CONTEXT DispatchContext; // get current irp stack location IoStack = IoGetCurrentIrpStackLocation(Irp); - IoStack->FileObject->FsContext = (PVOID)Target; - + DispatchContext = (PDISPATCH_CONTEXT)AllocateItem(NonPagedPool, sizeof(DISPATCH_CONTEXT), TAG_PORTCLASS); + if (!DispatchContext) + return STATUS_INSUFFICIENT_RESOURCES; + + // allocate object header Status = KsAllocateObjectHeader(&ObjectHeader, CreateItemCount, CreateItem, Irp, &DispatchTable); - DPRINT("KsAllocateObjectHeader result %x\n", Status); + + if (!NT_SUCCESS(Status)) + { + // free dispatch context + FreeItem(DispatchContext, TAG_PORTCLASS); + // done + return Status; + } + + // initialize dispatch context + DispatchContext->ObjectHeader = ObjectHeader; + DispatchContext->Target = Target; + DispatchContext->CreateItem = CreateItem; + + // store dispatch context + IoStack->FileObject->FsContext = DispatchContext; + + DPRINT("KsAllocateObjectHeader result %x Target %p Context %p\n", Status, Target, DispatchContext); return Status; } Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/dma_slave.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/dma_slave.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/dma_slave.cpp [iso-8859-1] Sat Nov 28 18:01:46 2009 @@ -223,6 +223,7 @@ CDmaChannelInit::BufferSize() { DPRINT("BufferSize %u\n", m_BufferSize); + PC_ASSERT(m_BufferSize); return m_BufferSize; } Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/interrupt.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/interrupt.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/interrupt.cpp [iso-8859-1] Sat Nov 28 18:01:46 2009 @@ -231,6 +231,8 @@ if (IsListEmpty(&m_ServiceRoutines)) return STATUS_UNSUCCESSFUL; + DPRINT("Vector %u Level %u Flags %x Affinity %x\n", Descriptor->u.Interrupt.Vector, Descriptor->u.Interrupt.Level, Descriptor->Flags, Descriptor->u.Interrupt.Affinity); + Status = IoConnectInterrupt(&m_Interrupt, IInterruptServiceRoutine, (PVOID)this, Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/irp.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/irp.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/irp.cpp [iso-8859-1] Sat Nov 28 18:01:46 2009 @@ -12,6 +12,13 @@ #include "private.hpp" +typedef struct +{ + PIRP Irp; + PDEVICE_OBJECT DeviceObject; +}QUERY_POWER_CONTEXT, *PQUERY_POWER_CONTEXT; + + NTSTATUS NTAPI PortClsCreate( @@ -33,7 +40,10 @@ NTSTATUS Status; PPCLASS_DEVICE_EXTENSION DeviceExt; PIO_STACK_LOCATION IoStack; + POWER_STATE PowerState; IResourceList* resource_list = NULL; + //ULONG Index; + //PCM_PARTIAL_RESOURCE_DESCRIPTOR PartialDescriptor, UnPartialDescriptor; DeviceExt = (PPCLASS_DEVICE_EXTENSION) DeviceObject->DeviceExtension; IoStack = IoGetCurrentIrpStackLocation(Irp); @@ -92,6 +102,14 @@ // Assign the resource list to our extension DeviceExt->resources = resource_list; + // store device power state + DeviceExt->DevicePowerState = PowerDeviceD0; + DeviceExt->SystemPowerState = PowerSystemWorking; + + // notify power manager of current state + PowerState = *((POWER_STATE*)&DeviceExt->DevicePowerState); + PoSetPowerState(DeviceObject, DevicePowerState, PowerState); + Irp->IoStatus.Status = STATUS_SUCCESS; IoCompleteRequest(Irp, IO_NO_INCREMENT); return Status; @@ -103,10 +121,9 @@ DeviceExt->resources->Release(); IoDeleteDevice(DeviceObject); - // Do not complete? - Irp->IoStatus.Status = STATUS_SUCCESS; - IoCompleteRequest(Irp, IO_NO_INCREMENT); - return STATUS_SUCCESS; + // Forward request + Status = PcForwardIrpSynchronous(DeviceObject, Irp); + return PcCompleteIrp(DeviceObject, Irp, Status); case IRP_MN_QUERY_INTERFACE: DPRINT("IRP_MN_QUERY_INTERFACE\n"); @@ -133,13 +150,230 @@ return STATUS_UNSUCCESSFUL; } +VOID +CALLBACK +PwrCompletionFunction( + IN PDEVICE_OBJECT DeviceObject, + IN UCHAR MinorFunction, + IN POWER_STATE PowerState, + IN PVOID Context, + IN PIO_STATUS_BLOCK IoStatus) +{ + NTSTATUS Status; + PQUERY_POWER_CONTEXT PwrContext = (PQUERY_POWER_CONTEXT)Context; + + if (NT_SUCCESS(IoStatus->Status)) + { + // forward request to lower device object + Status = PcForwardIrpSynchronous(PwrContext->DeviceObject, PwrContext->Irp); + } + else + { + // failed + Status = IoStatus->Status; + } + + // start next power irp + PoStartNextPowerIrp(PwrContext->Irp); + + // complete request + PwrContext->Irp->IoStatus.Status = Status; + IoCompleteRequest(PwrContext->Irp, IO_NO_INCREMENT); + + // free context + FreeItem(PwrContext, TAG_PORTCLASS); +} + + NTSTATUS NTAPI PortClsPower( IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp) { + PIO_STACK_LOCATION IoStack; + PPCLASS_DEVICE_EXTENSION DeviceExtension; + PQUERY_POWER_CONTEXT PwrContext; + POWER_STATE PowerState; + NTSTATUS Status = STATUS_SUCCESS; + DPRINT("PortClsPower called\n"); + + // get currrent stack location + IoStack = IoGetCurrentIrpStackLocation(Irp); + + if (IoStack->MinorFunction != IRP_MN_SET_POWER && IoStack->MinorFunction != IRP_MN_QUERY_POWER) + { + // just forward the request + Status = PcForwardIrpSynchronous(DeviceObject, Irp); + + // start next power irp + PoStartNextPowerIrp(Irp); + + // complete request + Irp->IoStatus.Status = Status; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + + // done + return Status; + } + + + // get device extension + DeviceExtension = (PPCLASS_DEVICE_EXTENSION) DeviceObject->DeviceExtension; + + // get current request type + if (IoStack->Parameters.Power.Type == DevicePowerState) + { + // request for device power state + if (DeviceExtension->DevicePowerState == IoStack->Parameters.Power.State.DeviceState) + { + // nothing has changed + if (IoStack->MinorFunction == IRP_MN_QUERY_POWER) + { + // only forward query requests + Status = PcForwardIrpSynchronous(DeviceObject, Irp); + } + + // start next power irp + PoStartNextPowerIrp(Irp); + + // complete request + Irp->IoStatus.Status = Status; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + + // done + return Status; + } + + if (IoStack->MinorFunction == IRP_MN_QUERY_POWER) + { + // check if there is a registered adapter power management + if (DeviceExtension->AdapterPowerManagement) + { + // it is query if the change can be changed + PowerState = *((POWER_STATE*)&IoStack->Parameters.Power.State.DeviceState); + Status = DeviceExtension->AdapterPowerManagement->QueryPowerChangeState(PowerState); + + // sanity check + PC_ASSERT(Status == STATUS_SUCCESS); + } + + // only forward query requests + PcForwardIrpSynchronous(DeviceObject, Irp); + + // start next power irp + PoStartNextPowerIrp(Irp); + + // complete request + Irp->IoStatus.Status = Status; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + + // done + return Status; + } + else + { + // set power state + PowerState = *((POWER_STATE*)&IoStack->Parameters.Power.State.DeviceState); + PoSetPowerState(DeviceObject, DevicePowerState, PowerState); + + // check if there is a registered adapter power management + if (DeviceExtension->AdapterPowerManagement) + { + // notify of a power change state + DeviceExtension->AdapterPowerManagement->PowerChangeState(PowerState); + } + + // FIXME call all registered IPowerNotify interfaces via ISubdevice interface + + // store new power state + DeviceExtension->DevicePowerState = IoStack->Parameters.Power.State.DeviceState; + + // complete request + Irp->IoStatus.Status = Status; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + + // done + return Status; + } + } + else + { + // sanity check + PC_ASSERT(IoStack->Parameters.Power.Type == SystemPowerState); + + if (IoStack->MinorFunction == IRP_MN_QUERY_POWER) + { + // mark irp as pending + IoMarkIrpPending(Irp); + + // allocate power completion context + PwrContext = (PQUERY_POWER_CONTEXT)AllocateItem(NonPagedPool, sizeof(QUERY_POWER_CONTEXT), TAG_PORTCLASS); + + if (!PwrContext) + { + // no memory + PoStartNextPowerIrp(Irp); + + // complete and forget + Irp->IoStatus.Status = STATUS_INSUFFICIENT_RESOURCES; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + + // done + return Status; + } + + // setup power context + PwrContext->Irp = Irp; + PwrContext->DeviceObject = DeviceObject; + + // pass the irp down + PowerState = *((POWER_STATE*)IoStack->Parameters.Power.State.SystemState); + Status = PoRequestPowerIrp(DeviceExtension->PhysicalDeviceObject, IoStack->MinorFunction, PowerState, PwrCompletionFunction, (PVOID)PwrContext, NULL); + + // check for success + if (!NT_SUCCESS(Status)) + { + // failed + Irp->IoStatus.Status = Status; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + + // done + return Status; + } + + // done + return STATUS_PENDING; + } + else + { + // set power request + DeviceExtension->SystemPowerState = IoStack->Parameters.Power.State.SystemState; + + // only forward query requests + Status = PcForwardIrpSynchronous(DeviceObject, Irp); + + // start next power irp + PoStartNextPowerIrp(Irp); + + // complete request + Irp->IoStatus.Status = Status; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + + // done + return Status; + } + } +} + +NTSTATUS +NTAPI +PortClsSysControl( + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp) +{ + DPRINT("PortClsSysControl called\n"); // TODO @@ -152,13 +386,21 @@ NTSTATUS NTAPI -PortClsSysControl( - IN PDEVICE_OBJECT DeviceObject, - IN PIRP Irp) -{ - DPRINT("PortClsSysControl called\n"); - - // TODO +PortClsShutdown( + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp) +{ + PPCLASS_DEVICE_EXTENSION DeviceExtension; + DPRINT("PortClsShutdown called\n"); + + // get device extension + DeviceExtension = (PPCLASS_DEVICE_EXTENSION)DeviceObject->DeviceExtension; + + if (DeviceExtension->AdapterPowerManagement) + { + // release adapter power management + DPRINT("Power %u\n", DeviceExtension->AdapterPowerManagement->Release()); + } Irp->IoStatus.Status = STATUS_SUCCESS; Irp->IoStatus.Information = 0; @@ -169,40 +411,15 @@ NTSTATUS NTAPI -PortClsShutdown( - IN PDEVICE_OBJECT DeviceObject, - IN PIRP Irp) -{ - PPCLASS_DEVICE_EXTENSION DeviceExtension; - DPRINT("PortClsShutdown called\n"); - - // get device extension - DeviceExtension = (PPCLASS_DEVICE_EXTENSION)DeviceObject->DeviceExtension; - - if (DeviceExtension->AdapterPowerManagement) - { - // release adapter power management - DPRINT("Power %u\n", DeviceExtension->AdapterPowerManagement->Release()); - } - - Irp->IoStatus.Status = STATUS_SUCCESS; - Irp->IoStatus.Information = 0; - IoCompleteRequest(Irp, IO_NO_INCREMENT); - - return STATUS_SUCCESS; -} - -NTSTATUS -NTAPI PcDispatchIrp( IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp) { PIO_STACK_LOCATION IoStack; - DPRINT("PcDispatchIrp called - handling IRP in PortCls\n"); - IoStack = IoGetCurrentIrpStackLocation(Irp); + + DPRINT("PcDispatchIrp called - handling IRP in PortCls MajorFunction %x MinorFunction %x\n", IoStack->MajorFunction, IoStack->MinorFunction); switch ( IoStack->MajorFunction ) { Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/irpstream.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/irpstream.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/irpstream.cpp [iso-8859-1] Sat Nov 28 18:01:46 2009 @@ -145,7 +145,14 @@ } // get first stream header - Header = (PKSSTREAM_HEADER)Irp->AssociatedIrp.SystemBuffer; + + if (Irp->RequestorMode == UserMode) + Header = (PKSSTREAM_HEADER)Irp->AssociatedIrp.SystemBuffer; + else + Header = (PKSSTREAM_HEADER)Irp->UserBuffer; + + // sanity check + PC_ASSERT(Header); // calculate num headers NumHeaders = IoStack->Parameters.DeviceIoControl.OutputBufferLength / Header->Size; @@ -156,7 +163,8 @@ // get first audio buffer Mdl = Irp->MdlAddress; - + // sanity check + PC_ASSERT(Mdl); // store the current stream header Irp->Tail.Overlay.DriverContext[OFFSET_STREAMHEADER] = (PVOID)Header; @@ -166,7 +174,6 @@ // store current header index Irp->Tail.Overlay.DriverContext[OFFSET_HEADERINDEX] = UlongToPtr(0); - NumData = 0; // prepare all headers for(Index = 0; Index < NumHeaders; Index++) @@ -175,7 +182,10 @@ PC_ASSERT(Header); PC_ASSERT(Mdl); - Header->Data = MmGetSystemAddressForMdlSafe(Mdl, NormalPagePriority); + if (Irp->RequestorMode == UserMode) + { + Header->Data = MmGetSystemAddressForMdlSafe(Mdl, NormalPagePriority); + } if (!Header->Data) { @@ -344,10 +354,13 @@ return; } - // irp has been processed completly + // irp has been processed completly NumData = 0; - StreamHeader = (PKSSTREAM_HEADER)m_Irp->AssociatedIrp.SystemBuffer; + if (m_Irp->RequestorMode == KernelMode) + StreamHeader = (PKSSTREAM_HEADER)m_Irp->UserBuffer; + else + StreamHeader = (PKSSTREAM_HEADER)m_Irp->AssociatedIrp.SystemBuffer; // loop all stream headers for(Index = 0; Index < STREAMHEADER_COUNT(m_Irp); Index++) Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/pin_wavecyclic.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/pin_wavecyclic.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/pin_wavecyclic.cpp [iso-8859-1] Sat Nov 28 18:01:46 2009 @@ -35,16 +35,11 @@ CPortPinWaveCyclic(IUnknown *OuterUnknown){} virtual ~CPortPinWaveCyclic(){} - VOID SetState(KSSTATE State); - protected: VOID UpdateCommonBuffer(ULONG Position, ULONG MaxTransferCount); VOID UpdateCommonBufferOverlap(ULONG Position, ULONG MaxTransferCount); VOID GeneratePositionEvents(IN ULONGLONG OldOffset, IN ULONGLONG NewOffset); - NTSTATUS NTAPI HandleKsStream(IN PIRP Irp); - NTSTATUS NTAPI HandleKsProperty(IN PIRP Irp); - friend NTSTATUS NTAPI PinWaveCyclicState(IN PIRP Irp, IN PKSIDENTIFIER Request, IN OUT PVOID Data); friend NTSTATUS NTAPI PinWaveCyclicDataFormat(IN PIRP Irp, IN PKSIDENTIFIER Request, IN OUT PVOID Data); @@ -52,6 +47,7 @@ friend NTSTATUS NTAPI PinWaveCyclicAllocatorFraming(IN PIRP Irp, IN PKSIDENTIFIER Request, IN OUT PVOID Data); friend NTSTATUS NTAPI PinWaveCyclicAddEndOfStreamEvent(IN PIRP Irp, IN PKSEVENTDATA EventData, IN PKSEVENT_ENTRY EventEntry); friend NTSTATUS NTAPI PinWaveCyclicAddLoopedStreamEvent(IN PIRP Irp, IN PKSEVENTDATA EventData, IN PKSEVENT_ENTRY EventEntry); + friend VOID CALLBACK PinSetStateWorkerRoutine(IN PDEVICE_OBJECT DeviceObject, IN PVOID Context); IPortWaveCyclic * m_Port; IPortFilterWaveCyclic * m_Filter; @@ -82,6 +78,8 @@ KSPIN_LOCK m_EventListLock; LIST_ENTRY m_EventList; + KSRESET m_ResetState; + ULONG m_Delay; LONG m_Ref; @@ -358,6 +356,57 @@ return STATUS_NOT_SUPPORTED; } +typedef struct +{ + CPortPinWaveCyclic *Pin; + KSSTATE NewState; + PIO_WORKITEM WorkItem; + PIRP Irp; + +}SETPIN_CONTEXT, *PSETPIN_CONTEXT; + +VOID +CALLBACK +PinSetStateWorkerRoutine( + IN PDEVICE_OBJECT DeviceObject, + IN PVOID Context) +{ + PSETPIN_CONTEXT PinWorkContext = (PSETPIN_CONTEXT)Context; + NTSTATUS Status; + + // try set stream + Status = PinWorkContext->Pin->m_Stream->SetState(PinWorkContext->NewState); + + DPRINT1("Setting state %u %x\n", PinWorkContext->NewState, Status); + if (NT_SUCCESS(Status)) + { + // store new state + PinWorkContext->Pin->m_State = PinWorkContext->NewState; + + if (PinWorkContext->Pin->m_ConnectDetails->Interface.Id == KSINTERFACE_STANDARD_LOOPED_STREAMING && PinWorkContext->Pin->m_State == KSSTATE_STOP) + { + /* FIXME complete pending irps with successfull state */ + PinWorkContext->Pin->m_IrpQueue->CancelBuffers(); + } + //HACK + //PinWorkContext->Pin->m_IrpQueue->CancelBuffers(); + } + + // store result + PinWorkContext->Irp->IoStatus.Information = sizeof(KSSTATE); + PinWorkContext->Irp->IoStatus.Status = Status; + + // complete irp + IoCompleteRequest(PinWorkContext->Irp, IO_NO_INCREMENT); + + // free work item + IoFreeWorkItem(PinWorkContext->WorkItem); + + // free work context + FreeItem(PinWorkContext, TAG_PORTCLASS); + +} + NTSTATUS NTAPI @@ -366,10 +415,10 @@ IN PKSIDENTIFIER Request, IN OUT PVOID Data) { - NTSTATUS Status = STATUS_UNSUCCESSFUL; CPortPinWaveCyclic *Pin; PSUBDEVICE_DESCRIPTOR Descriptor; PKSSTATE State = (PKSSTATE)Data; + PSETPIN_CONTEXT PinWorkContext; // get sub device descriptor Descriptor = (PSUBDEVICE_DESCRIPTOR)KSPROPERTY_ITEM_IRP_STORAGE(Irp); @@ -387,25 +436,20 @@ if (Request->Flags & KSPROPERTY_TYPE_SET) { - // try set stream - Status = Pin->m_Stream->SetState(*State); - - DPRINT("Setting state %u %x\n", *State, Status); - if (NT_SUCCESS(Status)) - { - // store new state - Pin->m_State = *State; - - if (Pin->m_ConnectDetails->Interface.Id == KSINTERFACE_STANDARD_LOOPED_STREAMING && Pin->m_State == KSSTATE_STOP) - { - /* FIXME complete pending irps with successfull state */ - Pin->m_IrpQueue->CancelBuffers(); - } - } - - // store result - Irp->IoStatus.Information = sizeof(KSSTATE); - return Status; + PinWorkContext = (PSETPIN_CONTEXT)AllocateItem(NonPagedPool, sizeof(PSETPIN_CONTEXT), TAG_PORTCLASS); + PC_ASSERT(PinWorkContext); + + PinWorkContext->WorkItem = IoAllocateWorkItem(IoGetCurrentIrpStackLocation(Irp)->DeviceObject); + PC_ASSERT(PinWorkContext->WorkItem); + // initialize work item context + PinWorkContext->NewState = *State; + PinWorkContext->Pin = Pin; + PinWorkContext->Irp = Irp; + + IoMarkIrpPending(Irp); + + IoQueueWorkItem(PinWorkContext->WorkItem, PinSetStateWorkerRoutine, DelayedWorkQueue, (PVOID)PinWorkContext); + return STATUS_PENDING; } else if (Request->Flags & KSPROPERTY_TYPE_GET) { @@ -413,7 +457,7 @@ *State = Pin->m_State; // store result Irp->IoStatus.Information = sizeof(KSSTATE); - + DPRINT1("Getting state %u %x\n", *State, STATUS_SUCCESS); return STATUS_SUCCESS; } @@ -464,7 +508,7 @@ } // new change request - PC_ASSERT(Pin->m_State == KSSTATE_STOP); + PC_ASSERT(Pin->m_State != KSSTATE_RUN); // FIXME queue a work item when Irql != PASSIVE_LEVEL PC_ASSERT(KeGetCurrentIrql() == PASSIVE_LEVEL); @@ -762,78 +806,33 @@ NTSTATUS NTAPI -CPortPinWaveCyclic::HandleKsProperty( - IN PIRP Irp) -{ - PKSPROPERTY Property; - NTSTATUS Status; - UNICODE_STRING GuidString; - PIO_STACK_LOCATION IoStack; - - IoStack = IoGetCurrentIrpStackLocation(Irp); - - DPRINT("IPortPinWave_HandleKsProperty entered\n"); - - IoStack = IoGetCurrentIrpStackLocation(Irp); - - Status = PcHandlePropertyWithTable(Irp, m_Descriptor.FilterPropertySetCount, m_Descriptor.FilterPropertySet, &m_Descriptor); - - if (Status == STATUS_NOT_FOUND) - { - Property = (PKSPROPERTY)IoStack->Parameters.DeviceIoControl.Type3InputBuffer; - - RtlStringFromGUID(Property->Set, &GuidString); - DPRINT("Unhandeled property Set |%S| Id %u Flags %x\n", GuidString.Buffer, Property->Id, Property->Flags); - RtlFreeUnicodeString(&GuidString); - } - - if (Status != STATUS_PENDING) - { - Irp->IoStatus.Status = Status; - IoCompleteRequest(Irp, IO_NO_INCREMENT); - } - - return Status; -} - -NTSTATUS -NTAPI -CPortPinWaveCyclic::HandleKsStream( - IN PIRP Irp) -{ - NTSTATUS Status; - ULONG Data = 0; - InterlockedIncrement((PLONG)&m_TotalPackets); - - DPRINT("IPortPinWaveCyclic_HandleKsStream entered Total %u State %x MinData %u\n", m_TotalPackets, m_State, m_IrpQueue->NumData()); - - Status = m_IrpQueue->AddMapping(Irp, &Data); - - if (NT_SUCCESS(Status)) - { - m_Position.WriteOffset += Data; - - return STATUS_PENDING; - } - - return Status; -} - -NTSTATUS -NTAPI CPortPinWaveCyclic::DeviceIoControl( IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp) { PIO_STACK_LOCATION IoStack; + PKSPROPERTY Property; + UNICODE_STRING GuidString; NTSTATUS Status = STATUS_NOT_SUPPORTED; - + ULONG Data = 0; + KSRESET ResetValue; + + /* get current irp stack location */ IoStack = IoGetCurrentIrpStackLocation(Irp); - if (IoStack->Parameters.DeviceIoControl.IoControlCode == IOCTL_KS_PROPERTY) { - return HandleKsProperty(Irp); + /* handle property with subdevice descriptor */ + Status = PcHandlePropertyWithTable(Irp, m_Descriptor.FilterPropertySetCount, m_Descriptor.FilterPropertySet, &m_Descriptor); + + if (Status == STATUS_NOT_FOUND) + { + Property = (PKSPROPERTY)IoStack->Parameters.DeviceIoControl.Type3InputBuffer; + + RtlStringFromGUID(Property->Set, &GuidString); + DPRINT("Unhandeled property Set |%S| Id %u Flags %x\n", GuidString.Buffer, Property->Id, Property->Flags); + RtlFreeUnicodeString(&GuidString); + } } else if (IoStack->Parameters.DeviceIoControl.IoControlCode == IOCTL_KS_ENABLE_EVENT) { @@ -846,11 +845,48 @@ else if (IoStack->Parameters.DeviceIoControl.IoControlCode == IOCTL_KS_RESET_STATE) { /// FIXME - /// handle reset state + Status = KsAcquireResetValue(Irp, &ResetValue); + DPRINT("Status %x Value %u\n", Status, ResetValue); + /* check for success */ + if (NT_SUCCESS(Status)) + { + if (ResetValue == KSRESET_BEGIN) + { + m_IrpQueue->CancelBuffers(); + m_ResetState = KSRESET_BEGIN; + } + else if (ResetValue == KSRESET_END) + { + m_ResetState = KSRESET_END; + } + } } else if (IoStack->Parameters.DeviceIoControl.IoControlCode == IOCTL_KS_WRITE_STREAM || IoStack->Parameters.DeviceIoControl.IoControlCode == IOCTL_KS_READ_STREAM) { - return HandleKsStream(Irp); + /* increment total number of packets */ + InterlockedIncrement((PLONG)&m_TotalPackets); + + DPRINT("New Packet Total %u State %x MinData %u\n", m_TotalPackets, m_State, m_IrpQueue->NumData()); + + /* is the device not currently reset */ + if (m_ResetState == KSRESET_END) + { + /* add the mapping */ + Status = m_IrpQueue->AddMapping(Irp, &Data); + + /* check for success */ + if (NT_SUCCESS(Status)) + { + m_Position.WriteOffset += Data; + Status = STATUS_PENDING; + } + } + else + { + /* reset request is currently in progress */ + Status = STATUS_DEVICE_NOT_READY; + DPRINT1("NotReady\n"); + } } else { @@ -1146,6 +1182,9 @@ m_Descriptor.EventList = &m_EventList; m_Descriptor.EventListLock = &m_EventListLock; + // initialize reset state + m_ResetState = KSRESET_END; + // release subdevice descriptor Subdevice->Release(); @@ -1183,6 +1222,7 @@ m_AllocatorFraming.FrameSize = m_FrameSize; m_Stream->Silence(SilenceBuffer, m_FrameSize); + m_Stream->Silence(m_CommonBuffer, m_CommonBufferSize); Status = m_IrpQueue->Init(ConnectDetails, DataFormat, DeviceObject, m_FrameSize, 0, SilenceBuffer); if (!NT_SUCCESS(Status)) @@ -1203,8 +1243,8 @@ m_Port = Port; m_Filter = Filter; - DPRINT("Setting state to acquire %x\n", m_Stream->SetState(KSSTATE_ACQUIRE)); - DPRINT("Setting state to pause %x\n", m_Stream->SetState(KSSTATE_PAUSE)); + //DPRINT("Setting state to acquire %x\n", m_Stream->SetState(KSSTATE_ACQUIRE)); + //DPRINT("Setting state to pause %x\n", m_Stream->SetState(KSSTATE_PAUSE)); return STATUS_SUCCESS; } Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/port_dmus.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/port_dmus.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/port_dmus.cpp [iso-8859-1] Sat Nov 28 18:01:46 2009 @@ -107,6 +107,7 @@ if (IsEqualGUIDAligned(refiid, IID_IPortDMus) || IsEqualGUIDAligned(refiid, IID_IPortMidi) || + IsEqualGUIDAligned(refiid, IID_IPort) || IsEqualGUIDAligned(refiid, IID_IUnknown)) { *Output = PVOID(PUNKNOWN((IPortDMus*)this)); Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/private.hpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/private.hpp [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/private.hpp [iso-8859-1] Sat Nov 28 18:01:46 2009 @@ -328,7 +328,10 @@ IN PIRP Irp, IN PSUBDEVICE_DESCRIPTOR Descriptor); - +IIrpTarget * +NTAPI +KsoGetIrpTargetFromIrp( + PIRP Irp); #define DEFINE_KSPROPERTY_CONNECTIONSET(PinSet,\ PropStateHandler, PropDataFormatHandler, PropAllocatorFraming)\ @@ -389,6 +392,9 @@ LIST_ENTRY TimerList; KSPIN_LOCK TimerListLock; + DEVICE_POWER_STATE DevicePowerState; + SYSTEM_POWER_STATE SystemPowerState; + } PCLASS_DEVICE_EXTENSION, *PPCLASS_DEVICE_EXTENSION; @@ -406,4 +412,11 @@ PVOID Context; }TIMER_CONTEXT, *PTIMER_CONTEXT; +typedef struct +{ + KSOBJECT_HEADER ObjectHeader; + IIrpTarget * Target; + PKSOBJECT_CREATE_ITEM CreateItem; +}DISPATCH_CONTEXT, *PDISPATCH_CONTEXT; + #endif Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/propertyhandler.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/propertyhandler.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/propertyhandler.cpp [iso-8859-1] Sat Nov 28 18:01:46 2009 @@ -183,7 +183,7 @@ IIrpTarget * IrpTarget; IPort *Port; ISubdevice *SubDevice; - + PDISPATCH_CONTEXT DispatchContext; NTSTATUS Status = STATUS_UNSUCCESSFUL; @@ -193,8 +193,11 @@ // get current irp stack IoStack = IoGetCurrentIrpStackLocation(Irp); + // get dispatch context + DispatchContext = (PDISPATCH_CONTEXT)IoStack->FileObject->FsContext; + // Get the IrpTarget - IrpTarget = (IIrpTarget*)IoStack->FileObject->FsContext; + IrpTarget = DispatchContext->Target; PC_ASSERT(IrpTarget); // Get the parent Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/undoc.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/undoc.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/undoc.cpp [iso-8859-1] Sat Nov 28 18:01:46 2009 @@ -50,13 +50,13 @@ KsoGetIrpTargetFromIrp( PIRP Irp) { - PKSOBJECT_CREATE_ITEM CreateItem; - - // access the create item - CreateItem = KSCREATE_ITEM_IRP_STORAGE(Irp); + PIO_STACK_LOCATION IoStack; + + // get current irp stack location + IoStack = IoGetCurrentIrpStackLocation(Irp); // IIrpTarget is stored in Context member - return (IIrpTarget*)CreateItem->Context; + return (IIrpTarget*)IoStack->FileObject->FsContext; } NTSTATUS @@ -110,6 +110,9 @@ /* try first KsPropertyHandler */ Status = KsPropertyHandler(Irp, PropertySetCount, PropertySet); + if (Status != STATUS_NOT_FOUND) + return Status; + // get current irp stack location IoStack = IoGetCurrentIrpStackLocation(Irp); @@ -119,7 +122,7 @@ // check if this a GUID_NULL request if (Status == STATUS_NOT_FOUND) { - if (IoStack->Parameters.DeviceIoControl.InputBufferLength < sizeof(KSP_NODE)) + if (IoStack->Parameters.DeviceIoControl.InputBufferLength < sizeof(KSP_NODE) || !(Property->Property.Flags & KSPROPERTY_TYPE_TOPOLOGY)) return Status; // check if its a request for a topology node @@ -350,16 +353,21 @@ DumpFilterDescriptor( IN PPCFILTER_DESCRIPTOR FilterDescription) { - ULONG Index; + ULONG Index, SubIndex; PPCPROPERTY_ITEM PropertyItem; + PPCEVENT_ITEM EventItem; + PPCNODE_DESCRIPTOR NodeDescriptor; UNICODE_STRING GuidString; - DPRINT("======================\n"); - DPRINT("Descriptor Automation Table%p\n",FilterDescription->AutomationTable); + + + DPRINT1("======================\n"); + DPRINT1("Descriptor Automation Table%p\n",FilterDescription->AutomationTable); if (FilterDescription->AutomationTable) { - DPRINT("FilterPropertiesCount %u FilterPropertySize %u Expected %u\n", FilterDescription->AutomationTable->PropertyCount, FilterDescription->AutomationTable->PropertyItemSize, sizeof(PCPROPERTY_ITEM)); + DPRINT1("FilterPropertiesCount %u FilterPropertySize %u Expected %u Events %u EventItemSize %u expected %u\n", FilterDescription->AutomationTable->PropertyCount, FilterDescription->AutomationTable->PropertyItemSize, sizeof(PCPROPERTY_ITEM), + FilterDescription->AutomationTable->EventCount, FilterDescription->AutomationTable->EventItemSize, sizeof(PCEVENT_ITEM)); if (FilterDescription->AutomationTable->PropertyCount) { PropertyItem = (PPCPROPERTY_ITEM)FilterDescription->AutomationTable->Properties; @@ -367,15 +375,56 @@ for(Index = 0; Index < FilterDescription->AutomationTable->PropertyCount; Index++) { RtlStringFromGUID(*PropertyItem->Set, &GuidString); - DPRINT("Index %u GUID %S Id %u Flags %x\n", Index, GuidString.Buffer, PropertyItem->Id, PropertyItem->Flags); + DPRINT("Property Index %u GUID %S Id %u Flags %x\n", Index, GuidString.Buffer, PropertyItem->Id, PropertyItem->Flags); PropertyItem = (PPCPROPERTY_ITEM)((ULONG_PTR)PropertyItem + FilterDescription->AutomationTable->PropertyItemSize); } + + EventItem = (PPCEVENT_ITEM)FilterDescription->AutomationTable->Events; + for(Index = 0; Index < FilterDescription->AutomationTable->EventCount; Index++) + { + RtlStringFromGUID(*EventItem->Set, &GuidString); + DPRINT1("EventIndex %u GUID %S Id %u Flags %x\n", Index, GuidString.Buffer, EventItem->Id, EventItem->Flags); + + EventItem = (PPCEVENT_ITEM)((ULONG_PTR)EventItem + FilterDescription->AutomationTable->EventItemSize); + } + } } - - DPRINT("======================\n"); + if (FilterDescription->Nodes) + { + DPRINT1("NodeCount %u NodeSize %u expected %u\n", FilterDescription->NodeCount, FilterDescription->NodeSize, sizeof(PCNODE_DESCRIPTOR)); + NodeDescriptor = (PPCNODE_DESCRIPTOR)FilterDescription->Nodes; + for(Index = 0; Index < FilterDescription->NodeCount; Index++) + { + DPRINT("Index %u AutomationTable %p\n", Index, NodeDescriptor->AutomationTable); + + if (NodeDescriptor->AutomationTable) + { + DPRINT1("Index %u EventCount %u\n", Index, NodeDescriptor->AutomationTable->EventCount); + EventItem = (PPCEVENT_ITEM)NodeDescriptor->AutomationTable->Events; + for(SubIndex = 0; SubIndex < NodeDescriptor->AutomationTable->EventCount; SubIndex++) + { + RtlStringFromGUID(*EventItem->Set, &GuidString); + DPRINT1("EventIndex %u GUID %S Id %u Flags %x\n", Index, GuidString.Buffer, EventItem->Id, EventItem->Flags); + + EventItem = (PPCEVENT_ITEM)((ULONG_PTR)EventItem + FilterDescription->AutomationTable->EventItemSize); + } + + } + + + NodeDescriptor = (PPCNODE_DESCRIPTOR)((ULONG_PTR)NodeDescriptor + FilterDescription->NodeSize); + } + + + + } + + + + DPRINT1("======================\n"); } NTSTATUS

14 years, 10 months

[gschneider] 44308: [gdiplus] - Update to current Wine sources - Now routes BMP drawing to gdi instead of doing ole32 magic (bug #3412)

by gschneider＠svn.reactos.org

Author: gschneider Date: Sat Nov 28 16:26:02 2009 New Revision: 44308 URL: http://svn.reactos.org/svn/reactos?rev=44308&view=rev Log: [gdiplus] - Update to current Wine sources - Now routes BMP drawing to gdi instead of doing ole32 magic (bug #3412) Modified: trunk/reactos/dll/win32/gdiplus/brush.c trunk/reactos/dll/win32/gdiplus/gdiplus.c trunk/reactos/dll/win32/gdiplus/gdiplus.spec trunk/reactos/dll/win32/gdiplus/gdiplus_private.h trunk/reactos/dll/win32/gdiplus/graphics.c trunk/reactos/dll/win32/gdiplus/image.c Modified: trunk/reactos/dll/win32/gdiplus/brush.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdiplus/brush.c?… ============================================================================== --- trunk/reactos/dll/win32/gdiplus/brush.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/gdiplus/brush.c [iso-8859-1] Sat Nov 28 16:26:02 2009 @@ -143,7 +143,7 @@ } case BrushTypeLinearGradient:{ GpLineGradient *dest, *src; - INT count; + INT count, pcount; dest = GdipAlloc(sizeof(GpLineGradient)); if(!dest) return OutOfMemory; @@ -157,11 +157,20 @@ count = dest->blendcount; dest->blendfac = GdipAlloc(count * sizeof(REAL)); dest->blendpos = GdipAlloc(count * sizeof(REAL)); - - if (!dest->blendfac || !dest->blendpos) + pcount = dest->pblendcount; + if (pcount) + { + dest->pblendcolor = GdipAlloc(pcount * sizeof(ARGB)); + dest->pblendpos = GdipAlloc(pcount * sizeof(REAL)); + } + + if (!dest->blendfac || !dest->blendpos || + (pcount && (!dest->pblendcolor || !dest->pblendpos))) { GdipFree(dest->blendfac); GdipFree(dest->blendpos); + GdipFree(dest->pblendcolor); + GdipFree(dest->pblendpos); DeleteObject(dest->brush.gdibrush); GdipFree(dest); return OutOfMemory; @@ -169,6 +178,12 @@ memcpy(dest->blendfac, src->blendfac, count * sizeof(REAL)); memcpy(dest->blendpos, src->blendpos, count * sizeof(REAL)); + + if (pcount) + { + memcpy(dest->pblendcolor, src->pblendcolor, pcount * sizeof(ARGB)); + memcpy(dest->pblendpos, src->pblendpos, pcount * sizeof(REAL)); + } *clone = &dest->brush; break; @@ -189,19 +204,38 @@ return Ok; } -static LONG HatchStyleToHatch(HatchStyle hatchstyle) -{ - switch (hatchstyle) - { - case HatchStyleHorizontal: return HS_HORIZONTAL; - case HatchStyleVertical: return HS_VERTICAL; - case HatchStyleForwardDiagonal: return HS_FDIAGONAL; - case HatchStyleBackwardDiagonal: return HS_BDIAGONAL; - case HatchStyleCross: return HS_CROSS; - case HatchStyleDiagonalCross: return HS_DIAGCROSS; - default: return 0; - } -} +static const char HatchBrushes[][8] = { + { 0x00, 0x00, 0x00, 0xff, 0x00, 0x00, 0x00, 0x00 }, /* HatchStyleHorizontal */ + { 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08 }, /* HatchStyleVertical */ + { 0x01, 0x02, 0x04, 0x08, 0x10, 0x20, 0x40, 0x80 }, /* HatchStyleForwardDiagonal */ + { 0x80, 0x40, 0x20, 0x10, 0x08, 0x04, 0x02, 0x01 }, /* HatchStyleBackwardDiagonal */ + { 0x08, 0x08, 0x08, 0xff, 0x08, 0x08, 0x08, 0x08 }, /* HatchStyleCross */ + { 0x81, 0x42, 0x24, 0x18, 0x18, 0x24, 0x42, 0x81 }, /* HatchStyleDiagonalCross */ + { 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x80 }, /* HatchStyle05Percent */ + { 0x00, 0x02, 0x00, 0x88, 0x00, 0x20, 0x00, 0x88 }, /* HatchStyle10Percent */ + { 0x00, 0x22, 0x00, 0xcc, 0x00, 0x22, 0x00, 0xcc }, /* HatchStyle20Percent */ + { 0x00, 0xcc, 0x00, 0xcc, 0x00, 0xcc, 0x00, 0xcc }, /* HatchStyle25Percent */ + { 0x00, 0xcc, 0x04, 0xcc, 0x00, 0xcc, 0x40, 0xcc }, /* HatchStyle30Percent */ + { 0x44, 0xcc, 0x22, 0xcc, 0x44, 0xcc, 0x22, 0xcc }, /* HatchStyle40Percent */ + { 0x55, 0xcc, 0x55, 0xcc, 0x55, 0xcc, 0x55, 0xcc }, /* HatchStyle50Percent */ + { 0x55, 0xcd, 0x55, 0xee, 0x55, 0xdc, 0x55, 0xee }, /* HatchStyle60Percent */ + { 0x55, 0xdd, 0x55, 0xff, 0x55, 0xdd, 0x55, 0xff }, /* HatchStyle70Percent */ + { 0x55, 0xff, 0x55, 0xff, 0x55, 0xff, 0x55, 0xff }, /* HatchStyle75Percent */ + { 0x55, 0xff, 0x59, 0xff, 0x55, 0xff, 0x99, 0xff }, /* HatchStyle80Percent */ + { 0x77, 0xff, 0xdd, 0xff, 0x77, 0xff, 0xfd, 0xff }, /* HatchStyle90Percent */ + { 0x11, 0x22, 0x44, 0x88, 0x11, 0x22, 0x44, 0x88 }, /* HatchStyleLightDownwardDiagonal */ + { 0x88, 0x44, 0x22, 0x11, 0x88, 0x44, 0x22, 0x11 }, /* HatchStyleLightUpwardDiagonal */ + { 0x99, 0x33, 0x66, 0xcc, 0x99, 0x33, 0x66, 0xcc }, /* HatchStyleDarkDownwardDiagonal */ + { 0xcc, 0x66, 0x33, 0x99, 0xcc, 0x66, 0x33, 0x99 }, /* HatchStyleDarkUpwardDiagonal */ + { 0xc1, 0x83, 0x07, 0x0e, 0x1c, 0x38, 0x70, 0xe0 }, /* HatchStyleWideDownwardDiagonal */ + { 0xe0, 0x70, 0x38, 0x1c, 0x0e, 0x07, 0x83, 0xc1 }, /* HatchStyleWideUpwardDiagonal */ + { 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88 }, /* HatchStyleLightVertical */ + { 0x00, 0x00, 0x00, 0xff, 0x00, 0x00, 0x00, 0xff }, /* HatchStyleLightHorizontal */ + { 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa }, /* HatchStyleNarrowVertical */ + { 0x00, 0xff, 0x00, 0xff, 0x00, 0xff, 0x00, 0xff }, /* HatchStyleNarrowHorizontal */ + { 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc }, /* HatchStyleDarkVertical */ + { 0x00, 0x00, 0xff, 0xff, 0x00, 0x00, 0xff, 0xff }, /* HatchStyleDarkHorizontal */ +}; /****************************************************************************** * GdipCreateHatchBrush [GDIPLUS.@] @@ -209,6 +243,7 @@ GpStatus WINGDIPAPI GdipCreateHatchBrush(HatchStyle hatchstyle, ARGB forecol, ARGB backcol, GpHatch **brush) { COLORREF fgcol = ARGB2COLORREF(forecol); + GpStatus stat = Ok; TRACE("(%d, %d, %d, %p)\n", hatchstyle, forecol, backcol, brush); @@ -217,37 +252,79 @@ *brush = GdipAlloc(sizeof(GpHatch)); if (!*brush) return OutOfMemory; - switch (hatchstyle) + if (hatchstyle < sizeof(HatchBrushes) / sizeof(HatchBrushes[0])) { - case HatchStyleHorizontal: - case HatchStyleVertical: - case HatchStyleForwardDiagonal: - case HatchStyleBackwardDiagonal: - case HatchStyleCross: - case HatchStyleDiagonalCross: - /* Brushes that map to BS_HATCHED */ - (*brush)->brush.lb.lbStyle = BS_HATCHED; - (*brush)->brush.lb.lbColor = fgcol; - (*brush)->brush.lb.lbHatch = HatchStyleToHatch(hatchstyle); - break; - - default: - FIXME("Unimplemented hatch style %d\n", hatchstyle); - - (*brush)->brush.lb.lbStyle = BS_SOLID; - (*brush)->brush.lb.lbColor = fgcol; - (*brush)->brush.lb.lbHatch = 0; - break; - } - - - (*brush)->brush.gdibrush = CreateBrushIndirect(&(*brush)->brush.lb); - (*brush)->brush.bt = BrushTypeHatchFill; - (*brush)->forecol = forecol; - (*brush)->backcol = backcol; - (*brush)->hatchstyle = hatchstyle; - - return Ok; + HBITMAP hbmp; + HDC hdc; + BITMAPINFOHEADER bmih; + DWORD* bits; + int x, y; + + hdc = CreateCompatibleDC(0); + + if (hdc) + { + bmih.biSize = sizeof(bmih); + bmih.biWidth = 8; + bmih.biHeight = 8; + bmih.biPlanes = 1; + bmih.biBitCount = 32; + bmih.biCompression = BI_RGB; + bmih.biSizeImage = 0; + + hbmp = CreateDIBSection(hdc, (BITMAPINFO*)&bmih, DIB_RGB_COLORS, (void**)&bits, NULL, 0); + + if (hbmp) + { + for (y=0; y<8; y++) + for (x=0; x<8; x++) + if ((HatchBrushes[hatchstyle][y] & (0x80 >> x)) != 0) + bits[y*8+x] = forecol; + else + bits[y*8+x] = backcol; + } + else + stat = GenericError; + + DeleteDC(hdc); + } + else + stat = GenericError; + + if (stat == Ok) + { + (*brush)->brush.lb.lbStyle = BS_PATTERN; + (*brush)->brush.lb.lbColor = 0; + (*brush)->brush.lb.lbHatch = (ULONG_PTR)hbmp; + (*brush)->brush.gdibrush = CreateBrushIndirect(&(*brush)->brush.lb); + + DeleteObject(hbmp); + } + } + else + { + FIXME("Unimplemented hatch style %d\n", hatchstyle); + + (*brush)->brush.lb.lbStyle = BS_SOLID; + (*brush)->brush.lb.lbColor = fgcol; + (*brush)->brush.lb.lbHatch = 0; + (*brush)->brush.gdibrush = CreateBrushIndirect(&(*brush)->brush.lb); + } + + if (stat == Ok) + { + (*brush)->brush.bt = BrushTypeHatchFill; + (*brush)->forecol = forecol; + (*brush)->backcol = backcol; + (*brush)->hatchstyle = hatchstyle; + } + else + { + GdipFree(*brush); + *brush = NULL; + } + + return stat; } /****************************************************************************** @@ -315,6 +392,10 @@ (*line)->blendfac[0] = 1.0f; (*line)->blendpos[0] = 1.0f; + + (*line)->pblendcolor = NULL; + (*line)->pblendpos = NULL; + (*line)->pblendcount = 0; return Ok; } @@ -762,7 +843,7 @@ /* image is flipped */ if(pbmi->bmiHeader.biHeight > 0){ - dibits += pbmi->bmiHeader.biSizeImage; + dibits += image_stride * (pbmi->bmiHeader.biHeight - 1); image_stride *= -1; textbits += stride * (n_height - 1); stride *= -1; @@ -893,6 +974,8 @@ case BrushTypeLinearGradient: GdipFree(((GpLineGradient*)brush)->blendfac); GdipFree(((GpLineGradient*)brush)->blendpos); + GdipFree(((GpLineGradient*)brush)->pblendcolor); + GdipFree(((GpLineGradient*)brush)->pblendpos); break; case BrushTypeTextureFill: GdipDeleteMatrix(((GpTexture*)brush)->transform); @@ -1601,6 +1684,69 @@ GpStatus WINGDIPAPI GdipSetLinePresetBlend(GpLineGradient *brush, GDIPCONST ARGB *blend, GDIPCONST REAL* positions, INT count) { + ARGB *new_color; + REAL *new_pos; + TRACE("(%p,%p,%p,%i)\n", brush, blend, positions, count); + + if (!brush || !blend || !positions || count < 2 || + positions[0] != 0.0f || positions[count-1] != 1.0f) + { + return InvalidParameter; + } + + new_color = GdipAlloc(count * sizeof(ARGB)); + new_pos = GdipAlloc(count * sizeof(REAL)); + if (!new_color || !new_pos) + { + GdipFree(new_color); + GdipFree(new_pos); + return OutOfMemory; + } + + memcpy(new_color, blend, sizeof(ARGB) * count); + memcpy(new_pos, positions, sizeof(REAL) * count); + + GdipFree(brush->pblendcolor); + GdipFree(brush->pblendpos); + + brush->pblendcolor = new_color; + brush->pblendpos = new_pos; + brush->pblendcount = count; + + return Ok; +} + +GpStatus WINGDIPAPI GdipGetLinePresetBlend(GpLineGradient *brush, + ARGB *blend, REAL* positions, INT count) +{ + if (!brush || !blend || !positions || count < 2) + return InvalidParameter; + + if (brush->pblendcount == 0) + return GenericError; + + if (count < brush->pblendcount) + return InsufficientBuffer; + + memcpy(blend, brush->pblendcolor, sizeof(ARGB) * brush->pblendcount); + memcpy(positions, brush->pblendpos, sizeof(REAL) * brush->pblendcount); + + return Ok; +} + +GpStatus WINGDIPAPI GdipGetLinePresetBlendCount(GpLineGradient *brush, + INT *count) +{ + if (!brush || !count) + return InvalidParameter; + + *count = brush->pblendcount; + + return Ok; +} + +GpStatus WINGDIPAPI GdipResetLineTransform(GpLineGradient *brush) +{ static int calls; if(!(calls++)) @@ -1611,6 +1757,17 @@ GpStatus WINGDIPAPI GdipSetLineTransform(GpLineGradient *brush, GDIPCONST GpMatrix *matrix) +{ + static int calls; + + if(!(calls++)) + FIXME("not implemented\n"); + + return NotImplemented; +} + +GpStatus WINGDIPAPI GdipScaleLineTransform(GpLineGradient *brush, REAL sx, REAL sy, + GpMatrixOrder order) { static int calls; Modified: trunk/reactos/dll/win32/gdiplus/gdiplus.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdiplus/gdiplus.… ============================================================================== --- trunk/reactos/dll/win32/gdiplus/gdiplus.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/gdiplus/gdiplus.c [iso-8859-1] Sat Nov 28 16:26:02 2009 @@ -86,7 +86,7 @@ input->DebugEventCallback, input->SuppressBackgroundThread, input->SuppressExternalCodecs); - if(input->GdiplusVersion != 1) + if(input->GdiplusVersion < 1 || input->GdiplusVersion > 2) return UnsupportedGdiplusVersion; if(input->SuppressBackgroundThread){ @@ -211,38 +211,37 @@ INT arc2polybezier(GpPointF * points, REAL x1, REAL y1, REAL x2, REAL y2, REAL startAngle, REAL sweepAngle) { - INT i, count; + INT i; REAL end_angle, start_angle, endAngle; endAngle = startAngle + sweepAngle; unstretch_angle(&startAngle, x2 / 2.0, y2 / 2.0); unstretch_angle(&endAngle, x2 / 2.0, y2 / 2.0); - count = ceilf(fabs(endAngle - startAngle) / M_PI_2) * 3 + 1; - /* don't make more than a full circle */ - count = min(MAX_ARC_PTS, count); - - if(count == 1) - return 0; - if(!points) - return count; - /* start_angle and end_angle are the iterative variables */ start_angle = startAngle; - for(i = 0; i < count - 1; i += 3){ + for(i = 0; i < MAX_ARC_PTS - 1; i += 3){ /* check if we've overshot the end angle */ if( sweepAngle > 0.0 ) + { + if (start_angle >= endAngle) break; end_angle = min(start_angle + M_PI_2, endAngle); + } else + { + if (start_angle <= endAngle) break; end_angle = max(start_angle - M_PI_2, endAngle); - - add_arc_part(&points[i], x1, y1, x2, y2, start_angle, end_angle, i == 0); + } + + if (points) + add_arc_part(&points[i], x1, y1, x2, y2, start_angle, end_angle, i == 0); start_angle += M_PI_2 * (sweepAngle < 0.0 ? -1.0 : 1.0); } - return count; + if (i == 0) return 0; + else return i+1; } COLORREF ARGB2COLORREF(ARGB color) @@ -419,7 +418,7 @@ } /* recursive deletion of GpRegion nodes */ -inline void delete_element(region_element* element) +void delete_element(region_element* element) { switch(element->type) { Modified: trunk/reactos/dll/win32/gdiplus/gdiplus.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdiplus/gdiplus.… ============================================================================== --- trunk/reactos/dll/win32/gdiplus/gdiplus.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/gdiplus/gdiplus.spec [iso-8859-1] Sat Nov 28 16:26:02 2009 @@ -304,8 +304,8 @@ @ stdcall GdipGetLineBlendCount(ptr ptr) @ stdcall GdipGetLineColors(ptr ptr) @ stdcall GdipGetLineGammaCorrection(ptr ptr) -@ stub GdipGetLinePresetBlend -@ stub GdipGetLinePresetBlendCount +@ stdcall GdipGetLinePresetBlend(ptr ptr ptr long) +@ stdcall GdipGetLinePresetBlendCount(ptr ptr) @ stdcall GdipGetLineRect(ptr ptr) @ stdcall GdipGetLineRectI(ptr ptr) @ stdcall GdipGetLineSpacing(ptr long ptr) @@ -476,7 +476,7 @@ @ stdcall GdipRemovePropertyItem(ptr long) @ stdcall GdipResetClip(ptr) @ stub GdipResetImageAttributes -@ stub GdipResetLineTransform +@ stdcall GdipResetLineTransform(ptr) @ stub GdipResetPageTransform @ stdcall GdipResetPath(ptr) @ stub GdipResetPathGradientTransform @@ -496,7 +496,7 @@ @ stdcall GdipSaveGraphics(ptr ptr) @ stdcall GdipSaveImageToFile(ptr ptr ptr ptr) @ stdcall GdipSaveImageToStream(ptr ptr ptr ptr) -@ stub GdipScaleLineTransform +@ stdcall GdipScaleLineTransform(ptr long long long) @ stdcall GdipScaleMatrix(ptr long long long) @ stub GdipScalePathGradientTransform @ stdcall GdipScalePenTransform(ptr long long long) Modified: trunk/reactos/dll/win32/gdiplus/gdiplus_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdiplus/gdiplus_… ============================================================================== --- trunk/reactos/dll/win32/gdiplus/gdiplus_private.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/gdiplus/gdiplus_private.h [iso-8859-1] Sat Nov 28 16:26:02 2009 @@ -61,7 +61,7 @@ extern GpStatus trace_path(GpGraphics *graphics, GpPath *path); typedef struct region_element region_element; -extern inline void delete_element(region_element *element); +extern void delete_element(region_element *element); static inline INT roundr(REAL x) { @@ -166,6 +166,9 @@ REAL* blendfac; /* blend factors */ REAL* blendpos; /* blend positions */ INT blendcount; + ARGB* pblendcolor; /* preset blend colors */ + REAL* pblendpos; /* preset blend positions */ + INT pblendcount; }; struct GpTexture{ @@ -208,6 +211,7 @@ struct GpImage{ IPicture* picture; ImageType type; + GUID format; UINT flags; }; Modified: trunk/reactos/dll/win32/gdiplus/graphics.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdiplus/graphics… ============================================================================== --- trunk/reactos/dll/win32/gdiplus/graphics.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/gdiplus/graphics.c [iso-8859-1] Sat Nov 28 16:26:02 2009 @@ -220,7 +220,27 @@ blendfac = (left_blendfac * (right_blendpos - position) + right_blendfac * (position - left_blendpos)) / range; } - return blend_colors(brush->startcolor, brush->endcolor, blendfac); + + if (brush->pblendcount == 0) + return blend_colors(brush->startcolor, brush->endcolor, blendfac); + else + { + int i=1; + ARGB left_blendcolor, right_blendcolor; + REAL left_blendpos, right_blendpos; + + /* locate the blend colors surrounding this position */ + while (blendfac > brush->pblendpos[i]) + i++; + + /* interpolate between the blend colors */ + left_blendpos = brush->pblendpos[i-1]; + left_blendcolor = brush->pblendcolor[i-1]; + right_blendpos = brush->pblendpos[i]; + right_blendcolor = brush->pblendcolor[i]; + blendfac = (blendfac - left_blendpos) / (right_blendpos - left_blendpos); + return blend_colors(left_blendcolor, right_blendcolor, blendfac); + } } static void brush_fill_path(GpGraphics *graphics, GpBrush* brush) @@ -1235,6 +1255,7 @@ (*metafile)->image.type = ImageTypeMetafile; + memcpy(&(*metafile)->image.format, &ImageFormatWMF, sizeof(GUID)); (*metafile)->bounds.X = ((REAL) placeable->BoundingBox.Left) / ((REAL) placeable->Inch); (*metafile)->bounds.Y = ((REAL) placeable->BoundingBox.Right) / ((REAL) placeable->Inch); (*metafile)->bounds.Width = ((REAL) (placeable->BoundingBox.Right @@ -1795,16 +1816,25 @@ REAL x, REAL y, REAL srcx, REAL srcy, REAL srcwidth, REAL srcheight, GpUnit srcUnit) { - FIXME("(%p, %p, %f, %f, %f, %f, %f, %f, %d): stub\n", graphics, image, x, y, srcx, srcy, srcwidth, srcheight, srcUnit); - return NotImplemented; + GpPointF points[3]; + TRACE("(%p, %p, %f, %f, %f, %f, %f, %f, %d)\n", graphics, image, x, y, srcx, srcy, srcwidth, srcheight, srcUnit); + + points[0].X = points[2].X = x; + points[0].Y = points[1].Y = y; + + /* FIXME: convert image coordinates to Graphics coordinates? */ + points[1].X = x + srcwidth; + points[2].Y = y + srcheight; + + return GdipDrawImagePointsRect(graphics, image, points, 3, srcx, srcy, + srcwidth, srcheight, srcUnit, NULL, NULL, NULL); } GpStatus WINGDIPAPI GdipDrawImagePointRectI(GpGraphics *graphics, GpImage *image, INT x, INT y, INT srcx, INT srcy, INT srcwidth, INT srcheight, GpUnit srcUnit) { - FIXME("(%p, %p, %d, %d, %d, %d, %d, %d, %d): stub\n", graphics, image, x, y, srcx, srcy, srcwidth, srcheight, srcUnit); - return NotImplemented; + return GdipDrawImagePointRect(graphics, image, x, y, srcx, srcy, srcwidth, srcheight, srcUnit); } GpStatus WINGDIPAPI GdipDrawImagePoints(GpGraphics *graphics, GpImage *image, @@ -1854,15 +1884,6 @@ else return NotImplemented; - /* IPicture renders bitmaps with the y-axis reversed - * FIXME: flipping for unknown image type might not be correct. */ - if(image->type != ImageTypeMetafile){ - INT temp; - temp = pti[0].y; - pti[0].y = pti[2].y; - pti[2].y = temp; - } - if(IPicture_Render(image->picture, graphics->hdc, pti[0].x, pti[0].y, pti[1].x - pti[0].x, pti[2].y - pti[0].y, srcx * dx, srcy * dy, @@ -2362,7 +2383,7 @@ HFONT gdifont; LOGFONTW lfw; TEXTMETRICW textmet; - GpPointF pt[2], rectcpy[4]; + GpPointF pt[3], rectcpy[4]; POINT corners[4]; WCHAR* stringdup; REAL angle, ang_cos, ang_sin, rel_width, rel_height; @@ -2409,6 +2430,21 @@ SetBkMode(graphics->hdc, TRANSPARENT); SetTextColor(graphics->hdc, brush->lb.lbColor); + pt[0].X = 0.0; + pt[0].Y = 0.0; + pt[1].X = 1.0; + pt[1].Y = 0.0; + pt[2].X = 0.0; + pt[2].Y = 1.0; + GdipTransformPoints(graphics, CoordinateSpaceDevice, CoordinateSpaceWorld, pt, 3); + angle = -gdiplus_atan2((pt[1].Y - pt[0].Y), (pt[1].X - pt[0].X)); + ang_cos = cos(angle); + ang_sin = sin(angle); + rel_width = sqrt((pt[1].Y-pt[0].Y)*(pt[1].Y-pt[0].Y)+ + (pt[1].X-pt[0].X)*(pt[1].X-pt[0].X)); + rel_height = sqrt((pt[2].Y-pt[0].Y)*(pt[2].Y-pt[0].Y)+ + (pt[2].X-pt[0].X)*(pt[2].X-pt[0].X)); + rectcpy[3].X = rectcpy[0].X = rect->X; rectcpy[1].Y = rectcpy[0].Y = rect->Y + offsety; rectcpy[2].X = rectcpy[1].X = rect->X + rect->Width; @@ -2416,30 +2452,14 @@ transform_and_round_points(graphics, corners, rectcpy, 4); if (roundr(rect->Width) == 0) - { - rel_width = 1.0; nwidth = INT_MAX; - } else - { - rel_width = sqrt((corners[1].x - corners[0].x) * (corners[1].x - corners[0].x) + - (corners[1].y - corners[0].y) * (corners[1].y - corners[0].y)) - / rect->Width; nwidth = roundr(rel_width * rect->Width); - } if (roundr(rect->Height) == 0) - { - rel_height = 1.0; nheight = INT_MAX; - } else - { - rel_height = sqrt((corners[2].x - corners[1].x) * (corners[2].x - corners[1].x) + - (corners[2].y - corners[1].y) * (corners[2].y - corners[1].y)) - / rect->Height; nheight = roundr(rel_height * rect->Height); - } if (roundr(rect->Width) != 0 && roundr(rect->Height) != 0) { @@ -2457,14 +2477,6 @@ lfw.lfHeight = roundr(((REAL)lfw.lfHeight) * rel_height); lfw.lfWidth = roundr(textmet.tmAveCharWidth * rel_width); - pt[0].X = 0.0; - pt[0].Y = 0.0; - pt[1].X = 1.0; - pt[1].Y = 0.0; - GdipTransformMatrixPoints(graphics->worldtrans, pt, 2); - angle = -gdiplus_atan2((pt[1].Y - pt[0].Y), (pt[1].X - pt[0].X)); - ang_cos = cos(angle); - ang_sin = sin(angle); lfw.lfEscapement = lfw.lfOrientation = roundr((angle / M_PI) * 1800.0); gdifont = CreateFontIndirectW(&lfw); Modified: trunk/reactos/dll/win32/gdiplus/image.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdiplus/image.c?… ============================================================================== --- trunk/reactos/dll/win32/gdiplus/image.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/gdiplus/image.c [iso-8859-1] Sat Nov 28 16:26:02 2009 @@ -94,36 +94,321 @@ return NotImplemented; } +static inline void getpixel_16bppGrayScale(BYTE *r, BYTE *g, BYTE *b, BYTE *a, + const BYTE *row, UINT x) +{ + *r = *g = *b = row[x*2+1]; + *a = 255; +} + +static inline void getpixel_16bppRGB555(BYTE *r, BYTE *g, BYTE *b, BYTE *a, + const BYTE *row, UINT x) +{ + WORD pixel = *((WORD*)(row)+x); + *r = (pixel>>7&0xf8)|(pixel>>12&0x7); + *g = (pixel>>2&0xf8)|(pixel>>6&0x7); + *b = (pixel<<3&0xf8)|(pixel>>2&0x7); + *a = 255; +} + +static inline void getpixel_16bppRGB565(BYTE *r, BYTE *g, BYTE *b, BYTE *a, + const BYTE *row, UINT x) +{ + WORD pixel = *((WORD*)(row)+x); + *r = (pixel>>8&0xf8)|(pixel>>13&0x7); + *g = (pixel>>3&0xfc)|(pixel>>9&0x3); + *b = (pixel<<3&0xf8)|(pixel>>2&0x7); + *a = 255; +} + +static inline void getpixel_16bppARGB1555(BYTE *r, BYTE *g, BYTE *b, BYTE *a, + const BYTE *row, UINT x) +{ + WORD pixel = *((WORD*)(row)+x); + *r = (pixel>>7&0xf8)|(pixel>>12&0x7); + *g = (pixel>>2&0xf8)|(pixel>>6&0x7); + *b = (pixel<<3&0xf8)|(pixel>>2&0x7); + if ((pixel&0x8000) == 0x8000) + *a = 255; + else + *a = 0; +} + +static inline void getpixel_24bppRGB(BYTE *r, BYTE *g, BYTE *b, BYTE *a, + const BYTE *row, UINT x) +{ + *r = row[x*3+2]; + *g = row[x*3+1]; + *b = row[x*3]; + *a = 255; +} + +static inline void getpixel_32bppRGB(BYTE *r, BYTE *g, BYTE *b, BYTE *a, + const BYTE *row, UINT x) +{ + *r = row[x*4+2]; + *g = row[x*4+1]; + *b = row[x*4]; + *a = 255; +} + +static inline void getpixel_32bppARGB(BYTE *r, BYTE *g, BYTE *b, BYTE *a, + const BYTE *row, UINT x) +{ + *r = row[x*4+2]; + *g = row[x*4+1]; + *b = row[x*4]; + *a = row[x*4+3]; +} + +static inline void getpixel_32bppPARGB(BYTE *r, BYTE *g, BYTE *b, BYTE *a, + const BYTE *row, UINT x) +{ + *a = row[x*4+3]; + if (*a == 0) + *r = *g = *b = 0; + else + { + *r = row[x*4+2] * 255 / *a; + *g = row[x*4+1] * 255 / *a; + *b = row[x*4] * 255 / *a; + } +} + +static inline void getpixel_48bppRGB(BYTE *r, BYTE *g, BYTE *b, BYTE *a, + const BYTE *row, UINT x) +{ + *r = row[x*6+5]; + *g = row[x*6+3]; + *b = row[x*6+1]; + *a = 255; +} + +static inline void getpixel_64bppARGB(BYTE *r, BYTE *g, BYTE *b, BYTE *a, + const BYTE *row, UINT x) +{ + *r = row[x*8+5]; + *g = row[x*8+3]; + *b = row[x*8+1]; + *a = row[x*8+7]; +} + +static inline void getpixel_64bppPARGB(BYTE *r, BYTE *g, BYTE *b, BYTE *a, + const BYTE *row, UINT x) +{ + *a = row[x*8+7]; + if (*a == 0) + *r = *g = *b = 0; + else + { + *r = row[x*8+5] * 255 / *a; + *g = row[x*8+3] * 255 / *a; + *b = row[x*8+1] * 255 / *a; + } +} + GpStatus WINGDIPAPI GdipBitmapGetPixel(GpBitmap* bitmap, INT x, INT y, ARGB *color) { - static int calls; + BYTE r, g, b, a; + BYTE *row; TRACE("%p %d %d %p\n", bitmap, x, y, color); - if(!bitmap || !color) - return InvalidParameter; - - if(!(calls++)) - FIXME("not implemented\n"); - - *color = 0xdeadbeef; - - return NotImplemented; + if(!bitmap || !color || + x < 0 || y < 0 || x >= bitmap->width || y >= bitmap->height) + return InvalidParameter; + + row = bitmap->bits+bitmap->stride*y; + + switch (bitmap->format) + { + case PixelFormat16bppGrayScale: + getpixel_16bppGrayScale(&r,&g,&b,&a,row,x); + break; + case PixelFormat16bppRGB555: + getpixel_16bppRGB555(&r,&g,&b,&a,row,x); + break; + case PixelFormat16bppRGB565: + getpixel_16bppRGB565(&r,&g,&b,&a,row,x); + break; + case PixelFormat16bppARGB1555: + getpixel_16bppARGB1555(&r,&g,&b,&a,row,x); + break; + case PixelFormat24bppRGB: + getpixel_24bppRGB(&r,&g,&b,&a,row,x); + break; + case PixelFormat32bppRGB: + getpixel_32bppRGB(&r,&g,&b,&a,row,x); + break; + case PixelFormat32bppARGB: + getpixel_32bppARGB(&r,&g,&b,&a,row,x); + break; + case PixelFormat32bppPARGB: + getpixel_32bppPARGB(&r,&g,&b,&a,row,x); + break; + case PixelFormat48bppRGB: + getpixel_48bppRGB(&r,&g,&b,&a,row,x); + break; + case PixelFormat64bppARGB: + getpixel_64bppARGB(&r,&g,&b,&a,row,x); + break; + case PixelFormat64bppPARGB: + getpixel_64bppPARGB(&r,&g,&b,&a,row,x); + break; + default: + FIXME("not implemented for format 0x%x\n", bitmap->format); + return NotImplemented; + } + + *color = a<<24|r<<16|g<<8|b; + + return Ok; +} + +static inline void setpixel_16bppGrayScale(BYTE r, BYTE g, BYTE b, BYTE a, + BYTE *row, UINT x) +{ + *((WORD*)(row)+x) = (r+g+b)*85; +} + +static inline void setpixel_16bppRGB555(BYTE r, BYTE g, BYTE b, BYTE a, + BYTE *row, UINT x) +{ + *((WORD*)(row)+x) = (r<<7&0x7c00)| + (g<<2&0x03e0)| + (b>>3&0x001f); +} + +static inline void setpixel_16bppRGB565(BYTE r, BYTE g, BYTE b, BYTE a, + BYTE *row, UINT x) +{ + *((WORD*)(row)+x) = (r<<8&0xf800)| + (g<<3&0x07e0)| + (b>>3&0x001f); +} + +static inline void setpixel_16bppARGB1555(BYTE r, BYTE g, BYTE b, BYTE a, + BYTE *row, UINT x) +{ + *((WORD*)(row)+x) = (a<<8&0x8000)| + (r<<7&0x7c00)| + (g<<2&0x03e0)| + (b>>3&0x001f); +} + +static inline void setpixel_24bppRGB(BYTE r, BYTE g, BYTE b, BYTE a, + BYTE *row, UINT x) +{ + row[x*3+2] = r; + row[x*3+1] = g; + row[x*3] = b; +} + +static inline void setpixel_32bppRGB(BYTE r, BYTE g, BYTE b, BYTE a, + BYTE *row, UINT x) +{ + *((DWORD*)(row)+x) = (r<<16)|(g<<8)|b; +} + +static inline void setpixel_32bppARGB(BYTE r, BYTE g, BYTE b, BYTE a, + BYTE *row, UINT x) +{ + *((DWORD*)(row)+x) = (a<<24)|(r<<16)|(g<<8)|b; +} + +static inline void setpixel_32bppPARGB(BYTE r, BYTE g, BYTE b, BYTE a, + BYTE *row, UINT x) +{ + r = r * a / 255; + g = g * a / 255; + b = b * a / 255; + *((DWORD*)(row)+x) = (a<<24)|(r<<16)|(g<<8)|b; +} + +static inline void setpixel_48bppRGB(BYTE r, BYTE g, BYTE b, BYTE a, + BYTE *row, UINT x) +{ + row[x*6+5] = row[x*6+4] = r; + row[x*6+3] = row[x*6+2] = g; + row[x*6+1] = row[x*6] = b; +} + +static inline void setpixel_64bppARGB(BYTE r, BYTE g, BYTE b, BYTE a, + BYTE *row, UINT x) +{ + UINT64 a64=a, r64=r, g64=g, b64=b; + *((UINT64*)(row)+x) = (a64<<56)|(a64<<48)|(r64<<40)|(r64<<32)|(g64<<24)|(g64<<16)|(b64<<8)|b64; +} + +static inline void setpixel_64bppPARGB(BYTE r, BYTE g, BYTE b, BYTE a, + BYTE *row, UINT x) +{ + UINT64 a64, r64, g64, b64; + a64 = a * 257; + r64 = r * a / 255; + g64 = g * a / 255; + b64 = b * a / 255; + *((UINT64*)(row)+x) = (a64<<48)|(r64<<32)|(g64<<16)|b64; } GpStatus WINGDIPAPI GdipBitmapSetPixel(GpBitmap* bitmap, INT x, INT y, ARGB color) { - static int calls; + BYTE a, r, g, b; + BYTE *row; TRACE("bitmap:%p, x:%d, y:%d, color:%08x\n", bitmap, x, y, color); - if(!bitmap) - return InvalidParameter; - - if(!(calls++)) - FIXME("not implemented\n"); - - return NotImplemented; + if(!bitmap || x < 0 || y < 0 || x >= bitmap->width || y >= bitmap->height) + return InvalidParameter; + + a = color>>24; + r = color>>16; + g = color>>8; + b = color; + + row = bitmap->bits + bitmap->stride * y; + + switch (bitmap->format) + { + case PixelFormat16bppGrayScale: + setpixel_16bppGrayScale(r,g,b,a,row,x); + break; + case PixelFormat16bppRGB555: + setpixel_16bppRGB555(r,g,b,a,row,x); + break; + case PixelFormat16bppRGB565: + setpixel_16bppRGB565(r,g,b,a,row,x); + break; + case PixelFormat16bppARGB1555: + setpixel_16bppARGB1555(r,g,b,a,row,x); + break; + case PixelFormat24bppRGB: + setpixel_24bppRGB(r,g,b,a,row,x); + break; + case PixelFormat32bppRGB: + setpixel_32bppRGB(r,g,b,a,row,x); + break; + case PixelFormat32bppARGB: + setpixel_32bppARGB(r,g,b,a,row,x); + break; + case PixelFormat32bppPARGB: + setpixel_32bppPARGB(r,g,b,a,row,x); + break; + case PixelFormat48bppRGB: + setpixel_48bppRGB(r,g,b,a,row,x); + break; + case PixelFormat64bppARGB: + setpixel_64bppARGB(r,g,b,a,row,x); + break; + case PixelFormat64bppPARGB: + setpixel_64bppPARGB(r,g,b,a,row,x); + break; + default: + FIXME("not implemented for format 0x%x\n", bitmap->format); + return NotImplemented; + } + + return Ok; } /* This function returns a pointer to an array of pixels that represents the @@ -413,6 +698,8 @@ GdipDisposeImage(*cloneImage); *cloneImage = NULL; } + else memcpy(&(*cloneImage)->format, &image->format, sizeof(GUID)); + return stat; } else @@ -645,11 +932,7 @@ TRACE("%p, %p\n", hicon, bitmap); if(!bitmap || !GetIconInfo(hicon, &iinfo)) - { - DeleteObject(iinfo.hbmColor); - DeleteObject(iinfo.hbmMask); - return InvalidParameter; - } + return InvalidParameter; /* get the size of the icon */ ret = GetObjectA(iinfo.hbmColor ? iinfo.hbmColor : iinfo.hbmMask, sizeof(bm), &bm); @@ -858,6 +1141,7 @@ } (*bitmap)->image.type = ImageTypeBitmap; + memcpy(&(*bitmap)->image.format, &ImageFormatMemoryBMP, sizeof(GUID)); (*bitmap)->image.flags = ImageFlagsNone; (*bitmap)->width = width; (*bitmap)->height = height; @@ -1144,23 +1428,11 @@ GpStatus WINGDIPAPI GdipGetImageRawFormat(GpImage *image, GUID *format) { - static int calls; - if(!image || !format) return InvalidParameter; - if(!(calls++)) - FIXME("stub\n"); - - /* FIXME: should be detected from embedded picture or stored separately */ - switch (image->type) - { - case ImageTypeBitmap: *format = ImageFormatBMP; break; - case ImageTypeMetafile: *format = ImageFormatEMF; break; - default: - WARN("unknown type %u\n", image->type); - *format = ImageFormatUndefined; - } + memcpy(format, &image->format, sizeof(GUID)); + return Ok; } @@ -1507,105 +1779,37 @@ return decode_image_wic(stream, &CLSID_WICIcoDecoder, image); } +static GpStatus decode_image_bmp(IStream* stream, REFCLSID clsid, GpImage **image) +{ + GpStatus status; + GpBitmap* bitmap; + + status = decode_image_wic(stream, &CLSID_WICBmpDecoder, image); + + bitmap = (GpBitmap*)*image; + + if (status == Ok && bitmap->format == PixelFormat32bppARGB) + { + /* WIC supports bmp files with alpha, but gdiplus does not */ + bitmap->format = PixelFormat32bppRGB; + } + + return status; +} + static GpStatus decode_image_jpeg(IStream* stream, REFCLSID clsid, GpImage **image) { return decode_image_wic(stream, &CLSID_WICJpegDecoder, image); } +static GpStatus decode_image_png(IStream* stream, REFCLSID clsid, GpImage **image) +{ + return decode_image_wic(stream, &CLSID_WICPngDecoder, image); +} + static GpStatus decode_image_gif(IStream* stream, REFCLSID clsid, GpImage **image) { return decode_image_wic(stream, &CLSID_WICGifDecoder, image); -} - -static GpStatus decode_image_olepicture_bitmap(IStream* stream, REFCLSID clsid, GpImage **image) -{ - IPicture *pic; - BITMAPINFO *pbmi; - BITMAPCOREHEADER* bmch; - HBITMAP hbm; - HDC hdc; - - TRACE("%p %p\n", stream, image); - - if(!stream || !image) - return InvalidParameter; - - if(OleLoadPicture(stream, 0, FALSE, &IID_IPicture, - (LPVOID*) &pic) != S_OK){ - TRACE("Could not load picture\n"); - return GenericError; - } - - pbmi = GdipAlloc(sizeof(BITMAPINFOHEADER) + 256 * sizeof(RGBQUAD)); - if (!pbmi) - return OutOfMemory; - *image = GdipAlloc(sizeof(GpBitmap)); - if(!*image){ - GdipFree(pbmi); - return OutOfMemory; - } - (*image)->type = ImageTypeBitmap; - - (*((GpBitmap**) image))->width = ipicture_pixel_width(pic); - (*((GpBitmap**) image))->height = ipicture_pixel_height(pic); - - /* get the pixel format */ - IPicture_get_Handle(pic, (OLE_HANDLE*)&hbm); - IPicture_get_CurDC(pic, &hdc); - - (*((GpBitmap**) image))->hbitmap = hbm; - (*((GpBitmap**) image))->hdc = hdc; - (*((GpBitmap**) image))->bits = NULL; - - bmch = (BITMAPCOREHEADER*) (&pbmi->bmiHeader); - bmch->bcSize = sizeof(BITMAPCOREHEADER); - - if(!hdc){ - HBITMAP old; - hdc = CreateCompatibleDC(0); - old = SelectObject(hdc, hbm); - GetDIBits(hdc, hbm, 0, 0, NULL, pbmi, DIB_RGB_COLORS); - SelectObject(hdc, old); - DeleteDC(hdc); - } - else - GetDIBits(hdc, hbm, 0, 0, NULL, pbmi, DIB_RGB_COLORS); - - switch(bmch->bcBitCount) - { - case 1: - (*((GpBitmap**) image))->format = PixelFormat1bppIndexed; - break; - case 4: - (*((GpBitmap**) image))->format = PixelFormat4bppIndexed; - break; - case 8: - (*((GpBitmap**) image))->format = PixelFormat8bppIndexed; - break; - case 16: - (*((GpBitmap**) image))->format = PixelFormat16bppRGB565; - break; - case 24: - (*((GpBitmap**) image))->format = PixelFormat24bppRGB; - break; - case 32: - (*((GpBitmap**) image))->format = PixelFormat32bppRGB; - break; - case 48: - (*((GpBitmap**) image))->format = PixelFormat48bppRGB; - break; - default: - FIXME("Bit depth %d is not fully supported yet\n", bmch->bcBitCount); - (*((GpBitmap**) image))->format = (bmch->bcBitCount << 8) | PixelFormatGDI; - break; - } - - GdipFree(pbmi); - - (*image)->picture = pic; - (*image)->flags = ImageFlagsNone; - - return Ok; } static GpStatus decode_image_olepicture_metafile(IStream* stream, REFCLSID clsid, GpImage **image) @@ -1715,7 +1919,15 @@ if (FAILED(hr)) return hresult_to_status(hr); /* call on the image decoder to do the real work */ - return codec->decode_func(stream, &codec->info.Clsid, image); + stat = codec->decode_func(stream, &codec->info.Clsid, image); + + /* take note of the original data format */ + if (stat == Ok) + { + memcpy(&(*image)->format, &codec->info.FormatID, sizeof(GUID)); + } + + return stat; } /* FIXME: no ICM */ @@ -1913,6 +2125,12 @@ GDIPCONST CLSID* clsid, GDIPCONST EncoderParameters* params) { return encode_image_WIC(image, stream, &CLSID_WICBmpEncoder, params); +} + +static GpStatus encode_image_png(GpImage *image, IStream* stream, + GDIPCONST CLSID* clsid, GDIPCONST EncoderParameters* params) +{ + return encode_image_WIC(image, stream, &CLSID_WICPngEncoder, params); } /***************************************************************************** @@ -2051,7 +2269,7 @@ /* SigMask */ bmp_sig_mask, }, encode_image_BMP, - decode_image_olepicture_bitmap + decode_image_bmp }, { { /* JPEG */ @@ -2138,15 +2356,15 @@ /* FormatDescription */ png_format, /* FilenameExtension */ png_extension, /* MimeType */ png_mimetype, - /* Flags */ ImageCodecFlagsDecoder | ImageCodecFlagsSupportBitmap | ImageCodecFlagsBuiltin, + /* Flags */ ImageCodecFlagsEncoder | ImageCodecFlagsDecoder | ImageCodecFlagsSupportBitmap | ImageCodecFlagsBuiltin, /* Version */ 1, /* SigCount */ 1, /* SigSize */ 8, /* SigPattern */ png_sig_pattern, /* SigMask */ png_sig_mask, }, - NULL, - decode_image_olepicture_bitmap + encode_image_png, + decode_image_png }, { { /* ICO */

14 years, 10 months

[gschneider] 44307: [msvcrt] - Fix buffer calculation in argvtoW, missed unicode character size - Fixes another crash during GIMP startup, now GIMP starts (bug #3503, part 2) - Fix same problem in valisttoA/W

by gschneider＠svn.reactos.org

Author: gschneider Date: Sat Nov 28 16:16:36 2009 New Revision: 44307 URL: http://svn.reactos.org/svn/reactos?rev=44307&view=rev Log: [msvcrt] - Fix buffer calculation in argvtoW, missed unicode character size - Fixes another crash during GIMP startup, now GIMP starts (bug #3503, part 2) - Fix same problem in valisttoA/W Modified: trunk/reactos/lib/sdk/crt/process/process.c Modified: trunk/reactos/lib/sdk/crt/process/process.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/process/proces… ============================================================================== --- trunk/reactos/lib/sdk/crt/process/process.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/process/process.c [iso-8859-1] Sat Nov 28 16:16:36 2009 @@ -128,7 +128,7 @@ len += _tcslen(argv[i]) + 1; } - str = ptr = (_TCHAR*) malloc(len + 1); + str = ptr = (_TCHAR*) malloc((len + 1) * sizeof(_TCHAR)); if (str == NULL) return NULL; @@ -163,7 +163,7 @@ } while(ptr != NULL); - str = (_TCHAR*) malloc(len + 1); + str = (_TCHAR*) malloc((len + 1) * sizeof(_TCHAR)); if (str == NULL) return NULL;

14 years, 10 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs November 2009