Ros-diffs August 2009

ros-diffs@reactos.org

21 participants
654 discussions

[tkreuzer] 42626: [win32k] - EngSetPointerShape: Don't dereference psoMask without checking it
by tkreuzer＠svn.reactos.org 11 Aug '09

11 Aug '09

Author: tkreuzer Date: Tue Aug 11 21:03:51 2009 New Revision: 42626 URL: http://svn.reactos.org/svn/reactos?rev=42626&view=rev Log: [win32k] - EngSetPointerShape: Don't dereference psoMask without checking it Modified: trunk/reactos/subsystems/win32/win32k/eng/mouse.c Modified: trunk/reactos/subsystems/win32/win32k/eng/mouse.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/en… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/eng/mouse.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/eng/mouse.c [iso-8859-1] Tue Aug 11 21:03:51 2009 @@ -358,7 +358,7 @@ } } } - else + else if (psoMask) { pgp->Size.cx = psoMask->sizlBitmap.cx; pgp->Size.cy = psoMask->sizlBitmap.cy / 2;

1 0

[tkreuzer] 42625: [win32k] - GreSetPointerShape: Don't cleanup the XLATEOBJ when it wasn't initialized. - Found by Amine Khaldi
by tkreuzer＠svn.reactos.org 11 Aug '09

11 Aug '09

Author: tkreuzer Date: Tue Aug 11 20:42:30 2009 New Revision: 42625 URL: http://svn.reactos.org/svn/reactos?rev=42625&view=rev Log: [win32k] - GreSetPointerShape: Don't cleanup the XLATEOBJ when it wasn't initialized. - Found by Amine Khaldi Modified: trunk/reactos/subsystems/win32/win32k/eng/mouse.c Modified: trunk/reactos/subsystems/win32/win32k/eng/mouse.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/en… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/eng/mouse.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/eng/mouse.c [iso-8859-1] Tue Aug 11 20:42:30 2009 @@ -686,11 +686,11 @@ fl | SPS_CHANGE); /* Cleanup */ - if (hbmColor) + if (psurfColor) + { EXLATEOBJ_vCleanup(&exlo); - - if (psurfColor) SURFACE_ShareUnlockSurface(psurfColor); + } if (psurfMask) SURFACE_ShareUnlockSurface(psurfMask);

1 0

[pschweitzer] 42624: Other resync. Now branch builds up to gdi32.
by pschweitzer＠svn.reactos.org 11 Aug '09

11 Aug '09

Author: pschweitzer Date: Tue Aug 11 19:08:58 2009 New Revision: 42624 URL: http://svn.reactos.org/svn/reactos?rev=42624&view=rev Log: Other resync. Now branch builds up to gdi32. Modified: branches/pierre-fsd/drivers/filesystems/fastfat/fastio.c branches/pierre-fsd/drivers/filesystems/fs_rec/fs_rec.h branches/pierre-fsd/include/ddk/winddk.h Modified: branches/pierre-fsd/drivers/filesystems/fastfat/fastio.c URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/drivers/filesystems/… ============================================================================== --- branches/pierre-fsd/drivers/filesystems/fastfat/fastio.c [iso-8859-1] (original) +++ branches/pierre-fsd/drivers/filesystems/fastfat/fastio.c [iso-8859-1] Tue Aug 11 19:08:58 2009 @@ -114,7 +114,7 @@ static BOOLEAN NTAPI VfatFastIoUnlockAllByKey(IN PFILE_OBJECT FileObject, - PEPROCESS ProcessId, + PVOID ProcessId, ULONG Key, OUT PIO_STATUS_BLOCK IoStatus, IN PDEVICE_OBJECT DeviceObject) Modified: branches/pierre-fsd/drivers/filesystems/fs_rec/fs_rec.h URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/drivers/filesystems/… ============================================================================== --- branches/pierre-fsd/drivers/filesystems/fs_rec/fs_rec.h [iso-8859-1] (original) +++ branches/pierre-fsd/drivers/filesystems/fs_rec/fs_rec.h [iso-8859-1] Tue Aug 11 19:08:58 2009 @@ -25,6 +25,12 @@ // #define UDFS_VRS_START_OFFSET 32768 #define UDFS_AVDP_SECTOR 256 + +// +// Ext2 Magic +// Taken from Linux Kernel +// +#define EXT2_SUPER_MAGIC 0xEF53 // // Non-standard rounding macros Modified: branches/pierre-fsd/include/ddk/winddk.h URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/include/ddk/winddk.h… ============================================================================== --- branches/pierre-fsd/include/ddk/winddk.h [iso-8859-1] (original) +++ branches/pierre-fsd/include/ddk/winddk.h [iso-8859-1] Tue Aug 11 19:08:58 2009 @@ -2157,6 +2157,7 @@ #define DO_POWER_PAGABLE 0x00002000 #define DO_POWER_INRUSH 0x00004000 #define DO_LOW_PRIORITY_FILESYSTEM 0x00010000 +#define DO_XIP 0x00020000 /* DEVICE_OBJECT.Characteristics */ @@ -3289,7 +3290,7 @@ typedef BOOLEAN (DDKAPI *PFAST_IO_UNLOCK_ALL_BY_KEY)( IN struct _FILE_OBJECT *FileObject, - PEPROCESS ProcessId, + PVOID ProcessId, ULONG Key, OUT PIO_STATUS_BLOCK IoStatus, IN struct _DEVICE_OBJECT *DeviceObject); @@ -4548,6 +4549,9 @@ #define IO_FORCE_ACCESS_CHECK 0x001 #define IO_NO_PARAMETER_CHECKING 0x100 +#define IO_REPARSE 0x0 +#define IO_REMOUNT 0x1 + typedef NTSTATUS (DDKAPI *PIO_QUERY_DEVICE_ROUTINE)( IN PVOID Context,

