Ros-diffs

ros-diffs@reactos.org

81390 discussions

[cgutman] 50071: [WINHTTP] - Sync to Wine 1.3.9
by cgutman＠svn.reactos.org 20 Dec '10

20 Dec '10

Author: cgutman Date: Mon Dec 20 20:36:21 2010 New Revision: 50071 URL: http://svn.reactos.org/svn/reactos?rev=50071&view=rev Log: [WINHTTP] - Sync to Wine 1.3.9 Modified: trunk/reactos/dll/win32/winhttp/net.c Modified: trunk/reactos/dll/win32/winhttp/net.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/winhttp/net.c?re… ============================================================================== --- trunk/reactos/dll/win32/winhttp/net.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/winhttp/net.c [iso-8859-1] Mon Dec 20 20:36:21 2010 @@ -92,7 +92,7 @@ static void *libssl_handle; static void *libcrypto_handle; -#if defined(OPENSSL_VERSION_NUMBER) && (OPENSSL_VERSION_NUMBER> 0x1000000) +#if defined(OPENSSL_VERSION_NUMBER) && (OPENSSL_VERSION_NUMBER > 0x10000000) static const SSL_METHOD *method; #else static SSL_METHOD *method; @@ -277,7 +277,8 @@ TRACE("verifying %s\n", debugstr_w( server )); chainPara.RequestedUsage.Usage.cUsageIdentifier = 1; chainPara.RequestedUsage.Usage.rgpszUsageIdentifier = server_auth; - if ((ret = CertGetCertificateChain( NULL, cert, NULL, store, &chainPara, 0, + if ((ret = CertGetCertificateChain( NULL, cert, NULL, store, &chainPara, + CERT_CHAIN_REVOCATION_CHECK_CHAIN_EXCLUDE_ROOT, NULL, &chain ))) { if (chain->TrustStatus.dwErrorStatus) @@ -330,6 +331,7 @@ sslExtraPolicyPara.u.cbSize = sizeof(sslExtraPolicyPara); sslExtraPolicyPara.dwAuthType = AUTHTYPE_SERVER; sslExtraPolicyPara.pwszServerName = server; + sslExtraPolicyPara.fdwChecks = security_flags; policyPara.cbSize = sizeof(policyPara); policyPara.dwFlags = 0; policyPara.pvExtraPolicyPara = &sslExtraPolicyPara; @@ -342,10 +344,7 @@ if (ret && policyStatus.dwError) { if (policyStatus.dwError == CERT_E_CN_NO_MATCH) - { - if (!(security_flags & SECURITY_FLAG_IGNORE_CERT_CN_INVALID)) - err = ERROR_WINHTTP_SECURE_CERT_CN_INVALID; - } + err = ERROR_WINHTTP_SECURE_CERT_CN_INVALID; else err = ERROR_WINHTTP_SECURE_INVALID_CERT; } @@ -876,10 +875,10 @@ return FALSE; #endif } - + FD_ZERO(&infd); FD_SET(conn->socket, &infd); - + while (recvd < *buflen) { int res; @@ -890,7 +889,7 @@ ptv = &tv; else ptv = NULL; - + if (select( 0, &infd, NULL, NULL, ptv ) > 0) { if ((res = recv( conn->socket, &buffer[recvd], 1, 0 )) <= 0) @@ -1086,7 +1085,11 @@ int netconn_get_cipher_strength( netconn_t *conn ) { #ifdef SONAME_LIBSSL +#if defined(OPENSSL_VERSION_NUMBER) && (OPENSSL_VERSION_NUMBER >= 0x0090707f) + const SSL_CIPHER *cipher; +#else SSL_CIPHER *cipher; +#endif int bits = 0; if (!conn->secure) return 0;

1 0

[fireball] 50070: - Update "slightly less than all" IDLs to Wine-1.3.9. (Except for shlobj, shobjidl and shtypes.h, and DirectX stuff).
by fireball＠svn.reactos.org 20 Dec '10

20 Dec '10

Author: fireball Date: Mon Dec 20 11:56:24 2010 New Revision: 50070 URL: http://svn.reactos.org/svn/reactos?rev=50070&view=rev Log: - Update "slightly less than all" IDLs to Wine-1.3.9. (Except for shlobj, shobjidl and shtypes.h, and DirectX stuff). Added: trunk/reactos/include/psdk/msxml6.idl (with props) trunk/reactos/include/psdk/msxml6did.h (with props) trunk/reactos/include/psdk/propkeydef.h (with props) trunk/reactos/include/psdk/winsxs.idl (with props) Modified: trunk/reactos/include/psdk/control.idl trunk/reactos/include/psdk/exdisp.idl trunk/reactos/include/psdk/exdispid.h trunk/reactos/include/psdk/mscoree.idl trunk/reactos/include/psdk/mshtmdid.h trunk/reactos/include/psdk/mshtml.idl trunk/reactos/include/psdk/mstask.idl trunk/reactos/include/psdk/msxml2.idl trunk/reactos/include/psdk/msxml2did.h trunk/reactos/include/psdk/objidl.idl trunk/reactos/include/psdk/oledb.idl trunk/reactos/include/psdk/propsys.idl trunk/reactos/include/psdk/psdk.rbuild trunk/reactos/include/psdk/urlmon.idl trunk/reactos/include/psdk/wbemcli.idl trunk/reactos/include/psdk/wincodec.idl trunk/reactos/include/psdk/wuapi.idl [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/include/psdk/control.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/control.idl?r… Modified: trunk/reactos/include/psdk/exdisp.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/exdisp.idl?re… Modified: trunk/reactos/include/psdk/exdispid.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/exdispid.h?re… Modified: trunk/reactos/include/psdk/mscoree.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/mscoree.idl?r… Modified: trunk/reactos/include/psdk/mshtmdid.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/mshtmdid.h?re… Modified: trunk/reactos/include/psdk/mshtml.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/mshtml.idl?re… Modified: trunk/reactos/include/psdk/mstask.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/mstask.idl?re… Modified: trunk/reactos/include/psdk/msxml2.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/msxml2.idl?re… Modified: trunk/reactos/include/psdk/msxml2did.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/msxml2did.h?r… Added: trunk/reactos/include/psdk/msxml6.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/msxml6.idl?re… Added: trunk/reactos/include/psdk/msxml6did.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/msxml6did.h?r… Modified: trunk/reactos/include/psdk/objidl.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/objidl.idl?re… Modified: trunk/reactos/include/psdk/oledb.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/oledb.idl?rev… Added: trunk/reactos/include/psdk/propkeydef.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/propkeydef.h?… Modified: trunk/reactos/include/psdk/propsys.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/propsys.idl?r… Modified: trunk/reactos/include/psdk/psdk.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/psdk.rbuild?r… Modified: trunk/reactos/include/psdk/urlmon.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/urlmon.idl?re… Modified: trunk/reactos/include/psdk/wbemcli.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/wbemcli.idl?r… Modified: trunk/reactos/include/psdk/wincodec.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/wincodec.idl?… Added: trunk/reactos/include/psdk/winsxs.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winsxs.idl?re… Modified: trunk/reactos/include/psdk/wuapi.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/wuapi.idl?rev…

1 0

[tkreuzer] 50069: [CRT] rename pow_asm.c to powl.c to reflect it's content.
by tkreuzer＠svn.reactos.org 20 Dec '10

20 Dec '10

Author: tkreuzer Date: Mon Dec 20 11:48:55 2010 New Revision: 50069 URL: http://svn.reactos.org/svn/reactos?rev=50069&view=rev Log: [CRT] rename pow_asm.c to powl.c to reflect it's content. Added: trunk/reactos/lib/sdk/crt/math/powl.c - copied unchanged from r50068, trunk/reactos/lib/sdk/crt/math/pow_asm.c Removed: trunk/reactos/lib/sdk/crt/math/pow_asm.c Modified: trunk/reactos/lib/sdk/crt/crt.rbuild Modified: trunk/reactos/lib/sdk/crt/crt.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/crt.rbuild?rev… ============================================================================== --- trunk/reactos/lib/sdk/crt/crt.rbuild [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/crt.rbuild [iso-8859-1] Mon Dec 20 11:48:55 2010 @@ -156,7 +156,7 @@ <file>sinf.c</file> <file>sinh.c</file> <file>tanh.c</file> - <file>pow_asm.c</file> + <file>powl.c</file> <if property="ARCH" value="i386"> <directory name="i386"> Removed: trunk/reactos/lib/sdk/crt/math/pow_asm.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/math/pow_asm.c… ============================================================================== --- trunk/reactos/lib/sdk/crt/math/pow_asm.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/math/pow_asm.c (removed) @@ -1,31 +1,0 @@ -/* Math functions for i387. - Copyright (C) 1995, 1996, 1997 Free Software Foundation, Inc. - This file is part of the GNU C Library. - Contributed by John C. Bowman <bowman(a)ipp-garching.mpg.de>, 1995. - - The GNU C Library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. - - The GNU C Library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with the GNU C Library; if not, write to the Free - Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. -*/ - -#include <math.h> - -/* - * @implemented - */ - -long double powl (long double __x,long double __y) -{ - return pow(__x,__y/2)*pow(__x,__y/2); -}

1 0

[tkreuzer] 50068: [CRT] Fix bugs in converted asm file. Fixes Firefox color issues.
by tkreuzer＠svn.reactos.org 20 Dec '10

20 Dec '10

Author: tkreuzer Date: Mon Dec 20 10:16:43 2010 New Revision: 50068 URL: http://svn.reactos.org/svn/reactos?rev=50068&view=rev Log: [CRT] Fix bugs in converted asm file. Fixes Firefox color issues. Modified: trunk/reactos/lib/sdk/crt/math/i386/pow_asm.s Modified: trunk/reactos/lib/sdk/crt/math/i386/pow_asm.s URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/math/i386/pow_… ============================================================================== --- trunk/reactos/lib/sdk/crt/math/i386/pow_asm.s [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/math/i386/pow_asm.s [iso-8859-1] Mon Dec 20 10:16:43 2010 @@ -117,7 +117,7 @@ /* fistpll raises invalid exception for |y| >= 1L<<63. */ fld st // y : y : x fabs // |y| : y : x - fcomp qword ptr MO(p63) // y : x + fcomp qword ptr ds:MO(p63) // y : x fnstsw ax sahf jnc L2 @@ -194,7 +194,7 @@ L8: fmul st, st(1) // y*log2(x) : y fst st(1) // y*log2(x) : y*log2(x) frndint // int(y*log2(x)) : y*log2(x) - fsubr st(1), st // int(y*log2(x)) : fract(y*log2(x)) + fsub st(1), st // int(y*log2(x)) : fract(y*log2(x)) fxch // fract(y*log2(x)) : int(y*log2(x)) f2xm1 // 2^fract(y*log2(x))-1 : int(y*log2(x)) fadd qword ptr MO(one) // 2^fract(y*log2(x)) : int(y*log2(x)) @@ -278,7 +278,7 @@ cfi_adjust_cfa_offset (8) .align ALIGNARG(4) -L16:fcomp qword ptr MO(zero) +L16:fcomp qword ptr ds:MO(zero) add esp, 8 cfi_adjust_cfa_offset (-8) fnstsw ax @@ -289,7 +289,7 @@ cfi_adjust_cfa_offset (8) .align ALIGNARG(4) -L17: shl ecx, 30 // sign bit for y in right position +L17: shl edx, 30 // sign bit for y in right position add esp, 8 cfi_adjust_cfa_offset (-8) L18: shr edx, 31

1 0

[janderwald] 50067: [AUDIO-BRINGUP] - Move software bus functions into swenum.c - Add missing #undef INTERFACE in ksiface.h - Partly implement KsRemoveBusEnumInterface - Implement KsServiceBusEnumP...
by janderwald＠svn.reactos.org 20 Dec '10

20 Dec '10

