Ros-diffs

ros-diffs@reactos.org

81390 discussions

[janderwald] 42590: - Arch broke it
by janderwald＠svn.reactos.org 10 Aug '09

10 Aug '09

Author: janderwald Date: Mon Aug 10 15:07:05 2009 New Revision: 42590 URL: http://svn.reactos.org/svn/reactos?rev=42590&view=rev Log: - Arch broke it Added: trunk/reactos/drivers/multimedia/bdasup/precomp.h (with props) Added: trunk/reactos/drivers/multimedia/bdasup/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/multimedia/bdasup/… ============================================================================== --- trunk/reactos/drivers/multimedia/bdasup/precomp.h (added) +++ trunk/reactos/drivers/multimedia/bdasup/precomp.h [iso-8859-1] Mon Aug 10 15:07:05 2009 @@ -1,0 +1,44 @@ +#ifndef PRECOMP_H__ +#define PRECOMP_H__ + +#include <ntddk.h> +#include <windef.h> +#include <ks.h> +#include <bdatypes.h> +#include <bdamedia.h> +#include <bdasup.h> + +#define NDEBUG +#include <debug.h> + + +typedef struct +{ + LIST_ENTRY Entry; + PKSFILTERFACTORY FilterFactoryInstance; + PBDA_FILTER_TEMPLATE FilterTemplate; +}BDA_FILTER_INSTANCE_ENTRY, *PBDA_FILTER_INSTANCE_ENTRY; + +typedef struct +{ + BOOLEAN Initialized; + KSPIN_LOCK FilterFactoryInstanceListLock; + LIST_ENTRY FilterFactoryInstanceList; +}BDA_GLOBAL, *PBDA_GLOBAL; + + +extern BDA_GLOBAL g_Settings; + + +PVOID +AllocateItem( + IN POOL_TYPE PoolType, + IN SIZE_T NumberOfBytes); + +VOID +FreeItem( + IN PVOID Item); + + + +#endif Propchange: trunk/reactos/drivers/multimedia/bdasup/precomp.h ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[pschweitzer] 42589: Other resync. Now branch builds up to ext2.
by pschweitzer＠svn.reactos.org 10 Aug '09

10 Aug '09

Author: pschweitzer Date: Mon Aug 10 15:02:15 2009 New Revision: 42589 URL: http://svn.reactos.org/svn/reactos?rev=42589&view=rev Log: Other resync. Now branch builds up to ext2. Removed: branches/pierre-fsd/subsystems/win32/csrss/api/alias.c Modified: branches/pierre-fsd/base/shell/cmd/chcp.c branches/pierre-fsd/base/shell/cmd/choice.c branches/pierre-fsd/base/shell/cmd/cmd.h branches/pierre-fsd/base/shell/cmd/color.c branches/pierre-fsd/base/shell/cmd/console.c branches/pierre-fsd/base/shell/cmd/copy.c branches/pierre-fsd/base/shell/cmd/date.c branches/pierre-fsd/base/shell/cmd/del.c branches/pierre-fsd/base/shell/cmd/echo.c branches/pierre-fsd/base/shell/cmd/error.c branches/pierre-fsd/base/shell/cmd/free.c branches/pierre-fsd/base/shell/cmd/goto.c branches/pierre-fsd/base/shell/cmd/internal.c branches/pierre-fsd/base/shell/cmd/label.c branches/pierre-fsd/base/shell/cmd/memory.c branches/pierre-fsd/base/shell/cmd/misc.c branches/pierre-fsd/base/shell/cmd/move.c branches/pierre-fsd/base/shell/cmd/path.c branches/pierre-fsd/base/shell/cmd/ren.c branches/pierre-fsd/base/shell/cmd/replace.c branches/pierre-fsd/base/shell/cmd/timer.c branches/pierre-fsd/base/shell/cmd/type.c branches/pierre-fsd/base/shell/cmd/ver.c branches/pierre-fsd/base/shell/cmd/verify.c branches/pierre-fsd/base/shell/cmd/vol.c branches/pierre-fsd/include/reactos/subsys/csrss/csrss.h branches/pierre-fsd/lib/sdk/crt/process/thread.c branches/pierre-fsd/lib/sdk/crt/process/threadx.c branches/pierre-fsd/subsystems/win32/csrss/api/handle.c branches/pierre-fsd/subsystems/win32/csrss/api/process.c branches/pierre-fsd/subsystems/win32/csrss/csrss.rbuild branches/pierre-fsd/subsystems/win32/csrss/include/api.h branches/pierre-fsd/subsystems/win32/csrss/include/conio.h branches/pierre-fsd/subsystems/win32/csrss/include/csrplugin.h branches/pierre-fsd/subsystems/win32/csrss/include/win32csr.h branches/pierre-fsd/subsystems/win32/csrss/init.c branches/pierre-fsd/subsystems/win32/csrss/win32csr/conio.c branches/pierre-fsd/subsystems/win32/csrss/win32csr/dllmain.c branches/pierre-fsd/subsystems/win32/csrss/win32csr/guiconsole.c branches/pierre-fsd/subsystems/win32/csrss/win32csr/tuiconsole.c branches/pierre-fsd/subsystems/win32/csrss/win32csr/win32csr.rbuild [This mail would be too long, it was shortened to contain the URLs only.] Modified: branches/pierre-fsd/base/shell/cmd/chcp.c URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/base/shell/cmd/chcp.… Modified: branches/pierre-fsd/base/shell/cmd/choice.c URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/base/shell/cmd/choic… Modified: branches/pierre-fsd/base/shell/cmd/cmd.h URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/base/shell/cmd/cmd.h… Modified: branches/pierre-fsd/base/shell/cmd/color.c URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/base/shell/cmd/color… Modified: branches/pierre-fsd/base/shell/cmd/console.c URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/base/shell/cmd/conso… Modified: branches/pierre-fsd/base/shell/cmd/copy.c URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/base/shell/cmd/copy.… Modified: branches/pierre-fsd/base/shell/cmd/date.c URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/base/shell/cmd/date.… Modified: branches/pierre-fsd/base/shell/cmd/del.c URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/base/shell/cmd/del.c… Modified: branches/pierre-fsd/base/shell/cmd/echo.c URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/base/shell/cmd/echo.… Modified: branches/pierre-fsd/base/shell/cmd/error.c URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/base/shell/cmd/error… Modified: branches/pierre-fsd/base/shell/cmd/free.c URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/base/shell/cmd/free.… Modified: branches/pierre-fsd/base/shell/cmd/goto.c URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/base/shell/cmd/goto.… Modified: branches/pierre-fsd/base/shell/cmd/internal.c URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/base/shell/cmd/inter… Modified: branches/pierre-fsd/base/shell/cmd/label.c URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/base/shell/cmd/label… Modified: branches/pierre-fsd/base/shell/cmd/memory.c URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/base/shell/cmd/memor… Modified: branches/pierre-fsd/base/shell/cmd/misc.c URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/base/shell/cmd/misc.… Modified: branches/pierre-fsd/base/shell/cmd/move.c URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/base/shell/cmd/move.… Modified: branches/pierre-fsd/base/shell/cmd/path.c URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/base/shell/cmd/path.… Modified: branches/pierre-fsd/base/shell/cmd/ren.c URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/base/shell/cmd/ren.c… Modified: branches/pierre-fsd/base/shell/cmd/replace.c URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/base/shell/cmd/repla… Modified: branches/pierre-fsd/base/shell/cmd/timer.c URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/base/shell/cmd/timer… Modified: branches/pierre-fsd/base/shell/cmd/type.c URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/base/shell/cmd/type.… Modified: branches/pierre-fsd/base/shell/cmd/ver.c URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/base/shell/cmd/ver.c… Modified: branches/pierre-fsd/base/shell/cmd/verify.c URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/base/shell/cmd/verif… Modified: branches/pierre-fsd/base/shell/cmd/vol.c URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/base/shell/cmd/vol.c… Modified: branches/pierre-fsd/include/reactos/subsys/csrss/csrss.h URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/include/reactos/subs… Modified: branches/pierre-fsd/lib/sdk/crt/process/thread.c URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/lib/sdk/crt/process/… Modified: branches/pierre-fsd/lib/sdk/crt/process/threadx.c URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/lib/sdk/crt/process/… Removed: branches/pierre-fsd/subsystems/win32/csrss/api/alias.c URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/subsystems/win32/csr… Modified: branches/pierre-fsd/subsystems/win32/csrss/api/handle.c URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/subsystems/win32/csr… Modified: branches/pierre-fsd/subsystems/win32/csrss/api/process.c URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/subsystems/win32/csr… Modified: branches/pierre-fsd/subsystems/win32/csrss/csrss.rbuild URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/subsystems/win32/csr… Modified: branches/pierre-fsd/subsystems/win32/csrss/include/api.h URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/subsystems/win32/csr… Modified: branches/pierre-fsd/subsystems/win32/csrss/include/conio.h URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/subsystems/win32/csr… Modified: branches/pierre-fsd/subsystems/win32/csrss/include/csrplugin.h URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/subsystems/win32/csr… Modified: branches/pierre-fsd/subsystems/win32/csrss/include/win32csr.h URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/subsystems/win32/csr… Modified: branches/pierre-fsd/subsystems/win32/csrss/init.c URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/subsystems/win32/csr… Modified: branches/pierre-fsd/subsystems/win32/csrss/win32csr/conio.c URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/subsystems/win32/csr… Modified: branches/pierre-fsd/subsystems/win32/csrss/win32csr/dllmain.c URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/subsystems/win32/csr… Modified: branches/pierre-fsd/subsystems/win32/csrss/win32csr/guiconsole.c URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/subsystems/win32/csr… Modified: branches/pierre-fsd/subsystems/win32/csrss/win32csr/tuiconsole.c URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/subsystems/win32/csr… Modified: branches/pierre-fsd/subsystems/win32/csrss/win32csr/win32csr.rbuild URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/subsystems/win32/csr…