1 0

[jmorlan] 42623: Fix a buffer overflow in ConvertULargeInteger
by jmorlan＠svn.reactos.org 11 Aug '09

11 Aug '09

Author: jmorlan Date: Tue Aug 11 18:21:46 2009 New Revision: 42623 URL: http://svn.reactos.org/svn/reactos?rev=42623&view=rev Log: Fix a buffer overflow in ConvertULargeInteger Modified: trunk/reactos/base/shell/cmd/cmd.c Modified: trunk/reactos/base/shell/cmd/cmd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/cmd.c?rev=4… ============================================================================== --- trunk/reactos/base/shell/cmd/cmd.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/cmd.c [iso-8859-1] Tue Aug 11 18:21:46 2009 @@ -182,7 +182,7 @@ INT ConvertULargeInteger(ULONGLONG num, LPTSTR des, INT len, BOOL bPutSeperator) { - TCHAR temp[32]; + TCHAR temp[39]; /* maximum length with nNumberGroups == 1 */ UINT n, iTarget; if (len <= 1) @@ -198,15 +198,15 @@ if (iTarget == n && bPutSeperator) { iTarget += nNumberGroups + 1; - temp[31 - n++] = cThousandSeparator; - } - temp[31 - n++] = (TCHAR)(num % 10) + _T('0'); + temp[38 - n++] = cThousandSeparator; + } + temp[38 - n++] = (TCHAR)(num % 10) + _T('0'); num /= 10; } while (num > 0); if (n > len-1) n = len-1; - memcpy(des, temp + 32 - n, n * sizeof(TCHAR)); + memcpy(des, temp + 39 - n, n * sizeof(TCHAR)); des[n] = _T('\0'); return n;

1 0

[janderwald] 42622: - Filter dispatch is optional, handle it when creating new filters
by janderwald＠svn.reactos.org 11 Aug '09

11 Aug '09

Author: janderwald Date: Tue Aug 11 17:22:06 2009 New Revision: 42622 URL: http://svn.reactos.org/svn/reactos?rev=42622&view=rev Log: - Filter dispatch is optional, handle it when creating new filters Modified: trunk/reactos/drivers/ksfilter/ks/filter.c Modified: trunk/reactos/drivers/ksfilter/ks/filter.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/ksfilter/ks/filter… ============================================================================== --- trunk/reactos/drivers/ksfilter/ks/filter.c [iso-8859-1] (original) +++ trunk/reactos/drivers/ksfilter/ks/filter.c [iso-8859-1] Tue Aug 11 17:22:06 2009 @@ -442,6 +442,13 @@ /* free object header */ KsFreeObjectHeader(This->ObjectHeader); + } + else + { + /* complete and forget */ + Irp->IoStatus.Status = Status; + /* complete irp */ + IoCompleteRequest(Irp, IO_NO_INCREMENT); } /* done */ @@ -1085,21 +1092,29 @@ return Status; } - /* now let driver initialize the filter instance */ - Status = Factory->FilterDescriptor->Dispatch->Create(&This->Filter, Irp); - - if (!NT_SUCCESS(Status) && Status != STATUS_PENDING) - { - /* driver failed to initialize */ - DPRINT1("Driver: Status %x\n", Status); - - /* remove filter instance from filter factory */ - iface->lpVtbl->RemoveFilterInstance(iface, (IKsFilter*)&This->lpVtbl); - - /* free filter instance */ - FreeItem(This); - FreeItem(CreateItem); - return Status; + /* does the filter have a filter dispatch */ + if (Factory->FilterDescriptor->Dispatch) + { + /* does it have a create routine */ + if (Factory->FilterDescriptor->Dispatch->Create) + { + /* now let driver initialize the filter instance */ + Status = Factory->FilterDescriptor->Dispatch->Create(&This->Filter, Irp); + + if (!NT_SUCCESS(Status) && Status != STATUS_PENDING) + { + /* driver failed to initialize */ + DPRINT1("Driver: Status %x\n", Status); + + /* remove filter instance from filter factory */ + iface->lpVtbl->RemoveFilterInstance(iface, (IKsFilter*)&This->lpVtbl); + + /* free filter instance */ + FreeItem(This); + FreeItem(CreateItem); + return Status; + } + } } /* now allocate the object header */