Author: janderwald Date: Mon Dec 20 02:45:18 2010 New Revision: 50067 URL: http://svn.reactos.org/svn/reactos?rev=50067&view=rev Log: [AUDIO-BRINGUP] - Move software bus functions into swenum.c - Add missing #undef INTERFACE in ksiface.h - Partly implement KsRemoveBusEnumInterface - Implement KsServiceBusEnumPnpRequest, KsServiceBusEnumCreateRequest, KsIsBusEnumChildDevice, KsInstallBusEnumInterface, KsGetBusEnumPnpDeviceObject, KsCreateBusEnumObject, KsGetBusEnumParentFDOFromChildPDO, KsGetBusEnumIdentifier - KS now supports the software bus driver - As a side effect, ks.sys now fully works in Windows XP - Tested with VBox+WINXP SP3+ Added: branches/audio-bringup/drivers/ksfilter/ks/swenum.c (with props) Modified: branches/audio-bringup/drivers/ksfilter/ks/api.c branches/audio-bringup/drivers/ksfilter/ks/ks.rbuild branches/audio-bringup/drivers/ksfilter/ks/ksiface.h branches/audio-bringup/drivers/ksfilter/ks/kstypes.h branches/audio-bringup/drivers/ksfilter/ks/priv.h Modified: branches/audio-bringup/drivers/ksfilter/ks/api.c URL: http://svn.reactos.org/svn/reactos/branches/audio-bringup/drivers/ksfilter/… ============================================================================== --- branches/audio-bringup/drivers/ksfilter/ks/api.c [iso-8859-1] (original) +++ branches/audio-bringup/drivers/ksfilter/ks/api.c [iso-8859-1] Mon Dec 20 02:45:18 2010 @@ -1723,146 +1723,7 @@ } -/* - @implemented -*/ -KSDDKAPI -NTSTATUS -NTAPI -KsCreateBusEnumObject( - IN PWCHAR BusIdentifier, - IN PDEVICE_OBJECT BusDeviceObject, - IN PDEVICE_OBJECT PhysicalDeviceObject, - IN PDEVICE_OBJECT PnpDeviceObject OPTIONAL, - IN REFGUID InterfaceGuid OPTIONAL, - IN PWCHAR ServiceRelativePath OPTIONAL) -{ - ULONG Length; - NTSTATUS Status = STATUS_SUCCESS; - UNICODE_STRING ServiceKeyPath = RTL_CONSTANT_STRING(L"\\REGISTRY\\MACHINE\\SYSTEM\\CurrentControlSet\\Services\\"); - PBUS_ENUM_DEVICE_EXTENSION BusDeviceExtension; - PDEVICE_EXTENSION DeviceExtension; - - DPRINT1("KsCreateBusEnumObject %S\n", ServiceRelativePath); - DbgBreakPoint(); - - /* calculate sizeof bus enum device extension */ - Length = wcslen(BusIdentifier) * sizeof(WCHAR); - Length += sizeof(BUS_ENUM_DEVICE_EXTENSION); - - BusDeviceExtension = AllocateItem(NonPagedPool, Length); - if (!BusDeviceExtension) - { - /* not enough memory */ - return STATUS_INSUFFICIENT_RESOURCES; - } - - /* zero device extension */ - RtlZeroMemory(BusDeviceExtension, sizeof(BUS_ENUM_DEVICE_EXTENSION)); - - /* store bus device extension */ - *((PVOID*)BusDeviceObject->DeviceExtension) = BusDeviceExtension; - - /* initialize bus device extension */ - wcscpy(BusDeviceExtension->BusIdentifier, BusIdentifier); - - /* allocate service path string */ - Length = ServiceKeyPath.MaximumLength; - Length += BusDeviceObject->DriverObject->DriverExtension->ServiceKeyName.MaximumLength; - - if (ServiceRelativePath) - { - /* relative path for devices */ - Length += (wcslen(ServiceRelativePath) + 2) * sizeof(WCHAR); - } - - BusDeviceExtension->ServicePath.Length = 0; - BusDeviceExtension->ServicePath.MaximumLength = Length; - BusDeviceExtension->ServicePath.Buffer = AllocateItem(NonPagedPool, Length); - - if (!BusDeviceExtension->ServicePath.Buffer) - { - /* not enough memory */ - FreeItem(BusDeviceExtension); - return STATUS_INSUFFICIENT_RESOURCES; - } - - RtlAppendUnicodeStringToString(&BusDeviceExtension->ServicePath, &ServiceKeyPath); - RtlAppendUnicodeStringToString(&BusDeviceExtension->ServicePath, &BusDeviceObject->DriverObject->DriverExtension->ServiceKeyName); - - if (ServiceRelativePath) - { - RtlAppendUnicodeToString(&BusDeviceExtension->ServicePath, L"\\"); - RtlAppendUnicodeToString(&BusDeviceExtension->ServicePath, ServiceRelativePath); - } - - if (InterfaceGuid) - { - /* register an device interface */ - Status = IoRegisterDeviceInterface(PhysicalDeviceObject, InterfaceGuid, NULL, &BusDeviceExtension->SymbolicLinkName); - - /* check for success */ - if (!NT_SUCCESS(Status)) - { - FreeItem(BusDeviceExtension->ServicePath.Buffer); - FreeItem(BusDeviceExtension); - return Status; - } - - /* now enable device interface */ - Status = IoSetDeviceInterfaceState(&BusDeviceExtension->SymbolicLinkName, TRUE); - - if (!NT_SUCCESS(Status)) - { - FreeItem(BusDeviceExtension->ServicePath.Buffer); - FreeItem(BusDeviceExtension); - return Status; - } - - /* set state enabled */ - BusDeviceExtension->Enabled = TRUE; - } - - /* store device objects */ - BusDeviceExtension->BusDeviceObject = BusDeviceObject; - BusDeviceExtension->PnpDeviceObject = PnpDeviceObject; - BusDeviceExtension->PhysicalDeviceObject = PhysicalDeviceObject; - - if (!PnpDeviceObject) - { - BusDeviceExtension->PnpDeviceObject = IoAttachDeviceToDeviceStack(BusDeviceObject, PhysicalDeviceObject); - - if (!BusDeviceExtension->PnpDeviceObject) - { - /* failed to attach device */ - if (BusDeviceExtension->Enabled) - { - IoSetDeviceInterfaceState(&BusDeviceExtension->SymbolicLinkName, FALSE); - RtlFreeUnicodeString(&BusDeviceExtension->SymbolicLinkName); - } - - /* free device extension */ - FreeItem(BusDeviceExtension->ServicePath.Buffer); - FreeItem(BusDeviceExtension); - - return STATUS_DEVICE_REMOVED; - } - } - else - { - /* directly attach */ - BusDeviceExtension->PnpDeviceObject = PnpDeviceObject; - } - - /* attach device extension */ - DeviceExtension = (PDEVICE_EXTENSION)BusDeviceObject->DeviceExtension; - DeviceExtension->DeviceHeader = (PKSIDEVICE_HEADER)BusDeviceExtension; - - /* FIXME scan bus and invalidate device relations */ - return Status; -} - - NTSTATUS +NTSTATUS NTAPI KspSetGetBusDataCompletion( IN PDEVICE_OBJECT DeviceObject, @@ -1990,130 +1851,6 @@ } -/* - @implemented -*/ -KSDDKAPI -NTSTATUS -NTAPI -KsGetBusEnumIdentifier( - IN PIRP Irp) -{ - PBUS_ENUM_DEVICE_EXTENSION BusDeviceExtension; - PIO_STACK_LOCATION IoStack; - ULONG Length; - NTSTATUS Status; - LPWSTR Buffer; - - /* get stack location */ - IoStack = IoGetCurrentIrpStackLocation(Irp); - - /* sanity checks */ - ASSERT(IoStack->DeviceObject); - ASSERT(IoStack->DeviceObject->DeviceExtension); - - /* get bus device extension */ - BusDeviceExtension = *(PBUS_ENUM_DEVICE_EXTENSION*)(IoStack->DeviceObject->DeviceExtension); - - if (!BusDeviceExtension) - { - /* invalid parameter */ - return STATUS_INVALID_PARAMETER; - } - - /* get length */ - Length = (wcslen(BusDeviceExtension->BusIdentifier)+1) * sizeof(WCHAR); - - /* is there an output buffer provided */ - if (IoStack->Parameters.DeviceIoControl.InputBufferLength) - { - if (Length > IoStack->Parameters.DeviceIoControl.InputBufferLength) - { - /* buffer is too small */ - return STATUS_BUFFER_TOO_SMALL; - } - - /* now allocate buffer */ - Buffer = AllocateItem(NonPagedPool, Length); - if (!Buffer) - { - /* no memory */ - Status = STATUS_INSUFFICIENT_RESOURCES; - } - else - { - /* copy bus identifier */ - wcscpy(Buffer, BusDeviceExtension->BusIdentifier); - - /* store buffer */ - Irp->AssociatedIrp.SystemBuffer = Buffer; - - /* set flag that buffer gets copied back */ - Irp->Flags |= IRP_BUFFERED_IO | IRP_DEALLOCATE_BUFFER | IRP_INPUT_OPERATION; - - /* done */ - Status = STATUS_SUCCESS; - } - } - else - { - /* no buffer provided */ - Status = STATUS_BUFFER_OVERFLOW; - } - - /* done */ - return Status; -} - -/* - @unimplemented -*/ -KSDDKAPI -NTSTATUS -NTAPI -KsGetBusEnumParentFDOFromChildPDO( - IN PDEVICE_OBJECT DeviceObject, - OUT PDEVICE_OBJECT *FunctionalDeviceObject) -{ - DPRINT1("KsGetBusEnumParentFDOFromChildPDO\n"); - DbgBreakPoint(); - return STATUS_UNSUCCESSFUL; -} - -/* - @implemented -*/ -KSDDKAPI -NTSTATUS -NTAPI -KsGetBusEnumPnpDeviceObject( - IN PDEVICE_OBJECT DeviceObject, - IN PDEVICE_OBJECT *PnpDeviceObject) -{ - PBUS_ENUM_DEVICE_EXTENSION BusDeviceExtension; - - if (!DeviceObject->DeviceExtension) - { - /* invalid parameter */ - return STATUS_INVALID_PARAMETER; - } - - /* get bus device extension */ - BusDeviceExtension = *(PBUS_ENUM_DEVICE_EXTENSION*)(DeviceObject->DeviceExtension); - - if (!BusDeviceExtension) - { - /* invalid parameter */ - return STATUS_INVALID_PARAMETER; - } - - /* store result */ - *PnpDeviceObject = BusDeviceExtension->PnpDeviceObject; - - - /* done */ - return STATUS_SUCCESS; -} /* @implemented @@ -2153,37 +1890,6 @@ BasicHeader->Type == KsObjectTypeFilter || BasicHeader->Type == KsObjectTypePin); return (PVOID)BasicHeader->Next.Pin; -} - -/* - @unimplemented -*/ -KSDDKAPI -NTSTATUS -NTAPI -KsInstallBusEnumInterface( - PIRP Irp) -{ - UNIMPLEMENTED - DPRINT1("KsInstallBusEnumInterface\n"); - DbgBreakPoint(); - return STATUS_UNSUCCESSFUL; -} - -/* - @unimplemented -*/ -KSDDKAPI -NTSTATUS -NTAPI -KsIsBusEnumChildDevice( - IN PDEVICE_OBJECT DeviceObject, - OUT PBOOLEAN ChildDevice) -{ - UNIMPLEMENTED - DPRINT1("KsIsBusEnumChildDevice\n"); - DbgBreakPoint(); - return STATUS_UNSUCCESSFUL; } ULONG @@ -2700,154 +2406,6 @@ @unimplemented */ KSDDKAPI -NTSTATUS -NTAPI -KsServiceBusEnumCreateRequest( - IN PDEVICE_OBJECT DeviceObject, - IN OUT PIRP Irp) -{ - UNIMPLEMENTED - DPRINT1("KsServiceBusEnumCreateRequest\n"); - DbgBreakPoint(); - return STATUS_UNSUCCESSFUL; -} - - -/* - @unimplemented -*/ -KSDDKAPI -NTSTATUS -NTAPI -KsServiceBusEnumPnpRequest( - IN PDEVICE_OBJECT DeviceObject, - IN OUT PIRP Irp) -{ - UNIMPLEMENTED - DPRINT1("KsServiceBusEnumPnpRequest\n"); - DbgBreakPoint(); -/* -KsServiceBusEnumPnpRequest services the following Plug and Play IRPs for an FDO or parent device: - - * - IRP_MN_START_DEVICE - IRP_MN_QUERY_BUS_INFORMATION OK - IRP_MN_QUERY_DEVICE_RELATIONS - IRP_MN_QUERY_STOP_DEVICE - IRP_MN_QUERY_REMOVE_DEVICE - IRP_MN_CANCEL_STOP_DEVICE - IRP_MN_CANCEL_REMOVE_DEVICE - IRP_MN_STOP_DEVICE - IRP_MN_REMOVE_DEVICE -*/ - -/* -Plug and Play IRPs for a PDO or child device: - - * - IRP_MN_START_DEVICE - IRP_MN_QUERY_STOP_DEVICE - IRP_MN_QUERY_REMOVE_DEVICE - IRP_MN_STOP_DEVICE - IRP_MN_REMOVE_DEVICE - IRP_MN_QUERY_DEVICE_RELATIONS (TargetDeviceRelations) - IRP_MN_QUERY_PNP_DEVICE_STATE - IRP_MN_QUERY_ID - IRP_MN_QUERY_INTERFACE - IRP_MN_QUERY_RESOURCES NOP - IRP_MN_QUERY_RESOURCE_REQUIREMENTS NOP - IRP_MN_READ_CONFIG - IRP_MN_WRITE_CONFIG - IRP_MN_QUERY_CAPABILITIES - -*/ -/** - Request: IRP_MN_QUERY_BUS_INFORMATION - : GUID PNP_BUS_INFORMATION - BusTypeGuid: KSMEDIUMSETID_Standard - LegacyBusType: InterfaceTypeUndefined - BusNumber: 0 -*/ - - return STATUS_UNSUCCESSFUL; -} - -VOID -NTAPI -KspRemoveBusInterface( - PVOID Ctx) -{ - PKSREMOVE_BUS_INTERFACE_CTX Context =(PKSREMOVE_BUS_INTERFACE_CTX)Ctx; - - /* TODO - * get SWENUM_INSTALL_INTERFACE struct - * open device key and delete the keys - */ - - UNIMPLEMENTED - - /* set status */ - Context->Irp->IoStatus.Status = STATUS_NOT_IMPLEMENTED; - - - /* signal completion */ - KeSetEvent(&Context->Event, IO_NO_INCREMENT, FALSE); -} - -/* - @unimplemented -*/ -KSDDKAPI -NTSTATUS -NTAPI -KsRemoveBusEnumInterface( - IN PIRP Irp) -{ - KPROCESSOR_MODE Mode; - LUID luid; - KSREMOVE_BUS_INTERFACE_CTX Ctx; - WORK_QUEUE_ITEM WorkItem; - - DPRINT1("KsRemoveBusEnumInterface\n"); - DbgBreakPoint(); - - /* get previous mode */ - Mode = ExGetPreviousMode(); - - /* convert to luid */ - luid = RtlConvertUlongToLuid(SE_LOAD_DRIVER_PRIVILEGE); - - /* perform access check */ - if (!SeSinglePrivilegeCheck(luid, Mode)) - { - /* insufficient privileges */ - return STATUS_PRIVILEGE_NOT_HELD; - } - /* initialize event */ - KeInitializeEvent(&Ctx.Event, NotificationEvent, FALSE); - - /* store irp in ctx */ - Ctx.Irp = Irp; - - /* initialize work item */ - ExInitializeWorkItem(&WorkItem, KspRemoveBusInterface, (PVOID)&Ctx); - - /* now queue the work item */ - ExQueueWorkItem(&WorkItem, DelayedWorkQueue); - - /* wait for completion */ - KeWaitForSingleObject(&Ctx.Event, Executive, KernelMode, FALSE, NULL); - - /* return result */ - return Ctx.Irp->IoStatus.Status; - -} - - -/* - @unimplemented -*/ -KSDDKAPI PUNKNOWN NTAPI KsRegisterAggregatedClientUnknown( Modified: branches/audio-bringup/drivers/ksfilter/ks/ks.rbuild URL: http://svn.reactos.org/svn/reactos/branches/audio-bringup/drivers/ksfilter/… ============================================================================== --- branches/audio-bringup/drivers/ksfilter/ks/ks.rbuild [iso-8859-1] (original) +++ branches/audio-bringup/drivers/ksfilter/ks/ks.rbuild [iso-8859-1] Mon Dec 20 02:45:18 2010 @@ -32,4 +32,5 @@ <file>unknown.c</file> <file>worker.c</file> <file>kcom.c</file> + <file>swenum.c</file> </module> Modified: branches/audio-bringup/drivers/ksfilter/ks/ksiface.h URL: http://svn.reactos.org/svn/reactos/branches/audio-bringup/drivers/ksfilter/… ============================================================================== --- branches/audio-bringup/drivers/ksfilter/ks/ksiface.h [iso-8859-1] (original) +++ branches/audio-bringup/drivers/ksfilter/ks/ksiface.h [iso-8859-1] Mon Dec 20 02:45:18 2010 @@ -307,3 +307,5 @@ STDMETHOD_(NTSTATUS, CheckIoCapability)(THIS_ IN ULONG Unknown)PURE; }; + +#undef INTERFACE Modified: branches/audio-bringup/drivers/ksfilter/ks/kstypes.h URL: http://svn.reactos.org/svn/reactos/branches/audio-bringup/drivers/ksfilter/… ============================================================================== --- branches/audio-bringup/drivers/ksfilter/ks/kstypes.h [iso-8859-1] (original) +++ branches/audio-bringup/drivers/ksfilter/ks/kstypes.h [iso-8859-1] Mon Dec 20 02:45:18 2010 @@ -136,12 +136,6 @@ typedef struct { - PIRP Irp; - KEVENT Event; -}KSREMOVE_BUS_INTERFACE_CTX, *PKSREMOVE_BUS_INTERFACE_CTX; - -typedef struct -{ PLIST_ENTRY List; PFILE_OBJECT FileObject; PKSEVENT_ENTRY EventEntry; @@ -150,19 +144,96 @@ typedef BOOLEAN (NTAPI *PKSEVENT_SYNCHRONIZED_ROUTINE)(PKSEVENT_CTX Context); -typedef struct -{ - BOOLEAN Enabled; - +struct __BUS_ENUM_DEVICE_EXTENSION__; +struct BUS_DEVICE_ENTRY; + +typedef struct +{ + LIST_ENTRY Entry; + ULONG IsBus; + union + { + PDEVICE_OBJECT DeviceObject; + ULONG DeviceReferenceCount; + }; + union + { + PVOID DeviceEntry; + ULONG Dummy1; + }; + struct __BUS_ENUM_DEVICE_EXTENSION__ *BusDeviceExtension; + ULONG DeviceObjectReferenceCount; +}COMMON_DEVICE_EXTENSION, *PCOMMON_DEVICE_EXTENSION; + +typedef struct +{ + PCOMMON_DEVICE_EXTENSION Ext; +}DEV_EXTENSION, *PDEV_EXTENSION; + +typedef struct +{ + LIST_ENTRY Entry; + GUID InterfaceGuid; + UNICODE_STRING SymbolicLink; +}BUS_INSTANCE_ENTRY, *PBUS_INSTANCE_ENTRY; + + + +typedef enum +{ + NotStarted = 0, // Not started yet + Started, // Device has received the START_DEVICE IRP + StopPending, // Device has received the QUERY_STOP IRP + Stopped, // Device has received the STOP_DEVICE IRP + RemovePending, // Device has received the QUERY_REMOVE IRP + SurpriseRemovePending, // Device has received the SURPRISE_REMOVE IRP + Deleted +}DEVICE_STATE; + + +typedef struct +{ + LIST_ENTRY Entry; + LIST_ENTRY DeviceInterfaceList; + LIST_ENTRY IrpPendingList; + PDEVICE_OBJECT PDO; + DEVICE_STATE DeviceState; + GUID DeviceGuid; + LPWSTR PDODeviceName; + LPWSTR DeviceName; + LPWSTR BusId; + LARGE_INTEGER TimeCreated; + LARGE_INTEGER TimeExpired; + LPWSTR Instance; +}BUS_DEVICE_ENTRY, *PBUS_DEVICE_ENTRY; + +typedef struct __BUS_ENUM_DEVICE_EXTENSION__ +{ + COMMON_DEVICE_EXTENSION Common; + KSPIN_LOCK Lock; + KEVENT Event; + UNICODE_STRING DeviceInterfaceLink; + PDEVICE_OBJECT PhysicalDeviceObject; PDEVICE_OBJECT PnpDeviceObject; - PDEVICE_OBJECT PhysicalDeviceObject; PDEVICE_OBJECT BusDeviceObject; - + ULONG PdoCreated; + KTIMER Timer; + KDPC Dpc; + WORK_QUEUE_ITEM WorkItem; + ULONG DeviceAttached; UNICODE_STRING ServicePath; - UNICODE_STRING SymbolicLinkName; WCHAR BusIdentifier[1]; }BUS_ENUM_DEVICE_EXTENSION, *PBUS_ENUM_DEVICE_EXTENSION; + +typedef struct +{ + PIRP Irp; + PBUS_ENUM_DEVICE_EXTENSION BusDeviceExtension; + KEVENT Event; + NTSTATUS Status; + WORK_QUEUE_ITEM WorkItem; +}BUS_INSTALL_ENUM_CONTEXT, *PBUS_INSTALL_ENUM_CONTEXT; typedef struct { Modified: branches/audio-bringup/drivers/ksfilter/ks/priv.h URL: http://svn.reactos.org/svn/reactos/branches/audio-bringup/drivers/ksfilter/… ============================================================================== --- branches/audio-bringup/drivers/ksfilter/ks/priv.h [iso-8859-1] (original) +++ branches/audio-bringup/drivers/ksfilter/ks/priv.h [iso-8859-1] Mon Dec 20 02:45:18 2010 @@ -19,6 +19,8 @@ #include "ksmedia.h" #include "bdamedia.h" +#include <swenum.h> + #define TAG_DEVICE_HEADER 'KSDH' #define REG_PINFLAG_B_MANY 0x4 /* strmif.h */ Added: branches/audio-bringup/drivers/ksfilter/ks/swenum.c URL: http://svn.reactos.org/svn/reactos/branches/audio-bringup/drivers/ksfilter/… ============================================================================== --- branches/audio-bringup/drivers/ksfilter/ks/swenum.c (added) +++ branches/audio-bringup/drivers/ksfilter/ks/swenum.c [iso-8859-1] Mon Dec 20 02:45:18 2010 @@ -1,0 +1,1961 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS Kernel Streaming + * FILE: drivers/ksfilter/ks/swenum.c + * PURPOSE: KS Software BUS functions + * PROGRAMMER: Johannes Anderwald + */ + + +#include "priv.h" + +LONG KsDeviceCount = 0; + +typedef NTSTATUS (NTAPI *PKSP_BUS_ENUM_CALLBACK)( + IN PHANDLE hKey, + IN PBUS_ENUM_DEVICE_EXTENSION BusDeviceExtension, + IN PBUS_DEVICE_ENTRY DummyEntry, + IN LPWSTR RootName, + IN LPWSTR DirectoryName); + +NTSTATUS +KspCreatePDO( + IN PBUS_ENUM_DEVICE_EXTENSION BusDeviceExtension, + IN PBUS_DEVICE_ENTRY DeviceEntry, + OUT PDEVICE_OBJECT * OutDeviceObject) +{ + PDEVICE_OBJECT DeviceObject; + WCHAR Buffer[50]; + ULONG CurDeviceId; + UNICODE_STRING DeviceName; + NTSTATUS Status; + PCOMMON_DEVICE_EXTENSION DeviceExtension; + + /* increment device count */ + CurDeviceId = InterlockedIncrement(&KsDeviceCount); + + /* generate new device id */ + swprintf(Buffer, L"\\Device\\KSENUM%08x\n", CurDeviceId); + + /* initialize new device name */ + RtlInitUnicodeString(&DeviceName, Buffer); + + /* create new device object */ + Status = IoCreateDevice(BusDeviceExtension->BusDeviceObject->DriverObject, sizeof(PVOID), &DeviceName, FILE_DEVICE_UNKNOWN, 0, FALSE, &DeviceObject); + + /* check for success */ + if (!NT_SUCCESS(Status)) + { + /* failed to create pdo */ + return Status; + } + + /* now allocate device extension */ + DeviceExtension = (PCOMMON_DEVICE_EXTENSION)AllocateItem(NonPagedPool, sizeof(COMMON_DEVICE_EXTENSION)); + if (!DeviceExtension) + { + /* no memory */ + IoDeleteDevice(DeviceObject); + return STATUS_INSUFFICIENT_RESOURCES; + } + + /* store device extension */ + *((PVOID*)DeviceObject->DeviceExtension) = DeviceExtension; + + /* initialize device extension */ + DeviceExtension->IsBus = FALSE; + DeviceExtension->DeviceObject = DeviceObject; + DeviceExtension->DeviceEntry = DeviceEntry; + DeviceExtension->BusDeviceExtension = BusDeviceExtension; + + /* TODO: update last creation time in bus device extension */ + + /* setup flags */ + DeviceObject->Flags |= DO_DIRECT_IO | DO_POWER_PAGABLE; + + /* TODO: fire time when expired */ + + *OutDeviceObject = DeviceObject; + + return STATUS_SUCCESS; +} + +NTSTATUS +KspRegisterDeviceAssociation( + IN PBUS_ENUM_DEVICE_EXTENSION BusDeviceExtension, + IN PBUS_DEVICE_ENTRY DeviceEntry, + IN OUT PBUS_INSTANCE_ENTRY BusInstanceEntry) +{ + NTSTATUS Status; + UNICODE_STRING ReferenceString; + + /* initialize reference string */ + RtlInitUnicodeString(&ReferenceString, DeviceEntry->DeviceName); + + /* register device interface */ + Status = IoRegisterDeviceInterface(BusDeviceExtension->PhysicalDeviceObject, &BusInstanceEntry->InterfaceGuid, &ReferenceString, &BusInstanceEntry->SymbolicLink); + + /* check for success */ + if (!NT_SUCCESS(Status)) + { + /* failed */ + return Status; + } + + /* now enable the interface */ + Status = IoSetDeviceInterfaceState(&BusInstanceEntry->SymbolicLink, TRUE); + + /* check for success */ + if (!NT_SUCCESS(Status)) + { + /* failed, free memory */ + FreeItem(BusInstanceEntry->SymbolicLink.Buffer); + return Status; + } + + DPRINT1("Registered DeviceInterface %wZ\n", &BusInstanceEntry->SymbolicLink); + + + /* done */ + return Status; +} + +VOID +KspRemoveDeviceAssociations( + IN PBUS_DEVICE_ENTRY DeviceEntry) +{ + PLIST_ENTRY Entry; + PBUS_INSTANCE_ENTRY CurEntry; + + /* remove all entries */ + Entry = DeviceEntry->DeviceInterfaceList.Flink; + + while(Entry != &DeviceEntry->DeviceInterfaceList) + { + /* get offset */ + CurEntry = (PBUS_INSTANCE_ENTRY)CONTAINING_RECORD(Entry, BUS_INSTANCE_ENTRY, Entry); + + /* sanity check */ + ASSERT(CurEntry->SymbolicLink.Buffer); + + /* de-register interface */ + IoSetDeviceInterfaceState(&CurEntry->SymbolicLink, FALSE); + + /* free symbolic link buffer */ + FreeItem(CurEntry->SymbolicLink.Buffer); + + /* remove entry from list */ + RemoveEntryList(Entry); + + /* move to next entry */ + Entry = Entry->Flink; + + /* free entry */ + FreeItem(CurEntry); + } +} + +NTSTATUS +KspEnumerateBusRegistryKeys( + IN HANDLE hKey, + IN LPWSTR ReferenceString, + IN PKSP_BUS_ENUM_CALLBACK Callback, + IN PBUS_ENUM_DEVICE_EXTENSION BusDeviceExtension, + IN PBUS_DEVICE_ENTRY DeviceEntry) +{ + UNICODE_STRING String; + OBJECT_ATTRIBUTES ObjectAttributes; + HANDLE hNewKey; + NTSTATUS Status; + ULONG ResultLength, Index, KeyInfoLength; + KEY_FULL_INFORMATION KeyInformation; + PKEY_BASIC_INFORMATION KeyInfo; + + /* initialize key name */ + RtlInitUnicodeString(&String, ReferenceString); + + /* initialize object attributes */ + InitializeObjectAttributes(&ObjectAttributes, &String, OBJ_KERNEL_HANDLE | OBJ_CASE_INSENSITIVE, hKey, NULL); + + /* open new key */ + Status = ZwOpenKey(&hNewKey, GENERIC_READ, &ObjectAttributes); + + /* check for success */ + if (!NT_SUCCESS(Status)) + { + /* failed to open key */ + + return Status; + } + + /* query key stats */ + Status = ZwQueryKey(hNewKey, KeyFullInformation, &KeyInformation, sizeof(KeyInformation), &ResultLength); + + if (!NT_SUCCESS(Status)) + { + /* close key */ + ZwClose(hNewKey); + + /* done */ + return Status; + } + + /* calculate key info length */ + KeyInfoLength = KeyInformation.MaxNameLen + sizeof(KEY_BASIC_INFORMATION) + 1 * sizeof(WCHAR); + + /* allocate buffer */ + KeyInfo = (PKEY_BASIC_INFORMATION)AllocateItem(NonPagedPool, KeyInfoLength); + if (!KeyInfo) + { + + /* no memory */ + ZwClose(hNewKey); + + /* done */ + return STATUS_INSUFFICIENT_RESOURCES; + } + + /* enumerate all keys */ + for(Index = 0; Index < KeyInformation.SubKeys; Index++) + { + + /* query sub key */ + Status = ZwEnumerateKey(hNewKey, Index, KeyBasicInformation, (PVOID)KeyInfo, KeyInfoLength, &ResultLength); + + /* check for success */ + if (NT_SUCCESS(Status)) + { + /* perform callback */ + Status = Callback(hNewKey, BusDeviceExtension, DeviceEntry, ReferenceString, KeyInfo->Name); + + /* should enumeration stop */ + if (!NT_SUCCESS(Status)) + break; + } + } + + /* free info buffer */ + FreeItem(KeyInfo); + + /* close key */ + ZwClose(hNewKey); + + /* done */ + return Status; +} + +NTSTATUS +NTAPI +KspCreateDeviceAssociation( + IN PHANDLE hKey, + IN PBUS_ENUM_DEVICE_EXTENSION BusDeviceExtension, + IN PBUS_DEVICE_ENTRY DeviceEntry, + IN LPWSTR ReferenceString, + IN LPWSTR InterfaceString) +{ + GUID DeviceGuid; + NTSTATUS Status; + PLIST_ENTRY Entry; + PBUS_INSTANCE_ENTRY CurEntry; + UNICODE_STRING DeviceName; + + /* initialize interface string */ + RtlInitUnicodeString(&DeviceName, InterfaceString); + + /* first convert device name to guid */ + RtlGUIDFromString(&DeviceName, &DeviceGuid); + + /* check if the device is already present */ + Entry = DeviceEntry->DeviceInterfaceList.Flink; + + while(Entry != &DeviceEntry->DeviceInterfaceList) + { + /* get offset */ + CurEntry = (PBUS_INSTANCE_ENTRY)CONTAINING_RECORD(Entry, BUS_INSTANCE_ENTRY, Entry); + + if (IsEqualGUIDAligned(&CurEntry->InterfaceGuid, &DeviceGuid)) + { + /* entry already exists */ + return STATUS_SUCCESS; + } + + /* move to next entry */ + Entry = Entry->Flink; + } + + /* time to allocate new entry */ + CurEntry = (PBUS_INSTANCE_ENTRY)AllocateItem(NonPagedPool, sizeof(BUS_INSTANCE_ENTRY)); + + if (!CurEntry) + { + /* no memory */ + return STATUS_INSUFFICIENT_RESOURCES; + } + + /* store guid */ + RtlMoveMemory(&CurEntry->InterfaceGuid, &DeviceGuid, sizeof(GUID)); + + /* now register the association */ + Status = KspRegisterDeviceAssociation(BusDeviceExtension, DeviceEntry, CurEntry); + + /* check for success */ + if (NT_SUCCESS(Status)) + { + /* store entry */ + InsertTailList(&DeviceEntry->DeviceInterfaceList, &CurEntry->Entry); + } + else + { + /* failed to associated device */ + FreeItem(CurEntry); + } + + /* done */ + return Status; +} + +NTSTATUS +NTAPI +KspCreateDeviceReference( + IN PHANDLE hKey, + IN PBUS_ENUM_DEVICE_EXTENSION BusDeviceExtension, + IN PBUS_DEVICE_ENTRY DummyEntry, + IN LPWSTR DeviceCategory, + IN LPWSTR ReferenceString) +{ + LPWSTR DeviceName; + ULONG Length; + PLIST_ENTRY Entry; + PBUS_DEVICE_ENTRY DeviceEntry = NULL; /* GCC warning */ + BOOLEAN ItemExists = FALSE; + UNICODE_STRING String; + NTSTATUS Status; + + /* first construct device name & reference guid */ + Length = wcslen(DeviceCategory) + wcslen(ReferenceString); + + /* append '&' and null byte */ + Length += 2; + + /* allocate device name */ + DeviceName = AllocateItem(NonPagedPool, Length * sizeof(WCHAR)); + + if (!DeviceName) + { + /* not enough memory */ + return STATUS_INSUFFICIENT_RESOURCES; + } + + /* construct device name */ + wcscpy(DeviceName, DeviceCategory); + wcscat(DeviceName, L"&"); + wcscat(DeviceName, ReferenceString); + + /* scan list and check if it is already present */ + Entry = BusDeviceExtension->Common.Entry.Flink; + + while(Entry != &BusDeviceExtension->Common.Entry) + { + /* get real offset */ + DeviceEntry = (PBUS_DEVICE_ENTRY)CONTAINING_RECORD(Entry, BUS_DEVICE_ENTRY, Entry); + + /* check if name matches */ + if (!wcsicmp(DeviceEntry->DeviceName, DeviceName)) + { + /* item already exists */ + ItemExists = TRUE; + break; + } + + /* move to next entry */ + Entry = Entry->Flink; + } + + if (!ItemExists) + { + /* allocate new device entry */ + DeviceEntry = AllocateItem(NonPagedPool, sizeof(BUS_DEVICE_ENTRY)); + if (!DeviceEntry) + { + /* no memory */ + FreeItem(DeviceName); + return STATUS_INSUFFICIENT_RESOURCES; + } + + /* initialize device entry */ + InitializeListHead(&DeviceEntry->DeviceInterfaceList); + InitializeListHead(&DeviceEntry->IrpPendingList); + + /* copy device guid */ + RtlInitUnicodeString(&String, ReferenceString); + RtlGUIDFromString(&String, &DeviceEntry->DeviceGuid); + + /* copy device names */ + DeviceEntry->DeviceName = DeviceName; + DeviceEntry->Instance = (DeviceName + wcslen(DeviceCategory) + 1); + + /* copy name */ + DeviceEntry->BusId = AllocateItem(NonPagedPool, (wcslen(DeviceCategory) + 1) * sizeof(WCHAR)); + if (!DeviceEntry->BusId) + { + /* no memory */ + FreeItem(DeviceName); + FreeItem(DeviceEntry); + return STATUS_INSUFFICIENT_RESOURCES; + } + wcscpy(DeviceEntry->BusId, DeviceCategory); + } + + /* now enumerate the devices */ + Status = KspEnumerateBusRegistryKeys(hKey, ReferenceString, KspCreateDeviceAssociation, BusDeviceExtension, DeviceEntry); + + /* check if list is empty */ + if (IsListEmpty(&DeviceEntry->DeviceInterfaceList)) + { + /* invalid device settings */ + FreeItem(DeviceEntry->BusId); + FreeItem(DeviceEntry->DeviceName); + FreeItem(DeviceEntry); + + ASSERT(ItemExists == FALSE); + + return STATUS_INVALID_DEVICE_STATE; + } + + /* check if enumeration failed */ + if (!NT_SUCCESS(Status)) + { + /* failed */ + KspRemoveDeviceAssociations(DeviceEntry); + FreeItem(DeviceEntry->BusId); + FreeItem(DeviceEntry->DeviceName); + FreeItem(DeviceEntry); + + ASSERT(ItemExists == FALSE); + + /* done */ + return Status; + } + + /* successfully initialized entry */ + InsertTailList(&BusDeviceExtension->Common.Entry, &DeviceEntry->Entry); + + /* done */ + return Status; +} + +NTSTATUS +NTAPI +KspCreateDeviceReferenceTrampoline( + IN PHANDLE hKey, + IN PBUS_ENUM_DEVICE_EXTENSION BusDeviceExtension, + IN PBUS_DEVICE_ENTRY DummyEntry, + IN LPWSTR DeviceCategory, + IN LPWSTR ReferenceString) +{ + return KspEnumerateBusRegistryKeys(hKey, ReferenceString, KspCreateDeviceReference, BusDeviceExtension, DummyEntry); +} + + +NTSTATUS +KspOpenBusRegistryKey( + IN PBUS_ENUM_DEVICE_EXTENSION BusDeviceExtension, + OUT PHANDLE hKey) +{ + OBJECT_ATTRIBUTES ObjectAttributes; + + /* initialize object attributes */ + InitializeObjectAttributes(&ObjectAttributes, &BusDeviceExtension->ServicePath, OBJ_KERNEL_HANDLE | OBJ_CASE_INSENSITIVE, NULL, NULL); + + return ZwCreateKey(hKey, GENERIC_READ | GENERIC_WRITE, &ObjectAttributes, 0, NULL, 0, NULL); +} + +NTSTATUS +KspScanBus( + IN PBUS_ENUM_DEVICE_EXTENSION BusDeviceExtension) +{ + HANDLE hKey; + NTSTATUS Status; + + /* first open key */ + Status = KspOpenBusRegistryKey(BusDeviceExtension, &hKey); + + /* check for success */ + if (!NT_SUCCESS(Status)) + { + /* no success */ + + return Status; + } + + /* TODO clear reference marks */ + + /* construct device entries */ + Status = KspEnumerateBusRegistryKeys(hKey, NULL, KspCreateDeviceReferenceTrampoline, BusDeviceExtension, NULL); + + /* TODO: delete unreferenced devices */ + + /* close handle */ + ZwClose(hKey); + + /* done */ + return Status; +} + + +NTSTATUS +NTAPI +KspBusQueryReferenceString( + IN PVOID Context, + IN OUT PWCHAR *String) +{ + LPWSTR Name; + ULONG Length; + PBUS_ENUM_DEVICE_EXTENSION BusDeviceExtension = (PBUS_ENUM_DEVICE_EXTENSION)Context; + + /* sanity checks */ + ASSERT(BusDeviceExtension); + ASSERT(BusDeviceExtension->BusIdentifier); + + /* calculate length */ + Length = wcslen(BusDeviceExtension->BusIdentifier) + 1; + + /* allocate buffer */ + Name = AllocateItem(PagedPool, Length * sizeof(WCHAR)); + + if (!Name) + { + /* failed to allocate buffer */ + return STATUS_INSUFFICIENT_RESOURCES; + } + + /* copy buffer */ + wcscpy(Name, BusDeviceExtension->BusIdentifier); + + /* store result */ + *String = Name; + + /* done */ + return STATUS_SUCCESS; +} + +VOID +NTAPI +KspBusDeviceReference( + IN PVOID Context) +{ + PCOMMON_DEVICE_EXTENSION ChildDeviceExtension = (PCOMMON_DEVICE_EXTENSION)Context; + + /* reference count */ + InterlockedIncrement((PLONG)&ChildDeviceExtension->DeviceReferenceCount); +} + +VOID +NTAPI +KspBusDeviceDereference( + IN PVOID Context) +{ + PCOMMON_DEVICE_EXTENSION ChildDeviceExtension = (PCOMMON_DEVICE_EXTENSION)Context; + + /* reference count */ + InterlockedDecrement((PLONG)&ChildDeviceExtension->DeviceReferenceCount); +} + +VOID +NTAPI +KspBusReferenceDeviceObject( + IN PVOID Context) +{ + PCOMMON_DEVICE_EXTENSION ChildDeviceExtension = (PCOMMON_DEVICE_EXTENSION)Context; + + /* reference count */ + InterlockedIncrement((PLONG)&ChildDeviceExtension->DeviceObjectReferenceCount); +} + +VOID +NTAPI +KspBusDereferenceDeviceObject( + IN PVOID Context) +{ + PCOMMON_DEVICE_EXTENSION ChildDeviceExtension = (PCOMMON_DEVICE_EXTENSION)Context; + + /* reference count */ + InterlockedDecrement((PLONG)&ChildDeviceExtension->DeviceObjectReferenceCount); +} + +NTSTATUS +KspQueryBusDeviceInterface( + IN PIRP Irp, + IN PCOMMON_DEVICE_EXTENSION ChildDeviceExtension) +{ + PBUS_INTERFACE_SWENUM Interface; + PIO_STACK_LOCATION IoStack; + + /* get current irp stack location */ + IoStack = IoGetCurrentIrpStackLocation(Irp); + + /* sanity checks */ + ASSERT(IoStack->Parameters.QueryInterface.Size == sizeof(BUS_INTERFACE_SWENUM)); + ASSERT(IoStack->Parameters.QueryInterface.Interface); + + /* fill in interface */ + Interface = (PBUS_INTERFACE_SWENUM)IoStack->Parameters.QueryInterface.Interface; + Interface->Interface.Size = sizeof(BUS_INTERFACE_SWENUM); + Interface->Interface.Version = BUS_INTERFACE_SWENUM_VERSION; + Interface->Interface.Context = ChildDeviceExtension; + Interface->Interface.InterfaceReference = KspBusDeviceReference; + Interface->Interface.InterfaceDereference = KspBusDeviceDereference; + Interface->ReferenceDeviceObject = KspBusReferenceDeviceObject; + Interface->DereferenceDeviceObject = KspBusDereferenceDeviceObject; + Interface->QueryReferenceString = KspBusQueryReferenceString; + + return STATUS_SUCCESS; +} + +NTSTATUS +KspEnableBusDeviceInterface( + PBUS_DEVICE_ENTRY DeviceEntry, + BOOLEAN bEnable) +{ + PLIST_ENTRY Entry; + PBUS_INSTANCE_ENTRY InstanceEntry; + NTSTATUS Status = STATUS_SUCCESS; + + /* enable now all interfaces */ + Entry = DeviceEntry->DeviceInterfaceList.Flink; + + while(Entry != &DeviceEntry->DeviceInterfaceList) + { + /* get bus instance entry */ + InstanceEntry = (PBUS_INSTANCE_ENTRY)CONTAINING_RECORD(Entry, BUS_INSTANCE_ENTRY, Entry); + + /* set interface state */ + Status = IoSetDeviceInterfaceState(&InstanceEntry->SymbolicLink, bEnable); + + if (!NT_SUCCESS(Status)) + { + /* failed to set interface */ + break; + } + + /* move to next entry */ + Entry = Entry->Flink; + } + + /* done */ + return Status; +} + +NTSTATUS +KspDoReparseForIrp( + PIRP Irp, + PBUS_DEVICE_ENTRY DeviceEntry) +{ + ULONG Length; + LPWSTR Buffer; + PIO_STACK_LOCATION IoStack; + + /* get stack location */ + IoStack = IoGetCurrentIrpStackLocation(Irp); + + /* sanity checks */ + ASSERT(DeviceEntry->PDODeviceName); + ASSERT(DeviceEntry->Instance); + ASSERT(IoStack->FileObject); + ASSERT(IoStack->FileObject->FileName.Buffer); + + /* calculate length */ + Length = wcslen(DeviceEntry->PDODeviceName); + Length += wcslen(DeviceEntry->Instance); + + /* zero byte and '\\' */ + Length += 2; + + /* allocate buffer */ + Buffer = AllocateItem(PagedPool, Length * sizeof(WCHAR)); + if (!Buffer) + { + /* no resources */ + return STATUS_INSUFFICIENT_RESOURCES; + } + + /* construct buffer */ + wcscpy(Buffer, DeviceEntry->PDODeviceName); + wcscat(Buffer, L"\\"); + wcscat(Buffer, DeviceEntry->Instance); + + /* free old file name */ + ExFreePool(IoStack->FileObject->FileName.Buffer); + + /* store new file name */ + RtlInitUnicodeString(&IoStack->FileObject->FileName, Buffer); + + /* done */ + return STATUS_REPARSE; +} + +VOID +KspCompletePendingIrps( + IN PBUS_DEVICE_ENTRY DeviceEntry, + IN OUT NTSTATUS ResultCode) +{ + PLIST_ENTRY Entry; + PIRP Irp; + NTSTATUS Status; + + /* go through list */ + + while(!IsListEmpty(&DeviceEntry->IrpPendingList)) + { + /* get first entry */ + Entry = RemoveHeadList(&DeviceEntry->IrpPendingList); + + /* get irp */ + Irp = (PIRP)CONTAINING_RECORD(Entry, IRP, Tail.Overlay.ListEntry); + + if (ResultCode == STATUS_REPARSE) + { + /* construct reparse information */ + Status = KspDoReparseForIrp(Irp, DeviceEntry); + } + else + { + /* use default code */ + Status = ResultCode; + } + + /* store result code */ + Irp->IoStatus.Status = Status; + + DPRINT1("Completing IRP %p\n", Irp); + + /* complete the request */ + IoCompleteRequest(Irp, IO_NO_INCREMENT); + } +} + + + +NTSTATUS +KspStartBusDevice( + IN PDEVICE_OBJECT DeviceObject, + IN PCOMMON_DEVICE_EXTENSION ChildDeviceExtension, + IN PIRP Irp) +{ + WCHAR PDOName[256]; + NTSTATUS Status; + ULONG ResultLength; + LPWSTR Name; + PBUS_DEVICE_ENTRY DeviceEntry; + + /* FIXME handle pending remove */ + + /* get full device name */ + Status = IoGetDeviceProperty(DeviceObject, DevicePropertyPhysicalDeviceObjectName, sizeof(PDOName), (PVOID)PDOName, &ResultLength); + + if (!NT_SUCCESS(Status)) + { + /* failed to get device name */ + return Status; + } + + /* allocate device name buffer */ + Name = AllocateItem(PagedPool, ResultLength); + if (!Name) + { + /* no memory */ + return STATUS_INSUFFICIENT_RESOURCES; + } + + /* copy name */ + wcscpy(Name, PDOName); + + /* TODO: time stamp creation time */ + + /* get device entry */ + DeviceEntry = (PBUS_DEVICE_ENTRY)ChildDeviceExtension->DeviceEntry; + + /* sanity check */ + ASSERT(DeviceEntry); + + /* store device name */ + DeviceEntry->PDODeviceName = Name; + + /* mark device as started */ + DeviceEntry->DeviceState = Started; + + DPRINT1("KspStartBusDevice Name %S Started\n", Name); + + /* now complete pending i/o */ + KspCompletePendingIrps(DeviceEntry, STATUS_REPARSE); + + /* done */ + return STATUS_SUCCESS; +} + +NTSTATUS +KspQueryBusDeviceCapabilities( + IN PCOMMON_DEVICE_EXTENSION ChildDeviceExtension, + IN PIRP Irp) +{ + PDEVICE_CAPABILITIES Capabilities; + PIO_STACK_LOCATION IoStack; + + /* get stack location */ + IoStack = IoGetCurrentIrpStackLocation(Irp); + + /* get capabilities */ + Capabilities = IoStack->Parameters.DeviceCapabilities.Capabilities; + + /* setup capabilities */ + Capabilities->UniqueID = TRUE; + Capabilities->SilentInstall = TRUE; + Capabilities->SurpriseRemovalOK = TRUE; + Capabilities->Address = 0; + Capabilities->UINumber = 0; + Capabilities->SystemWake = PowerSystemWorking; /* FIXME common device extension */ + Capabilities->DeviceWake = PowerDeviceD0; + + /* done */ + return STATUS_SUCCESS; +} + +NTSTATUS +KspQueryBusInformation( + IN PCOMMON_DEVICE_EXTENSION ChildDeviceExtension, + IN PIRP Irp) +{ + PPNP_BUS_INFORMATION BusInformation; + + /* allocate bus information */ + BusInformation = (PPNP_BUS_INFORMATION)AllocateItem(PagedPool, sizeof(PNP_BUS_INFORMATION)); + + if (!BusInformation) + { + /* no memory */ + return STATUS_INSUFFICIENT_RESOURCES; + } + + /* return info */ + BusInformation->BusNumber = 0; + BusInformation->LegacyBusType = InterfaceTypeUndefined; + RtlMoveMemory(&BusInformation->BusTypeGuid, &KSMEDIUMSETID_Standard, sizeof(GUID)); + + /* store result */ + Irp->IoStatus.Information = (ULONG_PTR)BusInformation; + + /* done */ + return STATUS_SUCCESS; +} + +NTSTATUS +KspQueryBusDevicePnpState( + IN PCOMMON_DEVICE_EXTENSION ChildDeviceExtension, + IN PIRP Irp) +{ + /* set device flags */ + Irp->IoStatus.Information = PNP_DEVICE_DONT_DISPLAY_IN_UI | PNP_DEVICE_NOT_DISABLEABLE; + + /* done */ + return STATUS_SUCCESS; +} + +NTSTATUS +KspQueryId( + IN PCOMMON_DEVICE_EXTENSION ChildDeviceExtension, + IN PIRP Irp) +{ + PIO_STACK_LOCATION IoStack; + PBUS_DEVICE_ENTRY DeviceEntry; + PBUS_ENUM_DEVICE_EXTENSION BusDeviceExtension; + LPWSTR Name; + ULONG Length; + + /* get current irp stack location */ + IoStack = IoGetCurrentIrpStackLocation(Irp); + + if (IoStack->Parameters.QueryId.IdType == BusQueryInstanceID) + { + /* get device entry */ + DeviceEntry = (PBUS_DEVICE_ENTRY) ChildDeviceExtension->DeviceEntry; + + /* sanity check */ + ASSERT(DeviceEntry); + ASSERT(DeviceEntry->Instance); + + /* calculate length */ + Length = wcslen(DeviceEntry->Instance) + 1; + + /* allocate buffer */ + Name = AllocateItem(PagedPool, Length * sizeof(WCHAR)); + + if (!Name) + { + /* failed to allocate buffer */ + return STATUS_INSUFFICIENT_RESOURCES; + } + + /* copy buffer */ + wcscpy(Name, DeviceEntry->Instance); + + /* store result */ + Irp->IoStatus.Information = (ULONG_PTR)Name; + + /* done */ + return STATUS_SUCCESS; + } + else if (IoStack->Parameters.QueryId.IdType == BusQueryDeviceID || + IoStack->Parameters.QueryId.IdType == BusQueryHardwareIDs) + { + /* get device entry */ + DeviceEntry = (PBUS_DEVICE_ENTRY) ChildDeviceExtension->DeviceEntry; + + /* get bus device extension */ + BusDeviceExtension = (PBUS_ENUM_DEVICE_EXTENSION) ChildDeviceExtension->BusDeviceExtension; + + /* sanity check */ + ASSERT(DeviceEntry); + ASSERT(DeviceEntry->BusId); + ASSERT(BusDeviceExtension); + ASSERT(BusDeviceExtension->BusIdentifier); + + /* calculate length */ + Length = wcslen(BusDeviceExtension->BusIdentifier); + Length += wcslen(DeviceEntry->BusId); + + /* extra length for '\\' and zero byte */ + Length += 2; + + /* allocate buffer */ + Name = ExAllocatePool(PagedPool, Length * sizeof(WCHAR)); + if (!Name) + { + /* failed to allocate buffer */ + return STATUS_INSUFFICIENT_RESOURCES; + } + + /* construct id */ + wcscpy(Name, BusDeviceExtension->BusIdentifier); + wcscat(Name, L"\\"); + wcscat(Name, DeviceEntry->BusId); + + /* store result */ + Irp->IoStatus.Information = (ULONG_PTR)Name; + + /* done */ + return STATUS_SUCCESS; + } + else + { + /* other ids are not supported */ + DPRINT1("Not Supported ID Type %x\n", IoStack->Parameters.QueryId.IdType); + return STATUS_NOT_SUPPORTED; + } +} + +NTSTATUS +KspInstallInterface( + IN PBUS_ENUM_DEVICE_EXTENSION BusDeviceExtension, + IN PSWENUM_INSTALL_INTERFACE InstallInterface) +{ + ULONG Length, Index; + UNICODE_STRING DeviceString, InterfaceString, ReferenceString; + HANDLE hKey, hDeviceKey, hInterfaceKey, hReferenceKey; + NTSTATUS Status; + OBJECT_ATTRIBUTES ObjectAttributes; + + /* calculate length */ + Length = wcslen(InstallInterface->ReferenceString); + + /* check for invalid characters */ + for(Index = 0; Index < Length; Index++) + { + if (InstallInterface->ReferenceString[Index] <= L' ' || + InstallInterface->ReferenceString[Index] > L'~' || + InstallInterface->ReferenceString[Index] == L',' || + InstallInterface->ReferenceString[Index] == L'\\' || + InstallInterface->ReferenceString[Index] == L'/') + { + /* invalid character */ + return STATUS_INVALID_PARAMETER; + } + } + + /* open bus key */ + Status = KspOpenBusRegistryKey(BusDeviceExtension, &hKey); + if (NT_SUCCESS(Status)) + { + /* convert device guid to string */ + Status = RtlStringFromGUID(&InstallInterface->DeviceId, &DeviceString); + if (NT_SUCCESS(Status)) + { + /* initialize object attributes */ + InitializeObjectAttributes(&ObjectAttributes, &DeviceString, OBJ_KERNEL_HANDLE | OBJ_CASE_INSENSITIVE, hKey, NULL); + + /* construct device key */ + Status = ZwCreateKey(&hDeviceKey, GENERIC_WRITE, &ObjectAttributes, 0, NULL, 0, NULL); + if (NT_SUCCESS(Status)) + { + /* initialize reference string */ + RtlInitUnicodeString(&ReferenceString, InstallInterface->ReferenceString); + + /* initialize object attributes */ + InitializeObjectAttributes(&ObjectAttributes, &ReferenceString, OBJ_KERNEL_HANDLE | OBJ_CASE_INSENSITIVE, hDeviceKey, NULL); + + /* construct device key */ + Status = ZwCreateKey(&hReferenceKey, GENERIC_WRITE, &ObjectAttributes, 0, NULL, 0, NULL); + if (NT_SUCCESS(Status)) + { + /* convert interface guid to string */ + Status = RtlStringFromGUID(&InstallInterface->InterfaceId, &InterfaceString); + if (NT_SUCCESS(Status)) + { + /* initialize object attributes */ + InitializeObjectAttributes(&ObjectAttributes, &InterfaceString, OBJ_KERNEL_HANDLE | OBJ_CASE_INSENSITIVE, hReferenceKey, NULL); + + /* construct device key */ + Status = ZwCreateKey(&hInterfaceKey, GENERIC_WRITE, &ObjectAttributes, 0, NULL, 0, NULL); + if (NT_SUCCESS(Status)) + { + /* close key */ + ZwClose(hInterfaceKey); + } + /* free interface string */ + RtlFreeUnicodeString(&InterfaceString); + } + /* close reference key */ + ZwClose(hReferenceKey); + } + /* close device key */ + ZwClose(hDeviceKey); + } + /* free device string */ + RtlFreeUnicodeString(&DeviceString); + } + /* close bus key */ + ZwClose(hKey); + } + + /* done */ + return Status; + } + +VOID +NTAPI +KspInstallBusEnumInterface( + IN PVOID Ctx) +{ + PIO_STACK_LOCATION IoStack; + NTSTATUS Status; + PLIST_ENTRY Entry; + PBUS_DEVICE_ENTRY DeviceEntry; + PSWENUM_INSTALL_INTERFACE InstallInterface; + PBUS_INSTALL_ENUM_CONTEXT Context = (PBUS_INSTALL_ENUM_CONTEXT)Ctx; + + /* get current irp stack location */ + IoStack = IoGetCurrentIrpStackLocation(Context->Irp); + + /* get install request */ + InstallInterface = (PSWENUM_INSTALL_INTERFACE)IoStack->Parameters.DeviceIoControl.Type3InputBuffer; + + if (IoStack->Parameters.DeviceIoControl.InputBufferLength < sizeof(SWENUM_INSTALL_INTERFACE)) + { + /* buffer too small */ + Context->Status = STATUS_INVALID_PARAMETER; + + /* signal completion */ + KeSetEvent(&Context->Event, 0, FALSE); + + /* done */ + return; + } + + /* FIXME locks */ + + /* now install the interface */ + Status = KspInstallInterface(Context->BusDeviceExtension, InstallInterface); + if (!NT_SUCCESS(Status)) + { + /* failed to install interface */ + Context->Status = Status; + + /* signal completion */ + KeSetEvent(&Context->Event, 0, FALSE); + + /* done */ + return; + } + + /* now iterate all device entries */ + Entry = Context->BusDeviceExtension->Common.Entry.Flink; + while(Entry != &Context->BusDeviceExtension->Common.Entry) + { + /* get device entry */ + DeviceEntry = (PBUS_DEVICE_ENTRY)CONTAINING_RECORD(Entry, BUS_DEVICE_ENTRY, Entry); + + if (IsEqualGUIDAligned(&DeviceEntry->DeviceGuid, &InstallInterface->DeviceId) && + !wcsicmp(DeviceEntry->Instance, InstallInterface->ReferenceString)) + { + if (!DeviceEntry->PDO) + { + /* create pdo */ + Status = KspCreatePDO(Context->BusDeviceExtension, DeviceEntry, &DeviceEntry->PDO); + + /* done */ + break; + } + } + } + + /* signal that bus driver relations has changed */ + IoInvalidateDeviceRelations(Context->BusDeviceExtension->PhysicalDeviceObject, BusRelations); + + /* update status */ + Context->Status = Status; + + /* signal completion */ + KeSetEvent(&Context->Event, 0, FALSE); +} + + +VOID +NTAPI +KspBusWorkerRoutine( + IN PVOID Parameter) +{ + /* TODO: implement sweeping */ + UNIMPLEMENTED +} + +VOID +NTAPI +KspBusDpcRoutine( + IN PKDPC Dpc, + IN PVOID DeferredContext OPTIONAL, + IN PVOID SystemArgument1 OPTIONAL, + IN PVOID SystemArgument2 OPTIONAL) +{ + /* get device extension */ + PBUS_ENUM_DEVICE_EXTENSION BusDeviceExtension = (PBUS_ENUM_DEVICE_EXTENSION)DeferredContext; + + /* queue the item */ + ExQueueWorkItem(&BusDeviceExtension->WorkItem, DelayedWorkQueue); +} + +VOID +NTAPI +KspRemoveBusInterface( + PVOID Ctx) +{ + PBUS_INSTALL_ENUM_CONTEXT Context =(PBUS_INSTALL_ENUM_CONTEXT)Ctx; + + /* TODO + * get SWENUM_INSTALL_INTERFACE struct + * open device key and delete the keys + */ + + UNIMPLEMENTED + + /* set status */ + Context->Status = STATUS_NOT_IMPLEMENTED; + + + /* signal completion */ + KeSetEvent(&Context->Event, IO_NO_INCREMENT, FALSE); +} + +NTSTATUS +KspQueryBusRelations( + IN PBUS_ENUM_DEVICE_EXTENSION BusDeviceExtension, + IN PIRP Irp) +{ + PDEVICE_RELATIONS DeviceRelations; + PLIST_ENTRY Entry; + PBUS_DEVICE_ENTRY DeviceEntry; + ULONG Count = 0, Length; + + + /* FIXME locks */ + + /* first scan all device entries */ + Entry = BusDeviceExtension->Common.Entry.Flink; + + while(Entry != &BusDeviceExtension->Common.Entry) + { + /* get offset to device entry */ + DeviceEntry = (PBUS_DEVICE_ENTRY)CONTAINING_RECORD(Entry, BUS_DEVICE_ENTRY, Entry); + + /* is there a pdo yet */ + if (DeviceEntry->PDO) + { + /* increment count */ + Count++; + } + + /* move to next entry */ + Entry = Entry->Flink; + } + + /* calculate length */ + Length = sizeof(DEVICE_RELATIONS) + (Count > 1 ? sizeof(PDEVICE_OBJECT) * (Count-1) : 0); + + /* allocate device relations */ + DeviceRelations = (PDEVICE_RELATIONS)AllocateItem(NonPagedPool, Length); + + if (!DeviceRelations) + { + /* not enough memory */ + return STATUS_INSUFFICIENT_RESOURCES; + } + + /* rescan device entries */ + Entry = BusDeviceExtension->Common.Entry.Flink; + + while(Entry != &BusDeviceExtension->Common.Entry) + { + /* get offset to device entry */ + DeviceEntry = (PBUS_DEVICE_ENTRY)CONTAINING_RECORD(Entry, BUS_DEVICE_ENTRY, Entry); + + /* is there a pdo yet */ + if (DeviceEntry->PDO) + { + /* store pdo */ + DeviceRelations->Objects[DeviceRelations->Count] = DeviceEntry->PDO; + + /* reference device object */ + ObReferenceObject(DeviceEntry->PDO); + + /* increment pdo count */ + DeviceRelations->Count++; + } + + /* move to next entry */ + Entry = Entry->Flink; + } + + /* FIXME handle existing device relations */ + ASSERT(Irp->IoStatus.Information == 0); + + /* store device relations */ + Irp->IoStatus.Information = (ULONG_PTR)DeviceRelations; + + /* done */ + return STATUS_SUCCESS; +} + +//------------------------------------------------------------------------------------ + +/* + @implemented +*/ + +KSDDKAPI +NTSTATUS +NTAPI +KsGetBusEnumIdentifier( + IN PIRP Irp) +{ + PDEV_EXTENSION DeviceExtension; + PBUS_ENUM_DEVICE_EXTENSION BusDeviceExtension; + PIO_STACK_LOCATION IoStack; + ULONG Length; + NTSTATUS Status; + LPWSTR Buffer; + + DPRINT1("KsGetBusEnumIdentifier\n"); + + /* get stack location */ + IoStack = IoGetCurrentIrpStackLocation(Irp); + + /* sanity checks */ + ASSERT(IoStack->DeviceObject); + ASSERT(IoStack->DeviceObject->DeviceExtension); + + /* get device extension */ + DeviceExtension = (PDEV_EXTENSION)IoStack->DeviceObject->DeviceExtension; + + /* get bus device extension */ + BusDeviceExtension = (PBUS_ENUM_DEVICE_EXTENSION)DeviceExtension->Ext->BusDeviceExtension; + + /* sanity checks */ + ASSERT(BusDeviceExtension); + ASSERT(BusDeviceExtension->Common.IsBus); + + if (!BusDeviceExtension) + { + /* invalid parameter */ + return STATUS_INVALID_PARAMETER; + } + + /* get length */ + Length = (wcslen(BusDeviceExtension->BusIdentifier)+1) * sizeof(WCHAR); + + /* is there an output buffer provided */ + if (IoStack->Parameters.DeviceIoControl.InputBufferLength) + { + if (Length > IoStack->Parameters.DeviceIoControl.InputBufferLength) + { + /* buffer is too small */ + return STATUS_BUFFER_TOO_SMALL; + } + + /* now allocate buffer */ + Buffer = AllocateItem(NonPagedPool, Length); + if (!Buffer) + { + /* no memory */ + Status = STATUS_INSUFFICIENT_RESOURCES; + } + else + { + /* copy bus identifier */ + wcscpy(Buffer, BusDeviceExtension->BusIdentifier); + + /* store buffer */ + Irp->AssociatedIrp.SystemBuffer = Buffer; + + /* set flag that buffer gets copied back */ + Irp->Flags |= IRP_BUFFERED_IO | IRP_DEALLOCATE_BUFFER | IRP_INPUT_OPERATION; + + /* done */ + Status = STATUS_SUCCESS; + } + } + else + { + /* no buffer provided */ + Status = STATUS_BUFFER_OVERFLOW; + } + + /* done */ + return Status; +} + +/* + @implemented +*/ +KSDDKAPI +NTSTATUS +NTAPI +KsGetBusEnumParentFDOFromChildPDO( + IN PDEVICE_OBJECT DeviceObject, + OUT PDEVICE_OBJECT *FunctionalDeviceObject) +{ + PDEV_EXTENSION DeviceExtension; + + DPRINT1("KsGetBusEnumParentFDOFromChildPDO\n"); + + /* get device extension */ + DeviceExtension = (PDEV_EXTENSION)DeviceObject->DeviceExtension; + + /* check if this is child pdo */ + if (DeviceExtension->Ext->IsBus == FALSE) + { + /* return bus device object */ + *FunctionalDeviceObject = DeviceExtension->Ext->BusDeviceExtension->BusDeviceObject; + + /* done */ + return STATUS_SUCCESS; + } + + /* invalid parameter */ + return STATUS_INVALID_PARAMETER; +} + + +/* + @implemented +*/ +KSDDKAPI +NTSTATUS +NTAPI +KsCreateBusEnumObject( + IN PWCHAR BusIdentifier, + IN PDEVICE_OBJECT BusDeviceObject, + IN PDEVICE_OBJECT PhysicalDeviceObject, + IN PDEVICE_OBJECT PnpDeviceObject OPTIONAL, + IN REFGUID InterfaceGuid OPTIONAL, + IN PWCHAR ServiceRelativePath OPTIONAL) +{ + ULONG Length; + NTSTATUS Status = STATUS_SUCCESS; + UNICODE_STRING ServiceKeyPath = RTL_CONSTANT_STRING(L"\\REGISTRY\\MACHINE\\SYSTEM\\CurrentControlSet\\Services\\"); + PBUS_ENUM_DEVICE_EXTENSION BusDeviceExtension; + PDEV_EXTENSION DeviceExtension; + + DPRINT1("KsCreateBusEnumObject %S BusDeviceObject %p\n", ServiceRelativePath, BusDeviceObject); + + /* calculate sizeof bus enum device extension */ + Length = wcslen(BusIdentifier) * sizeof(WCHAR); + Length += sizeof(BUS_ENUM_DEVICE_EXTENSION); + + BusDeviceExtension = AllocateItem(NonPagedPool, Length); + if (!BusDeviceExtension) + { + /* not enough memory */ + + return STATUS_INSUFFICIENT_RESOURCES; + } + + /* get device extension */ + DeviceExtension = (PDEV_EXTENSION)BusDeviceObject->DeviceExtension; + + DPRINT1("DeviceExtension %p BusDeviceExtension %p\n", DeviceExtension, DeviceExtension->Ext); + + /* store bus device extension */ + DeviceExtension->Ext = (PCOMMON_DEVICE_EXTENSION)BusDeviceExtension; + + DPRINT1("DeviceExtension %p BusDeviceExtension %p\n", DeviceExtension, DeviceExtension->Ext); + + + /* zero device extension */ + RtlZeroMemory(BusDeviceExtension, sizeof(BUS_ENUM_DEVICE_EXTENSION)); + + /* initialize bus device extension */ + wcscpy(BusDeviceExtension->BusIdentifier, BusIdentifier); + + /* allocate service path string */ + Length = ServiceKeyPath.MaximumLength; + Length += BusDeviceObject->DriverObject->DriverExtension->ServiceKeyName.MaximumLength; + + if (ServiceRelativePath) + { + /* relative path for devices */ + Length += (wcslen(ServiceRelativePath) + 2) * sizeof(WCHAR); + } + + BusDeviceExtension->ServicePath.Length = 0; + BusDeviceExtension->ServicePath.MaximumLength = Length; + BusDeviceExtension->ServicePath.Buffer = AllocateItem(NonPagedPool, Length); + + if (!BusDeviceExtension->ServicePath.Buffer) + { + /* not enough memory */ + FreeItem(BusDeviceExtension); + + return STATUS_INSUFFICIENT_RESOURCES; + } + + RtlAppendUnicodeStringToString(&BusDeviceExtension->ServicePath, &ServiceKeyPath); + RtlAppendUnicodeStringToString(&BusDeviceExtension->ServicePath, &BusDeviceObject->DriverObject->DriverExtension->ServiceKeyName); + + if (ServiceRelativePath) + { + RtlAppendUnicodeToString(&BusDeviceExtension->ServicePath, L"\\"); + RtlAppendUnicodeToString(&BusDeviceExtension->ServicePath, ServiceRelativePath); + } + + if (InterfaceGuid) + { + /* register an device interface */ + Status = IoRegisterDeviceInterface(PhysicalDeviceObject, InterfaceGuid, NULL, &BusDeviceExtension->DeviceInterfaceLink); + + /* check for success */ + if (!NT_SUCCESS(Status)) + { + + FreeItem(BusDeviceExtension->ServicePath.Buffer); + FreeItem(BusDeviceExtension); + return Status; + } + + /* now enable device interface */ + Status = IoSetDeviceInterfaceState(&BusDeviceExtension->DeviceInterfaceLink, TRUE); + + if (!NT_SUCCESS(Status)) + { + FreeItem(BusDeviceExtension->ServicePath.Buffer); + FreeItem(BusDeviceExtension); + return Status; + } + } + + /* initialize common device extension */ + BusDeviceExtension->Common.BusDeviceExtension = NULL; + BusDeviceExtension->Common.DeviceObjectReferenceCount = 1; + BusDeviceExtension->Common.DeviceReferenceCount = 1; + BusDeviceExtension->Common.IsBus = TRUE; + InitializeListHead(&BusDeviceExtension->Common.Entry); + + /* store device objects */ + BusDeviceExtension->BusDeviceObject = BusDeviceObject; + BusDeviceExtension->PhysicalDeviceObject = PhysicalDeviceObject; + + /* initialize lock */ + KeInitializeSpinLock(&BusDeviceExtension->Lock); + + /* initialize timer */ + KeInitializeTimer(&BusDeviceExtension->Timer); + + /* initialize dpc */ + KeInitializeDpc(&BusDeviceExtension->Dpc, KspBusDpcRoutine, (PVOID)BusDeviceExtension); + + /* initialize event */ + KeInitializeEvent(&BusDeviceExtension->Event, SynchronizationEvent, FALSE); + + /* initialize work item */ + ExInitializeWorkItem(&BusDeviceExtension->WorkItem, KspBusWorkerRoutine, (PVOID)BusDeviceExtension); + + if (!PnpDeviceObject) + { + /* attach device */ + BusDeviceExtension->PnpDeviceObject = IoAttachDeviceToDeviceStack(BusDeviceObject, PhysicalDeviceObject); + + if (!BusDeviceExtension->PnpDeviceObject) + { + /* failed to attach device */ + if (BusDeviceExtension->DeviceInterfaceLink.Buffer) + { + IoSetDeviceInterfaceState(&BusDeviceExtension->DeviceInterfaceLink, FALSE); + RtlFreeUnicodeString(&BusDeviceExtension->DeviceInterfaceLink); + } + + /* free device extension */ + FreeItem(BusDeviceExtension->ServicePath.Buffer); + FreeItem(BusDeviceExtension); + + return STATUS_DEVICE_REMOVED; + } + + /* mark device as attached */ + BusDeviceExtension->DeviceAttached = TRUE; + } + else + { + /* directly attach */ + BusDeviceExtension->PnpDeviceObject = PnpDeviceObject; + } + + /* now scan the bus */ + Status = KspScanBus(BusDeviceExtension); + + /* check for success */ + if (!NT_SUCCESS(Status)) + { + /* failed to scan bus */ + if (BusDeviceExtension->DeviceInterfaceLink.Buffer) + { + IoSetDeviceInterfaceState(&BusDeviceExtension->DeviceInterfaceLink, FALSE); + RtlFreeUnicodeString(&BusDeviceExtension->DeviceInterfaceLink); + } + + if (BusDeviceExtension->DeviceAttached) + { + /* detach device */ + IoDetachDevice(BusDeviceExtension->PnpDeviceObject); + } + + /* free device extension */ + FreeItem(BusDeviceExtension->ServicePath.Buffer); + FreeItem(BusDeviceExtension); + } + + DPRINT1("KsCreateBusEnumObject cp %x\n", Status); + /* done */ + return Status; +} + +/* + @implemented +*/ +KSDDKAPI +NTSTATUS +NTAPI +KsGetBusEnumPnpDeviceObject( + IN PDEVICE_OBJECT DeviceObject, + IN PDEVICE_OBJECT *PnpDeviceObject) +{ + PDEV_EXTENSION DeviceExtension; + PCOMMON_DEVICE_EXTENSION CommonDeviceExtension; + PBUS_ENUM_DEVICE_EXTENSION BusDeviceExtension; + + DPRINT1("KsGetBusEnumPnpDeviceObject\n"); + + if (!DeviceObject->DeviceExtension) + { + /* invalid parameter */ + return STATUS_INVALID_PARAMETER; + } + + /* get device extension */ + DeviceExtension = (PDEV_EXTENSION)DeviceObject->DeviceExtension; + + /* get common device extension */ + CommonDeviceExtension = DeviceExtension->Ext; + + if (!CommonDeviceExtension) + { + /* invalid parameter */ + return STATUS_INVALID_PARAMETER; + } + + if (!CommonDeviceExtension->IsBus) + { + /* getting pnp device object is only supported for software bus device object */ + return STATUS_INVALID_PARAMETER; + } + + /* sanity checks */ + ASSERT(CommonDeviceExtension); + ASSERT(CommonDeviceExtension->IsBus); + + /* cast to bus device extension */ + BusDeviceExtension = (PBUS_ENUM_DEVICE_EXTENSION)CommonDeviceExtension; + + /* store result */ + *PnpDeviceObject = BusDeviceExtension->PnpDeviceObject; + + /* done */ + return STATUS_SUCCESS; +} + +/* + @implemented +*/ +KSDDKAPI +NTSTATUS +NTAPI +KsInstallBusEnumInterface( + PIRP Irp) +{ + BUS_INSTALL_ENUM_CONTEXT Context; + KPROCESSOR_MODE Mode; + LUID luid; + PIO_STACK_LOCATION IoStack; + PDEV_EXTENSION DeviceExtension; + PBUS_ENUM_DEVICE_EXTENSION BusDeviceExtension; + + DPRINT1("KsGetBusEnumPnpDeviceObject\n"); + + /* get current irp stack location */ + IoStack = IoGetCurrentIrpStackLocation(Irp); + + /* get previous mode */ + Mode = ExGetPreviousMode(); + + /* convert to luid */ + luid = RtlConvertUlongToLuid(SE_LOAD_DRIVER_PRIVILEGE); + + /* perform access check */ + if (!SeSinglePrivilegeCheck(luid, Mode)) + { + /* insufficient privileges */ + return STATUS_PRIVILEGE_NOT_HELD; + } + + /* get device extension */ + DeviceExtension = (PDEV_EXTENSION)IoStack->DeviceObject->DeviceExtension; + + /* get bus device extension */ + BusDeviceExtension = DeviceExtension->Ext->BusDeviceExtension; + + + /* initialize context */ + Context.Irp = Irp; + KeInitializeEvent(&Context.Event, NotificationEvent, FALSE); + Context.BusDeviceExtension = BusDeviceExtension; + ExInitializeWorkItem(&Context.WorkItem, KspInstallBusEnumInterface, (PVOID)&Context); + + /* queue the work item */ + ExQueueWorkItem(&Context.WorkItem, DelayedWorkQueue); + + /* wait for completion */ + KeWaitForSingleObject(&Context.Event, Executive, KernelMode, FALSE, NULL); + + /* done */ + return Context.Status; +} + +/* + @implemented +*/ +KSDDKAPI +NTSTATUS +NTAPI +KsIsBusEnumChildDevice( + IN PDEVICE_OBJECT DeviceObject, + OUT PBOOLEAN ChildDevice) +{ + PDEV_EXTENSION DeviceExtension; + PBUS_ENUM_DEVICE_EXTENSION BusDeviceExtension; + + DPRINT("KsIsBusEnumChildDevice %p\n", DeviceObject); + + /* get device extension */ + DeviceExtension = (PDEV_EXTENSION)DeviceObject->DeviceExtension; + + /* get bus device extension */ + BusDeviceExtension = (PBUS_ENUM_DEVICE_EXTENSION)DeviceExtension->Ext; + + if (!BusDeviceExtension) + { + /* not a bus device */ + return STATUS_INVALID_PARAMETER; + } + + /* store result */ + *ChildDevice = (BusDeviceExtension->Common.IsBus == FALSE); + + return STATUS_SUCCESS; +} + +/* + @implemented +*/ +KSDDKAPI +NTSTATUS +NTAPI +KsServiceBusEnumCreateRequest( + IN PDEVICE_OBJECT DeviceObject, + IN OUT PIRP Irp) +{ + PLIST_ENTRY Entry; + PBUS_DEVICE_ENTRY DeviceEntry = NULL; /* fix gcc */ + PIO_STACK_LOCATION IoStack; + BOOLEAN ItemExists; + PDEV_EXTENSION DeviceExtension; + PBUS_ENUM_DEVICE_EXTENSION BusDeviceExtension; + //PCOMMON_DEVICE_EXTENSION ChildDeviceExtension; + NTSTATUS Status; + + DPRINT1("KsServiceBusEnumCreateRequest\n"); + + /* FIXME: locks */ + + /* get device extension */ + DeviceExtension = (PDEV_EXTENSION)DeviceObject->DeviceExtension; + + /* get bus device extension */ + BusDeviceExtension = (PBUS_ENUM_DEVICE_EXTENSION)DeviceExtension->Ext; + + /* get current irp stack location */ + IoStack = IoGetCurrentIrpStackLocation(Irp); + + /* sanity checks */ + ASSERT(IoStack->FileObject); + ASSERT(IoStack->FileObject->FileName.Buffer); + + /* scan list and check if it is already present */ + Entry = BusDeviceExtension->Common.Entry.Flink; + + while(Entry != &BusDeviceExtension->Common.Entry) + { + /* get real offset */ + DeviceEntry = (PBUS_DEVICE_ENTRY)CONTAINING_RECORD(Entry, BUS_DEVICE_ENTRY, Entry); + + /* check if name matches */ + if (!wcsicmp(DeviceEntry->DeviceName, IoStack->FileObject->FileName.Buffer + 1)) + { + /* item already exists */ + ItemExists = TRUE; + break; + } + + /* move to next entry */ + Entry = Entry->Flink; + } + + if (!ItemExists) + { + /* interface not registered */ + DPRINT1("Interface %wZ not registered\n", &IoStack->FileObject->FileName); + return STATUS_OBJECT_NAME_NOT_FOUND; + } + + /* is there a pdo yet */ + if (DeviceEntry->PDO) + { + if (DeviceEntry->DeviceState == Started) + { + /* issue reparse */ + return KspDoReparseForIrp(Irp, DeviceEntry); + } + + /* delay processing until pnp is finished with enumeration */ + IoMarkIrpPending(Irp); + + /* insert into irp pending list */ + InsertTailList(&DeviceEntry->IrpPendingList, &Irp->Tail.Overlay.ListEntry); + + /* HACK */ + IoInvalidateDeviceRelations(BusDeviceExtension->PhysicalDeviceObject, BusRelations); + + + /* done for now */ + return STATUS_PENDING; + + } + else + { + /* time to create PDO */ + Status = KspCreatePDO(BusDeviceExtension, DeviceEntry, &DeviceEntry->PDO); + + if (!NT_SUCCESS(Status)) + { + /* failed to create PDO */ + DPRINT1("KsServiceBusEnumCreateRequest failed to create PDO with %x\n", Status); + return Status; + } + + /* delay processing until pnp is finished with enumeration */ + IoMarkIrpPending(Irp); + + /* insert into irp pending list */ + InsertTailList(&DeviceEntry->IrpPendingList, &Irp->Tail.Overlay.ListEntry); + + /* get current time */ + KeQuerySystemTime(&DeviceEntry->TimeCreated); + + /* invalidate device relations */ + IoInvalidateDeviceRelations(BusDeviceExtension->PhysicalDeviceObject, BusRelations); + + /* done for now */ + return STATUS_PENDING; + } +} + +/* + @implemented +*/ +KSDDKAPI +NTSTATUS +NTAPI +KsServiceBusEnumPnpRequest( + IN PDEVICE_OBJECT DeviceObject, + IN OUT PIRP Irp) +{ + PDEV_EXTENSION DeviceExtension; + PBUS_ENUM_DEVICE_EXTENSION BusDeviceExtension; + PIO_STACK_LOCATION IoStack; + + DPRINT1("KsServiceBusEnumPnpRequest %p\n", DeviceObject); + + /* get device extension */ + DeviceExtension = (PDEV_EXTENSION)DeviceObject->DeviceExtension; + + /* get bus device extension */ + BusDeviceExtension = (PBUS_ENUM_DEVICE_EXTENSION)DeviceExtension->Ext; + + /* get current irp stack location */ + IoStack = IoGetCurrentIrpStackLocation(Irp); + + if (BusDeviceExtension->Common.IsBus) + { + if (IoStack->MinorFunction == IRP_MN_START_DEVICE) + { + /* no op for bus driver */ + return STATUS_SUCCESS; + } + else if (IoStack->MinorFunction == IRP_MN_QUERY_DEVICE_RELATIONS) + { + /* handle bus device relations */ + ASSERT(IoStack->Parameters.QueryDeviceRelations.Type == BusRelations); + + return KspQueryBusRelations(BusDeviceExtension, Irp); + } + DPRINT1("KsServiceBusEnumPnpRequest BusObject MinorFunction %x\n", IoStack->MinorFunction); + return STATUS_NOT_SUPPORTED; + } + else + { + if (IoStack->MinorFunction == IRP_MN_QUERY_ID) + { + /* query id */ + return KspQueryId(&BusDeviceExtension->Common, Irp); + } + else if (IoStack->MinorFunction == IRP_MN_QUERY_BUS_INFORMATION) + { + /* query bus information */ + return KspQueryBusInformation(&BusDeviceExtension->Common, Irp); + } + else if (IoStack->MinorFunction == IRP_MN_QUERY_RESOURCES) + { + /* no op */ + return STATUS_SUCCESS; + } + else if (IoStack->MinorFunction == IRP_MN_QUERY_RESOURCE_REQUIREMENTS) + { + /* no op */ + return STATUS_SUCCESS; + } + else if (IoStack->MinorFunction == IRP_MN_START_DEVICE) + { + /* start bus */ + return KspStartBusDevice(DeviceObject, &BusDeviceExtension->Common, Irp); + } + else if (IoStack->MinorFunction == IRP_MN_QUERY_CAPABILITIES) + { + /* query capabilities */ + return KspQueryBusDeviceCapabilities(&BusDeviceExtension->Common, Irp); + } + else if (IoStack->MinorFunction == IRP_MN_QUERY_PNP_DEVICE_STATE) + { + /* query pnp state */ + return KspQueryBusDevicePnpState(&BusDeviceExtension->Common, Irp); + } + else if (IoStack->MinorFunction == IRP_MN_QUERY_INTERFACE) + { + /* query interface */ + return KspQueryBusDeviceInterface(Irp, &BusDeviceExtension->Common); + } + + DPRINT1("KsServiceBusEnumPnpRequest BusObject MinorFunction %x\n", IoStack->MinorFunction); + return STATUS_NOT_SUPPORTED; + } +} + +/* + @implemented +*/ +KSDDKAPI +NTSTATUS +NTAPI +KsRemoveBusEnumInterface( + IN PIRP Irp) +{ + KPROCESSOR_MODE Mode; + LUID luid; + BUS_INSTALL_ENUM_CONTEXT Ctx; + PDEV_EXTENSION DeviceExtension; + PBUS_ENUM_DEVICE_EXTENSION BusDeviceExtension; + PIO_STACK_LOCATION IoStack; + + DPRINT1("KsRemoveBusEnumInterface\n"); + + /* get io stack location */ + IoStack = IoGetCurrentIrpStackLocation(Irp); + + /* get device extension */ + DeviceExtension = (PDEV_EXTENSION)IoStack->DeviceObject->DeviceExtension; + + /* get bus device extension */ + BusDeviceExtension = DeviceExtension->Ext->BusDeviceExtension; + + /* get previous mode */ + Mode = ExGetPreviousMode(); + + /* convert to luid */ + luid = RtlConvertUlongToLuid(SE_LOAD_DRIVER_PRIVILEGE); + + /* perform access check */ + if (!SeSinglePrivilegeCheck(luid, Mode)) + { + /* insufficient privileges */ + return STATUS_PRIVILEGE_NOT_HELD; + } + + /* initialize context */ + KeInitializeEvent(&Ctx.Event, NotificationEvent, FALSE); + Ctx.Irp = Irp; + Ctx.BusDeviceExtension = BusDeviceExtension; + ExInitializeWorkItem(&Ctx.WorkItem, KspRemoveBusInterface, (PVOID)&Ctx); + + /* now queue the work item */ + ExQueueWorkItem(&Ctx.WorkItem, DelayedWorkQueue); + + /* wait for completion */ + KeWaitForSingleObject(&Ctx.Event, Executive, KernelMode, FALSE, NULL); + + /* return result */ + return Ctx.Status; +} Propchange: branches/audio-bringup/drivers/ksfilter/ks/swenum.c ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[rmessiant] 50066: [ADVAPI32] - ConvertStringSidToSidW: Stop writing 1 subauthority too much. Fixes a DWORD sized buffer overflow. Should fix bug #5764. - ConvertStringSidToSidW: Don't leak an allo...
by rmessiant＠svn.reactos.org 19 Dec '10

