Author: janderwald
Date: Fri Aug 14 11:27:24 2009
New Revision: 42664
URL: http://svn.reactos.org/svn/reactos?rev=42664&view=rev
Log:
[KS]
- Proper implement KsValidateConnectRequest
- Dataformat isnt not yet checked
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/connectivity.c?rev=42664&r1=42663&r2=42664&view=diff
==============================================================================
--- trunk/reactos/drivers/ksfilter/ks/connectivity.c [iso-8859-1] (original)
+++ trunk/reactos/drivers/ksfilter/ks/connectivity.c [iso-8859-1] Fri Aug 14
11:27:24 2009
@@ -8,6 +8,21 @@
#include "priv.h"
+
+KSPIN_INTERFACE StandardPinInterface =
+{
+ {STATIC_KSINTERFACESETID_Standard},
+ KSINTERFACE_STANDARD_STREAMING,
+ 0
+};
+
+KSPIN_MEDIUM StandardPinMedium =
+{
+ {STATIC_KSMEDIUMSETID_Standard},
+ KSMEDIUM_TYPE_ANYINSTANCE,
+ 0
+};
+
/*
@implemented
@@ -50,61 +65,112 @@
IN KSPIN_DESCRIPTOR* Descriptor,
OUT PKSPIN_CONNECT* Connect)
{
- PIO_STACK_LOCATION IoStack;
PKSPIN_CONNECT ConnectDetails;
- LPWSTR PinName = L"{146F1A80-4791-11D0-A5D6-28DB04C10000}\\";
- PKSDATAFORMAT DataFormat;
- LPWSTR Offset;
-
- IoStack = IoGetCurrentIrpStackLocation(Irp);
- if (!IoStack->FileObject->FileName.Buffer)
+ PKSPIN_INTERFACE Interface;
+ PKSPIN_MEDIUM Medium;
+ ULONG Size;
+ NTSTATUS Status;
+ ULONG Index;
+ ULONG Count;
+ BOOLEAN Found;
+
+ /* did the caller miss the connect parameter */
+ if (!Connect)
return STATUS_INVALID_PARAMETER;
- if (IoStack->FileObject->FileName.Length < wcslen(PinName) +
sizeof(KSPIN_CONNECT) + sizeof(KSDATAFORMAT))
- return STATUS_INVALID_PARAMETER;
-
- Offset = wcsstr(IoStack->FileObject->FileName.Buffer, PinName);
- if (!Offset)
- {
- /* request is not targeted for a pin */
- return STATUS_INVALID_PARAMETER;
- }
-
- ConnectDetails = (PKSPIN_CONNECT)(Offset + wcslen(PinName));
-
- if (ConnectDetails->PinToHandle != NULL)
- {
- UNIMPLEMENTED
- return STATUS_NOT_IMPLEMENTED;
- }
-
+ /* set create param size */
+ Size = sizeof(KSPIN_CONNECT);
+
+ /* fetch create parameters */
+ Status = KspCopyCreateRequest(Irp,
+ KSSTRING_Pin,
+ &Size,
+ (PVOID*)&ConnectDetails);
+
+ /* check for success */
+ if (!NT_SUCCESS(Status))
+ return Status;
+
+ /* is pin id out of bounds */
if (ConnectDetails->PinId >= DescriptorsCount)
return STATUS_INVALID_PARAMETER;
-#if 0
- if (!IsEqualGUIDAligned(&ConnectDetails->Interface.Set,
&KSINTERFACESETID_Standard) &&
- ConnectDetails->Interface.Id != KSINTERFACE_STANDARD_STREAMING)
- {
- //FIXME
- // validate provided interface set
- DPRINT1("FIXME\n");
- }
-
- if (!IsEqualGUIDAligned(&ConnectDetails->Medium.Set,
&KSMEDIUMSETID_Standard) &&
- ConnectDetails->Medium.Id != KSMEDIUM_TYPE_ANYINSTANCE)
- {
- //FIXME
- // validate provided medium set
- DPRINT1("FIXME\n");
- }
-#endif
+ /* does the pin have interface details filled in */
+ if (Descriptor[ConnectDetails->PinId].InterfacesCount &&
Descriptor[ConnectDetails->PinId].Interfaces)
+ {
+ /* use provided pin interface count */
+ Count = Descriptor[ConnectDetails->PinId].InterfacesCount;
+ Interface =
(PKSPIN_INTERFACE)Descriptor[ConnectDetails->PinId].Interfaces;
+ }
+ else
+ {
+ /* use standard pin interface */
+ Count = 1;
+ Interface = &StandardPinInterface;
+ }
+
+ /* now check the interface */
+ Found = FALSE;
+ Index = 0;
+ do
+ {
+ if (IsEqualGUIDAligned(&Interface[Index].Set,
&ConnectDetails->Interface.Set) &&
+ Interface[Index].Id ==
ConnectDetails->Interface.Id)
+ {
+ /* found a matching interface */
+ Found = TRUE;
+ break;
+ }
+ /* iterate to next interface */
+ Index++;
+ }while(Index < Count);
+
+ if (!Found)
+ {
+ /* pin doesnt support this interface */
+ return STATUS_NO_MATCH;
+ }
+
+ /* does the pin have medium details filled in */
+ if (Descriptor[ConnectDetails->PinId].MediumsCount &&
Descriptor[ConnectDetails->PinId].Mediums)
+ {
+ /* use provided pin interface count */
+ Count = Descriptor[ConnectDetails->PinId].MediumsCount;
+ Medium = (PKSPIN_MEDIUM)Descriptor[ConnectDetails->PinId].Mediums;
+ }
+ else
+ {
+ /* use standard pin interface */
+ Count = 1;
+ Medium = &StandardPinMedium;
+ }
+
+ /* now check the interface */
+ Found = FALSE;
+ Index = 0;
+ do
+ {
+ if (IsEqualGUIDAligned(&Medium[Index].Set,
&ConnectDetails->Medium.Set) &&
+ Medium[Index].Id == ConnectDetails->Medium.Id)
+ {
+ /* found a matching interface */
+ Found = TRUE;
+ break;
+ }
+ /* iterate to next medium */
+ Index++;
+ }while(Index < Count);
+
+ if (!Found)
+ {
+ /* pin doesnt support this medium */
+ return STATUS_NO_MATCH;
+ }
/// FIXME
/// implement format checking
- DataFormat = (PKSDATAFORMAT) (ConnectDetails + 1);
*Connect = ConnectDetails;
-
return STATUS_SUCCESS;
}