1 0

[janderwald] 42588: - Add BDA filter context to object bag, so that it gets freed automatically later
by janderwald＠svn.reactos.org 10 Aug '09

10 Aug '09

Author: janderwald Date: Mon Aug 10 13:28:25 2009 New Revision: 42588 URL: http://svn.reactos.org/svn/reactos?rev=42588&view=rev Log: - Add BDA filter context to object bag, so that it gets freed automatically later Modified: trunk/reactos/drivers/multimedia/bdasup/bdasup.c Modified: trunk/reactos/drivers/multimedia/bdasup/bdasup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/multimedia/bdasup/… ============================================================================== --- trunk/reactos/drivers/multimedia/bdasup/bdasup.c [iso-8859-1] (original) +++ trunk/reactos/drivers/multimedia/bdasup/bdasup.c [iso-8859-1] Mon Aug 10 13:28:25 2009 @@ -105,6 +105,43 @@ { return BdaCreateFilterFactoryEx(pKSDevice, pFilterDescriptor, pBdaFilterTemplate, NULL); } + +VOID +NTAPI +FreeFilterInstance( + IN PVOID Context) +{ + PBDA_FILTER_INSTANCE_ENTRY InstanceEntry = NULL; + PLIST_ENTRY Entry; + KIRQL OldLevel; + + /* acquire list lock */ + KeAcquireSpinLock(&g_Settings.FilterFactoryInstanceListLock, &OldLevel); + + /* point to first entry */ + Entry = g_Settings.FilterFactoryInstanceList.Flink; + + while(Entry != &g_Settings.FilterFactoryInstanceList) + { + /* get instance entry from list entry offset */ + InstanceEntry = (PBDA_FILTER_INSTANCE_ENTRY)CONTAINING_RECORD(Entry, BDA_FILTER_INSTANCE_ENTRY, Entry); + + /* is the instance entry the requested one */ + if (InstanceEntry == (PBDA_FILTER_INSTANCE_ENTRY)Context) + { + RemoveEntryList(&InstanceEntry->Entry); + FreeItem(InstanceEntry); + break; + } + + /* move to next entry */ + Entry = Entry->Flink; + } + + /* release spin lock */ + KeReleaseSpinLock(&g_Settings.FilterFactoryInstanceListLock, OldLevel); +} + /* @implemented @@ -141,6 +178,16 @@ if (NT_SUCCESS(Status)) { + /* add the item to filter object bag */ + Status = KsAddItemToObjectBag(FilterFactory->Bag, FilterInstance, FreeFilterInstance); + if (!NT_SUCCESS(Status)) + { + /* destroy filter instance */ + FreeItem(FilterInstance); + KsDeleteFilterFactory(FilterFactory); + return Status; + } + /* initialize filter instance entry */ FilterInstance->FilterFactoryInstance = FilterFactory; FilterInstance->FilterTemplate = (BDA_FILTER_TEMPLATE *)BdaFilterTemplate; @@ -153,6 +200,7 @@ /* release spin lock */ KeReleaseSpinLock(&g_Settings.FilterFactoryInstanceListLock, OldLevel); + if (ppKSFilterFactory) {

1 0

[janderwald] 42587: - Add KsFilterFactoryGetParentDevice macro - Fix inline function for msvc compability
by janderwald＠svn.reactos.org 10 Aug '09

10 Aug '09

Author: janderwald Date: Mon Aug 10 13:27:23 2009 New Revision: 42587 URL: http://svn.reactos.org/svn/reactos?rev=42587&view=rev Log: - Add KsFilterFactoryGetParentDevice macro - Fix inline function for msvc compability Modified: trunk/reactos/include/psdk/ks.h Modified: trunk/reactos/include/psdk/ks.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/ks.h?rev=4258… ============================================================================== --- trunk/reactos/include/psdk/ks.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/ks.h [iso-8859-1] Mon Aug 10 13:27:23 2009 @@ -3747,8 +3747,8 @@ ); +static PKSFILTERFACTORY -static __inline KsFilterGetParentFilterFactory( IN PKSFILTER Filter @@ -3756,6 +3756,17 @@ { return (PKSFILTERFACTORY) KsGetParent((PVOID) Filter); } + +static +PKSDEVICE +__inline +KsFilterFactoryGetParentDevice( + IN PKSFILTERFACTORY FilterFactory + ) +{ + return (PKSDEVICE) KsGetParent((PVOID) FilterFactory); +} + #define KsDeleteFilterFactory(FilterFactory) \

1 0

[janderwald] 42586: [BDASUP] - Start implementing BDASup - Implement BdaCheckChanges, BdaCommitChanges, BdaCreateFilterFactory, BdaCreateFilterFactoryEx, BdaCreatePin, BdaMethodCreatePin, BdaFilterFactoryUpdateCacheData, BdaGetChangeState, BdaMethodCreateTopology, BdaMethodDeletePin, BdaPropertyTemplateConnections, BdaStartChanges, BdaUninitFilter, BdaValidateNodeProperty
by janderwald＠svn.reactos.org 10 Aug '09