19 Dec '10

Author: rmessiant Date: Sun Dec 19 23:19:04 2010 New Revision: 50066 URL: http://svn.reactos.org/svn/reactos?rev=50066&view=rev Log: [ADVAPI32] - ConvertStringSidToSidW: Stop writing 1 subauthority too much. Fixes a DWORD sized buffer overflow. Should fix bug #5764. - ConvertStringSidToSidW: Don't leak an allocated SID in case of failure. [SETUPAPI] - SetupDiClassNameFromGuidExW: Rewrite to prevent a buffer overflow and pass additional winetests. Should fix bug #5474. - SetupDiClassNameFromGuidExA: Return the required buffer size in failure cases. Modified: trunk/reactos/dll/win32/advapi32/sec/sid.c trunk/reactos/dll/win32/setupapi/devinst.c Modified: trunk/reactos/dll/win32/advapi32/sec/sid.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/sec/sid… ============================================================================== --- trunk/reactos/dll/win32/advapi32/sec/sid.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/advapi32/sec/sid.c [iso-8859-1] Sun Dec 19 23:19:04 2010 @@ -1982,16 +1982,14 @@ if (*StringSid == '-') StringSid++; - pisid->SubAuthority[i] = atoiW(StringSid); - while (*StringSid) { + pisid->SubAuthority[i++] = atoiW(StringSid); + while (*StringSid && *StringSid != '-') StringSid++; if (*StringSid == '-') StringSid++; - - pisid->SubAuthority[++i] = atoiW(StringSid); } if (i != pisid->SubAuthorityCount) @@ -2002,7 +2000,10 @@ lend: if (!ret) + { + LocalFree(pisid); SetLastError(ERROR_INVALID_SID); + } TRACE("returning %s\n", ret ? "TRUE" : "FALSE"); return ret; Modified: trunk/reactos/dll/win32/setupapi/devinst.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/devinst… ============================================================================== --- trunk/reactos/dll/win32/setupapi/devinst.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/setupapi/devinst.c [iso-8859-1] Sun Dec 19 23:19:04 2010 @@ -1103,7 +1103,7 @@ if (MachineName) MachineNameW = MultiByteToUnicode(MachineName, CP_ACP); ret = SetupDiClassNameFromGuidExW(ClassGuid, ClassNameW, MAX_CLASS_NAME_LEN, - NULL, MachineNameW, Reserved); + RequiredSize, MachineNameW, Reserved); if (ret) { int len = WideCharToMultiByte(CP_ACP, 0, ClassNameW, -1, ClassName, @@ -1113,8 +1113,6 @@ SetLastError(ERROR_INSUFFICIENT_BUFFER); ret = FALSE; } - else if (RequiredSize) - *RequiredSize = len; } MyFree(MachineNameW); return ret; @@ -1135,73 +1133,98 @@ DWORD dwLength; DWORD dwRegType; LONG rc; + PWSTR Buffer; TRACE("%s %p %lu %p %s %p\n", debugstr_guid(ClassGuid), ClassName, ClassNameSize, RequiredSize, debugstr_w(MachineName), Reserved); - hKey = SetupDiOpenClassRegKeyExW(ClassGuid, - KEY_QUERY_VALUE, - DIOCR_INSTALLER, - MachineName, - Reserved); + /* Make sure there's a GUID */ + if (ClassGuid == NULL) + { + SetLastError(ERROR_INVALID_CLASS); /* On Vista: ERROR_INVALID_USER_BUFFER */ + return FALSE; + } + + /* Make sure there's a real buffer when there's a size */ + if ((ClassNameSize > 0) && (ClassName == NULL)) + { + SetLastError(ERROR_INVALID_PARAMETER); /* On Vista: ERROR_INVALID_USER_BUFFER */ + return FALSE; + } + + /* Open the key for the GUID */ + hKey = SetupDiOpenClassRegKeyExW(ClassGuid, KEY_QUERY_VALUE, DIOCR_INSTALLER, MachineName, Reserved); + if (hKey == INVALID_HANDLE_VALUE) - { - return FALSE; - } - + return FALSE; + + /* Retrieve the class name data */ + dwLength = ClassNameSize * sizeof(WCHAR); + + do + { + /* Allocate a buffer to retrieve the class name data */ + Buffer = HeapAlloc(GetProcessHeap(), 0, dwLength); + + if (Buffer == NULL) + { + rc = GetLastError(); + break; + } + + /* Query for the class name data */ + rc = RegQueryValueExW(hKey, Class, NULL, &dwRegType, (LPBYTE) Buffer, &dwLength); + + /* Clean up the buffer if needed */ + if (rc != ERROR_SUCCESS) + HeapFree(GetProcessHeap(), 0, Buffer); + } while (rc == ERROR_MORE_DATA); + + /* Close the key */ + RegCloseKey(hKey); + + /* Make sure we got the data */ + if (rc != ERROR_SUCCESS) + { + SetLastError(rc); + return FALSE; + } + + /* Make sure the data is a string */ + if (dwRegType != REG_SZ) + { + HeapFree(GetProcessHeap(), 0, Buffer); + SetLastError(ERROR_GEN_FAILURE); + return FALSE; + } + + /* Determine the length of the class name */ + dwLength /= sizeof(WCHAR); + + if ((dwLength == 0) || (Buffer[dwLength - 1] != UNICODE_NULL)) + /* Count the null-terminator */ + dwLength++; + + /* Inform the caller about the class name */ + if ((ClassName != NULL) && (dwLength <= ClassNameSize)) + { + memcpy(ClassName, Buffer, (dwLength - 1) * sizeof(WCHAR)); + ClassName[dwLength - 1] = UNICODE_NULL; + } + + /* Inform the caller about the required size */ if (RequiredSize != NULL) - { - dwLength = 0; - if (RegQueryValueExW(hKey, - Class, - NULL, - NULL, - NULL, - &dwLength)) - { - RegCloseKey(hKey); - return FALSE; - } - - *RequiredSize = dwLength / sizeof(WCHAR) + 1; - } - - if (!ClassGuid) - { - SetLastError(ERROR_INVALID_CLASS); - RegCloseKey(hKey); - return FALSE; - } - if (!ClassName && ClassNameSize > 0) - { - SetLastError(ERROR_INVALID_PARAMETER); - RegCloseKey(hKey); - return FALSE; - } - - dwLength = ClassNameSize * sizeof(WCHAR) - sizeof(UNICODE_NULL); - rc = RegQueryValueExW(hKey, - Class, - NULL, - &dwRegType, - (LPBYTE)ClassName, - &dwLength); - if (rc != ERROR_SUCCESS) - { - SetLastError(rc); - RegCloseKey(hKey); - return FALSE; - } - if (dwRegType != REG_SZ) - { - SetLastError(ERROR_GEN_FAILURE); - RegCloseKey(hKey); - return FALSE; - } - - if (ClassNameSize > 1) - ClassName[ClassNameSize] = UNICODE_NULL; - RegCloseKey(hKey); + *RequiredSize = dwLength; + + /* Clean up the buffer */ + HeapFree(GetProcessHeap(), 0, Buffer); + + /* Make sure the buffer was large enough */ + if ((ClassName == NULL) || (dwLength > ClassNameSize)) + { + SetLastError(ERROR_INSUFFICIENT_BUFFER); + return FALSE; + } return TRUE; }