1 0

[gschneider] 42621: Re-add r42536, it didn't break the build server
by gschneider＠svn.reactos.org 11 Aug '09

11 Aug '09

Author: gschneider Date: Tue Aug 11 17:03:41 2009 New Revision: 42621 URL: http://svn.reactos.org/svn/reactos?rev=42621&view=rev Log: Re-add r42536, it didn't break the build server Modified: trunk/reactos/dll/win32/kernel32/misc/commdcb.c Modified: trunk/reactos/dll/win32/kernel32/misc/commdcb.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/misc/co… ============================================================================== --- trunk/reactos/dll/win32/kernel32/misc/commdcb.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/misc/commdcb.c [iso-8859-1] Tue Aug 11 17:03:41 2009 @@ -627,7 +627,7 @@ DWORD dwErr; dwErr = ERROR_INVALID_PARAMETER; - cchAscii = WideCharToMultiByte(20127, 0, lpDef, -1, NULL, 0, NULL, NULL); + cchAscii = WideCharToMultiByte(CP_ACP, 0, lpDef, -1, NULL, 0, NULL, NULL); bRet = cchAscii > 0; @@ -641,7 +641,7 @@ if(bRet) { bInvalidChars = FALSE; - cchAscii = WideCharToMultiByte(20127, 0, lpDef, -1, pszAscii, cchAscii, NULL, &bInvalidChars); + cchAscii = WideCharToMultiByte(CP_ACP, 0, lpDef, -1, pszAscii, cchAscii, NULL, &bInvalidChars); bRet = cchAscii > 0 && !bInvalidChars;

1 0

[janderwald] 42620: - Start implementing splitter - Add a device descriptor
by janderwald＠svn.reactos.org 11 Aug '09

11 Aug '09