10 Aug '09

Author: janderwald Date: Mon Aug 10 13:13:43 2009 New Revision: 42586 URL: http://svn.reactos.org/svn/reactos?rev=42586&view=rev Log: [BDASUP] - Start implementing BDASup - Implement BdaCheckChanges, BdaCommitChanges, BdaCreateFilterFactory, BdaCreateFilterFactoryEx, BdaCreatePin, BdaMethodCreatePin, BdaFilterFactoryUpdateCacheData, BdaGetChangeState, BdaMethodCreateTopology, BdaMethodDeletePin, BdaPropertyTemplateConnections, BdaStartChanges, BdaUninitFilter, BdaValidateNodeProperty Modified: trunk/reactos/drivers/multimedia/bdasup/bdasup.c trunk/reactos/drivers/multimedia/bdasup/bdasup.rbuild Modified: trunk/reactos/drivers/multimedia/bdasup/bdasup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/multimedia/bdasup/… ============================================================================== --- trunk/reactos/drivers/multimedia/bdasup/bdasup.c [iso-8859-1] (original) +++ trunk/reactos/drivers/multimedia/bdasup/bdasup.c [iso-8859-1] Mon Aug 10 13:13:43 2009 @@ -1,55 +1,308 @@ -#include <ntddk.h> -#include <windef.h> -#include <ks.h> -#include <bdatypes.h> -#include <bdamedia.h> -#include <bdasup.h> - -#define NDEBUG -#include <debug.h> - -STDMETHODIMP_(NTSTATUS) BdaCheckChanges(IN PIRP Irp) -{ - UNIMPLEMENTED - return STATUS_NOT_IMPLEMENTED; -} - -STDMETHODIMP_(NTSTATUS) BdaCommitChanges(IN PIRP Irp) -{ - UNIMPLEMENTED - return STATUS_NOT_IMPLEMENTED; -} - -STDMETHODIMP_(NTSTATUS) BdaCreateFilterFactory( +#include "precomp.h" + +BDA_GLOBAL g_Settings = +{ + 0, + 0, + {NULL, NULL} +}; + + +PVOID +AllocateItem( + IN POOL_TYPE PoolType, + IN SIZE_T NumberOfBytes) +{ + PVOID Item = ExAllocatePool(PoolType, NumberOfBytes); + if (!Item) + return Item; + + RtlZeroMemory(Item, NumberOfBytes); + return Item; +} + +VOID +FreeItem( + IN PVOID Item) +{ + ExFreePool(Item); +} + + +PBDA_FILTER_INSTANCE_ENTRY +GetFilterInstanceEntry( + IN PKSFILTERFACTORY FilterFactory) +{ + PBDA_FILTER_INSTANCE_ENTRY InstanceEntry = NULL; + PLIST_ENTRY Entry; + KIRQL OldLevel; + + /* acquire list lock */ + KeAcquireSpinLock(&g_Settings.FilterFactoryInstanceListLock, &OldLevel); + + /* point to first entry */ + Entry = g_Settings.FilterFactoryInstanceList.Flink; + + while(Entry != &g_Settings.FilterFactoryInstanceList) + { + /* get instance entry from list entry offset */ + InstanceEntry = (PBDA_FILTER_INSTANCE_ENTRY)CONTAINING_RECORD(Entry, BDA_FILTER_INSTANCE_ENTRY, Entry); + + /* is the instance entry the requested one */ + if (InstanceEntry->FilterFactoryInstance == FilterFactory) + break; + + /* move to next entry */ + Entry = Entry->Flink; + /* set to null as it has not been found */ + InstanceEntry = NULL; + } + + + /* release spin lock */ + KeReleaseSpinLock(&g_Settings.FilterFactoryInstanceListLock, OldLevel); + + /* return result */ + return InstanceEntry; +} + +/* + @implemented +*/ +NTSTATUS +NTAPI +BdaCheckChanges(IN PIRP Irp) +{ + if (!Irp) + return STATUS_INVALID_PARAMETER; + + return STATUS_SUCCESS; +} + +/* + @implemented +*/ +NTSTATUS +NTAPI +BdaCommitChanges(IN PIRP Irp) +{ + if (!Irp) + return STATUS_INVALID_PARAMETER; + + return STATUS_SUCCESS; +} + +/* + @implemented +*/ +NTSTATUS +NTAPI +BdaCreateFilterFactory( IN PKSDEVICE pKSDevice, IN const KSFILTER_DESCRIPTOR *pFilterDescriptor, IN const BDA_FILTER_TEMPLATE *pBdaFilterTemplate) { - UNIMPLEMENTED - return STATUS_NOT_IMPLEMENTED; -} - -STDMETHODIMP_(NTSTATUS) BdaCreateFilterFactoryEx( + return BdaCreateFilterFactoryEx(pKSDevice, pFilterDescriptor, pBdaFilterTemplate, NULL); +} + +/* + @implemented +*/ +NTSTATUS +NTAPI +BdaCreateFilterFactoryEx( IN PKSDEVICE pKSDevice, IN const KSFILTER_DESCRIPTOR *pFilterDescriptor, - IN const BDA_FILTER_TEMPLATE *pBdaFilterTemplate, + IN const BDA_FILTER_TEMPLATE *BdaFilterTemplate, OUT PKSFILTERFACTORY *ppKSFilterFactory) { - UNIMPLEMENTED - return STATUS_NOT_IMPLEMENTED; -} - -STDMETHODIMP_(NTSTATUS) BdaCreatePin( + PKSFILTERFACTORY FilterFactory; + PBDA_FILTER_INSTANCE_ENTRY FilterInstance; + KIRQL OldLevel; + NTSTATUS Status; + + /* FIXME provide a default automation table + * to handle requests which the driver doesnt implement + */ + + /* allocate filter instance */ + FilterInstance = AllocateItem(NonPagedPool, sizeof(BDA_FILTER_INSTANCE_ENTRY)); + if (!FilterInstance) + { + /* not enough memory */ + return STATUS_INSUFFICIENT_RESOURCES; + } + + /* create the filter factory */ + Status = KsCreateFilterFactory(pKSDevice->FunctionalDeviceObject, pFilterDescriptor, NULL, NULL, 0, NULL, NULL, &FilterFactory); + + /* check for success */ + if (NT_SUCCESS(Status)) + { + + /* initialize filter instance entry */ + FilterInstance->FilterFactoryInstance = FilterFactory; + FilterInstance->FilterTemplate = (BDA_FILTER_TEMPLATE *)BdaFilterTemplate; + + /* acquire list lock */ + KeAcquireSpinLock(&g_Settings.FilterFactoryInstanceListLock, &OldLevel); + + /* insert factory at the end */ + InsertTailList(&g_Settings.FilterFactoryInstanceList, &FilterInstance->Entry); + + /* release spin lock */ + KeReleaseSpinLock(&g_Settings.FilterFactoryInstanceListLock, OldLevel); + + if (ppKSFilterFactory) + { + /* store result */ + *ppKSFilterFactory = FilterFactory; + } + } + else + { + /* failed to create filter factory */ + FreeItem(FilterInstance); + } + + /* done */ + return Status; +} + +/* + @implemented +*/ +NTSTATUS +NTAPI +BdaCreatePin( IN PKSFILTER pKSFilter, IN ULONG ulPinType, OUT ULONG *pulPinId) { - UNIMPLEMENTED - return STATUS_NOT_IMPLEMENTED; -} - -STDMETHODIMP_(NTSTATUS) BdaCreateTopology( + PKSPIN_DESCRIPTOR_EX PinDescriptor; + PKSFILTERFACTORY FilterFactory; + PBDA_FILTER_INSTANCE_ENTRY InstanceEntry; + NTSTATUS Status; + ULONG PinId; + + if (!pulPinId || !pKSFilter) + return STATUS_INVALID_PARAMETER; + + + /* FIXME provide a default automation table + * to handle requests which the driver doesnt implement + */ + + /* get parent filter factory */ + FilterFactory = KsFilterGetParentFilterFactory(pKSFilter); + + /* sanity check */ + ASSERT(FilterFactory); + + /* find instance entry */ + InstanceEntry = GetFilterInstanceEntry(FilterFactory); + + if (!InstanceEntry) + { + /* the filter was not initialized with BDA */ + return STATUS_NOT_FOUND; + } + + /* sanity checks */ + ASSERT(InstanceEntry->FilterTemplate); + ASSERT(InstanceEntry->FilterTemplate->pFilterDescriptor); + + /* does the filter support any pins */ + if (!InstanceEntry->FilterTemplate->pFilterDescriptor->PinDescriptorsCount) + { + /* no pins supported */ + return STATUS_UNSUCCESSFUL; + } + + /* is pin factory still existing */ + if (InstanceEntry->FilterTemplate->pFilterDescriptor->PinDescriptorsCount <= ulPinType) + { + /* pin request is out of bounds */ + return STATUS_INVALID_PARAMETER; + } + + /* FIXME custom pin descriptors */ + ASSERT(InstanceEntry->FilterTemplate->pFilterDescriptor->PinDescriptorSize == sizeof(KSPIN_DESCRIPTOR_EX)); + + /* get pin descriptor */ + PinDescriptor = (PKSPIN_DESCRIPTOR_EX)&InstanceEntry->FilterTemplate->pFilterDescriptor->PinDescriptors[ulPinType]; + + /* create the pin factory */ + Status = KsFilterCreatePinFactory(pKSFilter, PinDescriptor, &PinId); + + /* check for success */ + if (NT_SUCCESS(Status)) + { + /* store result */ + *pulPinId = PinId; + } + + DPRINT("BdaCreatePin Result %x\n", Status); + return Status; +} + +/* + @implemented +*/ +NTSTATUS +NTAPI +BdaMethodCreatePin( + IN PIRP Irp, + IN KSMETHOD *pKSMethod, + OUT ULONG *pulPinFactoryID) +{ + PKSM_PIN Pin; + PKSFILTER Filter; + + if (!Irp) + { + /* invalid parameter */ + return STATUS_INVALID_PARAMETER; + } + + /* get filter from irp */ + Filter = KsGetFilterFromIrp(Irp); + + /* sanity check */ + ASSERT(Filter); + ASSERT(pKSMethod); + + /* get method request */ + Pin = (PKSM_PIN)pKSMethod; + + /* create the pin */ + return BdaCreatePin(Filter, Pin->PinId, pulPinFactoryID); +} + + + +/* + @unimplemented +*/ +NTSTATUS +NTAPI +BdaInitFilter( + IN PKSFILTER pKSFilter, + IN const BDA_FILTER_TEMPLATE *pBdaFilterTemplate) +{ + UNIMPLEMENTED + return STATUS_NOT_IMPLEMENTED; +} + + + +/* + @unimplemented +*/ +NTSTATUS +NTAPI +BdaCreateTopology( IN PKSFILTER pKSFilter, IN ULONG InputPinId, IN ULONG OutputPinId) @@ -58,7 +311,12 @@ return STATUS_NOT_IMPLEMENTED; } -STDMETHODIMP_(NTSTATUS) BdaDeletePin( +/* + @unimplemented +*/ +NTSTATUS +NTAPI +BdaDeletePin( IN PKSFILTER pKSFilter, IN ULONG *pulPinId) { @@ -66,58 +324,90 @@ return STATUS_NOT_IMPLEMENTED; } -STDMETHODIMP_(NTSTATUS) BdaFilterFactoryUpdateCacheData( - IN PKSFILTERFACTORY pFilterFactory, - IN const KSFILTER_DESCRIPTOR *pFilterDescriptor OPTIONAL) -{ - UNIMPLEMENTED - return STATUS_NOT_IMPLEMENTED; -} - -STDMETHODIMP_(NTSTATUS) BdaGetChangeState( - IN PIRP Irp, - OUT BDA_CHANGE_STATE *pChangeState) -{ - UNIMPLEMENTED - return STATUS_NOT_IMPLEMENTED; -} - -STDMETHODIMP_(NTSTATUS) BdaInitFilter( - IN PKSFILTER pKSFilter, - IN const BDA_FILTER_TEMPLATE *pBdaFilterTemplate) -{ - UNIMPLEMENTED - return STATUS_NOT_IMPLEMENTED; -} - -STDMETHODIMP_(NTSTATUS) BdaMethodCreatePin( - IN PIRP Irp, - IN KSMETHOD *pKSMethod, - OUT ULONG *pulPinFactoryID) -{ - UNIMPLEMENTED - return STATUS_NOT_IMPLEMENTED; -} - -STDMETHODIMP_(NTSTATUS) BdaMethodCreateTopology( +/* + @implemented +*/ +NTSTATUS +NTAPI +BdaFilterFactoryUpdateCacheData( + IN PKSFILTERFACTORY FilterFactory, + IN const KSFILTER_DESCRIPTOR *FilterDescriptor OPTIONAL) +{ + return KsFilterFactoryUpdateCacheData(FilterFactory, FilterDescriptor); +} + +/* + @implemented +*/ +NTSTATUS +NTAPI +BdaGetChangeState( + IN PIRP Irp, + OUT BDA_CHANGE_STATE *ChangeState) +{ + if (Irp && ChangeState) + { + *ChangeState = BDA_CHANGES_COMPLETE; + return STATUS_SUCCESS; + } + + /* invalid parameters supplied */ + return STATUS_INVALID_PARAMETER; + +} + +/* + @implemented +*/ +NTSTATUS +NTAPI +BdaMethodCreateTopology( IN PIRP Irp, IN KSMETHOD *pKSMethod, OPTIONAL PVOID pvIgnored) { - UNIMPLEMENTED - return STATUS_NOT_IMPLEMENTED; -} - -STDMETHODIMP_(NTSTATUS) BdaMethodDeletePin( + PKSFILTER Filter; + PKSP_BDA_NODE_PIN Node; + + /* check input parameters */ + if (!Irp || !pKSMethod) + return STATUS_INVALID_PARAMETER; + + /* get filter */ + Filter = KsGetFilterFromIrp(Irp); + + /* sanity check */ + ASSERT(Filter); + + /* get method request */ + Node = (PKSP_BDA_NODE_PIN)pKSMethod; + + /* create the topology */ + return BdaCreateTopology(Filter, Node->ulInputPinId, Node->ulOutputPinId); +} + +/* + @implemented +*/ +NTSTATUS +NTAPI +BdaMethodDeletePin( IN PIRP Irp, IN KSMETHOD *pKSMethod, OPTIONAL PVOID pvIgnored) { - UNIMPLEMENTED - return STATUS_NOT_IMPLEMENTED; -} - -STDMETHODIMP_(NTSTATUS) BdaPropertyGetControllingPinId( + if (!Irp) + return STATUS_INVALID_PARAMETER; + + return STATUS_SUCCESS; +} + +/* + @unimplemented +*/ +NTSTATUS +NTAPI +BdaPropertyGetControllingPinId( IN PIRP Irp, IN KSP_BDA_NODE_PIN *pProperty, OUT ULONG *pulControllingPinId) @@ -126,7 +416,12 @@ return STATUS_NOT_IMPLEMENTED; } -STDMETHODIMP_(NTSTATUS) BdaPropertyGetPinControl( +/* + @unimplemented +*/ +NTSTATUS +NTAPI +BdaPropertyGetPinControl( IN PIRP Irp, IN KSPROPERTY *pKSProperty, OUT ULONG *pulProperty) @@ -135,7 +430,12 @@ return STATUS_NOT_IMPLEMENTED; } -STDMETHODIMP_(NTSTATUS) BdaPropertyNodeDescriptors( +/* + @unimplemented +*/ +NTSTATUS +NTAPI +BdaPropertyNodeDescriptors( IN PIRP Irp, IN KSPROPERTY *pKSProperty, OUT GUID *pguidProperty) @@ -144,7 +444,12 @@ return STATUS_NOT_IMPLEMENTED; } -STDMETHODIMP_(NTSTATUS) BdaPropertyNodeEvents( +/* + @unimplemented +*/ +NTSTATUS +NTAPI +BdaPropertyNodeEvents( IN PIRP Irp, IN KSPROPERTY *pKSProperty, OUT GUID *pguidProperty) @@ -153,7 +458,12 @@ return STATUS_NOT_IMPLEMENTED; } -STDMETHODIMP_(NTSTATUS) BdaPropertyNodeMethods( +/* + @unimplemented +*/ +NTSTATUS +NTAPI +BdaPropertyNodeMethods( IN PIRP Irp, IN KSPROPERTY *pKSProperty, OUT GUID *pguidProperty) @@ -162,7 +472,12 @@ return STATUS_NOT_IMPLEMENTED; } -STDMETHODIMP_(NTSTATUS) BdaPropertyNodeProperties( +/* + @unimplemented +*/ +NTSTATUS +NTAPI +BdaPropertyNodeProperties( IN PIRP Irp, IN KSPROPERTY *pKSProperty, OUT GUID *pguidProperty) @@ -171,7 +486,12 @@ return STATUS_NOT_IMPLEMENTED; } -STDMETHODIMP_(NTSTATUS) BdaPropertyNodeTypes( +/* + @unimplemented +*/ +NTSTATUS +NTAPI +BdaPropertyNodeTypes( IN PIRP Irp, IN KSPROPERTY *pKSProperty, OUT ULONG *pulProperty) @@ -180,7 +500,12 @@ return STATUS_NOT_IMPLEMENTED; } -STDMETHODIMP_(NTSTATUS) BdaPropertyPinTypes( +/* + @unimplemented +*/ +NTSTATUS +NTAPI +BdaPropertyPinTypes( IN PIRP Irp, IN KSPROPERTY *pKSProperty, OUT ULONG *pulProperty) @@ -189,31 +514,105 @@ return STATUS_NOT_IMPLEMENTED; } -STDMETHODIMP_(NTSTATUS) BdaPropertyTemplateConnections( +/* + @implemented +*/ +NTSTATUS +NTAPI +BdaPropertyTemplateConnections( IN PIRP Irp, IN KSPROPERTY *pKSProperty, OUT KSTOPOLOGY_CONNECTION *pConnectionProperty) { - UNIMPLEMENTED - return STATUS_NOT_IMPLEMENTED; -} - -STDMETHODIMP_(NTSTATUS) BdaStartChanges(IN PIRP Irp) -{ - UNIMPLEMENTED - return STATUS_NOT_IMPLEMENTED; -} - -STDMETHODIMP_(NTSTATUS) BdaUninitFilter(IN PKSFILTER pKSFilter) -{ - UNIMPLEMENTED - return STATUS_NOT_IMPLEMENTED; -} - -STDMETHODIMP_(NTSTATUS) BdaValidateNodeProperty( - IN PIRP Irp, - IN KSPROPERTY *pKSProperty) -{ - UNIMPLEMENTED - return STATUS_NOT_IMPLEMENTED; -} + PBDA_FILTER_INSTANCE_ENTRY FilterInstance; + PKSFILTER Filter; + PIO_STACK_LOCATION IoStack; + ULONG Index; + + /* validate parameters */ + if (!Irp || !pKSProperty) + return STATUS_INVALID_PARAMETER; + + /* first get the filter */ + Filter = KsGetFilterFromIrp(Irp); + + /* sanity check */ + ASSERT(Filter); + + /* verify filter has been registered with BDA */ + FilterInstance = GetFilterInstanceEntry(KsFilterGetParentFilterFactory(Filter)); + + if (!FilterInstance) + return STATUS_INVALID_PARAMETER; + + /* get current irp stack */ + IoStack = IoGetCurrentIrpStackLocation(Irp); + + if (!pConnectionProperty) + { + /* caller needs the size first */ + Irp->IoStatus.Information = FilterInstance->FilterTemplate->pFilterDescriptor->ConnectionsCount * sizeof(KSTOPOLOGY_CONNECTION); + Irp->IoStatus.Status = STATUS_BUFFER_OVERFLOW; + return STATUS_BUFFER_OVERFLOW; + } + + /* sanity check */ + ASSERT(FilterInstance->FilterTemplate->pFilterDescriptor->ConnectionsCount * sizeof(KSTOPOLOGY_CONNECTION) <= IoStack->Parameters.DeviceIoControl.OutputBufferLength); + + for(Index = 0; Index < FilterInstance->FilterTemplate->pFilterDescriptor->ConnectionsCount; Index++) + { + /* sanity check */ + ASSERT(FilterInstance->FilterTemplate->pFilterDescriptor->Connections); + + /* copy connection */ + RtlMoveMemory(pConnectionProperty, &FilterInstance->FilterTemplate->pFilterDescriptor->Connections[Index], sizeof(KSTOPOLOGY_CONNECTION)); + } + + /* store result */ + Irp->IoStatus.Information = FilterInstance->FilterTemplate->pFilterDescriptor->ConnectionsCount * sizeof(KSTOPOLOGY_CONNECTION); + Irp->IoStatus.Status = STATUS_SUCCESS; + + /* done */ + return STATUS_SUCCESS; + +} + +/* + @implemented +*/ +NTSTATUS +NTAPI +BdaStartChanges(IN PIRP Irp) +{ + if (Irp) + return STATUS_SUCCESS; + else + return STATUS_INVALID_PARAMETER; + +} + +/* + @implemented +*/ +NTSTATUS +NTAPI +BdaUninitFilter(IN PKSFILTER pKSFilter) +{ + return STATUS_SUCCESS; +} + +/* + @unimplemented +*/ +NTSTATUS +NTAPI +BdaValidateNodeProperty( + IN PIRP Irp, + IN KSPROPERTY *KSProperty) +{ + /* check for valid parameter */ + if (Irp && KSProperty) + return STATUS_SUCCESS; + + return STATUS_INVALID_PARAMETER; +} Modified: trunk/reactos/drivers/multimedia/bdasup/bdasup.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/multimedia/bdasup/… ============================================================================== --- trunk/reactos/drivers/multimedia/bdasup/bdasup.rbuild [iso-8859-1] (original) +++ trunk/reactos/drivers/multimedia/bdasup/bdasup.rbuild [iso-8859-1] Mon Aug 10 13:13:43 2009 @@ -5,5 +5,6 @@ <library>ntoskrnl</library> <library>ks</library> <library>pseh</library> + <library>hal</library> <file>bdasup.c</file> </module>