1 0

[akhaldi] 50065: [CMAKE] - Use an actual entrypoint for oleacc. Reflects r50064.
by akhaldi＠svn.reactos.org 19 Dec '10

19 Dec '10

Author: akhaldi Date: Sun Dec 19 23:00:46 2010 New Revision: 50065 URL: http://svn.reactos.org/svn/reactos?rev=50065&view=rev Log: [CMAKE] - Use an actual entrypoint for oleacc. Reflects r50064. Modified: branches/cmake-bringup/dll/win32/oleacc/CMakeLists.txt Modified: branches/cmake-bringup/dll/win32/oleacc/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/oleacc/… ============================================================================== --- branches/cmake-bringup/dll/win32/oleacc/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/oleacc/CMakeLists.txt [iso-8859-1] Sun Dec 19 23:00:46 2010 @@ -12,14 +12,11 @@ add_library(oleacc SHARED ${SOURCE}) -set_entrypoint(oleacc 0) +set_module_type(oleacc win32dll) target_link_libraries(oleacc wine) -add_importlibs(oleacc - user32 - kernel32 - ntdll) +add_importlibs(oleacc user32 msvcrt kernel32 ntdll) add_importlib_target(oleacc.spec) add_cab_target(oleacc 1)

1 0

[rmessiant] 50064: [OLEACC] - Use an actual entrypoint. Needed to record the instance handle, used by various function that access resources of the module. Should fix oleacc:main winetest.
by rmessiant＠svn.reactos.org 19 Dec '10