Author: janderwald Date: Tue Aug 11 17:03:33 2009 New Revision: 42620 URL: http://svn.reactos.org/svn/reactos?rev=42620&view=rev Log: - Start implementing splitter - Add a device descriptor Added: trunk/reactos/drivers/wdm/audio/filters/splitter/filter.c (with props) trunk/reactos/drivers/wdm/audio/filters/splitter/pin.c (with props) trunk/reactos/drivers/wdm/audio/filters/splitter/precomp.h (with props) trunk/reactos/drivers/wdm/audio/filters/splitter/splitter.c (with props) trunk/reactos/drivers/wdm/audio/filters/splitter/splitter.rbuild (with props) Added: trunk/reactos/drivers/wdm/audio/filters/splitter/filter.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/filters/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/filters/splitter/filter.c (added) +++ trunk/reactos/drivers/wdm/audio/filters/splitter/filter.c [iso-8859-1] Tue Aug 11 17:03:33 2009 @@ -1,0 +1,20 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS Kernel Streaming + * FILE: drivers/wdm/audio/filters/splitter/filter.c + * PURPOSE: Filter File Context Handling + * PROGRAMMER: Johannes Anderwald + */ + +#include "precomp.h" + +NTSTATUS +NTAPI +FilterProcess( + IN PKSFILTER Filter, + IN PKSPROCESSPIN_INDEXENTRY ProcessPinsIndex) +{ + UNIMPLEMENTED + return STATUS_NOT_IMPLEMENTED; +} + Propchange: trunk/reactos/drivers/wdm/audio/filters/splitter/filter.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/drivers/wdm/audio/filters/splitter/pin.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/filters/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/filters/splitter/pin.c (added) +++ trunk/reactos/drivers/wdm/audio/filters/splitter/pin.c [iso-8859-1] Tue Aug 11 17:03:33 2009 @@ -1,0 +1,76 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS Kernel Streaming + * FILE: drivers/wdm/audio/filters/splitter/pin.c + * PURPOSE: Pin Context Handling + * PROGRAMMER: Johannes Anderwald + */ + +#include "precomp.h" + +NTSTATUS +NTAPI +PinCreate( + IN PKSPIN Pin, + IN PIRP Irp) +{ + UNIMPLEMENTED + return STATUS_NOT_IMPLEMENTED; +} + +NTSTATUS +NTAPI +PinClose( + IN PKSPIN Pin, + IN PIRP Irp) +{ + UNIMPLEMENTED + return STATUS_NOT_IMPLEMENTED; +} + +VOID +NTAPI +PinReset( + IN PKSPIN Pin) +{ + UNIMPLEMENTED +} + +NTSTATUS +NTAPI +PinState( + IN PKSPIN Pin, + IN KSSTATE ToState, + IN KSSTATE FromState) +{ + UNIMPLEMENTED + return STATUS_NOT_IMPLEMENTED; +} + +NTSTATUS +NTAPI +AudioPositionPropertyHandler( + IN PIRP Irp, + IN PKSIDENTIFIER Request, + IN OUT PVOID Data) +{ + UNIMPLEMENTED + return STATUS_NOT_IMPLEMENTED; +} + +NTSTATUS +NTAPI +PinIntersectHandler( + IN PVOID Context, + IN PIRP Irp, + IN PKSP_PIN Pin, + IN PKSDATARANGE DataRange, + IN PKSDATARANGE MatchingDataRange, + IN ULONG DataBufferSize, + OUT PVOID Data OPTIONAL, + OUT PULONG DataSize) +{ + UNIMPLEMENTED + return STATUS_NOT_IMPLEMENTED; +} + Propchange: trunk/reactos/drivers/wdm/audio/filters/splitter/pin.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/drivers/wdm/audio/filters/splitter/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/filters/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/filters/splitter/precomp.h (added) +++ trunk/reactos/drivers/wdm/audio/filters/splitter/precomp.h [iso-8859-1] Tue Aug 11 17:03:33 2009 @@ -1,0 +1,61 @@ +#ifndef PRECOMP_H__ +#define PRECOMP_H__ + +#include <ntddk.h> +#include <portcls.h> +#include <ks.h> +#include <ksmedia.h> +#include <debug.h> + +/* filter.c */ +NTSTATUS +NTAPI +FilterProcess( + IN PKSFILTER Filter, + IN PKSPROCESSPIN_INDEXENTRY ProcessPinsIndex); + +/* pin.c */ +NTSTATUS +NTAPI +PinCreate( + IN PKSPIN Pin, + IN PIRP Irp); + +NTSTATUS +NTAPI +PinClose( + IN PKSPIN Pin, + IN PIRP Irp); + +VOID +NTAPI +PinReset( + IN PKSPIN Pin); + +NTSTATUS +NTAPI +PinState( + IN PKSPIN Pin, + IN KSSTATE ToState, + IN KSSTATE FromState); + +NTSTATUS +NTAPI +AudioPositionPropertyHandler( + IN PIRP Irp, + IN PKSIDENTIFIER Request, + IN OUT PVOID Data); + +NTSTATUS +NTAPI +PinIntersectHandler( + IN PVOID Context, + IN PIRP Irp, + IN PKSP_PIN Pin, + IN PKSDATARANGE DataRange, + IN PKSDATARANGE MatchingDataRange, + IN ULONG DataBufferSize, + OUT PVOID Data OPTIONAL, + OUT PULONG DataSize); + +#endif Propchange: trunk/reactos/drivers/wdm/audio/filters/splitter/precomp.h ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/drivers/wdm/audio/filters/splitter/splitter.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/filters/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/filters/splitter/splitter.c (added) +++ trunk/reactos/drivers/wdm/audio/filters/splitter/splitter.c [iso-8859-1] Tue Aug 11 17:03:33 2009 @@ -1,0 +1,272 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS Kernel Streaming + * FILE: drivers/wdm/audio/filters/splitter/splitter.c + * PURPOSE: Splitter entry point + * PROGRAMMER: Johannes Anderwald + */ + +#include "precomp.h" + +const GUID PIN_VIDEO_CAPTURE = {0xfb6c4281, 0x0353, 0x11d1, {0x90, 0x5f, 0x0, 0x0, 0xc0, 0xcc, 0x16, 0xba}}; +const GUID KSPROPSETID_Audio = {0x45FFAAA0, 0x6E1B, 0x11D0, {0xBC, 0xF2, 0x44, 0x45, 0x53, 0x54, 0x00, 0x00}}; +const GUID KSCATEGORY_AUDIO_SPLITTER = {0x9EA331FA, 0xB91B, 0x45F8, {0x92, 0x85, 0xBD, 0x2B, 0xC7, 0x7A, 0xFC, 0xDE}}; +const GUID KSNAME_Filter = {0x9b365890, 0x165f, 0x11d0, {0xa1, 0x95, 0x00, 0x20, 0xaf, 0xd1, 0x56, 0xe4}}; + +KSPROPERTY_ITEM +PinPropertyTable[] = +{ + { + KSPROPERTY_AUDIO_POSITION, + {AudioPositionPropertyHandler}, + sizeof(KSPROPERTY), + sizeof(KSAUDIO_POSITION), + {AudioPositionPropertyHandler}, + NULL, + 0, + NULL, + NULL, + 0 + } +}; + +const +KSPROPERTY_SET +PinPropertySet[] = +{ + { + &KSPROPSETID_Audio, + 1, + PinPropertyTable, + 0, + NULL + } +}; + + +const +KSAUTOMATION_TABLE +PinAutomation = +{ + 1, + sizeof(PinPropertySet) / sizeof(KSPROPERTY_SET), + (const KSPROPERTY_SET*)&PinPropertySet, + 0, + sizeof(KSMETHOD_SET), + NULL, + 0, + sizeof(KSEVENT_SET), + NULL +}; + +const +KSPIN_DISPATCH +PinDispatch = +{ + PinCreate, + PinClose, + NULL, /* filter centric processing */ + PinReset, + NULL, + PinState, + NULL, + NULL, + NULL, + NULL +}; + + +const +KSFILTER_DISPATCH +FilterDispatch = +{ + NULL, + NULL, + FilterProcess, + NULL +}; + +KSDATARANGE +PinDataFormatRange = +{ + { + sizeof(KSDATARANGE), + 0, + 0, + 0, + {STATIC_KSDATAFORMAT_TYPE_AUDIO}, + {STATIC_GUID_NULL}, + {STATIC_GUID_NULL} + } +}; + +const +PKSDATARANGE +PinDataFormatRanges[] = +{ + &PinDataFormatRange +}; + +#if 0 +const +KSALLOCATOR_FRAMING_EX +AllocatorFraming = +{ + 1, + 0, + { + 1, + 1, + 0 + }, + 0, + { + {STATIC_KSMEMORY_TYPE_KERNEL_PAGED}, + {STATIC_GUID_NULL}, + KSALLOCATOR_REQUIREMENTF_MUST_ALLOCATE, + 0, + 0, //KSALLOCATOR_REQUIREMENTF_PREFERENCES_ONLY | KSALLOCATOR_FLAG_INSIST_ON_FRAMESIZE_RATIO | KSALLOCATOR_OPTIONF_VALID + 8, + FILE_64_BYTE_ALIGNMENT, + 0, + { + 0, + (ULONG)-1, + 1 + }, + { + { + 1536, // (48000khz * 2 channels * 16bit / 1000 ) * 8 frames + 1536, + 1 + }, + 0, + 0 + } + } +}; +#endif + +const +KSPIN_DESCRIPTOR_EX +PinDescriptors[] = +{ + { + &PinDispatch, + &PinAutomation, + { + 0, //no interfaces + NULL, + 0, // no mediums + NULL, + sizeof(PinDataFormatRange) / sizeof(PKSDATARANGE), + (const PKSDATARANGE*)&PinDataFormatRange, + KSPIN_DATAFLOW_OUT, + KSPIN_COMMUNICATION_BOTH, + NULL, + (const GUID*)&PIN_VIDEO_CAPTURE, + { + 0, + } + }, + KSPIN_FLAG_DISPATCH_LEVEL_PROCESSING | KSPIN_FLAG_INITIATE_PROCESSING_ON_EVERY_ARRIVAL | + KSPIN_FLAG_FRAMES_NOT_REQUIRED_FOR_PROCESSING | KSPIN_FLAG_PROCESS_IF_ANY_IN_RUN_STATE, + (ULONG)-1, + 1, + NULL, //&AllocatorFraming, + PinIntersectHandler + }, + { + &PinDispatch, + &PinAutomation, + { + 0, //no interfaces + NULL, + 0, // no mediums + NULL, + 1, + (const PKSDATARANGE*)&PinDataFormatRange, + KSPIN_DATAFLOW_IN, + KSPIN_COMMUNICATION_BOTH, + NULL, + NULL, + { + 0 + } + }, + KSPIN_FLAG_DISPATCH_LEVEL_PROCESSING | KSPIN_FLAG_INITIATE_PROCESSING_ON_EVERY_ARRIVAL | KSPIN_FLAG_PROCESS_IF_ANY_IN_RUN_STATE, + 1, + 1, + NULL, //&AllocatorFraming, + PinIntersectHandler + } +}; +const +GUID +Categories[] = +{ + {STATIC_KSCATEGORY_AUDIO}, + {STATIC_KSCATEGORY_AUDIO_SPLITTER} +}; + + +const +KSNODE_DESCRIPTOR +NodeDescriptor[] = +{ + { + NULL, //automation table + &KSCATEGORY_AUDIO_SPLITTER, //type + NULL // name + } +}; + + +const +KSFILTER_DESCRIPTOR +FilterDescriptor = +{ + &FilterDispatch, + NULL, + KSFILTER_DESCRIPTOR_VERSION, + KSFILTER_FLAG_DISPATCH_LEVEL_PROCESSING, + &KSNAME_Filter, + 2, + sizeof(KSPIN_DESCRIPTOR_EX), + (const KSPIN_DESCRIPTOR_EX*)&PinDescriptors, + sizeof(Categories) / sizeof(GUID), + (const GUID* )&Categories, + sizeof(NodeDescriptor) / sizeof(KSNODE_DESCRIPTOR), + sizeof(KSNODE_DESCRIPTOR), + (const KSNODE_DESCRIPTOR*)&NodeDescriptor, + DEFINE_KSFILTER_DEFAULT_CONNECTIONS, + NULL +}; + +const +KSFILTER_DESCRIPTOR * +FilterDescriptors = +{ + (const KSFILTER_DESCRIPTOR *)&FilterDescriptor +}; + +const +KSDEVICE_DESCRIPTOR +DeviceDescriptor = +{ + NULL, //no pnp notifications needed + 1, // filter descriptor count + (const KSFILTER_DESCRIPTOR * const *)&FilterDescriptors, + 0, // pre KSDEVICE_DESCRIPTOR_VERSION + 0 +}; + + +NTSTATUS +NTAPI +DriverEntry( + PDRIVER_OBJECT DriverObject, + PUNICODE_STRING RegistryPathName) +{ + return KsInitializeDriver(DriverObject, RegistryPathName, &DeviceDescriptor); +} Propchange: trunk/reactos/drivers/wdm/audio/filters/splitter/splitter.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/drivers/wdm/audio/filters/splitter/splitter.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/filters/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/filters/splitter/splitter.rbuild (added) +++ trunk/reactos/drivers/wdm/audio/filters/splitter/splitter.rbuild [iso-8859-1] Tue Aug 11 17:03:33 2009 @@ -1,0 +1,9 @@ +<?xml version="1.0"?> +<!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> +<module name="splitter" type="kernelmodedriver" installbase="system32/drivers" installname="splitter.sys"> + <library>ntoskrnl</library> + <library>ks</library> + <file>splitter.c</file> + <file>filter.c</file> + <file>pin.c</file> +</module> Propchange: trunk/reactos/drivers/wdm/audio/filters/splitter/splitter.rbuild ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[janderwald] 42619: - Add few macros, constants for splitter
by janderwald＠svn.reactos.org 11 Aug '09