1 0

[janderwald] 42585: - Add include guards - Add KSM_PIN - Add a few function prototypes
by janderwald＠svn.reactos.org 10 Aug '09

10 Aug '09

Author: janderwald Date: Mon Aug 10 13:10:37 2009 New Revision: 42585 URL: http://svn.reactos.org/svn/reactos?rev=42585&view=rev Log: - Add include guards - Add KSM_PIN - Add a few function prototypes Modified: trunk/reactos/include/dxsdk/bdamedia.h trunk/reactos/include/dxsdk/bdatypes.h trunk/reactos/include/psdk/ks.h Modified: trunk/reactos/include/dxsdk/bdamedia.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/dxsdk/bdamedia.h?r… ============================================================================== --- trunk/reactos/include/dxsdk/bdamedia.h [iso-8859-1] (original) +++ trunk/reactos/include/dxsdk/bdamedia.h [iso-8859-1] Mon Aug 10 13:10:37 2009 @@ -1,4 +1,5 @@ - +#ifndef BDAMEDIA_H__ +#define BDAMEDIA_H__ typedef struct _KSP_BDA_NODE_PIN { KSPROPERTY Property; @@ -6,3 +7,5 @@ ULONG ulInputPinId; ULONG ulOutputPinId; } KSP_BDA_NODE_PIN, *PKSP_BDA_NODE_PIN; + +#endif Modified: trunk/reactos/include/dxsdk/bdatypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/dxsdk/bdatypes.h?r… ============================================================================== --- trunk/reactos/include/dxsdk/bdatypes.h [iso-8859-1] (original) +++ trunk/reactos/include/dxsdk/bdatypes.h [iso-8859-1] Mon Aug 10 13:10:37 2009 @@ -163,7 +163,16 @@ } PID_MAP ; - +typedef struct _KSM_PIN +{ + KSMETHOD Method; + union + { + ULONG PinId; + ULONG PinType; + }; + ULONG Reserved; +} KSM_PIN, * PKSM_PIN; typedef struct _BDA_PID_MAP Modified: trunk/reactos/include/psdk/ks.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/ks.h?rev=4258… ============================================================================== --- trunk/reactos/include/psdk/ks.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/ks.h [iso-8859-1] Mon Aug 10 13:10:37 2009 @@ -3702,6 +3702,22 @@ KSDDKAPI NTSTATUS NTAPI +KsFilterFactoryUpdateCacheData( + IN PKSFILTERFACTORY FilterFactory, + IN const KSFILTER_DESCRIPTOR *FilterDescriptor OPTIONAL + ); + + +KSDDKAPI +PKSFILTER +NTAPI +KsGetFilterFromIrp( + IN PIRP Irp + ); + +KSDDKAPI +NTSTATUS +NTAPI KsDefaultAddEventHandler( IN PIRP Irp, IN PKSEVENTDATA EventData, @@ -3723,6 +3739,23 @@ IN PIRP Irp ); +KSDDKAPI +PVOID +NTAPI +KsGetParent( + IN PVOID Object + ); + + +PKSFILTERFACTORY +static +__inline +KsFilterGetParentFilterFactory( + IN PKSFILTER Filter + ) +{ + return (PKSFILTERFACTORY) KsGetParent((PVOID) Filter); +} #define KsDeleteFilterFactory(FilterFactory) \