19 Dec '10

Author: rmessiant Date: Sun Dec 19 22:53:29 2010 New Revision: 50064 URL: http://svn.reactos.org/svn/reactos?rev=50064&view=rev Log: [OLEACC] - Use an actual entrypoint. Needed to record the instance handle, used by various function that access resources of the module. Should fix oleacc:main winetest. Modified: trunk/reactos/dll/win32/oleacc/oleacc.rbuild Modified: trunk/reactos/dll/win32/oleacc/oleacc.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oleacc/oleacc.rb… ============================================================================== --- trunk/reactos/dll/win32/oleacc/oleacc.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/oleacc/oleacc.rbuild [iso-8859-1] Sun Dec 19 22:53:29 2010 @@ -1,7 +1,7 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> <group> -<module name="oleacc" type="win32dll" baseaddress="${BASEADDRESS_OLEACC}" installbase="system32" installname="oleacc.dll" allowwarnings="true" entrypoint="0"> +<module name="oleacc" type="win32dll" baseaddress="${BASEADDRESS_OLEACC}" installbase="system32" installname="oleacc.dll" allowwarnings="true"> <autoregister infsection="OleControlDlls" type="DllRegisterServer" /> <importlibrary definition="oleacc.spec" /> <include base="oleacc">.</include>

1 0