11 Aug '09

Author: janderwald Date: Tue Aug 11 16:52:22 2009 New Revision: 42619 URL: http://svn.reactos.org/svn/reactos?rev=42619&view=rev Log: - Add few macros, constants for splitter Modified: trunk/reactos/include/psdk/ks.h trunk/reactos/include/psdk/ksmedia.h Modified: trunk/reactos/include/psdk/ks.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/ks.h?rev=4261… ============================================================================== --- trunk/reactos/include/psdk/ks.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/ks.h [iso-8859-1] Tue Aug 11 16:52:22 2009 @@ -90,10 +90,20 @@ #define STATIC_GUID_NULL \ -0x00000000L, 0x0000, 0x0000, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + 0x00000000L, 0x0000, 0x0000, {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00} DEFINE_GUIDSTRUCT("00000000-0000-0000-0000-000000000000", GUID_NULL); #define GUID_NULL DEFINE_GUIDNAMED(GUID_NULL) + +#define STATIC_KSNAME_Filter\ + 0x9b365890L, 0x165f, 0x11d0, {0xa1, 0x95, 0x00, 0x20, 0xaf, 0xd1, 0x56, 0xe4} +DEFINE_GUIDSTRUCT("9b365890-165f-11d0-a195-0020afd156e4", KSNAME_Filter); +#define KSNAME_Filter DEFINE_GUIDNAMED(KSNAME_Filter) + +#define STATIC_KSMEMORY_TYPE_KERNEL_PAGED \ + 0xd833f8f8L, 0x7894, 0x11d1, {0xb0, 0x69, 0x00, 0xa0, 0xc9, 0x06, 0x28, 0x02} +DEFINE_GUIDSTRUCT("d833f8f8-7894-11d1-b069-00a0c9062802", KSMEMORY_TYPE_KERNEL_PAGED); +#define KSMEMORY_TYPE_KERNEL_PAGED DEFINE_GUIDNAMED(KSMEMORY_TYPE_KERNEL_PAGED) /* =============================================================== I/O Control Codes @@ -2169,28 +2179,40 @@ PFNKSINTERSECTHANDLEREX IntersectHandler; } KSPIN_DESCRIPTOR_EX, *PKSPIN_DESCRIPTOR_EX; -/* TODO */ -#define KSPIN_FLAG_DISPATCH_LEVEL_PROCESSING -#define KSPIN_FLAG_CRITICAL_PROCESSING -#define KSPIN_FLAG_HYPERCRITICAL_PROCESSING -#define KSPIN_FLAG_ASYNCHRONOUS_PROCESSING -#define KSPIN_FLAG_DO_NOT_INITIATE_PROCESSING -#define KSPIN_FLAG_INITIATE_PROCESSING_ON_EVERY_ARRIVAL -#define KSPIN_FLAG_FRAMES_NOT_REQUIRED_FOR_PROCESSING -#define KSPIN_FLAG_ENFORCE_FIFO -#define KSPIN_FLAG_GENERATE_MAPPINGS -#define KSPIN_FLAG_DISTINCT_TRAILING_EDGE -#define KSPIN_FLAG_PROCESS_IN_RUN_STATE_ONLY -#define KSPIN_FLAG_SPLITTER -#define KSPIN_FLAG_USE_STANDARD_TRANSPORT -#define KSPIN_FLAG_DO_NOT_USE_STANDARD_TRANSPORT -#define KSPIN_FLAG_FIXED_FORMAT -#define KSPIN_FLAG_GENERATE_EOS_EVENTS -#define KSPIN_FLAG_RENDERER -#define KSPIN_FLAG_SOME_FRAMES_REQUIRED_FOR_PROCESSING -#define KSPIN_FLAG_PROCESS_IF_ANY_IN_RUN_STATE -#define KSPIN_FLAG_DENY_USERMODE_ACCESS -#define KSPIN_FLAG_IMPLEMENT_CLOCK +#define KSFILTER_FLAG_DISPATCH_LEVEL_PROCESSING 0x00000001 +#define KSFILTER_FLAG_CRITICAL_PROCESSING 0x00000002 +#define KSFILTER_FLAG_HYPERCRITICAL_PROCESSING 0x00000004 +#define KSFILTER_FLAG_RECEIVE_ZERO_LENGTH_SAMPLES 0x00000008 +#if (NTDDI_VERSION >= NTDDI_WINXPSP2) +#define KSFILTER_FLAG_DENY_USERMODE_ACCESS 0x80000000 +#endif + + +#define KSPIN_FLAG_DISPATCH_LEVEL_PROCESSING KSFILTER_FLAG_DISPATCH_LEVEL_PROCESSING +#define KSPIN_FLAG_CRITICAL_PROCESSING KSFILTER_FLAG_CRITICAL_PROCESSING +#define KSPIN_FLAG_HYPERCRITICAL_PROCESSING KSFILTER_FLAG_HYPERCRITICAL_PROCESSING +#define KSPIN_FLAG_ASYNCHRONOUS_PROCESSING 0x00000008 +#define KSPIN_FLAG_DO_NOT_INITIATE_PROCESSING 0x00000010 +#define KSPIN_FLAG_INITIATE_PROCESSING_ON_EVERY_ARRIVAL 0x00000020 +#define KSPIN_FLAG_FRAMES_NOT_REQUIRED_FOR_PROCESSING 0x00000040 +#define KSPIN_FLAG_ENFORCE_FIFO 0x00000080 + +#define KSPIN_FLAG_GENERATE_MAPPINGS 0x00000100 +#define KSPIN_FLAG_DISTINCT_TRAILING_EDGE 0x00000200 + +#define KSPIN_FLAG_PROCESS_IN_RUN_STATE_ONLY 0x00010000 +#define KSPIN_FLAG_SPLITTER 0x00020000 +#define KSPIN_FLAG_USE_STANDARD_TRANSPORT 0x00040000 +#define KSPIN_FLAG_DO_NOT_USE_STANDARD_TRANSPORT 0x00080000 +#define KSPIN_FLAG_FIXED_FORMAT 0x00100000 +#define KSPIN_FLAG_GENERATE_EOS_EVENTS 0x00200000 +#define KSPIN_FLAG_RENDERER (KSPIN_FLAG_PROCESS_IN_RUN_STATE_ONLY|KSPIN_FLAG_GENERATE_EOS_EVENTS) +#define KSPIN_FLAG_IMPLEMENT_CLOCK 0x00400000 +#define KSPIN_FLAG_SOME_FRAMES_REQUIRED_FOR_PROCESSING 0x00800000 +#define KSPIN_FLAG_PROCESS_IF_ANY_IN_RUN_STATE 0x01000000 +#if (NTDDI_VERSION >= NTDDI_WINXPSP2) +#define KSPIN_FLAG_DENY_USERMODE_ACCESS 0x80000000 +#endif struct _KSPIN { @@ -2757,6 +2779,8 @@ const KSCOMPONENTID* ComponentId; }; +#define KSFILTER_DESCRIPTOR_VERSION ((ULONG)-1) + struct _KSDEVICE_DESCRIPTOR { const KSDEVICE_DISPATCH* Dispatch; @@ -2771,6 +2795,44 @@ KSOBJECT_BAG Bag; PVOID Context; }; + +#define DEFINE_KSFILTER_DESCRIPTOR(descriptor)\ + const KSFILTER_DESCRIPTOR descriptor = + +#define DEFINE_KSFILTER_PIN_DESCRIPTORS(table)\ + SIZEOF_ARRAY(table),\ + sizeof(table[0]),\ + table + +#define DEFINE_KSFILTER_CATEGORIES(table)\ + SIZEOF_ARRAY(table),\ + table + +#define DEFINE_KSFILTER_CATEGORY(category)\ + 1,\ + &(category) + +#define DEFINE_KSFILTER_CATEGORIES_NULL\ + 0,\ + NULL + +#define DEFINE_KSFILTER_NODE_DESCRIPTORS(table)\ + SIZEOF_ARRAY(table),\ + sizeof(table[0]),\ + table + +#define DEFINE_KSFILTER_NODE_DESCRIPTORS_NULL\ + 0,\ + sizeof(KSNODE_DESCRIPTOR),\ + NULL + +#define DEFINE_KSFILTER_CONNECTIONS(table)\ + SIZEOF_ARRAY(table),\ + table + +#define DEFINE_KSFILTER_DEFAULT_CONNECTIONS\ + 0,\ + NULL #endif /* =============================================================== Modified: trunk/reactos/include/psdk/ksmedia.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/ksmedia.h?rev… ============================================================================== --- trunk/reactos/include/psdk/ksmedia.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/ksmedia.h [iso-8859-1] Tue Aug 11 16:52:22 2009 @@ -23,6 +23,14 @@ 0xFBF6F530L, 0x07B9, 0x11D2, {0xA7, 0x1E, 0x00, 0x00, 0xF8, 0x00, 0x47, 0x88} DEFINE_GUIDSTRUCT("FBF6F530-07B9-11D2-A71E-0000F8004788", KSCATEGORY_AUDIO_DEVICE); #define KSCATEGORY_AUDIO_DEVICE DEFINE_GUIDNAMED(KSCATEGORY_AUDIO_DEVICE) + +/* video */ +#define STATIC_PINNAME_VIDEO_CAPTURE \ + 0xfb6c4281, 0x353, 0x11d1, 0x90, 0x5f, 0x0, 0x0, 0xc0, 0xcc, 0x16, 0xba +#define STATIC_PINNAME_CAPTURE STATIC_PINNAME_VIDEO_CAPTURE +DEFINE_GUIDSTRUCT("FB6C4281-0353-11d1-905F-0000C0CC16BA", PINNAME_VIDEO_CAPTURE); +#define PINNAME_VIDEO_CAPTURE DEFINE_GUIDNAMED(PINNAME_VIDEO_CAPTURE) +#define PINNAME_CAPTURE PINNAME_VIDEO_CAPTURE /* Preferred devices */