1 0

[sginsberg] 42584: - Remove duplicate MmHighestPhysicalPage (the other being in init.c) -- we still ended up with only 1 global however, so this doesn't really change anything
by sginsberg＠svn.reactos.org 10 Aug '09

10 Aug '09

Author: sginsberg Date: Mon Aug 10 11:54:29 2009 New Revision: 42584 URL: http://svn.reactos.org/svn/reactos?rev=42584&view=rev Log: - Remove duplicate MmHighestPhysicalPage (the other being in init.c) -- we still ended up with only 1 global however, so this doesn't really change anything Modified: trunk/reactos/ntoskrnl/mm/freelist.c Modified: trunk/reactos/ntoskrnl/mm/freelist.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/freelist.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/mm/freelist.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/freelist.c [iso-8859-1] Mon Aug 10 11:54:29 2009 @@ -49,7 +49,6 @@ #define PPHYSICAL_PAGE PMMPFN PPHYSICAL_PAGE MmPfnDatabase; -ULONG MmHighestPhysicalPage; /* List of pages allocated to the MC_USER Consumer */ static LIST_ENTRY UserPageListHead;

1 0

[fireball] 42583: - Update commctrl.h.
by fireball＠svn.reactos.org 10 Aug '09

10 Aug '09

Author: fireball Date: Mon Aug 10 11:47:17 2009 New Revision: 42583 URL: http://svn.reactos.org/svn/reactos?rev=42583&view=rev Log: - Update commctrl.h. Modified: trunk/reactos/include/psdk/commctrl.h Modified: trunk/reactos/include/psdk/commctrl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/commctrl.h?re… ============================================================================== --- trunk/reactos/include/psdk/commctrl.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/commctrl.h [iso-8859-1] Mon Aug 10 11:47:17 2009 @@ -28,7 +28,7 @@ #endif BOOL WINAPI ShowHideMenuCtl (HWND, UINT_PTR, LPINT); -VOID WINAPI GetEffectiveClientRect (HWND hwnd, LPRECT lpRect, const INT *lpInfo); +VOID WINAPI GetEffectiveClientRect (HWND, LPRECT, const INT*); VOID WINAPI InitCommonControls (VOID); typedef struct tagINITCOMMONCONTROLSEX { @@ -344,8 +344,8 @@ HWND WINAPI CreateStatusWindowA (LONG, LPCSTR, HWND, UINT); HWND WINAPI CreateStatusWindowW (LONG, LPCWSTR, HWND, UINT); #define CreateStatusWindow WINELIB_NAME_AW(CreateStatusWindow) -void WINAPI DrawStatusTextA (HDC hdc, LPCRECT lprc, LPCSTR text, UINT style); -void WINAPI DrawStatusTextW (HDC hdc, LPCRECT lprc, LPCWSTR text, UINT style); +VOID WINAPI DrawStatusTextA (HDC, LPCRECT, LPCSTR, UINT); +VOID WINAPI DrawStatusTextW (HDC, LPCRECT, LPCWSTR, UINT); #define DrawStatusText WINELIB_NAME_AW(DrawStatusText) VOID WINAPI MenuHelp (UINT, WPARAM, LPARAM, HMENU, HINSTANCE, HWND, UINT*); @@ -1098,7 +1098,7 @@ #define TBSTYLE_EX_UNDOC1 0x00000004 /* similar to TBSTYLE_WRAPABLE */ #define TBSTYLE_EX_MIXEDBUTTONS 0x00000008 #define TBSTYLE_EX_HIDECLIPPEDBUTTONS 0x00000010 /* don't show partially obscured buttons */ -#define TBSTYLE_EX_DOUBLEBUFFER 0x00000080 /* Double Buffer the toolbar ??? */ +#define TBSTYLE_EX_DOUBLEBUFFER 0x00000080 /* Double Buffer the toolbar */ #define TBIF_IMAGE 0x00000001 #define TBIF_TEXT 0x00000002 @@ -2892,6 +2892,10 @@ #define TreeView_MapHTREEITEMToAccID(hwnd, htreeitem) \ (UINT)SNDMSG((hwnd), TVM_MAPHTREEITEMTOACCID, (WPARAM)htreeitem, 0) +#define TreeView_SetUnicodeFormat(hwnd, fUnicode) \ + (BOOL)SNDMSG((hwnd), TVM_SETUNICODEFORMAT, (WPARAM)(fUnicode), 0) +#define TreeView_GetUnicodeFormat(hwnd) \ + (BOOL)SNDMSG((hwnd), TVM_GETUNICODEFORMAT, 0, 0) /* Listview control */ @@ -3387,9 +3391,6 @@ #define ListView_GetBkImage(hwnd, plvbki) \ (BOOL)SNDMSG((hwnd), LVM_GETBKIMAGE, 0, (LPARAM)plvbki) -#define ListView_GetCheckState(w,i) ((((UINT)(SNDMSG((w),LVM_GETITEMSTATE,(WPARAM)(i),LVIS_STATEIMAGEMASK)))>>12)-1) -#define ListView_SetCheckState(w,i,f) ListView_SetItemState(w,i,INDEXTOSTATEIMAGEMASK((f)+1),LVIS_STATEIMAGEMASK) - typedef struct tagLVCOLUMNA { UINT mask; @@ -3746,6 +3747,11 @@ SNDMSGA(hwnd, LVM_SETITEMSTATE, (WPARAM)(UINT)i, (LPARAM) (LPLVITEMA)&_LVi);} #define ListView_GetItemState(hwnd,i,mask) \ (BOOL)SNDMSGA((hwnd),LVM_GETITEMSTATE,(WPARAM)(UINT)(i),(LPARAM)(UINT)(mask)) +#define ListView_SetCheckState(hwndLV, i, bCheck) \ + { LVITEM _LVi; _LVi.state = INDEXTOSTATEIMAGEMASK((bCheck)?2:1); _LVi.stateMask = LVIS_STATEIMAGEMASK; \ + SNDMSG(hwndLV, LVM_SETITEMSTATE, (WPARAM)(UINT)(i), (LPARAM)(LPLVITEM)&_LVi);} +#define ListView_GetCheckState(hwndLV, i) \ + (((UINT)SNDMSG((hwndLV), LVM_GETITEMSTATE, (i), LVIS_STATEIMAGEMASK) >> 12) - 1) #define ListView_GetCountPerPage(hwnd) \ (BOOL)SNDMSGW((hwnd),LVM_GETCOUNTPERPAGE,0,0L) #define ListView_GetImageList(hwnd,iImageList) \ @@ -3773,6 +3779,8 @@ (HWND)SNDMSGA((hwnd), LVM_GETEDITCONTROL, 0, 0) #define ListView_GetTextColor(hwnd) \ (COLORREF)SNDMSGA((hwnd), LVM_GETTEXTCOLOR, 0, 0) +#define ListView_GetTextBkColor(hwnd) \ + (COLORREF)SNDMSGA((hwnd), LVM_GETTEXTBKCOLOR, 0, 0) #define ListView_GetBkColor(hwnd) \ (COLORREF)SNDMSGA((hwnd), LVM_GETBKCOLOR, 0, 0) #define ListView_GetItemA(hwnd,pitem) \ @@ -3803,6 +3811,9 @@ #define ListView_SortItems(hwndLV,_pfnCompare,_lPrm) \ (BOOL)SNDMSGA((hwndLV),LVM_SORTITEMS,(WPARAM)(LPARAM)_lPrm,(LPARAM)(PFNLVCOMPARE)_pfnCompare) +#define ListView_SortItemsEx(hwndLV, _pfnCompare, _lPrm) \ + (BOOL)SNDMSGA((hwndLV), LVM_SORTITEMSEX, (WPARAM)(LPARAM)(_lPrm), (LPARAM)(PFNLVCOMPARE)(_pfnCompare)) + #define ListView_SetItemPosition(hwndLV, i, x, y) \ (BOOL)SNDMSGA((hwndLV),LVM_SETITEMPOSITION,(WPARAM)(INT)(i),MAKELPARAM((x),(y))) #define ListView_GetSelectedCount(hwndLV) \ @@ -3958,6 +3969,10 @@ (UINT)SNDMSG((hwnd), LVM_MAPINDEXTOID, (WPARAM)index, (LPARAM)0) #define ListView_MapIDToIndex(hwnd, id) \ (UINT)SNDMSG((hwnd), LVM_MAPIDTOINDEX, (WPARAM)id, (LPARAM)0) +#define ListView_SetUnicodeFormat(hwnd, fUnicode) \ + (BOOL)SNDMSG((hwnd), LVM_SETUNICODEFORMAT, (WPARAM)(fUnicode), 0) +#define ListView_GetUnicodeFormat(hwnd) \ + (BOOL)SNDMSG((hwnd), LVM_GETUNICODEFORMAT, 0, 0) /* Tab Control */