[fireball] 50063: [WIDL] - Update to Wine-1.3.9. - Important note: Syntax of widl invocation changed slightly, so take this into account when merging to cmake branch.
by fireball＠svn.reactos.org 19 Dec '10

19 Dec '10

Author: fireball Date: Sun Dec 19 20:47:16 2010 New Revision: 50063 URL: http://svn.reactos.org/svn/reactos?rev=50063&view=rev Log: [WIDL] - Update to Wine-1.3.9. - Important note: Syntax of widl invocation changed slightly, so take this into account when merging to cmake branch. Added: trunk/reactos/tools/widl/register.c (with props) Modified: trunk/reactos/include/psdk/rpcndr.h trunk/reactos/tools/rbuild/backend/mingw/rules.mak trunk/reactos/tools/widl/client.c trunk/reactos/tools/widl/header.c trunk/reactos/tools/widl/header.h trunk/reactos/tools/widl/parser.l trunk/reactos/tools/widl/parser.tab.c trunk/reactos/tools/widl/parser.tab.h trunk/reactos/tools/widl/parser.y trunk/reactos/tools/widl/parser.yy.c trunk/reactos/tools/widl/proxy.c trunk/reactos/tools/widl/server.c trunk/reactos/tools/widl/typegen.c trunk/reactos/tools/widl/typegen.h trunk/reactos/tools/widl/utils.c trunk/reactos/tools/widl/utils.h trunk/reactos/tools/widl/widl.c trunk/reactos/tools/widl/widl.h trunk/reactos/tools/widl/widl.rbuild trunk/reactos/tools/widl/widltypes.h trunk/reactos/tools/widl/write_msft.c [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/include/psdk/rpcndr.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/rpcndr.h?rev=… Modified: trunk/reactos/tools/rbuild/backend/mingw/rules.mak URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/mingw… Modified: trunk/reactos/tools/widl/client.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/client.c?rev=50… Modified: trunk/reactos/tools/widl/header.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/header.c?rev=50… Modified: trunk/reactos/tools/widl/header.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/header.h?rev=50… Modified: trunk/reactos/tools/widl/parser.l URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/parser.l?rev=50… Modified: trunk/reactos/tools/widl/parser.tab.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/parser.tab.c?re… Modified: trunk/reactos/tools/widl/parser.tab.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/parser.tab.h?re… Modified: trunk/reactos/tools/widl/parser.y URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/parser.y?rev=50… Modified: trunk/reactos/tools/widl/parser.yy.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/parser.yy.c?rev… Modified: trunk/reactos/tools/widl/proxy.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/proxy.c?rev=500… Added: trunk/reactos/tools/widl/register.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/register.c?rev=… Modified: trunk/reactos/tools/widl/server.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/server.c?rev=50… Modified: trunk/reactos/tools/widl/typegen.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/typegen.c?rev=5… Modified: trunk/reactos/tools/widl/typegen.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/typegen.h?rev=5… Modified: trunk/reactos/tools/widl/utils.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/utils.c?rev=500… Modified: trunk/reactos/tools/widl/utils.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/utils.h?rev=500… Modified: trunk/reactos/tools/widl/widl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/widl.c?rev=5006… Modified: trunk/reactos/tools/widl/widl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/widl.h?rev=5006… Modified: trunk/reactos/tools/widl/widl.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/widl.rbuild?rev… Modified: trunk/reactos/tools/widl/widltypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/widltypes.h?rev… Modified: trunk/reactos/tools/widl/write_msft.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/write_msft.c?re…