1 0

[gschneider] 42618: Free memory on error
by gschneider＠svn.reactos.org 11 Aug '09

11 Aug '09

Author: gschneider Date: Tue Aug 11 16:37:52 2009 New Revision: 42618 URL: http://svn.reactos.org/svn/reactos?rev=42618&view=rev Log: Free memory on error Modified: trunk/reactos/lib/sdk/crt/stdio/file.c Modified: trunk/reactos/lib/sdk/crt/stdio/file.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/stdio/file.c?r… ============================================================================== --- trunk/reactos/lib/sdk/crt/stdio/file.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/stdio/file.c [iso-8859-1] Tue Aug 11 16:37:52 2009 @@ -1489,7 +1489,7 @@ free(patha); return retval; } - + free(patha); _dosmaperr(GetLastError()); return -1; }

1 0

[gschneider] 42617: Return INVALID_FILE_ATTRIBUTES when no filename is passed
by gschneider＠svn.reactos.org 11 Aug '09

11 Aug '09

Author: gschneider Date: Tue Aug 11 16:19:43 2009 New Revision: 42617 URL: http://svn.reactos.org/svn/reactos?rev=42617&view=rev Log: Return INVALID_FILE_ATTRIBUTES when no filename is passed Modified: trunk/reactos/dll/win32/kernel32/file/file.c Modified: trunk/reactos/dll/win32/kernel32/file/file.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/file/fi… ============================================================================== --- trunk/reactos/dll/win32/kernel32/file/file.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/file/file.c [iso-8859-1] Tue Aug 11 16:19:43 2009 @@ -996,9 +996,9 @@ { WIN32_FILE_ATTRIBUTE_DATA FileAttributeData; PWSTR FileNameW; - BOOL ret; - - if (!(FileNameW = FilenameA2W(lpFileName, FALSE))) + BOOL ret; + + if (!lpFileName || !(FileNameW = FilenameA2W(lpFileName, FALSE))) return INVALID_FILE_ATTRIBUTES; ret = GetFileAttributesExW(FileNameW, GetFileExInfoStandard, &FileAttributeData);

1 0

← Newer
1
...
33
34
35
36
37
38
39
...
66
Older →

Jump to page:

2025

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