1 0

[fireball] 42582: - Add missing constifying to MonitorFromRect API - Don't compile d3d8thk.dll since it relies on a nonstubbed GDI API now. - Remove d3d8thk.dll and ftfd.dll from bootcd, and add freetype.dll and winent.drv. - Update some merge history. - Arwinss branch now can be compiled with a usual "makex bootcd".
by fireball＠svn.reactos.org 10 Aug '09

10 Aug '09

Author: fireball Date: Mon Aug 10 11:10:53 2009 New Revision: 42582 URL: http://svn.reactos.org/svn/reactos?rev=42582&view=rev Log: - Add missing constifying to MonitorFromRect API - Don't compile d3d8thk.dll since it relies on a nonstubbed GDI API now. - Remove d3d8thk.dll and ftfd.dll from bootcd, and add freetype.dll and winent.drv. - Update some merge history. - Arwinss branch now can be compiled with a usual "makex bootcd". Modified: branches/arwinss/reactos/boot/bootdata/packages/reactos.dff branches/arwinss/reactos/dll/directx/directx.rbuild branches/arwinss/reactos/dll/win32/user32/misc.c branches/arwinss/reactos/include/psdk/winuser.h branches/arwinss/reactos/tools/rsym/log2lines.c (props changed) branches/arwinss/reactos/tools/rsym/log2lines.mak (props changed) branches/arwinss/reactos/tools/rsym/rsym.c (props changed) branches/arwinss/reactos/tools/rsym/rsym.h (props changed) branches/arwinss/reactos/tools/rsym/rsym.mak (props changed) branches/arwinss/reactos/tools/rsym/rsym_common.c (props changed) Modified: branches/arwinss/reactos/boot/bootdata/packages/reactos.dff URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/boot/bootdata/p… ============================================================================== --- branches/arwinss/reactos/boot/bootdata/packages/reactos.dff [iso-8859-1] (original) +++ branches/arwinss/reactos/boot/bootdata/packages/reactos.dff [iso-8859-1] Mon Aug 10 11:10:53 2009 @@ -155,7 +155,7 @@ dll\directx\dsound\dsound.dll 1 dll\directx\dxdiagn\dxdiagn.dll 1 dll\directx\wine\ddraw\ddraw.dll 1 -dll\directx\d3d8thk\d3d8thk.dll 1 +;dll\directx\d3d8thk\d3d8thk.dll 1 dll\directx\devenum\devenum.dll 1 dll\directx\ksproxy\ksproxy.ax 1 dll\directx\ksuser\ksuser.dll 1 @@ -248,6 +248,7 @@ dll\ntdll\ntdll.dll 1 +dll\3rdparty\freetype\freetype.dll 1 dll\win32\acledit\acledit.dll 1 dll\win32\aclui\aclui.dll 1 dll\win32\activeds\activeds.dll 1 @@ -437,6 +438,7 @@ dll\win32\vdmdbg\vdmdbg.dll 1 dll\win32\version\version.dll 1 dll\win32\winemp3.acm\winemp3.acm 1 +dll\win32\winent.drv\winent.drv 1 dll\win32\winfax\winfax.dll 1 dll\win32\winhttp\winhttp.dll 1 dll\win32\wininet\wininet.dll 1 @@ -510,7 +512,7 @@ drivers\video\miniport\vga\vgamp.sys 2 drivers\video\miniport\vbe\vbemp.sys 2 drivers\video\videoprt\videoprt.sys 2 -drivers\video\font\ftfd\ftfd.dll 1 +;drivers\video\font\ftfd\ftfd.dll 1 drivers\wdm\audio\filters\kmixer\kmixer.sys 2 drivers\wdm\audio\sysaudio\sysaudio.sys 2 Modified: branches/arwinss/reactos/dll/directx/directx.rbuild URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/directx/dir… ============================================================================== --- branches/arwinss/reactos/dll/directx/directx.rbuild [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/directx/directx.rbuild [iso-8859-1] Mon Aug 10 11:10:53 2009 @@ -4,9 +4,9 @@ <directory name="amstream"> <xi:include href="amstream/amstream.rbuild" /> </directory> - <directory name="d3d8thk"> +  <directory name="devenum"> <xi:include href="devenum/devenum.rbuild" /> </directory> Modified: branches/arwinss/reactos/dll/win32/user32/misc.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/user3… ============================================================================== --- branches/arwinss/reactos/dll/win32/user32/misc.c [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/win32/user32/misc.c [iso-8859-1] Mon Aug 10 11:10:53 2009 @@ -393,7 +393,7 @@ /*********************************************************************** * MonitorFromRect (USER32.@) */ -HMONITOR WINAPI MonitorFromRect( LPRECT rect, DWORD flags ) +HMONITOR WINAPI MonitorFromRect( LPCRECT rect, DWORD flags ) { struct monitor_enum_info info; Modified: branches/arwinss/reactos/include/psdk/winuser.h URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/include/psdk/wi… ============================================================================== --- branches/arwinss/reactos/include/psdk/winuser.h [iso-8859-1] (original) +++ branches/arwinss/reactos/include/psdk/winuser.h [iso-8859-1] Mon Aug 10 11:10:53 2009 @@ -4269,7 +4269,7 @@ BOOL WINAPI ModifyMenuA(HMENU,UINT,UINT,UINT_PTR,LPCSTR); BOOL WINAPI ModifyMenuW(HMENU,UINT,UINT,UINT_PTR,LPCWSTR); HMONITOR WINAPI MonitorFromPoint(POINT,DWORD); -HMONITOR WINAPI MonitorFromRect(LPRECT,DWORD); +HMONITOR WINAPI MonitorFromRect(LPCRECT,DWORD); HMONITOR WINAPI MonitorFromWindow(HWND,DWORD); void WINAPI mouse_event(DWORD,DWORD,DWORD,DWORD,ULONG_PTR); BOOL WINAPI MoveWindow(HWND,int,int,int,int,BOOL); Propchange: branches/arwinss/reactos/tools/rsym/log2lines.c ------------------------------------------------------------------------------ (empty) Propchange: branches/arwinss/reactos/tools/rsym/log2lines.mak ------------------------------------------------------------------------------ (empty) Propchange: branches/arwinss/reactos/tools/rsym/rsym.c ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Mon Aug 10 11:10:53 2009 @@ -1,1 +1,2 @@ /branches/ros-amd64-bringup/reactos/tools/rsym/rsym.c:37291,37302,37305,37320,37329,37462,37895,38129,38330-38331,38341,38947,38973,39072,39114,39121,40605 +/trunk/reactos/tools/rsym/rsym.c:42202,42376,42419 Propchange: branches/arwinss/reactos/tools/rsym/rsym.h ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Mon Aug 10 11:10:53 2009 @@ -1,1 +1,2 @@ /branches/ros-amd64-bringup/reactos/tools/rsym/rsym.h:37291,37302,37305,37320,37329,37462,37895,38129,38330-38331,38341,38947,38973,39072,39114,39121,40605 +/trunk/reactos/tools/rsym/rsym.h:42202,42376,42419 Propchange: branches/arwinss/reactos/tools/rsym/rsym.mak ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Mon Aug 10 11:10:53 2009 @@ -1,1 +1,2 @@ /branches/ros-amd64-bringup/reactos/tools/rsym/rsym.mak:37291,37302,37305,37320,37329,37462,37895,38129,38330-38331,38341,38947,38973,39072,39114,39121,40605 +/trunk/reactos/tools/rsym/rsym.mak:42202,42376,42419 Propchange: branches/arwinss/reactos/tools/rsym/rsym_common.c ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Mon Aug 10 11:10:53 2009 @@ -1,1 +1,2 @@ /branches/ros-amd64-bringup/reactos/tools/rsym/rsym_common.c:37291,37302,37305,37320,37329,37462,37895,38129,38330-38331,38341,38947,38973,39072,39114,39121,40605 +/trunk/reactos/tools/rsym/rsym_common.c:42202,42376,42419