1 0

[tkreuzer] 50062: [CMAKE] Fix configure script for msvc
by tkreuzer＠svn.reactos.org 19 Dec '10

19 Dec '10

Author: tkreuzer Date: Sun Dec 19 17:01:35 2010 New Revision: 50062 URL: http://svn.reactos.org/svn/reactos?rev=50062&view=rev Log: [CMAKE] Fix configure script for msvc Modified: branches/cmake-bringup/configure.cmd Modified: branches/cmake-bringup/configure.cmd URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/configure.cmd?rev… ============================================================================== --- branches/cmake-bringup/configure.cmd [iso-8859-1] (original) +++ branches/cmake-bringup/configure.cmd [iso-8859-1] Sun Dec 19 17:01:35 2010 @@ -48,7 +48,7 @@ cmake -G "MinGW Makefiles" -DCMAKE_TOOLCHAIN_FILE=toolchain-mingw32.cmake %ROS_SOURCE_DIR% -DREACTOS_BUILD_TOOLS_DIR:DIR="%REACTOS_BUILD_TOOLS_DIR%" ) if "%BUILD_ENVIRONMENT%" == "WDK" ( - cmake -G "NMake Makefiles" -DCMAKE_TOOLCHAIN_FILE=toolchain-msc.cmake %ROS_SOURCE_DIR% -DREACTOS_BUILD_TOOLS_DIR:DIR="%REACTOS_BUILD_TOOLS_DIR%" + cmake -G "NMake Makefiles" -DCMAKE_TOOLCHAIN_FILE=toolchain-msvc.cmake %ROS_SOURCE_DIR% -DREACTOS_BUILD_TOOLS_DIR:DIR="%REACTOS_BUILD_TOOLS_DIR%" ) cd..

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