1 0

[fireball] 42581: - Sync wine/config.h with trunk's changes to fix msxml3 compiling.
by fireball＠svn.reactos.org 10 Aug '09

10 Aug '09

Author: fireball Date: Mon Aug 10 10:47:22 2009 New Revision: 42581 URL: http://svn.reactos.org/svn/reactos?rev=42581&view=rev Log: - Sync wine/config.h with trunk's changes to fix msxml3 compiling. Modified: branches/arwinss/reactos/include/reactos/wine/config.h Modified: branches/arwinss/reactos/include/reactos/wine/config.h URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/include/reactos… ============================================================================== --- branches/arwinss/reactos/include/reactos/wine/config.h [iso-8859-1] (original) +++ branches/arwinss/reactos/include/reactos/wine/config.h [iso-8859-1] Mon Aug 10 10:47:22 2009 @@ -123,7 +123,7 @@ #define HAVE_FREETYPE_FTWINFNT_H 1 /* Define to 1 if you have the <freetype/internal/sfnt.h> header file. */ -/* #define HAVE_FREETYPE_INTERNAL_SFNT_H 1 */ +/* #undef HAVE_FREETYPE_INTERNAL_SFNT_H */ /* Define to 1 if you have the <freetype/ttnameid.h> header file. */ #define HAVE_FREETYPE_TTNAMEID_H 1 @@ -289,6 +289,8 @@ /* Define if you have the libxml2 library */ #define HAVE_LIBXML2 +#define HAVE_XMLNEWDOCPI +#define HAVE_XMLREADMEMORY /* Define to 1 if you have the <libxml/parser.h> header file. */ #define HAVE_LIBXML_PARSER_H @@ -306,10 +308,10 @@ /* #undef HAVE_LIBXSLT */ /* Define to 1 if you have the <libxslt/pattern.h> header file. */ -/* #undef HAVE_LIBXSLT_PATTERN_H */ +#define HAVE_LIBXSLT_PATTERN_H /* Define to 1 if you have the <libxslt/transform.h> header file. */ -/* #undef HAVE_LIBXSLT_TRANSFORM_H */ +#define HAVE_LIBXSLT_TRANSFORM_H /* Define if you have the Xxf86dga library version 2 */ /* #undef HAVE_LIBXXF86DGA2 */ @@ -453,9 +455,7 @@ #define HAVE_PCLOSE 1 /* Define to 1 if the system has the type `pid_t'. */ -#if !defined(_MSC_VER) #define HAVE_PID_T 1 -#endif /* Define to 1 if you have the <poll.h> header file. */ /* #undef HAVE_POLL_H */

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs